jshint 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef128351316e9344e5e64b1ab2de445e0460aa7a
-  data.tar.gz: c3afc2a26142ec10fd332fd4138774712b54e135
+  metadata.gz: 01efa9fdd22b78a92a186509d41e01f0fcad80fd
+  data.tar.gz: c2fb47f05d4fa59486e54c28fb3e790eb887b811
 SHA512:
-  metadata.gz: fce5df5a5335091ce83ae353b9d70f9070071288ecb09f2e4ca882d99f6836fae27455a77d083164072cde81b47822eec4d461f7bbe81ddf85aa39f4c7644a9c
-  data.tar.gz: 00657ab0cf8e142147e8be016c215fa60af1879f8520dbf72bb25a26f4da600b2018f2b34f0fad0a141e849c924e9a9053fa5cff93de6e9275001159496d9a2c
+  metadata.gz: 9379e20591b3eb801cbdc11b18affc46de660f2c03b83b41117a1871b8d96281351fb0158932c0d089395c207c4fdcb27269deedd221a8f497ace3f6fc47d1bb
+  data.tar.gz: c18374536ae858bef9aebabb5144f9d3d4d2c5ee17ca76e1e9a54e542b9d5a17164cf3271136881f3ec5e60b511ba2f50ad9abfd86804e736441dc0354639e89

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.swp

data/.travis.yml

@@ -1,3 +1,9 @@
+language: ruby
+before_install: gem install bundler
 rvm:
   - 1.9.3
-script: rspec spec
+  - 2.0.0
+  - 2.1.5
+  - 2.2.2
+  - 2.3.0
+script: bundle exec rspec

data/README.md

@@ -52,6 +52,7 @@ JSHint has some configuration options. You can read the default configuration cr
 # your-rails-project/config/jshint.yml
 files: ['**/*.js']
 exclude_paths: []
+exclude_files: []
 options:
   boss: true
   browser: true
@@ -72,7 +73,7 @@ bundle exec rake jshint:lint['path/to/your/config.yml']
 
 ### Including folders to be Linted
 
-To add folders outside of the standard Rails asseet paths, you can define an array of `include_paths` within your configuration file.
+To add folders outside of the standard Rails asset paths, you can define an array of `include_paths` within your configuration file.
 
 ````yaml
 files: ['**/*.js']
@@ -82,11 +83,21 @@ include_paths: ['spec/javascripts']
 
 ### Excluding folders from being Linted
 
-To exclude one of the above folders from being linted, you can define an array of `exclude_paths` within your configuration file.
+To exclude a folder from being linted you can define an array of `exclude_paths` within your configuration file.
 
 ````yaml
 files: ['**/*.js']
-exclude_paths: ['vendor/assets/javascripts']
+exclude_paths: ['vendor', 'app/assets/javascripts/tests/']
+...
+````
+
+### Excluding files from being Linted
+
+To exclude a file from being linted you can define an array of `exclude_files` within your configuration file.
+
+````yaml
+files: ['**/*.js']
+exclude_files: ['**/*test.js']
 ...
 ````
 
@@ -96,7 +107,7 @@ To use jshint in your default Rake config, just add it to the list of default ta
 # your-rails-project/Rakefile
 if %w(development test).include? Rails.env
   task default: :jshint
-endif
+end
 ````
 
 ## Changelog

data/jshint.gemspec

@@ -23,8 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'multi_json', '~> 1.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "railties", ">= 3.2.0"
+  spec.add_development_dependency "railties", ">= 3.2.0", "< 5.0.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.1.0"
   spec.add_development_dependency "yard"
+  spec.add_development_dependency "tins", "~> 1.6.0"
+  spec.add_development_dependency 'term-ansicolor', '~> 1.3.0'
+  spec.add_development_dependency 'json', "~> 1.8.3"
 end

data/lib/jshint/configuration.rb

@@ -61,19 +61,23 @@ module Jshint
     #
     # @return [Array<String>] An Array of String files paths
     def files
-      options["files"]
+      options.fetch("files", [])
     end
 
-    def excluded_search_paths
+    def exclude_files
+      options.fetch("exclude_files", [])
+    end
+
+    def exclude_paths
       options.fetch("exclude_paths", [])
     end
 
-    def included_search_paths
+    def include_paths
       options.fetch("include_paths", [])
     end
 
     def search_paths
-      (default_search_paths + included_search_paths) - excluded_search_paths
+      default_search_paths + include_paths
     end
 
     def default_search_paths
@@ -84,6 +88,10 @@ module Jshint
       ]
     end
 
+    def javascript_files
+      get_files(search_paths, files) - get_files(exclude_paths, files) - get_files(search_paths, exclude_files)
+    end
+
     private
 
     def read_config_file
