guard-jasmine-headless-webkit 0.3.0 → 0.3.2

data/Gemfile

@@ -2,10 +2,12 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in guard-jasmine-headless-webkit.gemspec
 gemspec
-gem 'guard', :git => 'https://github.com/guard/guard.git'
+gem 'guard', :git => 'git://github.com/guard/guard.git'
 gem 'rspec'
 gem 'mocha'
-gem 'rake', '0.8.7'
+gem 'rake', '0.9.2'
 gem 'growl'
 gem 'fakefs', :require => nil
 gem 'jasmine-headless-webkit', :path => '../jasmine-headless-webkit'
+gem 'coffee-script'
+gem 'guard-rspec'

data/README.md

@@ -16,6 +16,7 @@ home folder's `.jasmine-headless-webkit` file.
 
 * `:all_on_start => false` to not run everything when starting, just like `guard-rspec`.
 * `:valid_extensions => %w{js coffee}` to only trigger `run_on_change` events for files with these extensions. Forces Guard to re-run all tests when any other matched file changes.
+* All other options from `Jasmine::Headless::Runner`: (see the [list of available options](https://github.com/johnbintz/jasmine-headless-webkit/blob/master/lib/jasmine/headless/options.rb#L11A))
 
 ### Deprecated options
 * `:run_before => "<command to run>"` to run a command before running specs. If the command fails, the test run stops.

data/Rakefile

@@ -13,27 +13,25 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+PLATFORMS = %w{1.8.7 1.9.2 ree 1.9.3-rc1}
+
+def rvm_bundle(command = '')
+  Bundler.with_clean_env do
+    system %{bash -c 'unset BUNDLE_BIN_PATH && unset BUNDLE_GEMFILE && rvm #{PLATFORMS.join(',')} do bundle #{command}'}.tap { |o| p o }
+  end
+end
+
+class SpecFailure < StandardError; end
+class BundleFailure < StandardError; end
+
 namespace :spec do
   desc "Run on three Rubies"
   task :platforms do
-    current = %x{rvm-prompt v}
-    
-    fail = false
-    %w{1.8.7 1.9.2 ree}.each do |version|
-      puts "Switching to #{version}"
-      Bundler.with_clean_env do
-        system %{bash -c 'source ~/.rvm/scripts/rvm && rvm #{version} && bundle exec rake spec'}
-      end
-      if $?.exitstatus != 0
-        fail = true
-        break
-      end
-    end
-
-    system %{rvm #{current}}
-
-    exit (fail ? 1 : 0)
+    rvm_bundle "update"
+    rvm_bundle "exec rspec spec"
+    raise SpecError.new if $?.exitstatus != 0
   end
 end
 
 task :default => 'spec:platforms'
+

data/guard-jasmine-headless-webkit.gemspec

@@ -1,10 +1,8 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "guard/jasmine-headless-webkit/version"
 
 Gem::Specification.new do |s|
   s.name        = "guard-jasmine-headless-webkit"
-  s.version     = Guard::JasmineHeadlessWebkitVersion::VERSION
+  s.version     = '0.3.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["John Bintz"]
   s.email       = ["john@coswellproductions.com"]
@@ -19,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'guard', '>= 0.4.0'
-  s.add_dependency 'jasmine-headless-webkit', '>= 0.7.0'
+  s.add_runtime_dependency 'guard', '>= 0.4.0'
+  s.add_runtime_dependency 'jasmine-headless-webkit', '>= 0.7.0'
 end
 

data/lib/guard/jasmine-headless-webkit.rb

@@ -1,10 +1,11 @@
 require 'guard'
 require 'guard/guard'
-require 'guard/jasmine-headless-webkit/runner'
 require 'coffee-script'
 
 module Guard
   class JasmineHeadlessWebkit < Guard
+    autoload :Runner,  'guard/jasmine-headless-webkit/runner'
+
     DEFAULT_EXTENSIONS = %w{js coffee}
 
     ALL_SPECS_MESSAGE = "Guard::JasmineHeadlessWebkit running all specs..."
@@ -12,13 +13,18 @@ module Guard
 
     attr_reader :files_to_rerun
 
+    DEFAULT_OPTIONS = {
+      :all_on_start => true,
+      :run_before => false,
+      :valid_extensions => DEFAULT_EXTENSIONS
+    }
+
     def initialize(watchers = [], options = {})
       super
-      @options = {
-        :all_on_start => true,
-        :run_before => false,
-        :valid_extensions => DEFAULT_EXTENSIONS
-      }.merge(options)
+
+      @options = DEFAULT_OPTIONS.merge(options)
+      @filtered_options = options
+      DEFAULT_OPTIONS.keys.each { |key| @filtered_options.delete(key) }
 
       UI.deprecation ":run_before is deprecated. Use guard-shell to do something beforehand. This will be removed in a future release." if @options[:run_before]
 
@@ -67,16 +73,14 @@ module Guard
       else
         UI.info(SOME_SPECS_MESSAGE % paths.join(' '))
       end
-
-      if failed_files = JasmineHeadlessWebkitRunner.run(paths)
-        @files_to_rerun = failed_files
-      end
-
-      failed_files && failed_files.empty?
+      failed_files = Runner.run(paths, @filtered_options)
+      @files_to_rerun = failed_files || paths
+      
+      failed_files && @files_to_rerun.empty?
     end
 
     def filter_paths(paths)
-      paths.find_all { |path| File.extname(path)[valid_extensions] }.uniq
+      paths.collect { |path| Dir[path] }.flatten.find_all { |path| File.extname(path)[valid_extensions] }.collect { |path| File.expand_path(path) }.uniq
     end
 
     def valid_extensions

data/lib/guard/jasmine-headless-webkit/runner.rb

@@ -2,49 +2,51 @@ require 'guard/notifier'
 require 'jasmine-headless-webkit'
 
 module Guard
-  class JasmineHeadlessWebkitRunner
-    class << self
-      def run(paths = [])
-        file = Tempfile.new('guard-jasmine-headless-webkit')
-        file.close
+  class JasmineHeadlessWebkit
+    class Runner
+      class << self
+        def run(paths = [], options = {})
+          file = Tempfile.new('guard-jasmine-headless-webkit')
+          file.close
 
-        Jasmine::Headless::Runner.run(:report => file.path, :colors => true, :files => paths)
+          options.merge!(:report => file.path, :colors => true, :files => paths)
 
-        notify(file.path)
-      end
+          Jasmine::Headless::Runner.run(options)
 
-      def notify(file)
-        if (report = Jasmine::Headless::Report.load(file)).valid?
-          Notifier.notify(message(report.total, report.failed, report.time, report.has_used_console?), :title => 'Jasmine results', :image => image(report.has_used_console?, report.failed))
-          report.failed_files
-        else
-          raise Jasmine::Headless::InvalidReport.new
+          notify(file.path)
         end
-      rescue Jasmine::Headless::InvalidReport => e
-        Notifier.notify('Spec runner interrupted!', :title => 'Jasmine results', :image => :failed)
-      rescue Exception => e
-        p e
-      end
 
-      private
-      def message(total, fails, secs, any_console)
-        total_word = (total.to_i == 1) ? "test" : "tests"
+        def notify(file)
+          if (report = Jasmine::Headless::Report.load(file)).valid?
+            Notifier.notify(message(report.total, report.failed, report.time, report.has_used_console?), :title => 'Jasmine results', :image => image(report.has_used_console?, report.failed))
+            report.failed_files
+          else
+            raise Jasmine::Headless::InvalidReport
+          end
+        rescue Jasmine::Headless::InvalidReport => e
+          Notifier.notify('Spec runner interrupted!', :title => 'Jasmine results', :image => :failed)
+          false
+        end
 
-        "#{total} #{total_word}, #{fails} failures, #{secs} secs#{any_console ? ', console.log used' : ''}."
-      end
+        private
+        def message(total, fails, secs, any_console)
+          total_word = (total.to_i == 1) ? "test" : "tests"
+
+          "#{total} #{total_word}, #{fails} failures, #{secs} secs#{any_console ? ', console.log used' : ''}."
+        end
 
-      def image(any_console, fails)
-        if any_console
-          :pending
-        else
-          if fails.to_i == 0
-            :success
+        def image(any_console, fails)
+          if any_console
+            :pending
           else
-            :failed
+            if fails.to_i == 0
+              :success
+            else
+              :failed
+            end
           end
         end
       end
     end
   end
 end
-

data/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb

@@ -1,8 +1,14 @@
 require 'spec_helper'
-require 'guard/jasmine-headless-webkit/runner'
-require 'fakefs/spec_helpers'
 
-describe Guard::JasmineHeadlessWebkitRunner do
+describe Guard::JasmineHeadlessWebkit::Runner do
+  describe '.run' do
+    it 'should pass along options' do
+      Jasmine::Headless::Runner.expects(:run).with(has_key(:full_run))
+
+      Guard::JasmineHeadlessWebkit::Runner.run([], :full_run => false)
+    end
+  end
+
   describe '.notify' do
     include FakeFS::SpecHelpers
 
@@ -18,7 +24,7 @@ describe Guard::JasmineHeadlessWebkitRunner do
       it 'should notify with the right information' do
         Guard::Notifier.expects(:notify).with("1 test, 0 failures, 5.0 secs.", { :title => 'Jasmine results', :image => :success })
 
-        Guard::JasmineHeadlessWebkitRunner.notify(file).should == []
+        Guard::JasmineHeadlessWebkit::Runner.notify(file).should == []
       end
     end
 
@@ -31,7 +37,7 @@ REPORT
       it 'should notify with the right information' do
         Guard::Notifier.expects(:notify).with("1 test, 1 failures, 5.0 secs.", { :title => 'Jasmine results', :image => :failed })
 
-        Guard::JasmineHeadlessWebkitRunner.notify(file).should == [ 'file.js' ]
+        Guard::JasmineHeadlessWebkit::Runner.notify(file).should == [ 'file.js' ]
       end
     end
 
@@ -41,7 +47,7 @@ REPORT
       it 'should notify failure' do
         Guard::Notifier.expects(:notify).with("Spec runner interrupted!", { :title => 'Jasmine results', :image => :failed })
 
-        Guard::JasmineHeadlessWebkitRunner.notify(file).should be_nil
+        Guard::JasmineHeadlessWebkit::Runner.notify(file).should be_false
       end
     end
   end

data/spec/lib/guard/jasmine-headless-webkit_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'guard/jasmine-headless-webkit'
 
 describe Guard::JasmineHeadlessWebkit do
   let(:guard) { Guard::JasmineHeadlessWebkit.new([], options) }
@@ -42,7 +41,7 @@ describe Guard::JasmineHeadlessWebkit do
 
     context 'fails' do
       it 'should return false' do
-        Guard::JasmineHeadlessWebkitRunner.stubs(:run).returns(['file.js'])
+        Guard::JasmineHeadlessWebkit::Runner.stubs(:run).returns(['file.js'])
 
         guard.run_all.should be_false
         guard.files_to_rerun.should == ['file.js']
@@ -51,20 +50,45 @@ describe Guard::JasmineHeadlessWebkit do
 
     context 'succeeds' do
       it 'should return true' do
-        Guard::JasmineHeadlessWebkitRunner.stubs(:run).returns([])
+        Guard::JasmineHeadlessWebkit::Runner.stubs(:run).returns([])
 
         guard.run_all.should be_true
         guard.files_to_rerun.should == []
       end
     end
+
+    context 'pass along jhw options' do
+      let(:options) { { :all_on_start => false, :full_run => false } }
+
+      it 'should only pass along jhw options' do
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).with([], :full_run => false)
+
+        guard.run_all
+      end
+    end
   end
 
   describe '#run_on_change' do
+    include FakeFS::SpecHelpers
+
     let(:one_file) { %w{test.js} }
 
+    def absolute(file)
+      case file
+      when Array
+        file.collect { |f| absolute(f) }
+      else
+        File.expand_path(file)
+      end
+    end
+
+    before do
+      File.open(one_file.first, 'wb')
+    end
+
     context 'two files' do
       it "should only run one" do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).with(one_file).returns(one_file)
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).with(absolute(one_file), {}).returns(one_file)
 
         guard.run_on_change(%w{test.js test.js}).should be_false
         guard.files_to_rerun.should == one_file
