jslint_on_rails 1.0.5 → 1.0.6

data/Changelog.markdown

@@ -1,3 +1,8 @@
+Version 1.0.6 (19.02.2011)
+
+* escape $ in predef line to prevent Bash for interpreting it
+* predef can be passed as a YAML array
+
 Version 1.0.5 (08.01.2011)
 
 * options passed on the command line to JSLint are joined with "&" to fix the "predef" option

data/lib/jslint/config/jslint.yml

@@ -51,7 +51,7 @@ indent:   2         # Number of spaces that should be used for indentation - use
 maxerr:   50        # The maximum number of warnings reported (per file)
 passfail: false     # true if the scan should stop on first error (per file)
 # following are relevant only if undef = true
-predef:   ''        # Names of predefined global variables - comma-separated string
+predef:   ''        # Names of predefined global variables - comma-separated string or a YAML array
 browser:  true      # true if the standard browser globals should be predefined
 rhino:    false     # true if the Rhino environment globals should be predefined
 windows:  false     # true if Windows-specific globals should be predefined

data/lib/jslint/lint.rb

@@ -23,6 +23,10 @@ module JSLint
       custom_config = Utils.load_config_file(options[:config_path] || JSLint.config_path)
       @config = default_config.merge(custom_config)
 
+      if @config['predef'].is_a?(Array)
+        @config['predef'] = @config['predef'].join(",")
+      end
+
       included_files = files_matching_paths(options, :paths)
       excluded_files = files_matching_paths(options, :exclude_paths)
       @file_list = Utils.exclude_files(included_files, excluded_files)
@@ -34,7 +38,7 @@ module JSLint
     def run
       check_java
       Utils.xputs "Running JSLint:\n\n"
-      arguments = "#{JSLINT_FILE} #{option_string.inspect} #{@file_list.join(' ')}"
+      arguments = "#{JSLINT_FILE} #{option_string.inspect.gsub(/\$/, "\\$")} #{@file_list.join(' ')}"
       success = call_java_with_status(RHINO_JAR_FILE, RHINO_JAR_CLASS, arguments)
       raise LintCheckFailure, "JSLint test failed." unless success
     end

data/lib/jslint/utils.rb

@@ -3,7 +3,7 @@ require 'yaml'
 
 module JSLint
 
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
   DEFAULT_CONFIG_FILE = File.expand_path(File.dirname(__FILE__) + "/config/jslint.yml")
 
   class << self

data/spec/lint_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe JSLint::Lint do
 
+  JSLint::Lint.class_eval do
+    attr_reader :config, :file_list
+  end
+
   before :all do
     File.open(JSLint::DEFAULT_CONFIG_FILE, "w") { |f| f.write "color: red\nsize: 5\nshape: circle\n" }
     File.open("custom_config.yml", "w") { |f| f.write "color: blue\nsize: 7\nborder: 2\n" }
@@ -13,20 +17,28 @@ describe JSLint::Lint do
     lint.should_receive(:call_java_with_output).once.and_return("OK")
   end
 
-  def file_list(lint)
-    lint.instance_variable_get("@file_list")
-  end
-
   it "should merge default config with custom config from JSLint.config_path" do
     lint = JSLint::Lint.new
-    config = lint.instance_variable_get("@config")
-    config.should == { 'color' => 'blue', 'size' => 7, 'border' => 2, 'shape' => 'circle' }
+    lint.config.should == { 'color' => 'blue', 'size' => 7, 'border' => 2, 'shape' => 'circle' }
   end
 
   it "should merge default config with custom config given in argument, if available" do
     lint = JSLint::Lint.new :config_path => 'other_config.yml'
-    config = lint.instance_variable_get("@config")
-    config.should == { 'color' => 'green', 'border' => 0, 'shape' => 'square', 'size' => 5 }
+    lint.config.should == { 'color' => 'green', 'border' => 0, 'shape' => 'square', 'size' => 5 }
+  end
+
+  it "should convert predef to string if it's an array" do
+    File.open("predef.yml", "w") { |f| f.write "predef:\n  - a\n  - b\n  - c" }
+
+    lint = JSLint::Lint.new :config_path => 'predef.yml'
+    lint.config['predef'].should == "a,b,c"
+  end
+
+  it "should accept predef as string" do
+    File.open("predef.yml", "w") { |f| f.write "predef: d,e,f" }
+
+    lint = JSLint::Lint.new :config_path => 'predef.yml'
+    lint.config['predef'].should == "d,e,f"
   end
 
   it "should not pass paths and exclude_paths options to real JSLint" do
