guard-jasmine-headless-webkit 0.3.2 → 0.4.0.rc1

data/Gemfile

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

data/Guardfile

@@ -5,13 +5,11 @@ guard 'rspec', :cli => '-c', :version => 2 do
   watch(%r{^spec/.+_spec\.rb})
   watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb') { "spec" }
+end
 
-  # Rails example
-  watch('spec/spec_helper.rb')                       { "spec" }
-  watch('config/routes.rb')                          { "spec/routing" }
-  watch('app/controllers/application_controller.rb') { "spec/controllers" }
-  watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^app/(.+)\.rb})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+guard 'cucumber', :cli => '-f pretty' do
+  watch(%r{^features/.+\.feature$})
+  watch(%r{^features/support/.+$})          { 'features' }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
 end
+

data/README.md

@@ -2,9 +2,11 @@
 
 Add running your Jasmine specs to your `Guardfile` via [`jasmine-headless-webkit`](http://github.com/johnbintz/jasmine-headless-webkit/). Nice!
 
-    guard 'jasmine-headless-webkit' do
-      watch(%r{^app/assets/javascripts/(.*)\..*}) { |m| newest_js_file("spec/javascripts/#{m[1]}_spec") }
-    end
+``` ruby
+guard 'jasmine-headless-webkit' do
+  watch(%r{^app/assets/javascripts/(.*)\..*}) { |m| newest_js_file("spec/javascripts/#{m[1]}_spec") }
+end
+```
 
 `gem install guard-jasmine-headless-webkit` and then `guard init jasmine-headless-webkit` in your project directory to get started.
 You should also put it in your `Gemfile` because, hey, why not, right?
@@ -18,22 +20,22 @@ home folder's `.jasmine-headless-webkit` file.
 * `: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.
+## Using with .erb files in the Rails 3.1 Asset Pipeline and/or Jammit
 
-## Using with Rails 3.1 and the Asset Pipeline and/or Jammit
-
-Use [`guard-rails-assets`](https://github.com/dnagir/guard-rails-assets) chained in before `guard-jasmine-headless-webkit` to precompile your application
+If your code required Jammit or ERB templates, which aren't directly supported by `jasmine-headledd-webkit`,
+use [`guard-rails-assets`](https://github.com/dnagir/guard-rails-assets) chained in before `guard-jasmine-headless-webkit` to precompile your application
 code for testing:
 
-    guard 'rails-assets' do
-      watch(%r{^app/assets/javascripts/.*})
-    end
+``` ruby
+guard 'rails-assets' do
+  watch(%r{^app/assets/javascripts/.*})
+end
 
-    guard 'jasmine-headless-webkit' do
-      watch(%r{^public/assets/.*\.js})
-      ... specs ...
-    end
+guard 'jasmine-headless-webkit' do
+  watch(%r{^public/assets/.*\.js})
+  ... specs ...
+end
+```
 
 Do the same for Jammit, using [`guard-jammit`](http://github.com/guard/guard-jammit).
 
@@ -51,12 +53,3 @@ file is a little more complicated. `newest_js_file` extends the Guard DSL to sea
 
 If you 100% know you won't need that support, modify your `Guardfile` as appropriate.
 
-## ...and the `.jst` file search?
-
-I use [Backbone.js](http://documentcloud.github.com/backbone/) a lot, and I put my Underscore view templates in `app/views/*.jst` 
-and mash them all together with [Jammit](https://github.com/documentcloud/jammit) for use in my apps. Feel free to change that, it's your `Guardfile` after all.
-Or, try it. It's easy to do in your `assets.yml` file:
-
-    templates:
-    - app/views/*.jst
-

data/Rakefile

@@ -13,11 +13,11 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-PLATFORMS = %w{1.8.7 1.9.2 ree 1.9.3-rc1}
+PLATFORMS = %w{1.8.7 1.9.2 ree 1.9.3}
 
 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 }
+    system %{bash -c 'unset BUNDLE_BIN_PATH && unset BUNDLE_GEMFILE && rvm #{PLATFORMS.join(',')} do bundle #{command}'}
   end
 end
 
@@ -29,6 +29,7 @@ namespace :spec do
   task :platforms do
     rvm_bundle "update"
     rvm_bundle "exec rspec spec"
+    rvm_bundle "exec cucumber"
     raise SpecError.new if $?.exitstatus != 0
   end
 end

data/features/runner.feature

@@ -0,0 +1,33 @@
+Feature: Runner
+  Scenario: Don't specify a reporter
+    Given I am going to call a JHW runner with the following reporters:
+      | name | file |
+      | Console | |
+      | File | notify-file |
+      And I am going to get a notification file
+    When I don't specify a reporter
+      And I run the runner
+    Then I should get the reporters
+
+  Scenario: Specify another console reporter
+    Given I am going to call a JHW runner with the following reporters:
+      | name | file |
+      | Verbose | |
+      | File | notify-file |
+      And I am going to get a notification file
+    When I specify the reporter "Verbose"
+      And I run the runner
+    Then I should get the reporters
+      And the reporter string should not have changed
+
+  Scenario: Specify two reporters
+    Given I am going to call a JHW runner with the following reporters:
+      | name | file |
+      | Verbose | |
+      | Tap | tap-file |
+      | File | notify-file |
+      And I am going to get a notification file
+    When I specify the reporter "Verbose Tap:tap-file"
+      And I run the runner
+    Then I should get the reporters
+

data/features/step_definitions/given/i_am_going_to_call_a_runner.rb

@@ -0,0 +1,13 @@
+Given /^I am going to call a JHW runner with the following reporters:$/ do |table|
+  reporters = []
+
+  table.rows.each do | name, file |
+    reporters << [ name ]
+
+    reporters.last << file if !file.empty?
+  end
+
+  Jasmine::Headless::Runner.expects(:run).with(has_entry(:reporters => reporters))
+  Guard::JasmineHeadlessWebkit::Runner.expects(:notify)
+end
+

data/features/step_definitions/given/i_am_going_to_get_a_notification.rb

@@ -0,0 +1,3 @@
+Given /^I am going to get a notification file$/ do
+  Guard::JasmineHeadlessWebkit::Runner.stubs(:notify_report_file).returns(@report_file)
+end

data/features/step_definitions/then/i_should_get_reporters.rb

@@ -0,0 +1,3 @@
+Then /^I should get the reporters$/ do
+end
+

data/features/step_definitions/then/reporter_string_should_not_have_changed.rb

@@ -0,0 +1,3 @@
+Then /^the reporter string should not have changed$/ do
+  @options[:reporters].should == @requested_reporter
+end

data/features/step_definitions/when/i_dont_specify_a_reporter.rb

@@ -0,0 +1,3 @@
+When /^I don't specify a reporter$/ do
+  @options = {}
+end

data/features/step_definitions/when/i_run_the_runner.rb

@@ -0,0 +1,3 @@
+When /^I run the runner$/ do
+  Guard::JasmineHeadlessWebkit::Runner.run(@paths, @options)
+end

data/features/step_definitions/when/i_specify_reporter.rb

@@ -0,0 +1,6 @@
+When /^I specify the reporter "([^"]*)"$/ do |reporter|
+  @requested_reporter = reporter
+
+  @options = { :reporters => reporter }
+end
+

data/features/support/env.rb

@@ -0,0 +1,30 @@
+require 'rspec'
+require 'mocha'
+require 'fakefs/safe'
+
+require 'jasmine-headless-webkit'
+require 'guard/jasmine-headless-webkit'
+
+require 'coffee-script'
+
+World(Mocha::API)
+
+Before do
+  mocha_setup
+
+  FakeFS.activate!
+
+  @report_file = 'notify-file'
+  @paths = []
+end
+
+After do
+  begin
+    mocha_verify
+  ensure
+    mocha_teardown
+  end
+
+  FakeFS.deactivate!
+end
+

data/guard-jasmine-headless-webkit.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "guard-jasmine-headless-webkit"
-  s.version     = '0.3.2'
+  s.version     = '0.4.0.rc1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["John Bintz"]
   s.email       = ["john@coswellproductions.com"]

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

@@ -26,8 +26,6 @@ module Guard
       @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]
-
       @files_to_rerun = []
     end
 
@@ -43,25 +41,18 @@ module Guard
 
     def run_all
       run_something_and_rescue do
-        @ran_before = false
-
-        run_for_failed_files if run_all_things_before
+        run_for_failed_files
       end
     end
 
     def run_on_change(paths)
       run_something_and_rescue do
-        paths = filter_paths(paths)
-        @ran_before = false
-        if run_all_things_before
-          @ran_before = true
-          if !paths.empty?
-            paths = (paths + @files_to_rerun).uniq
-
-            run_for_failed_files(paths)
-          else
-            run_all
-          end
+        if !(paths = filter_paths(paths)).empty?
+          paths = (paths + @files_to_rerun).uniq
+
+          run_for_failed_files(paths)
+        else
+          run_all
         end
       end
     end
@@ -75,7 +66,7 @@ module Guard
       end
       failed_files = Runner.run(paths, @filtered_options)
       @files_to_rerun = failed_files || paths
-      
+
       failed_files && @files_to_rerun.empty?
     end
 
@@ -87,22 +78,6 @@ module Guard
       %r{\.(#{@options[:valid_extensions].join('|')})$}
     end
 
-    def run_before
-      run_a_thing_before(:run_before, @options[:run_before])
-    end
-
-    def run_a_thing_before(option, *args)
-      if @options[option] && !@ran_before
-        run_program(*args)
-      else
-        true
-      end
-    end
-
-    def run_all_things_before
-      run_before
-    end
-
     def run_program(name, command = nil)
       command ||= name
       UI.info "Guard::JasmineHeadlessWebkit running #{name}..."

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

@@ -4,46 +4,64 @@ require 'jasmine-headless-webkit'
 module Guard
   class JasmineHeadlessWebkit
     class Runner
-      class << self
-        def run(paths = [], options = {})
-          file = Tempfile.new('guard-jasmine-headless-webkit')
-          file.close
+      def self.run(paths = [], options = {})
+        report_file = notify_report_file
 
-          options.merge!(:report => file.path, :colors => true, :files => paths)
+        options = options.merge(:reporters => process_reporters(options[:reporters], report_file), :colors => true, :files => paths)
 
-          Jasmine::Headless::Runner.run(options)
+        Jasmine::Headless::Runner.run(options)
 
-          notify(file.path)
-        end
+        notify(report_file)
+      end
 
-        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
+      def self.notify_report_file
+        file = Tempfile.new('guard-jasmine-headless-webkit')
+        file.close
+        file.path
+      end
+
+      def self.process_reporters(reporters, report_file)
+        reporters ||= 'Console'
+
+        out = []
+
+        reporters.split(' ').each do |reporter|
+          name, file = reporter.split(':', 2)
+
+          out << [ name ]
+          out.last << file if file && !file.empty?
         end
 
-        private
-        def message(total, fails, secs, any_console)
-          total_word = (total.to_i == 1) ? "test" : "tests"
+        out + [ [ 'File', report_file ] ]
+      end
 
-          "#{total} #{total_word}, #{fails} failures, #{secs} secs#{any_console ? ', console.log used' : ''}."
+      def self.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
+
+      private
+      def self.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
+      def self.image(any_console, fails)
+        if any_console
+          :pending
+        else
+          if fails.to_i == 0
+            :success
           else
-            if fails.to_i == 0
-              :success
-            else
-              :failed
-            end
+            :failed
           end
         end
       end

data/lib/guard/jasmine-headless-webkit/templates/Guardfile

@@ -1,4 +1,4 @@
-# Run JS and CoffeeScript files in a typical Rails 3.1 fashion, placing Underscore templates in app/views/*.jst
+# Run JS and CoffeeScript files in a typical Rails 3.1/Sprockets fashion.
 # Your spec files end with _spec.{js,coffee}.
 
 spec_location = "spec/javascripts/%s_spec"
@@ -7,9 +7,7 @@ spec_location = "spec/javascripts/%s_spec"
 # spec_location = "spec/javascripts/%sSpec"
 
 guard 'jasmine-headless-webkit' do
-  watch(%r{^app/views/.*\.jst$})
-  watch(%r{^public/javascripts/(.*)\.js$}) { |m| newest_js_file(spec_location % m[1]) }
-  watch(%r{^app/assets/javascripts/(.*)\.(js|coffee)$}) { |m| newest_js_file(spec_location % m[1]) }
-  watch(%r{^spec/javascripts/(.*)_spec\..*}) { |m| newest_js_file(spec_location % m[1]) }
+  watch(%r{^(app|lib|vendor)/assets/javascripts/(.*)$}) { |m| newest_js_file(spec_location % m[1]) }
+  watch(%r{^spec/javascripts/(.*)[Ss]pec\..*}) { |m| newest_js_file(spec_location % m[1]) }
 end
 

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

@@ -2,13 +2,43 @@ require 'spec_helper'
 
 describe Guard::JasmineHeadlessWebkit::Runner do
   describe '.run' do
+    let(:reporter) { 'reporter' }
+
+    before do
+      described_class.stubs(:process_reporters).returns([ reporter ])
+    end
+
     it 'should pass along options' do
-      Jasmine::Headless::Runner.expects(:run).with(has_key(:full_run))
+      Jasmine::Headless::Runner.expects(:run).with(all_of(has_key(:full_run), has_entry(:reporters => [ reporter ])))
 
       Guard::JasmineHeadlessWebkit::Runner.run([], :full_run => false)
     end
   end
 
+  describe '.process_reporters' do
+    subject { described_class.process_reporters(reporters, report_file) }
+
+    let(:report_file) { 'report file' }
+
+    context 'none provided' do
+      let(:reporters) { nil }
+
+      it { should == [ [ 'Console' ], [ 'File', report_file ] ] }
+    end
+
+    context 'one provided' do
+      let(:reporters) { 'One' }
+
+      it { should == [ [ 'One' ], [ 'File', report_file ] ] }
+    end
+
+    context 'two provided' do
+      let(:reporters) { 'One Two:file.txt' }
+
+      it { should == [ [ 'One' ], [ 'Two', 'file.txt' ], [ 'File', report_file ] ] }
+    end
+  end
+
   describe '.notify' do
     include FakeFS::SpecHelpers
 

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

@@ -23,15 +23,6 @@ describe Guard::JasmineHeadlessWebkit do
         guard.start
       end
     end
-
-    context 'run_before' do
-      let(:options) { { :run_before => true, :all_on_start => false } }
-
-      it "should warn about deprecation" do
-        Guard::UI.expects(:deprecation).at_least_once
-        guard.start
-      end
-    end
   end
 
   describe '#run_all' do
@@ -179,35 +170,6 @@ describe Guard::JasmineHeadlessWebkit do
     end
   end
 
-  context 'with run_before' do
-    context 'with failing command' do
-      before do
-        Guard::JasmineHeadlessWebkit::Runner.expects(:run).never
-        Guard::UI.expects(:info).with(regexp_matches(/false/))
-      end
-
-      let(:options) { { :run_before => 'false' } }
-
-      it "should run the command first" do
-        guard.run_all
-      end
-    end
-
-    context 'with succeeding command' do
-      before do
-        Guard::JasmineHeadlessWebkit::Runner.expects(:run).once
-        Guard::UI.expects(:info).with(regexp_matches(/true/))
-        Guard::UI.expects(:info).with(regexp_matches(/running all/))
-      end
-
-      let(:options) { { :run_before => 'true' } }
-
-      it "should run the command first" do
-        guard.run_all
-      end
-    end
-  end
-
   describe '#reload' do
     it 'should reset the state of the files_to_rerun' do
       Guard::UI.expects(:info).with(regexp_matches(/Resetting/))

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - John Bintz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2162482180 !ruby/object:Gem::Requirement
+  requirement: &2154052040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2162482180
+  version_requirements: *2154052040
 - !ruby/object:Gem::Dependency
   name: jasmine-headless-webkit
-  requirement: &2162481700 !ruby/object:Gem::Requirement
+  requirement: &2154047300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2162481700
+  version_requirements: *2154047300
 description: Run jasmine-headless-webkit using guard
 email:
 - john@coswellproductions.com
@@ -45,6 +45,15 @@ files:
 - Guardfile
 - README.md
 - Rakefile
+- features/runner.feature
+- features/step_definitions/given/i_am_going_to_call_a_runner.rb
+- features/step_definitions/given/i_am_going_to_get_a_notification.rb
+- features/step_definitions/then/i_should_get_reporters.rb
+- features/step_definitions/then/reporter_string_should_not_have_changed.rb
+- features/step_definitions/when/i_dont_specify_a_reporter.rb
+- features/step_definitions/when/i_run_the_runner.rb
+- features/step_definitions/when/i_specify_reporter.rb
+- features/support/env.rb
 - guard-jasmine-headless-webkit.gemspec
 - lib/guard/jasmine-headless-webkit.rb
 - lib/guard/jasmine-headless-webkit/runner.rb
@@ -68,12 +77,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 438818790571078981
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: guard-jasmine-headless-webkit
 rubygems_version: 1.8.11
@@ -81,6 +93,15 @@ signing_key:
 specification_version: 3
 summary: Run jasmine-headless-webkit using guard
 test_files:
+- features/runner.feature
+- features/step_definitions/given/i_am_going_to_call_a_runner.rb
+- features/step_definitions/given/i_am_going_to_get_a_notification.rb
+- features/step_definitions/then/i_should_get_reporters.rb
+- features/step_definitions/then/reporter_string_should_not_have_changed.rb
+- features/step_definitions/when/i_dont_specify_a_reporter.rb
+- features/step_definitions/when/i_run_the_runner.rb
+- features/step_definitions/when/i_specify_reporter.rb
+- features/support/env.rb
 - spec/lib/guard/jasmine-headless-webkit/runner_spec.rb
 - spec/lib/guard/jasmine-headless-webkit_spec.rb
 - spec/spec_helper.rb