@@ -73,7 +97,7 @@ describe Guard::JasmineHeadlessWebkit do
 
     context 'one file no priors' do
       it "should not run all" do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).returns(one_file)
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).returns(one_file)
 
         guard.run_on_change(one_file).should be_false
         guard.files_to_rerun.should == one_file
@@ -83,7 +107,7 @@ describe Guard::JasmineHeadlessWebkit do
     context 'one file one prior' do
       it "should not run all" do
         guard.instance_variable_set(:@files_to_rerun, [ "two.js" ])
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).with(one_file + [ "two.js" ]).returns(one_file)
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).with(absolute(one_file) + [ "two.js" ], {}).returns(one_file)
 
         guard.run_on_change(one_file).should be_false
         guard.files_to_rerun.should == one_file
@@ -92,17 +116,17 @@ describe Guard::JasmineHeadlessWebkit do
 
     context 'failed hard' do
       it "should not run all" do
-        guard.instance_variable_set(:@files_to_rerun, one_file)
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).with(one_file).returns(nil)
+        guard.instance_variable_set(:@files_to_rerun, absolute(one_file))
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).with(absolute(one_file), {}).returns(false)
 
         guard.run_on_change(one_file).should be_false
-        guard.files_to_rerun.should == one_file
+        guard.files_to_rerun.should == absolute(one_file)
       end
     end
 
     context 'succeed, but still do not run all' do
       it "should run all" do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).returns([])
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).returns([])
 
         guard.run_on_change(one_file).should be_true
         guard.files_to_rerun.should == []