@@ -97,5 +105,9 @@ module Jshint
     def default_config_path
       File.join(defined?(Rails) ? Rails.root : Dir.pwd, 'config', 'jshint.yml')
     end
+
+    def get_files paths, files
+      paths.map{ |path| files.map{ |file| Dir.glob(File.join(path, file)) }}.flatten
+    end
   end
 end

data/lib/jshint/lint.rb

@@ -25,7 +25,7 @@ module Jshint
     #
     # @return [void]
     def lint
-      javascript_files.each do |file|
+      config.javascript_files.each do |file|
         file_content = get_file_content_as_json(file)
         code = %(
           JSHINT(#{file_content}, #{jshint_options}, #{jshint_globals});
@@ -54,24 +54,6 @@ module Jshint
       get_json(content)
     end
 
-    def file_paths
-      paths = []
-
-      if files.is_a? Array
-        files.each do |file|
-          config.search_paths.each { |path| paths << File.join(path, file) }
-        end
-      else
-        config.search_paths.each { |path| paths << File.join(path, files) }
-      end
-
-      paths
-    end
-
-    def files
-      @files ||= config.files
-    end
-
     def jshint_globals
       @jshint_globals ||= get_json(config.global_variables)
     end
@@ -91,16 +73,5 @@ module Jshint
     def context
       @context ||= ExecJS.compile("var window = {};\n" + jshint)
     end
-
-    def javascript_files
-      js_asset_files = []
-      file_paths.each do |path|
-        Dir.glob(path) do |file|
-          js_asset_files << file
-        end
-      end
-
-      js_asset_files
-    end
   end
 end

data/lib/jshint/version.rb

@@ -1,4 +1,4 @@
 module Jshint
   # Our gem version
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/spec/lib/configuration_spec.rb

@@ -38,14 +38,14 @@ describe Jshint::Configuration do
       subject { described_class.new }
 
       it "should default the exclusion paths to an empty array" do
-        expect(subject.excluded_search_paths).to eq([])
+        expect(subject.exclude_paths).to eq([])
       end
 
       describe "include search paths" do
         it "should set the exclusion paths to those in the config" do
           subject.options["include_paths"] ||= []
           subject.options["include_paths"] << 'spec/javascripts'
-          expect(subject.included_search_paths).to eq(["spec/javascripts"])
+          expect(subject.include_paths).to eq(["spec/javascripts"])
           expect(subject.search_paths).to include("spec/javascripts")
         end
       end
@@ -53,15 +53,33 @@ describe Jshint::Configuration do
       describe "exclude search paths" do
         it "should set the exclusion paths to those in the config" do
           subject.options["exclude_paths"] << 'vendor/assets/javascripts'
-          expect(subject.excluded_search_paths).to eq(["vendor/assets/javascripts"])
+          expect(subject.exclude_paths).to eq(["vendor/assets/javascripts"])
         end
+      end
+    end
 
-        it "should be the default search paths minus the exclude paths" do
-          expect(subject.search_paths).to eq(subject.default_search_paths)
-          subject.options["exclude_paths"] << 'vendor/assets/javascripts'
-          expect(subject.search_paths).
-            to eq(['app/assets/javascripts', 'lib/assets/javascripts'])
-        end
+    context "javascript_files" do
+      it "knows what files to include by default" do
+        expect(subject.javascript_files).to eq(["vendor/assets/javascripts/jshint.js"])
+      end
+      it "knows what files to include when specifying include files and inlude paths" do
+        subject.options["include_paths"] = ["lib/jshint"]
+        subject.options["files"] = ["**/*.rake"]
+        expect(subject.javascript_files).to eq(["lib/jshint/tasks/jshint.rake"])
+      end
+      it "knows what files to exclude when specifying exclude files" do
+        subject.options["exclude_files"] = ["**/*jshi*"]
+        expect(subject.javascript_files).to eq([])
+      end
+      it "knows what files to exclude when specifying exclude paths" do
+        subject.options["exclude_paths"] = ["vendor"]
+        expect(subject.javascript_files).to eq([])
+      end
+    end
+
+    context "get_files" do
+      it "gets all matching files in given search paths" do
+        expect(subject.send(:get_files, ["vendor"], ["**/*.js"])).to eq(["vendor/assets/javascripts/jshint.js"])
       end
     end
   end

data/spec/lib/lint_spec.rb

@@ -29,7 +29,7 @@ describe Jshint::Lint do
 
   describe "lint" do
     before do
-      allow(subject).to receive(:javascript_files).and_return(files)
+      allow(configuration).to receive(:javascript_files).and_return(files)
       allow(subject).to receive(:jshint_options).and_return(opts)
       allow(subject).to receive(:jshint_globals).and_return(globals)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jshint
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Damian Nicholson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
@@ -73,6 +73,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +128,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: It achieves this by linting your code through a library called JSHint
   which catches most code smells, and ensures code consistency
 email: