editorconfig 0.13.2 → 0.13.3

{editorconfig-core-js-0.13.2 → package}/README.md

@@ -68,6 +68,11 @@ promise.then(function onFulfilled(result) {
 
 Synchronous version of `editorconfig.parse()`.
 
+#### parseString(fileContent)
+
+The `parse()` function above uses `parseString()` under the hood. If you have your file contents
+just pass it to `parseString()` and it'll return the same results as `parse()`.
+
 #### parseFromFiles(filePath, configs[, options])
 
 options is an object with the following defaults:

{editorconfig-core-js-0.13.2 → package}/editorconfig.js

@@ -1,13 +1,13 @@
+var Promise = require('bluebird');
+var fs = require('fs');
 var os = require('os');
 var path = require('path');
-var fs = require('fs');
+var semver = require('semver');
 var util = require('util');
-var Promise = require('bluebird');
 var whenReadFile = Promise.promisify(fs.readFile);
 
-var minimatch = require('./lib/fnmatch');
 var iniparser = require('./lib/ini');
-var Version = require('./lib/version');
+var minimatch = require('./lib/fnmatch');
 var pkg = require('./package.json');
 
 var knownProps = [
@@ -52,7 +52,7 @@ function processMatches(matches, version) {
   // Set indent_size to "tab" if indent_size is unspecified and
   // indent_style is set to "tab".
   if ("indent_style" in matches && matches.indent_style === "tab" &&
-    !("indent_size" in matches) && version.gte(new Version(0, 10))) {
+    !("indent_size" in matches) && semver.gte(version, "0.10.0")) {
     matches.indent_size = "tab";
   }
 
@@ -74,7 +74,7 @@ function processOptions(options, filepath) {
   options = options || {};
   return {
     config: options.config || '.editorconfig',
-    version: new Version(options.version || pkg.version),
+    version: options.version || pkg.version,
     root: path.resolve(options.root || getFilepathRoot(filepath))
   };
 }

{editorconfig-core-js-0.13.2 → package}/lib/ini.js

@@ -23,7 +23,7 @@ var regex = {
  * @param: {Function} callback, the function that will be called when parsing is done
  * @return: none
  */
-module.exports.parse = function (file, callback) {
+exports.parse = function (file, callback) {
   if (!callback) {
     return;
   }
@@ -36,11 +36,11 @@ module.exports.parse = function (file, callback) {
   });
 };
 
-module.exports.parseSync = function (file) {
+exports.parseSync = function (file) {
   return parse(fs.readFileSync(file, 'utf8'));
 };
 
-function parse (data) {
+exports.parseString = function (data) {
   var sectionBody = {};
   var sectionName = null;
   var value = [[sectionName, sectionBody]];
@@ -60,6 +60,4 @@ function parse (data) {
     }
   });
   return value;
-}
-
-module.exports.parseString = parse;
+};

{editorconfig-core-js-0.13.2 → package}/package.json

@@ -1,6 +1,6 @@
 {
   "name": "editorconfig",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "EditorConfig File Locator and Interpreter for Node.js",
   "keywords": [
     "editorconfig",
@@ -31,14 +31,12 @@
   },
   "bugs": "https://github.com/editorconfig/editorconfig-core-js/issues",
   "author": "EditorConfig Team",
-  "license": {
-    "type": "MIT",
-    "url": "http://editorconfig.mit-license.org/2012"
-  },
+  "license": "MIT",
   "dependencies": {
     "bluebird": "^3.0.5",
     "commander": "^2.9.0",
     "lru-cache": "^3.2.0",
+    "semver": "^5.1.0",
     "sigmund": "^1.0.1"
   },
   "devDependencies": {

editorconfig-core-js-0.13.2/.editorconfig

@@ -1,14 +0,0 @@
-; http://editorconfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-indent_size = 4

editorconfig-core-js-0.13.2/.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=lf

editorconfig-core-js-0.13.2/.gitignore

@@ -1,10 +0,0 @@
-node_modules/
-CTest*
-*.sln
-*.vcxproj*
-*.log
-[Tt]ests/
-Makefile
-*.cmake
-/CMakeFiles/
-/CMakeCache.txt

editorconfig-core-js-0.13.2/.npmignore

@@ -1,12 +0,0 @@
-node_modules/
-CMake*
-CTest*
-*.sln
-*.vcxproj*
-*.log
-[Tt]est*/
-Makefile
-.editorconfig
-.gitattributes
-.npmignore
-.travis.yml

editorconfig-core-js-0.13.2/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-
-language: node_js
-
-node_js:
-  - '0.10'
-  - '0.12'
-
-before_script:
-  - npm run pretest
-
-script:
-  - npm run test-verbose
-
-notifications:
-  email:
-    on_success: change
-    on_failure: always

editorconfig-core-js-0.13.2/CMakeLists.txt

@@ -1,16 +0,0 @@
-# This file is used for testing only
-
-# To perform the test, run `cmake .` at the root of the project tree followed
-# by `ctest .`
-
-cmake_minimum_required(VERSION 2.6)
-
-# Do not check any compiler
-project(editorconfig-core-js NONE)
-
-set(NODE node CACHE STRING "Node.js command")
-
-enable_testing()
-
-set(EDITORCONFIG_CMD ${NODE} ${PROJECT_SOURCE_DIR}/bin/editorconfig)
-add_subdirectory(tests)

editorconfig-core-js-0.13.2/lib/version.js

@@ -1,48 +0,0 @@
-function Version(version) {
-  var args = arguments;
-  this.components = typeof version === "string" ?
-    version.split(".").map(function(x){return parseInt(x, 10);}) :
-    Object.keys(arguments).map(function(k){return args[k];});
-
-  var len = this.components.length;
-  this.major = len ? this.components[0] : 0;
-  this.minor = len > 1 ? this.components[1] : 0;
-  this.build = len > 2 ? this.components[2] : 0;
-  this.revision = len > 3 ? this.components[3] : 0;
-
-  if (typeof version !== "string") {
-    return;
-  }
-
-  var ext = version.split("-");
-  if (ext.length === 2) {
-    this.configuration = ext[1];
-  }
-}
-
-Version.prototype = {
-  toString: function() {
-    var version = this.components.join(".");
-    if (typeof this.configuration !== "undefined") {
-      version += "-" + this.configuration;
-    }
-    return version;
-  },
-  gte: function(other){
-    if (this.major < other.major) {
-      return false;
-    }
-    if (this.minor < other.minor) {
-      return false;
-    }
-    if (this.build < other.build) {
-      return false;
-    }
-    if (this.revision < other.revision) {
-      return false;
-    }
-    return true;
-  }
-};
-
-module.exports = Version;

editorconfig-core-js-0.13.2/test/index.js

@@ -1,84 +0,0 @@
-var editorconfig = require('../');
-var fs = require('fs');
-var path = require('path');
-var should = require('should');
-
-describe('parse', function() {
-  it('async', function() {
-    var expected = {
-      indent_style: 'space',
-      indent_size: 2,
-      end_of_line: 'lf',
-      charset: 'utf-8',
-      trim_trailing_whitespace: true,
-      insert_final_newline: true,
-      tab_width: 2
-    };
-    var target = path.join(__dirname, '/app.js');
-    var promise = editorconfig.parse(target);
-    return promise.then(function onFulfilled(result) {
-      expected.should.eql(result);
-    });
-  });
-
-  it('sync', function() {
-    var expected = {
-      indent_style: 'space',
-      indent_size: 2,
-      end_of_line: 'lf',
-      charset: 'utf-8',
-      trim_trailing_whitespace: true,
-      insert_final_newline: true,
-      tab_width: 2
-    };
-    var target = path.join(__dirname, '/app.js');
-    expected.should.eql(editorconfig.parseSync(target));
-  });
-});
-
-describe('parseFromFiles', function() {
-  it('async', function() {
-    var expected = {
-      indent_style: 'space',
-      indent_size: 2,
-      tab_width: 2,
-      end_of_line: 'lf',
-      charset: 'utf-8',
-      trim_trailing_whitespace: true,
-      insert_final_newline: true,
-    };
-    var configs = [];
-    var configPath = path.resolve(__dirname, '../.editorconfig');
-    var config = {
-      name: configPath,
-      contents: fs.readFileSync(configPath, 'utf8')
-    };
-    configs.push(config);
-    var target = path.join(__dirname, '/app.js');
-    var promise = editorconfig.parseFromFiles(target, configs);
-    return promise.then(function onFulfilled(result) {
-      expected.should.eql(result);
-    });
-  });
-
-  it('sync', function() {
-    var expected = {
-      indent_style: 'space',
-      indent_size: 2,
-      tab_width: 2,
-      end_of_line: 'lf',
-      charset: 'utf-8',
-      trim_trailing_whitespace: true,
-      insert_final_newline: true,
-    };
-    var configs = [];
-    var configPath = path.resolve(__dirname, '../.editorconfig');
-    var config = {
-      name: configPath,
-      contents: fs.readFileSync(configPath, 'utf8')
-    };
-    configs.push(config);
-    var target = path.join(__dirname, '/app.js');
-    expected.should.eql(editorconfig.parseFromFilesSync(target, configs));
-  });
-});