Merge branch 'simon-p-r-master'

zkochan · Jun 13, 2015 · 5d735aa · 5d735aa
2 parents 9b4e236 + 854d254
commit 5d735aa
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 *.swp
 .DS_Store
 node_modules/
+.idea
+npm-debug.log
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,8 @@
 language: node_js
+
+sudo: false
+
 node_js:
- - "0.8"
- - "0.10"
+ - 0.10
+ - 0.12
+ - iojs
diff --git a/index.js b/index.js
@@ -5,15 +5,15 @@ module.exports = function (gitConfigPath, cb) {
  if (typeof cb === 'undefined') {
  cb = gitConfigPath;
  gitConfigPath = path.join(
- process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE, '.gitconfig');
+ process.env.HOME || process.env.USERPROFILE, '.gitconfig');
  }
  parser.parse(gitConfigPath, cb);
 };
 
 module.exports.sync = function (gitConfigPath) {
  if (typeof gitConfigPath === 'undefined') {
  gitConfigPath = path.join(
- process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE, '.gitconfig');
+ process.env.HOME || process.env.USERPROFILE, '.gitconfig');
  }
  var results = {};
  try {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "git-config",
- "version": "0.0.6",
+ "version": "0.0.7",
  "description": "A simple way to extract out all the contents of a .gitconfig file and return as JSON",
  "main": "index.js",
  "scripts": {
@@ -17,12 +17,12 @@
  "iniparser": "~1.0.5"
  },
  "devDependencies": {
- "expect.js": "~0.2.0",
- "grunt-contrib-jshint": "~0.6.4",
- "grunt-contrib-watch": "~0.5.3",
+ "expect.js": "^0.3.1",
  "grunt": "~0.4.1",
- "grunt-mocha-cli": "~1.1.0",
- "grunt-complexity": "~0.1.3",
- "grunt-cli": "~0.1.9"
+ "grunt-cli": "~0.1.9",
+ "grunt-complexity": "^0.3.0",
+ "grunt-contrib-jshint": "^0.11.2",
+ "grunt-contrib-watch": "^0.6.1",
+ "grunt-mocha-cli": "^1.13.0"
  }
 }