@@ -111,7 +135,7 @@ describe Guard::JasmineHeadlessWebkit do
 
     context 'no files given, just run all' do
       it 'should run all but not run once' do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).never
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).never
         guard.expects(:run_all).once.returns(true)
 
         guard.run_on_change([]).should be_true
@@ -121,19 +145,44 @@ describe Guard::JasmineHeadlessWebkit do
 
     context "Files I don't care about given, ignore" do
       it 'should run all but not run once' do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).never
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).never
         guard.expects(:run_all).once
 
         guard.run_on_change(%w{test.jst})
         guard.files_to_rerun.should == []
       end
     end
+
+    context 'glob given' do
+      let(:files) { %w{file1.js file2.js other.js} }
+
+      before do
+        files.each { |file| File.open(file, 'wb') }
+      end
+
+      context 'not a duplicate' do
+        it 'should expand the glob' do
+          Guard::JasmineHeadlessWebkit::Runner.expects(:run).with(absolute(%w{file1.js file2.js}), {}).returns(false)
+
+          guard.run_on_change(%w{file*.js})
+        end
+      end
+
+      context 'a duplicate' do
+        it 'should expand the glob and uniq' do
+          guard.instance_variable_set(:@files_to_rerun, absolute(%w{file1.js}))
+          Guard::JasmineHeadlessWebkit::Runner.expects(:run).with(absolute(%w{file1.js file2.js}), {}).returns(false)
+
+          guard.run_on_change(%w{file*.js})
+        end
+      end
+    end
   end
 
   context 'with run_before' do
     context 'with failing command' do
       before do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).never
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).never
         Guard::UI.expects(:info).with(regexp_matches(/false/))
       end
 