@@ -34,10 +46,9 @@ describe JSLint::Lint do
       f.write(YAML.dump({ 'paths' => ['a', 'b'], 'exclude_paths' => ['c'], 'debug' => 'true' }))
     end
     lint = JSLint::Lint.new :config_path => 'test.yml'
-    config = lint.instance_variable_get("@config")
-    config['debug'].should == 'true'
-    config['paths'].should be_nil
-    config['exclude_paths'].should be_nil
+    lint.config['debug'].should == 'true'
+    lint.config['paths'].should be_nil
+    lint.config['exclude_paths'].should be_nil
   end
 
   it "should fail if Java isn't available" do
@@ -86,6 +97,19 @@ describe JSLint::Lint do
     eval(option_string).split('&').sort.should == ['debug=true', 'linelength=120', 'semicolons=false']
   end
 
+  it "should escape $ in option string when passing it to Java/JSLint" do
+    lint = JSLint::Lint.new
+    lint.instance_variable_set("@config", { 'predef' => 'window,$,Ajax,$app,Request' })
+    setup_java(lint)
+    param_string = ""
+    lint.
+      should_receive(:call_java_with_status).
+      once.
+      with(an_instance_of(String), an_instance_of(String), /window,\\\$,Ajax,\\\$app,Request/).
+      and_return(true)
+    lint.run
+  end
+
   it "should pass space-separated list of files to JSLint" do
     lint = JSLint::Lint.new
     lint.instance_variable_set("@file_list", ['app.js', 'test.js', 'jquery.js'])
@@ -112,33 +136,33 @@ describe JSLint::Lint do
 
     it "should calculate a list of files to test" do
       lint = JSLint::Lint.new :paths => ['test/**/*.js']
-      file_list(lint).should == @files
+      lint.file_list.should == @files
 
       lint = JSLint::Lint.new :paths => ['test/a*.js', 'test/**/*r*.js']
-      file_list(lint).should == [@files[0], @files[3], @files[4]]
+      lint.file_list.should == [@files[0], @files[3], @files[4]]
 
       lint = JSLint::Lint.new :paths => ['test/a*.js', 'test/**/*r*.js'], :exclude_paths => ['**/*q*.js']
-      file_list(lint).should == [@files[0], @files[4]]
+      lint.file_list.should == [@files[0], @files[4]]
 
       lint = JSLint::Lint.new :paths => ['test/**/*.js'], :exclude_paths => ['**/*.js']
-      file_list(lint).should == []
+      lint.file_list.should == []
 
       lint = JSLint::Lint.new :paths => ['test/**/*.js', 'test/**/a*.js', 'test/**/p*.js']
-      file_list(lint).should == @files
+      lint.file_list.should == @files
 
       File.open("new.yml", "w") { |f| f.write(YAML.dump({ 'paths' => ['test/vendor/*.js'] })) }
 
       lint = JSLint::Lint.new :config_path => 'new.yml', :exclude_paths => ['**/proto.js']
-      file_list(lint).should == [@files[3]]
+      lint.file_list.should == [@files[3]]
 
       lint = JSLint::Lint.new :config_path => 'new.yml', :paths => ['test/l*.js']
-      file_list(lint).should == [@files[1]]
+      lint.file_list.should == [@files[1]]
     end
 
     it "should accept :paths and :exclude_paths as string instead of one-element array" do
       lambda do
         lint = JSLint::Lint.new :paths => 'test/*.js', :exclude_paths => 'test/lib.js'
-        file_list(lint).should == [@files[0], @files[2]]
+        lint.file_list.should == [@files[0], @files[2]]
       end.should_not raise_error
     end
 
@@ -147,8 +171,8 @@ describe JSLint::Lint do
       File.open("test/full.js", "w") { |f| f.write("qqq") }
 
       lint = JSLint::Lint.new :paths => ['test/*.js']
-      file_list(lint).should_not include(File.expand_path("test/empty.js"))
-      file_list(lint).should include(File.expand_path("test/full.js"))
+      lint.file_list.should_not include(File.expand_path("test/empty.js"))
+      lint.file_list.should include(File.expand_path("test/full.js"))
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jslint_on_rails
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Jakub Suder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 +01:00
+date: 2011-02-19 00:00:00 +01:00
 default_executable: 
 dependencies: []