guard-jasmine-headless-webkit 0.2.0 → 0.3.0

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+*.orig
+

data/README.md

@@ -15,9 +15,11 @@ home folder's `.jasmine-headless-webkit` file.
 ## `guard` options
 
 * `:all_on_start => false` to not run everything when starting, just like `guard-rspec`.
-* `:run_before => "<command to run>"` to run a command before running specs. If the command fails, the test run stops.
 * `: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.
 
+### Deprecated options
+* `:run_before => "<command to run>"` to run a command before running specs. If the command fails, the test run stops.
+
 ## 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

data/guard-jasmine-headless-webkit.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'guard', '>= 0.4.0'
-  s.add_dependency 'jasmine-headless-webkit', '>= 0.3.0'
+  s.add_dependency 'jasmine-headless-webkit', '>= 0.7.0'
 end
+

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

@@ -7,6 +7,11 @@ module Guard
   class JasmineHeadlessWebkit < Guard
     DEFAULT_EXTENSIONS = %w{js coffee}
 
+    ALL_SPECS_MESSAGE = "Guard::JasmineHeadlessWebkit running all specs..."
+    SOME_SPECS_MESSAGE = "Guard::JasmineHeadlessWebkit running the following: %s"
+
+    attr_reader :files_to_rerun
+
     def initialize(watchers = [], options = {})
       super
       @options = {
@@ -14,6 +19,10 @@ module Guard
         :run_before => false,
         :valid_extensions => DEFAULT_EXTENSIONS
       }.merge(options)
+
+      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
 
     def start
@@ -21,11 +30,16 @@ module Guard
       run_all if @options[:all_on_start]
     end
 
+    def reload
+      @files_to_rerun = []
+      UI.info "Resetting Guard::JasmineHeadlessWebkit failed files..."
+    end
+
     def run_all
       run_something_and_rescue do
-        UI.info "Guard::JasmineHeadlessWebkit running all specs..."
-        JasmineHeadlessWebkitRunner.run if run_all_things_before
         @ran_before = false
+
+        run_for_failed_files if run_all_things_before
       end
     end
 
@@ -36,8 +50,9 @@ module Guard
         if run_all_things_before
           @ran_before = true
           if !paths.empty?
-            UI.info "Guard::JasmineHeadlessWebkit running the following: #{paths.join(' ')}"
-            JasmineHeadlessWebkitRunner.run(paths)
+            paths = (paths + @files_to_rerun).uniq
+
+            run_for_failed_files(paths)
           else
             run_all
           end
@@ -46,6 +61,20 @@ module Guard
     end
 
     private
+    def run_for_failed_files(paths = [])
+      if paths.empty?
+        UI.info(ALL_SPECS_MESSAGE)
+      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?
+    end
+
     def filter_paths(paths)
       paths.find_all { |path| File.extname(path)[valid_extensions] }.uniq
     end
@@ -81,9 +110,13 @@ module Guard
       yield
     rescue ::CoffeeScript::CompilationError
     rescue StandardError => e
-      puts e.message
-      puts e.backtrace.join("\n")
-      puts
+      if ENV['GUARD_ENV'] == 'test'
+        raise e
+      else
+        puts e.message
+        puts e.backtrace.join("\n")
+        puts
+      end
     end
   end
 

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

@@ -1,5 +1,5 @@
 require 'guard/notifier'
-require 'jasmine/headless/runner'
+require 'jasmine-headless-webkit'
 
 module Guard
   class JasmineHeadlessWebkitRunner
@@ -14,14 +14,16 @@ module Guard
       end
 
       def notify(file)
-        if (data = File.read(file).strip).empty?
-          Notifier.notify('Spec runner interrupted!', :title => 'Jasmine results', :image => :failed)
+        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
-          total, fails, any_console, secs = data.lines.first.strip.split('/')
-
-          Notifier.notify(message(total, fails, secs, any_console == "T"), :title => 'Jasmine results', :image => image(any_console == "T", fails))
-          fails.to_i
+          raise Jasmine::Headless::InvalidReport.new
         end
+      rescue Jasmine::Headless::InvalidReport => e
+        Notifier.notify('Spec runner interrupted!', :title => 'Jasmine results', :image => :failed)
+      rescue Exception => e
+        p e
       end
 
       private

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

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

data/script/gemfile

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'penchant'
+
+if Penchant::Gemfile.do_full_env_switch!(ARGV[0])
+  puts "Gemfile switched to #{ARGV[0]}"
+else
+  exit 0
+end
+

data/script/hooks/pre-commit

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+OLD_GIT_DIR=$GIT_DIR
+
+if [ "$(penchant gemfile-env)" != "remote" ]; then
+  unset GIT_DIR
+  penchant gemfile remote
+  GIT_DIR=$OLD_GIT_DIR
+  git add Gemfile*
+fi
+
+bundle exec rake
+R=$?
+if [ $R -ne 0 ]; then exit $R; fi
+

data/script/initialize-environment

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+if File.file?('Gemfile.erb')
+  pwd = Dir.pwd
+
+  Dir.chdir '..' do
+    File.readlines(File.join(pwd, 'Gemfile.erb')).find_all { |line| line[':git'] }.each do |line|
+      repo = line[%r{:git => (['"])(.*)\1}, 2]
+
+      puts "Installing #{repo}"
+      system %{git clone #{repo}}
+    end
+  end
+
+  puts "Bundling for local environment"
+  system %{script/gemfile local}
+else
+  puts "Bundling..."
+  system %{bundle}
+end
+
+puts "Installing git hooks"
+system %{script/install-git-hooks}
+
+bundle = File.file?('Gemfile') ? 'bundle exec' : ''
+
+command = [ bundle, 'rake', '-s', '-T', 'bootstrap' ]
+
+if !(%x{#{command.join(' ')}}).empty?
+  puts "Trying to run rake bootstrap..."
+  system %{#{bundle} rake bootstrap}
+end
+
+puts "Done!"
+

data/script/install-git-hooks

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for hook in script/hooks/* ; do
+  ln -sf $PWD/$hook .git/hooks/${hook##*/}
+done
+

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

@@ -13,22 +13,25 @@ describe Guard::JasmineHeadlessWebkitRunner do
     end
 
     context 'system run not interrupted' do
-      let(:data) { '1/0/F/5' }
+      let(:data) { 'TOTAL||1||0||5||F' }
 
       it 'should notify with the right information' do
-        Guard::Notifier.expects(:notify).with("1 test, 0 failures, 5 secs.", { :title => 'Jasmine results', :image => :success })
+        Guard::Notifier.expects(:notify).with("1 test, 0 failures, 5.0 secs.", { :title => 'Jasmine results', :image => :success })
 
-        Guard::JasmineHeadlessWebkitRunner.notify(file)
+        Guard::JasmineHeadlessWebkitRunner.notify(file).should == []
       end
     end
 
     context 'with failures' do
-      let(:data) { "1/0/F/5\nThis||Is||A||Failure\n" }
+      let(:data) { <<-REPORT }
+FAIL||Test||Two||file.js:50
+TOTAL||1||1||5||F
+REPORT
 
       it 'should notify with the right information' do
-        Guard::Notifier.expects(:notify).with("1 test, 0 failures, 5 secs.", { :title => 'Jasmine results', :image => :success })
+        Guard::Notifier.expects(:notify).with("1 test, 1 failures, 5.0 secs.", { :title => 'Jasmine results', :image => :failed })
 
-        Guard::JasmineHeadlessWebkitRunner.notify(file)
+        Guard::JasmineHeadlessWebkitRunner.notify(file).should == [ 'file.js' ]
       end
     end
 
@@ -38,7 +41,7 @@ describe Guard::JasmineHeadlessWebkitRunner do
       it 'should notify failure' do
         Guard::Notifier.expects(:notify).with("Spec runner interrupted!", { :title => 'Jasmine results', :image => :failed })
 
-        Guard::JasmineHeadlessWebkitRunner.notify(file)
+        Guard::JasmineHeadlessWebkitRunner.notify(file).should be_nil
       end
     end
   end

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

@@ -24,42 +24,98 @@ 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
+    before do
+      guard.stubs(:run_all_things_before).returns(true)
+    end
+
+    context 'fails' do
+      it 'should return false' do
+        Guard::JasmineHeadlessWebkitRunner.stubs(:run).returns(['file.js'])
+
+        guard.run_all.should be_false
+        guard.files_to_rerun.should == ['file.js']
+      end
+    end
+
+    context 'succeeds' do
+      it 'should return true' do
+        Guard::JasmineHeadlessWebkitRunner.stubs(:run).returns([])
+
+        guard.run_all.should be_true
+        guard.files_to_rerun.should == []
+      end
+    end
   end
 
   describe '#run_on_change' do
+    let(:one_file) { %w{test.js} }
+
     context 'two files' do
       it "should only run one" do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).with(%w{test.js}).returns(1)
-        guard.expects(:run_all).never
+        Guard::JasmineHeadlessWebkitRunner.expects(:run).with(one_file).returns(one_file)
 
-        guard.run_on_change(%w{test.js test.js})
+        guard.run_on_change(%w{test.js test.js}).should be_false
+        guard.files_to_rerun.should == one_file
       end
     end
 
-    context 'jhw call fails' do
+    context 'one file no priors' do
       it "should not run all" do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).returns(1)
-        guard.expects(:run_all).never
+        Guard::JasmineHeadlessWebkitRunner.expects(:run).returns(one_file)
+
+        guard.run_on_change(one_file).should be_false
+        guard.files_to_rerun.should == one_file
+      end
+    end
+
+    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.run_on_change(one_file).should be_false
+        guard.files_to_rerun.should == one_file
+      end
+    end
 
-        guard.run_on_change(%w{test.js})
+    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.run_on_change(one_file).should be_false
+        guard.files_to_rerun.should == one_file
       end
     end
 
     context 'succeed, but still do not run all' do
       it "should run all" do
-        Guard::JasmineHeadlessWebkitRunner.expects(:run).returns(0)
-        guard.expects(:run_all).never
+        Guard::JasmineHeadlessWebkitRunner.expects(:run).returns([])
 
-        guard.run_on_change(%w{test.js})
+        guard.run_on_change(one_file).should be_true
+        guard.files_to_rerun.should == []
       end
     end
 
     context 'no files given, just run all' do
       it 'should run all but not run once' do
         Guard::JasmineHeadlessWebkitRunner.expects(:run).never
-        guard.expects(:run_all).once
+        guard.expects(:run_all).once.returns(true)
 
-        guard.run_on_change([])
+        guard.run_on_change([]).should be_true
+        guard.files_to_rerun.should == []
       end
     end
 
@@ -69,6 +125,7 @@ describe Guard::JasmineHeadlessWebkit do
         guard.expects(:run_all).once
 
         guard.run_on_change(%w{test.jst})
+        guard.files_to_rerun.should == []
       end
     end
   end
@@ -78,7 +135,6 @@ describe Guard::JasmineHeadlessWebkit do
       before do
         Guard::JasmineHeadlessWebkitRunner.expects(:run).never
         Guard::UI.expects(:info).with(regexp_matches(/false/))
-        Guard::UI.expects(:info).with(regexp_matches(/running all/))
       end
 
       let(:options) { { :run_before => 'false' } }
@@ -102,4 +158,14 @@ describe Guard::JasmineHeadlessWebkit do
       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/))
+
+      guard.instance_variable_set(:@files_to_rerun, "test")
+      guard.reload
+      guard.files_to_rerun.should == []
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ RSpec.configure do |config|
   config.mock_with :mocha
 end
 
+ENV['GUARD_ENV'] = 'test'
+
 module Guard
   module UI
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-05 00:00:00.000000000 -04:00
+date: 2011-09-12 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2166408320 !ruby/object:Gem::Requirement
+  requirement: &2166592000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,18 +22,18 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166408320
+  version_requirements: *2166592000
 - !ruby/object:Gem::Dependency
   name: jasmine-headless-webkit
-  requirement: &2166407820 !ruby/object:Gem::Requirement
+  requirement: &2166591500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166407820
+  version_requirements: *2166591500
 description: Run jasmine-headless-webkit using guard
 email:
 - john@coswellproductions.com
@@ -51,6 +51,10 @@ files:
 - 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
+- script/install-git-hooks
 - spec/lib/guard/jasmine-headless-webkit/runner_spec.rb
 - spec/lib/guard/jasmine-headless-webkit_spec.rb
 - spec/spec_helper.rb