@@ -146,7 +195,7 @@ describe Guard::JasmineHeadlessWebkit do
 
     context 'with succeeding command' do
       before do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).once
+        Guard::JasmineHeadlessWebkit::Runner.expects(:run).once
         Guard::UI.expects(:info).with(regexp_matches(/true/))
         Guard::UI.expects(:info).with(regexp_matches(/running all/))
       end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'mocha'
 require 'guard'
+require 'guard/jasmine-headless-webkit'
+require 'fakefs/spec_helpers'
 
 RSpec.configure do |config|
   config.mock_with :mocha

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-11-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2166592000 !ruby/object:Gem::Requirement
+  requirement: &2162482180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166592000
+  version_requirements: *2162482180
 - !ruby/object:Gem::Dependency
   name: jasmine-headless-webkit
-  requirement: &2166591500 !ruby/object:Gem::Requirement
+  requirement: &2162481700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +32,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166591500
+  version_requirements: *2162481700
 description: Run jasmine-headless-webkit using guard
 email:
 - john@coswellproductions.com
@@ -50,7 +49,6 @@ files:
 - lib/guard/jasmine-headless-webkit.rb
 - lib/guard/jasmine-headless-webkit/runner.rb
 - lib/guard/jasmine-headless-webkit/templates/Guardfile
-- lib/guard/jasmine-headless-webkit/version.rb
 - script/gemfile
 - script/hooks/pre-commit
 - script/initialize-environment
@@ -58,7 +56,6 @@ files:
 - spec/lib/guard/jasmine-headless-webkit/runner_spec.rb
 - spec/lib/guard/jasmine-headless-webkit_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -79,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: guard-jasmine-headless-webkit
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Run jasmine-headless-webkit using guard

data/lib/guard/jasmine-headless-webkit/version.rb

@@ -1,5 +0,0 @@
-module Guard
-  module JasmineHeadlessWebkitVersion
-    VERSION = "0.3.0"
-  end
-end