jslint_on_rails 1.1 → 1.1.1

data/Changelog.markdown

@@ -1,3 +1,7 @@
+Version 1.1.1 (16.04.2012)
+
+* fixed issue with jslint:copy_config task
+
 Version 1.1 (09.04.2012)
 
 * removed support for installing as a Rails plugin

data/lib/jslint/lint.rb

@@ -37,7 +37,7 @@ module JSLint
 
     def run
       check_java
-      Utils.xputs "Running JSLint:\n\n"
+      Utils.log "Running JSLint:\n\n"
       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

data/lib/jslint/utils.rb

@@ -3,27 +3,36 @@ require 'yaml'
 
 module JSLint
 
-  VERSION = "1.1"
+  VERSION = "1.1.1"
   DEFAULT_CONFIG_FILE = File.expand_path(File.dirname(__FILE__) + "/config/jslint.yml")
 
   class << self
-    attr_accessor :config_path
-  end
+    attr_writer :config_path
 
-  self.config_path = if defined?(Rails)
-    File.join(Rails.root, 'config', 'jslint.yml')
-  else
-    'config/jslint.yml'
+    def config_path
+      @config_path || JSLint::Utils.default_config_path
+    end
   end
 
   module Utils
     class << self
+      def in_rails?
+        defined?(Rails)
+      end
+
+      def default_config_path
+        if in_rails?
+          File.expand_path(File.join(Rails.root, 'config', 'jslint.yml'))
+        else
+          'config/jslint.yml'
+        end
+      end
 
-      def xprint(txt)
+      def display(txt)
         print txt
       end
 
-      def xputs(txt)
+      def log(txt)
         puts txt
       end
 
@@ -55,14 +64,13 @@ module JSLint
       end
 
       def copy_config_file
-        raise ArgumentError, "Please set JSLint.config_path" if JSLint.config_path.nil?
-        xprint "Creating example JSLint config file in #{File.expand_path(JSLint.config_path)}... "
+        display "Creating example JSLint config file in #{File.expand_path(JSLint.config_path)}... "
         if File.exists?(JSLint.config_path)
-          xputs "\n\nWarning: config file exists, so it won't be overwritten. " +
-                "You can copy it manually from the jslint_on_rails directory if you want to reset it."
+          log "\n\nWarning: config file exists, so it won't be overwritten. " +
+              "You can copy it manually from the jslint_on_rails directory if you want to reset it."
         else
           FileUtils.copy(JSLint::DEFAULT_CONFIG_FILE, JSLint.config_path)
-          xputs "done."
+          log "done."
         end
       end
     end

data/spec/spec_helper.rb

@@ -2,23 +2,7 @@ require 'jslint'
 require 'pp' # fix for fakefs/pp incompatibility in Ruby 1.9.3
 require 'fakefs'
 
-module JSLint::Utils
-  # disable logging to stdout
-  def self.xprint(x) ; end
-  def self.xputs(x) ; end
-end
-
 module Rails
-  class Railtie
-    def self.rake_tasks
-    end
-  end
-end
-
-module FileUtils
-  def copy(*args)
-    cp(*args)
-  end
 end
 
 module FakeFS
@@ -42,4 +26,10 @@ end
 
 RSpec.configure do |config|
   config.include SpecHelper
+
+  config.before do
+    # disable logging to stdout
+    JSLint::Utils.stub(:display)
+    JSLint::Utils.stub(:log)
+  end
 end

data/spec/utils_spec.rb

@@ -8,9 +8,41 @@ describe JSLint::Utils do
     create_config "default config file"
   end
 
-  it "should have a config_path setting" do
-    JSLint.config_path = 'some/path'
-    JSLint.config_path.should == 'some/path'
+  describe ".config_path" do
+    context "if config path is set explicitly" do
+      let(:path) { 'some/path' }
+
+      before { JSLint.config_path = path }
+
+      it "should return the path that was set" do
+        JSLint.config_path.should == path
+      end
+    end
+
+    context "if config path is not set" do
+      before { JSLint.config_path = nil }
+
+      context "if JSLint is run within Rails" do
+        before do
+          JSLint::Utils.stub(:in_rails? => true)
+          Rails.stub(:root => '/dir')
+        end
+
+        it "should return config/jslint.yml in Rails project directory" do
+          JSLint.config_path.should == '/dir/config/jslint.yml'
+        end
+      end
+
+      context "if JSLint is not run within Rails" do
+        before do
+          JSLint::Utils.stub(:in_rails? => false)
+        end
+
+        it "should return config/jslint.yml in current directory" do
+          JSLint.config_path.should == 'config/jslint.yml'
+        end
+      end
+    end
   end
 
   describe "paths_from_command_line" do
@@ -90,11 +122,6 @@ describe JSLint::Utils do
   end
 
   describe "copy_config_file" do
-    it "throw an error if config path isn't set" do
-      JSLint.config_path = nil
-      lambda { JSLint::Utils.copy_config_file }.should raise_error(ArgumentError)
-    end
-
     it "should copy default config to config_path" do
       JSLint.config_path = "newfile.yml"
       FileUtils.should_receive(:copy).with(JSLint::DEFAULT_CONFIG_FILE, "newfile.yml")

metadata

@@ -1,22 +1,32 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jslint_on_rails
-version: !ruby/object:Gem::Version
-  version: '1.1'
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
-authors:
+authors: 
 - Jakub Suder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000Z
+
+date: 2012-04-16 00:00:00 Z
 dependencies: []
+
 description: 
 email: jakub.suder@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - MIT-LICENSE
 - README.markdown
 - Changelog.markdown
@@ -40,27 +50,36 @@ files:
 - spec/utils_spec.rb
 homepage: http://github.com/psionides/jslint_on_rails
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - Java JRE (5.0 or later)
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: JSLint JavaScript checker wrapped in a Ruby gem for easier use
 test_files: []
+