roger_jshint 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d14bd88e5858be37ebc958542a004606ead19cfb
-  data.tar.gz: c2cf5c3648a17610a1d3d91c53c3157a29bce5a1
+  metadata.gz: 83ba026e1e511b00e3e131301ac4eabcdbee9d5d
+  data.tar.gz: e49a5331b6365a9c70dd3805668f22eb42f775c6
 SHA512:
-  metadata.gz: 43e9915df854a9d385b3e53c8e4c5c6b56b6a6fbc884339b1c7089fec8a06961398c6b172d26cbc61051c0237122ef4e40e948ad1e70662501491ba93d11e067
-  data.tar.gz: a3df08386e01204e31d6e2ac9b670825d78a811c71d9bbf8ad6bb6c37325d656dc072dbb9548b0c8a285b7e3fdabba924b0e600a88afe638011b6505cee946fd
+  metadata.gz: 0754599dc1193291fd00171f758df12a610f7e859cf1d01cdca35ee6239c8bf10cb1b97c669a7be730685bb716606e48ca4e8edd149194b0071e61789083e3e8
+  data.tar.gz: a775a2f2c265c205f3c2701914e2c3e80f28202bdce580c3941e0efeabfce7686068e23a680ba9b70e61471f1226cbb5571772581df0ad35762c81798e14eace

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+## Version 1.1.1
+* Make sure the `.jshintrc` generator gets loaded
+* A few internal changes on the testing side of things
+
 ## Version 1.1.0
 * Add a `.jshintrc` generator
 * Correctly return success value so reger test will output the correct error code
 
 ## Version 1.0.0
-* What was before...
+* What was before...

data/Rakefile

@@ -1,3 +1,4 @@
+require "bundler/gem_tasks"
 require "rake/testtask"
 require "rubocop/rake_task"
 

data/lib/roger_jshint.rb

@@ -3,3 +3,4 @@ module RogerJsHint
 end
 
 require File.dirname(__FILE__) + "/roger_jshint/lint"
+require File.dirname(__FILE__) + "/roger_jshint/generator"

data/lib/roger_jshint/generator.rb

@@ -8,9 +8,9 @@ module RogerJsHint
   # Lint configuration retriever
   class Generator < Roger::Generators::Base
     include Thor::Actions
-    CONFIG_PATH = ".jshintrc"
+    CONFIG_PATH = ".jshintrc".freeze
     DEFAULT_CONFIG_URL = "https://raw.githubusercontent.com/"\
-                         "DigitPaint/javascript/master/linters/jshintrc"
+                         "DigitPaint/javascript/master/linters/jshintrc".freeze
 
     desc "JsHint generator creates an .jshintrc config file"
     class_option(
@@ -30,11 +30,7 @@ module RogerJsHint
 
     # Write config file
     def write_config_file
-      if options[:config]
-        config = open(options[:config]).read
-      else
-        config = open(DEFAULT_CONFIG_URL).read
-      end
+      config = options[:config] ? open(options[:config]).read : open(DEFAULT_CONFIG_URL).read
 
       # Create file check if we don't have a conflict or something
       create_file "#{@project.path}/#{CONFIG_PATH}", config, force: options[:force]

data/lib/roger_jshint/lint.rb

@@ -15,7 +15,6 @@ module RogerJsHint
         skip: [],
         jshint: "jshint"
       }
-      detect_jshint
 
       @options.update(options) if options
     end
@@ -46,6 +45,8 @@ module RogerJsHint
     # @option options [Array] :match Files to match
     # @option options [Array[Regexp]] :skip Array of regular expressions to skip files
     def call(test, options)
+      detect_jshint
+
       options = {}.update(@options).update(options)
 
       test.log(self, "JS-linting files")
@@ -61,7 +62,7 @@ module RogerJsHint
     def detect_jshint
       command = [@options[:jshint], "-v", "2>/dev/null"]
       detect = system(Shellwords.join(command))
-      fail "Could not find jshint. Install jshint using npm." unless detect
+      raise "Could not find jshint. Install jshint using npm." unless detect
     end
 
     def reporter

data/roger_jshint.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.authors = ["Hans Krutzer", "Flurin Egger"]
   s.email = ["info@digitpaint.nl", "hans@digitpaint.nl", "flurin@digitpaint.nl"]
   s.name = "roger_jshint"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
   s.homepage = "https://github.com/digitpaint/roger_jshint"
 
   s.summary = "Lint JavaScript files within Roger"

data/test/lint_test.rb

@@ -37,11 +37,10 @@ class LintTest < Test::Unit::TestCase
 
     assert_equal(false, success)
 
-    assert_equal(messages,
-                 ["test/data/test.js:0 0: Bad option: 'subsub'.",
-                  "test/data/test.js:1 1: 'x' is not defined.",
-                  "test/data/test.js:2 1: 'alert' is not defined.",
-                  "test/data/test.js:2 7: 'x' is not defined."])
+    assert_includes(messages, "test/data/test.js:0 0: Bad option: 'subsub'.")
+    assert_includes(messages, "test/data/test.js:1 1: 'x' is not defined.")
+    assert_includes(messages, "test/data/test.js:2 1: 'alert' is not defined.")
+    assert_includes(messages, "test/data/test.js:2 7: 'x' is not defined.")
   end
 
   def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger_jshint
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Hans Krutzer
@@ -9,96 +9,96 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 description: |2
@@ -112,10 +112,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -140,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Lint JavaScript files within Roger