run update

9 years ago · 32cf7ad59e
parent 90ca2a7df0
commit 32cf7ad59e
9 changed files with 335 additions and 63 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -3,15 +3,20 @@ root = true
 [*]
 indent_style = space
 indent_size = 2
 end_of_line = lf
 charset = utf-8
 indent_size = 2
 trim_trailing_whitespace = true
 insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false
 insert_final_newline = false
-[test/fixtures/*]
+[test/**]
 trim_trailing_whitespace = false
 insert_final_newline = false
 [templates/**]
 trim_trailing_whitespace = false
 insert_final_newline = false
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -0,0 +1,275 @@
 {
  "ecmaFeatures": {
    "modules": true,
    "experimentalObjectRestSpread": true
  },
  "env": {
    "browser": false,
    "es6": true,
    "node": true,
    "mocha": true
  },
  "globals": {
    "document": false,
    "navigator": false,
    "window": false
  },
  "rules": {
    "accessor-pairs": 2,
    "arrow-spacing": [
      2,
      {
        "before": true,
        "after": true
      }
    ],
    "block-spacing": [
      2,
      "always"
    ],
    "brace-style": [
      2,
      "1tbs",
      {
        "allowSingleLine": true
      }
    ],
    "comma-dangle": [
      2,
      "never"
    ],
    "comma-spacing": [
      2,
      {
        "before": false,
        "after": true
      }
    ],
    "comma-style": [
      2,
      "last"
    ],
    "constructor-super": 2,
    "curly": [
      2,
      "multi-line"
    ],
    "dot-location": [
      2,
      "property"
    ],
    "eol-last": 2,
    "eqeqeq": [
      2,
      "allow-null"
    ],
    "generator-star-spacing": [
      2,
      {
        "before": true,
        "after": true
      }
    ],
    "handle-callback-err": [
      2,
      "^(err|error)$"
    ],
    "indent": [
      2,
      2,
      {
        "SwitchCase": 1
      }
    ],
    "key-spacing": [
      2,
      {
        "beforeColon": false,
        "afterColon": true
      }
    ],
    "keyword-spacing": [
      2,
      {
        "before": true,
        "after": true
      }
    ],
    "new-cap": [
      2,
      {
        "newIsCap": true,
        "capIsNew": false
      }
    ],
    "new-parens": 2,
    "no-array-constructor": 2,
    "no-caller": 2,
    "no-class-assign": 2,
    "no-cond-assign": 2,
    "no-const-assign": 2,
    "no-control-regex": 2,
    "no-debugger": 2,
    "no-delete-var": 2,
    "no-dupe-args": 2,
    "no-dupe-class-members": 2,
    "no-dupe-keys": 2,
    "no-duplicate-case": 2,
    "no-empty-character-class": 2,
    "no-eval": 2,
    "no-ex-assign": 2,
    "no-extend-native": 2,
    "no-extra-bind": 2,
    "no-extra-boolean-cast": 2,
    "no-extra-parens": [
      2,
      "functions"
    ],
    "no-fallthrough": 2,
    "no-floating-decimal": 2,
    "no-func-assign": 2,
    "no-implied-eval": 2,
    "no-inner-declarations": [
      2,
      "functions"
    ],
    "no-invalid-regexp": 2,
    "no-irregular-whitespace": 2,
    "no-iterator": 2,
    "no-label-var": 2,
    "no-labels": 2,
    "no-lone-blocks": 2,
    "no-mixed-spaces-and-tabs": 2,
    "no-multi-spaces": 2,
    "no-multi-str": 2,
    "no-multiple-empty-lines": [
      2,
      {
        "max": 1
      }
    ],
    "no-native-reassign": 0,
    "no-negated-in-lhs": 2,
    "no-new": 2,
    "no-new-func": 2,
    "no-new-object": 2,
    "no-new-require": 2,
    "no-new-wrappers": 2,
    "no-obj-calls": 2,
    "no-octal": 2,
    "no-octal-escape": 2,
    "no-proto": 0,
    "no-redeclare": 2,
    "no-regex-spaces": 2,
    "no-return-assign": 2,
    "no-self-compare": 2,
    "no-sequences": 2,
    "no-shadow-restricted-names": 2,
    "no-spaced-func": 2,
    "no-sparse-arrays": 2,
    "no-this-before-super": 2,
    "no-throw-literal": 2,
    "no-trailing-spaces": 0,
    "no-undef": 2,
    "no-undef-init": 2,
    "no-unexpected-multiline": 2,
    "no-unneeded-ternary": [
      2,
      {
        "defaultAssignment": false
      }
    ],
    "no-unreachable": 2,
    "no-unused-vars": [
      2,
      {
        "vars": "all",
        "args": "none"
      }
    ],
    "no-useless-call": 0,
    "no-with": 2,
    "one-var": [
      0,
      {
        "initialized": "never"
      }
    ],
    "operator-linebreak": [
      0,
      "after",
      {
        "overrides": {
          "?": "before",
          ":": "before"
        }
      }
    ],
    "padded-blocks": [
      0,
      "never"
    ],
    "quotes": [
      2,
      "single",
      "avoid-escape"
    ],
    "radix": 2,
    "semi": [
      2,
      "always"
    ],
    "semi-spacing": [
      2,
      {
        "before": false,
        "after": true
      }
    ],
    "space-before-blocks": [
      2,
      "always"
    ],
    "space-before-function-paren": [
      2,
      "never"
    ],
    "space-in-parens": [
      2,
      "never"
    ],
    "space-infix-ops": 2,
    "space-unary-ops": [
      2,
      {
        "words": true,
        "nonwords": false
      }
    ],
    "spaced-comment": [
      0,
      "always",
      {
        "markers": [
          "global",
          "globals",
          "eslint",
          "eslint-disable",
          "*package",
          "!",
          ","
        ]
      }
    ],
    "use-isnan": 2,
    "valid-typeof": 2,
    "wrap-iife": [
      2,
      "any"
    ],
    "yoda": [
      2,
      "never"
    ]
  }
 }
--- a/.jshintrc
+++ b/.jshintrc
@ -1,18 +0,0 @@
 {
  "asi": false,
  "boss": true,
  "curly": true,
  "eqeqeq": true,
  "eqnull": true,
  "esnext": true,
  "immed": true,
  "latedef": true,
  "laxcomma": false,
  "newcap": true,
  "noarg": true,
  "node": true,
  "sub": true,
  "undef": "var",
  "unused": true,
  "mocha": true
 }
--- a/.travis.yml
+++ b/.travis.yml
@ -1,8 +1,12 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.10"
+  - "stable"
  - "5"
  - "4"
  - "0.12"
-  - "iojs"
+  - "0.10"
-git:
+matrix:
-  depth: 10
+  fast_finish: true
  allow_failures:
    - node_js: "0.10"
--- a/.verb.md
+++ b/.verb.md
@ -2,6 +2,8 @@
 > {%= description %}
 ## Install
 {%= include("install-npm", {save: true}) %}
 ## Usage
@ -49,7 +51,7 @@ Config object will be something like:
 ## Other useful projects
-{%= related(['parse-github-url', 'parse-gitignore', 'parse-author', 'parse-authors']) %}
+{%= related(verb.related.list) %}
 ## Run tests
 {%= include("tests") %}
@ -62,7 +64,7 @@ Config object will be something like:
 ## License
 {%= copyright() %}
-{%= license() %}
+{%= license %}
 ***
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2015 Jon Schlinkert
+Copyright (c) 2015-2016, Jon Schlinkert.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/index.js
+++ b/index.js
@ -11,15 +11,10 @@ var fs = require('fs');
 var path = require('path');
 var ini = require('ini');
-/**
+function parseGitConfig(options, cb) {
 * Expose `config`
 */
 module.exports = git;
 function git(options, cb) {
  if (typeof options === 'function') {
-    cb = options; options = null;
+    cb = options;
    options = null;
  }
  var fp = resolve(options);
@ -37,7 +32,7 @@ function git(options, cb) {
  });
 }
