Version 1.0 prep (#73)

* shellscape eslint config, refactoring

* fix for comments between selectors and braces, postcss 5.2

* updating tokenzing for latest postcss tests

* updating dependencies

* removing shrinkwrap

Author: shellscape

.editorconfig

@@ -2,7 +2,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

.eslintrc

@@ -1,73 +1,10 @@
 {
+  "extends": "shellscape",
+  "parser": "babel-eslint",
   "parserOptions": {
-    "ecmaVersion": 6,
     "sourceType": "module"
   },
-  "extends": [
-    "strict",
-    "strict/es6",
-    "strict/mocha"
-  ],
   "rules": {
-    // JUSTIFICATION: code cleanliness
-    // separation of variable declarations and logic makes source code more readable
-    "newline-after-var": [
-      "error",
-      "always"
-    ],
-    "semi": [
-      "error",
-      "always"
-    ],
-    "space-before-function-paren": [
-      "error",
-      "always"
-    ],
-    "comma-dangle": [
-      "error",
-      "never"
-    ],
-    "array-bracket-spacing": [
-      "error",
-      "never"
-    ],
-    "object-curly-spacing": [
-      "error",
-      "never"
-    ],
-    "no-trailing-spaces": [
-      "error",
-      {
-        "skipBlankLines": true
-      }
-    ],
-    "indent": [
-      "error",
-      4,
-      {
-        "SwitchCase": 1
-      }
-    ],
-    "eol-last": [
-      "off"
-    ],
-    "no-extra-semi": [
-      "off"
-    ],
-    "no-return-assign": [
-      "off"
-    ],
-    "semi-spacing": [
-      "error",
-      {
-        "before": false,
-        "after": true
-      }
-    ],
-    "quotes": [
-      "error",
-      "single",
-      "avoid-escape"
-    ]
+    "object-curly-spacing": ["error", "always", { "arraysInObjects": true }]
   }
 }

LICENSE

@@ -3,6 +3,7 @@ The MIT License (MIT)
 Copyright (c) 2013 Andrey Sitnik <andrey@sitnik.ru>
 Copyright (c) 2016 Denys Kniazevych <webschik@gmail.com>
 Copyright (c) 2016 Pat Sissons <patricksissons@gmail.com>
+Copyright (c) 2017 Andrew Powell <andrew@shellscape.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,4 +21,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

gulpfile.babel.js

@@ -18,23 +18,23 @@ import uglify from 'gulp-uglify';
 import util from 'gulp-util';
 
 const config = {
-    dirs: {
-        lib: path.join(__dirname, 'lib'),
-        test: path.join(__dirname, 'test'),
-        build: path.join(__dirname, 'build'),
-        dist: path.join(__dirname, 'dist')
-    },
-    builds: {
-        lib: 'lib',
-        test: 'test'
-    },
-    test: {
-        reporter: 'spec'
-    }
+  dirs: {
+    lib: path.join(__dirname, 'lib'),
+    test: path.join(__dirname, 'test'),
+    build: path.join(__dirname, 'build'),
+    dist: path.join(__dirname, 'dist')
+  },
+  builds: {
+    lib: 'lib',
+    test: 'test'
+  },
+  test: {
+    reporter: 'spec'
+  }
 };
 
 function lint (srcPath) {
-    return gulp
+  return gulp
         .src(srcPath)
         .pipe(eslint())
         .pipe(eslint.format())
@@ -44,7 +44,7 @@ function lint (srcPath) {
 gulp.task('default', ['test']);
 
 gulp.task('config', () => {
-    util.log(JSON.stringify(config, null, 2));
+  util.log(JSON.stringify(config, null, 2));
 });
 
 // Clean
@@ -54,26 +54,26 @@ gulp.task('clean', ['clean:all']);
 gulp.task('clean:all', ['clean:build', 'clean:dist']);
 
 gulp.task('clean:lib', () => {
-    return gulp
-        .src(path.join(config.dirs.build, config.builds.lib), {read: false})
+  return gulp
+        .src(path.join(config.dirs.build, config.builds.lib), { read: false })
         .pipe(clean());
 });
 
 gulp.task('clean:test', () => {
-    return gulp
-        .src(path.join(config.dirs.build, config.builds.test), {read: false})
+  return gulp
+        .src(path.join(config.dirs.build, config.builds.test), { read: false })
         .pipe(clean());
 });
 
 gulp.task('clean:build', () => {
-    return gulp
-        .src(config.dirs.build, {read: false})
+  return gulp
+        .src(config.dirs.build, { read: false })
         .pipe(clean());
 });
 
 gulp.task('clean:dist', () => {
-    return gulp
-        .src(path.join(config.dirs.dist), {read: false})
+  return gulp
+        .src(path.join(config.dirs.dist), { read: false })
         .pipe(clean());
 });
 
@@ -83,14 +83,14 @@ gulp.task('build', ['build:all']);
 gulp.task('build:all', ['build:lib', 'build:test']);
 
 gulp.task('build:lib', ['clean:lib'], () => {
-    return gulp
+  return gulp
         .src(path.join(config.dirs.lib, '**', '*.js'))
         .pipe(babel())
         .pipe(gulp.dest(path.join(config.dirs.build, config.builds.lib)));
 });
 
 gulp.task('build:test', ['clean:test', 'build:lib'], () => {
-    return gulp
+  return gulp
         .src(path.join(config.dirs.test, '**', '*.js'))
         .pipe(babel())
         .pipe(gulp.dest(path.join(config.dirs.build, config.builds.test)));
@@ -103,84 +103,85 @@ gulp.task('lint', ['lint:all']);
 gulp.task('lint:all', ['lint:lib', 'lint:test', 'lint:root']);
 
 gulp.task('lint:lib', () => {
-    return lint(path.join(config.dirs.lib, '**', '*.js'));
+  return lint(path.join(config.dirs.lib, '**', '*.js'));
 });
 
 gulp.task('lint:test', () => {
-    return lint(path.join(config.dirs.test, '**', '*.js'));
+  return lint(path.join(config.dirs.test, '**', '*.js'));
 });
 
 gulp.task('lint:root', () => {
-    return lint(path.join(__dirname, '*.js'));
+  return lint(path.join(__dirname, '*.js'));
 });
 
 // Test
 
 gulp.task('test', ['lint', 'test:run']);
 
 gulp.task('test:all', (done) => {
-    runSequence('lint', 'test:run', 'test:integration', done);
+  runSequence('lint', 'test:run', 'test:integration', done);
 });
 
 gulp.task('test:run', ['build:test'], () => {
-    let mochaError = {};
+  let mochaError = {};
 
-    return gulp
-        .src(path.join(config.dirs.build, config.builds.test, '**', '*.spec.js'), {read: false})
+  return gulp
+        .src(path.join(config.dirs.build, config.builds.test, '**', '*.spec.js'), { read: false })
         .pipe(mocha({
-            reporter: config.test.reporter
+          reporter: config.test.reporter
         }))
         .on('error', function (error) {
-            mochaError = error;
+          mochaError = error;
             // eslint-disable-next-line no-invalid-this
-            this.emit('end');
+          this.emit('end');
         })
         .on('end', () => {
-            if (mochaError.message) {
-                throw new util.PluginError({
-                    plugin: 'gulp-mocha',
-                    message: mochaError.message
-                });
-            }
+          if (mochaError.message) {
+            throw new util.PluginError({
+              plugin: 'gulp-mocha',
+              message: mochaError.message
+            });
+          }
         });
 });
 
 gulp.task('test:integration', ['build:lib'], (done) => {
     // this require is only available after running the build:lib task
     // eslint-disable-next-line global-require
-    const lessSyntax = require('./build/lib/less-syntax').default;
+  const lessSyntax = require('./build/lib/less-syntax').default;
 
-    real(done, (css) => {
-        return postcss()
+  real(done, (css) => {
+    return postcss()
             .process(css, {
-                parser: lessSyntax,
-                map: {annotation: false}
+              parser: lessSyntax,
+              map: { annotation: false }
             });
-    });
+  });
 });
 
 gulp.task('test:integration:local', ['build:lib'], () => {
     // create file in root source directory called integration.css to process
 
     // this require is only available after running the build:lib task
     // eslint-disable-next-line global-require
-    const lessSyntax = require('./build/lib/less-syntax').default;
+  const lessSyntax = require('./build/lib/less-syntax').default;
 
-    return gulp
+  return gulp
         .src(path.join(__dirname, 'integration.css'))
         .pipe(through((file) => {
-            try {
+          try {
                 // we need to access .css as it is a lazy property
                 // eslint-disable-next-line no-unused-vars
-                const css = postcss().process(file.contents.toString(), {
-                    parser: lessSyntax,
-                    map: {annotation: false}
-                }).css;
-
-                util.log(util.colors.green('VALID'));
-            } catch (err) {
-                util.log(util.colors.red('ERROR'), err.message, err.stack);
-            }
+            const css = postcss().process(file.contents.toString(), {
+              parser: lessSyntax,
+              map: { annotation: false }
+            }).css;
+
+            util.log(util.colors.green('VALID'));
+          }
+          catch (err) {
+            util.log(util.colors.red('ERROR'), err.message, err.stack);
+          }
         }));
 });
 
@@ -189,32 +190,32 @@ gulp.task('test:integration:local', ['build:lib'], () => {
 gulp.task('watch', ['watch:test']);
 
 gulp.task('watch:lint', ['lint'], () => {
-    return gulp
+  return gulp
         .watch([
-            path.join(config.dirs.lib, '**', '*.js'),
-            path.join(config.dirs.test, '**', '*.js'),
-            path.join(__dirname, '*.js')
+          path.join(config.dirs.lib, '**', '*.js'),
+          path.join(config.dirs.test, '**', '*.js'),
+          path.join(__dirname, '*.js')
         ], ['lint']);
 });
 
 gulp.task('watch:test', ['test:run'], () => {
-    return gulp
+  return gulp
         .watch([
-            path.join(config.dirs.lib, '**', '*.js'),
-            path.join(config.dirs.test, '**', '*.js')
+          path.join(config.dirs.lib, '**', '*.js'),
+          path.join(config.dirs.test, '**', '*.js')
         ], ['test:run']);
 });
 
 // Dist
 
 gulp.task('dist', ['build:lib'], () => {
-    gulp
+  gulp
         .src(path.join(config.dirs.build, config.builds.lib, '**', '*.js'))
         .pipe(gulp.dest(config.dirs.dist));
 
-    gulp
+  gulp
         .src(path.join(config.dirs.build, config.builds.lib, '**', '*.js'))
         .pipe(uglify())
-        .pipe(rename({suffix: '.min'}))
+        .pipe(rename({ suffix: '.min' }))
         .pipe(gulp.dest(config.dirs.dist));
 });