-git.sync = function configSync(options) {
+parseGitConfig.sync = function parseGitConfigSync(options) {
  var fp = resolve(options);
  if (!fs.existsSync(fp)) {
    return null;
@ -68,4 +63,10 @@ function resolve(options) {
 * Expose `resolve`
 */
-module.exports.resolve = resolve;
+parseGitConfig.resolve = resolve;
 /**
 * Expose `parseGitConfig`
 */
 module.exports = parseGitConfig;
--- a/package.json
+++ b/package.json
@ -3,14 +3,8 @@
  "description": "Parse `.git/config` into a JavaScript object. sync or async.",
  "version": "0.3.1",
  "homepage": "https://github.com/jonschlinkert/parse-git-config",
-  "author": {
+  "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
-    "name": "Jon Schlinkert",
+  "repository": "jonschlinkert/parse-git-config",
    "url": "https://github.com/jonschlinkert"
  },
  "repository": {
    "type": "git",
    "url": "git://github.com/jonschlinkert/parse-git-config.git"
  },
  "bugs": {
    "url": "https://github.com/jonschlinkert/parse-git-config/issues"
  },
@ -36,5 +30,15 @@
    "config",
    "git",
    "parse"
  ],
  "verb": {
    "related": {
      "list": [
        "parse-github-url",
        "parse-gitignore",
        "parse-author",
        "parse-authors"
      ]
    }
  }
 }
--- a/test.js
+++ b/test.js
@ -11,7 +11,6 @@
 require('should');
 var git = require('./');
 describe('sync:', function() {
  it('should return an object', function() {
    git.sync().should.have.properties(['core']);