guillaumegentil-rspactor 0.3.4 → 0.4

data/Rakefile

@@ -54,4 +54,4 @@ end
 task :release => :bump do
   system %(git commit VERSION *.gemspec -m "release v#{GEM_VERSION}")
   system %(git tag -am "release v#{GEM_VERSION}" v#{GEM_VERSION})
-end
+end

data/bin/rspactor

@@ -3,5 +3,7 @@ require 'rspactor/runner'
 
 RSpactor::Runner.start({
   :coral => ARGV.delete('--coral'),
+  :kill => ARGV.delete('--kill'),
+  :clear => ARGV.delete('--clear'),
   :run_in => ARGV.last
 })

data/bin/rspactor-system

@@ -53,11 +53,11 @@ listener = RSpactor::Listener.new do |changed_files|
         existing_targets = targets.select { |file| File.exist?(File.join(dir, file)) }
       else
         inspector = RSpactor::Inspector.new(dir)
-        existing_targets = inspector.determine_spec_files(changed_file).map do |file|
+        existing_targets = inspector.determine_files(changed_file).map do |file|
           file.sub(dir + '/', '')
         end
       end
-
+      
       if not existing_targets.empty?
         case existing_targets.first
         when %r{^test/}
@@ -77,7 +77,7 @@ listener = RSpactor::Listener.new do |changed_files|
           puts changed_file
           system command
         end
-
+        
         if $?.success?
           Growl::notify $title, "You rock!", Growl::image_path('success')
         else

data/lib/cucumber_growler.rb

@@ -0,0 +1,61 @@
+require 'cucumber'
+require 'cucumber/formatter/console'
+require File.dirname(__FILE__) + '/rspactor/growl'
+
+module CucumberGrowler
+  include RSpactor::Growl
+  
+  def self.included(base)
+    base.class_eval do
+      alias original_print_stats print_stats
+      include InstanceMethods
+      
+      def print_stats(features)
+        title, icon, messages = '', '', []
+        [:failed, :skipped, :undefined, :pending, :passed].reverse.each do |status|
+          if step_mother.steps(status).any?
+            icon = icon_for(status)
+            title = title_for(status)
+            messages << dump_count(step_mother.steps(status).length, "step", status.to_s)
+          end
+        end
+        
+        notify "Cucumber Results", messages.reverse.join(' - '), icon
+        original_print_stats(features)
+      end
+    end
+  end
+  
+  module InstanceMethods
+    def icon_for(status)
+      case status
+      when :passed
+        'success'
+      when :pending, :undefined, :skipped
+        'pending'
+      when :failed
+        'failed'
+      end
+    end
+    
+    def title_for(status)
+      case status
+      when :passed
+        'Features passed!'
+      when :pending
+        'Some steps are pending...'
+      when :undefined
+        'Some undefined steps...'
+      when :skipped
+        'Some steps skipped...'
+      when :failed
+        'Failures occurred!'
+      end
+    end
+  end
+  
+end
+
+module Cucumber::Formatter::Console
+  include CucumberGrowler
+end

data/lib/rspactor/growl.rb

@@ -2,8 +2,8 @@ module RSpactor
   module Growl
     extend self
     
-    def notify(title, msg, img, pri = 0)
-      system("growlnotify -w -n rspactor --image #{img} -p #{pri} -m #{msg.inspect} #{title} &") 
+    def notify(title, msg, icon, pri = 0)
+      system("growlnotify -w -n rspactor --image #{image_path(icon)} -p #{pri} -m #{msg.inspect} #{title} &") 
     end
     
     # failed | pending | success

data/lib/rspactor/inspector.rb

@@ -8,17 +8,20 @@ module RSpactor
       @root = dir
     end
     
-    def determine_spec_files(file)
+    def determine_files(file)
       candidates = translate(file)
+      cucumberable = candidates.delete('cucumber')
       candidates.reject { |candidate| candidate.index('.') }.each do |dir|
         candidates.reject! { |candidate| candidate.index("#{dir}/") == 0 }
       end
-      spec_files = candidates.select { |candidate| File.exists? candidate }
+      files = candidates.select { |candidate| File.exists? candidate }
       
-      if spec_files.empty?
+      if files.empty? && !cucumberable
         $stderr.puts "doesn't exist: #{candidates.inspect}"
       end
-      spec_files
+      
+      files << 'cucumber' if cucumberable
+      files.uniq
     end
     
     # mappings for Rails are inspired by autotest mappings in rspec-rails
@@ -28,6 +31,8 @@ module RSpactor
       
       if spec_file?(file)
         candidates << file
+      elsif cucumber_file?(file)
+        candidates << 'cucumber'
       else
         spec_file = append_spec_file_extension(file)
         
@@ -55,8 +60,8 @@ module RSpactor
           # lib/bar_spec.rb -> bar_spec.rb
           candidates << candidates.last.sub(%r:\w+/:, '') if candidates.last.index('/')
         when 'config/routes.rb'
-          candidates << 'controllers' << 'helpers' << 'views'
-        when 'config/database.yml', 'db/schema.rb'
+          candidates << 'controllers' << 'helpers' << 'views' << 'routing'
+        when 'config/database.yml', 'db/schema.rb', 'spec/factories.rb'
           candidates << 'models'
         when %r:^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$:, 'spec/spec.opts'
           candidates << 'spec'
@@ -66,7 +71,9 @@ module RSpactor
       end
       
       candidates.map do |candidate|
-        if candidate.index('spec') == 0
+        if candidate == 'cucumber'
+          candidate
+        elsif candidate.index('spec') == 0
           File.join(@root, candidate)
         else
           File.join(@root, 'spec', candidate)
@@ -85,5 +92,8 @@ module RSpactor
     def spec_file?(file)
       file =~ /^spec\/.+_spec.rb$/
     end
+    def cucumber_file?(file)
+      file =~ /^features\/.+$/
+    end
   end
 end

data/lib/rspactor/interactor.rb

@@ -2,14 +2,16 @@ require 'timeout'
 
 module RSpactor
   class Interactor
-    def initialize(dir)
+    def initialize(dir, options = {})
       @root = dir
+      @options = options
       ticker
     end
     
-    def wait_for_enter_key(msg, seconds_to_wait)
+    def wait_for_enter_key(msg, seconds_to_wait, clear = false)
       begin
         Timeout::timeout(seconds_to_wait) do
+          system("clear;") if clear
           ticker(:start => true, :msg => msg)
           $stdin.gets
           return true
@@ -27,7 +29,7 @@ module RSpactor
         loop do
           sleep 0.5
           if $stdin.gets
-            if wait_for_enter_key("** Running all specs.. Hit <enter> again to exit RSpactor", 3)
+            if wait_for_enter_key("** Running all specs.. Hit <enter> again to exit RSpactor", 3, @options[:clear])
               @main_thread.exit
               exit
             end

data/lib/rspactor/runner.rb

@@ -23,7 +23,7 @@ module RSpactor
     end
     
     def start_interactor
-      @interactor = Interactor.new(dir)
+      @interactor = Interactor.new(dir, options)
       aborted = @interactor.wait_for_enter_key("** Hit <enter> to skip initial spec run", 3)
       @interactor.start_termination_handler
       run_all_specs unless aborted
@@ -33,7 +33,7 @@ module RSpactor
       @inspector = Inspector.new(dir)
       
       Listener.new(Inspector::EXTENSIONS) do |files|
-        spec_changed_files(files) unless git_head_changed?
+        changed_files(files) unless git_head_changed?
       end.run(dir)
     end
     
@@ -62,6 +62,12 @@ module RSpactor
       end
     end
     
+    def run_cucumber_command
+      cmd = [ruby_opts, cucumber_runner, cucumber_opts].flatten.join(' ')
+      @last_run_failed = run_command(cmd)
+      system('killall java') if options[:kill]
+    end
+    
     def last_run_failed?
       @last_run_failed == false
     end
@@ -69,20 +75,27 @@ module RSpactor
     protected
     
     def run_command(cmd)
-      $stderr.puts "#{cmd}"
       system(cmd)
       $?.success?
     end
     
-    def spec_changed_files(files)
-      files_to_spec = files.inject([]) do |all, file|
-        all.concat inspector.determine_spec_files(file)
+    def changed_files(files)
+      files = files.inject([]) do |all, file|
+        all.concat inspector.determine_files(file)
       end
-      unless files_to_spec.empty?
-        puts files_to_spec.join("\n")
+      unless files.empty?
+        system("clear;") if @options[:clear]
+        
+        if files.delete('cucumber')
+          puts '--- cucumber current tagged features ---'
+          run_cucumber_command
+        end
+        
+        # specs files
+        puts files.map { |f| f.to_s.gsub(/#{dir}/, '') }.join("\n")
         
         previous_run_failed = last_run_failed?
-        run_spec_command(files_to_spec)
+        run_spec_command(files)
         
         if options[:retry_failed] and previous_run_failed and not last_run_failed?
           run_all_specs
@@ -99,15 +112,33 @@ module RSpactor
         opts = "--color"
       end
       
-      opts << ' ' << formatter_opts
+      opts << spec_formatter_opts
       # only add the "progress" formatter unless no other (besides growl) is specified
       opts << ' -f progress' unless opts.scan(/\s(?:-f|--format)\b/).length > 1
       
       opts
     end
     
-    def formatter_opts
-      "-r #{File.dirname(__FILE__)}/../rspec_growler.rb -f RSpecGrowler:STDOUT"
+    def cucumber_opts
+      if File.exist?('features/support/cucumber.opts')
+        opts = File.read('features/support/cucumber.opts').gsub("\n", ' ')
+      else
+        opts = "--format progress --drb "
+      end
+      
+      opts << " --tags current"
+      opts << cucumber_formatter_opts
+      opts << " --require features" # because cucumber_formatter_opts overwrite default features require
+      opts << " features"
+      opts
+    end
+    
+    def spec_formatter_opts
+      " --require #{File.dirname(__FILE__)}/../rspec_growler.rb --format RSpecGrowler:STDOUT"
+    end
+    
+    def cucumber_formatter_opts
+      " --require #{File.dirname(__FILE__)}/../cucumber_growler.rb"
     end
     
     def spec_runner
@@ -118,6 +149,14 @@ module RSpactor
       end
     end
     
+    def cucumber_runner
+      if File.exist?("script/cucumber")
+        "script/cucumber"
+      else
+        "cucumber"
+      end
+    end
+    
     def ruby_opts
       other = ENV['RUBYOPT'] ? " #{ENV['RUBYOPT']}" : ''
       other << ' -rcoral' if options[:coral]

data/lib/rspec_growler.rb

@@ -13,14 +13,12 @@ class RSpecGrowler < Spec::Runner::Formatter::BaseFormatter
       'success'
     end
     
-    image_path = File.dirname(__FILE__) + "/../images/#{icon}.png"
+    # image_path = File.dirname(__FILE__) + "/../images/#{icon}.png"
     message = "#{total} examples, #{failures} failures"
-    
     if pending > 0
       message << " (#{pending} pending)"
     end
     
-    notify "Test Results", message, image_path(icon)
+    notify "Spec Results", message, icon
   end
-end
-
+end

data/spec/inspector_spec.rb

@@ -53,7 +53,7 @@ describe RSpactor::Inspector do
     end
     
     it "should consider all controllers, helpers and views when routes.rb changes" do
-      translate('config/routes.rb').should == ['/project/spec/controllers', '/project/spec/helpers', '/project/spec/views']
+      translate('config/routes.rb').should == ['/project/spec/controllers', '/project/spec/helpers', '/project/spec/views', '/project/spec/routing']
     end
     
     it "should consider all models when config/database.yml changes" do
@@ -64,6 +64,10 @@ describe RSpactor::Inspector do
       translate('db/schema.rb').should == ['/project/spec/models']
     end
     
+    it "should consider all models when spec/factories.rb changes" do
+      translate('spec/factories.rb').should == ['/project/spec/models']
+    end
+    
     it "should consider related model when its observer changes" do
       translate('app/models/user_observer.rb').should == ['/project/spec/models/user_observer_spec.rb', '/project/spec/models/user_spec.rb']
     end
@@ -81,11 +85,18 @@ describe RSpactor::Inspector do
       translate('config/environments/test.rb').should == ['/project/spec']
       translate('config/boot.rb').should == ['/project/spec']
     end
+    
+    it "should consider cucumber when a features file change" do
+      translate('features/login.feature').should == ['cucumber']
+      translate('features/steps/webrat_steps.rb').should == ['cucumber']
+      translate('features/support/env.rb').should == ['cucumber']
+    end
+    
   end
   
-  describe "#determine_spec_files" do
+  describe "#determine_files" do
     def determine(file)
-      @inspector.determine_spec_files(file)
+      @inspector.determine_files(file)
     end
     
     it "should filter out files that don't exist on the filesystem" do

data/spec/runner_spec.rb

@@ -190,7 +190,7 @@ describe RSpactor::Runner do
     end
     
     it "should include growl formatter" do
-      run('foo').should include(' -f RSpecGrowler:STDOUT')
+      run('foo').should include(' --format RSpecGrowler:STDOUT')
     end
     
     it "should include 'progress' formatter" do
@@ -198,8 +198,8 @@ describe RSpactor::Runner do
     end
     
     it "should not include 'progress' formatter if there already are 2 or more formatters" do
-      @runner.should_receive(:formatter_opts).and_return('-f foo --format bar')
-      run('foo').should_not include('-f progress')
+      @runner.should_receive(:spec_formatter_opts).and_return('-f foo --format bar')
+      run('foo').should_not include('--format progress')
     end
     
     it "should save status of last run" do
@@ -213,14 +213,14 @@ describe RSpactor::Runner do
     end
   end
   
-  describe "#spec_changed_files" do
+  describe "#changed_files" do
     before(:each) do
       @runner = described_class.new('.')
       @runner.stub!(:inspector).and_return(mock("Inspector"))
     end
     
     def set_inspector_expectation(file, ret)
-      @runner.inspector.should_receive(:determine_spec_files).with(file).and_return(ret)
+      @runner.inspector.should_receive(:determine_files).with(file).and_return(ret)
     end
     
     it "should find and run spec files" do
@@ -232,20 +232,21 @@ describe RSpactor::Runner do
       @runner.should_receive(:run_spec_command).with(expected)
       
       capture_stdout do
-        @runner.send(:spec_changed_files, %w(moo.rb views/baz.haml config/bar.yml))
+        @runner.stub!(:dir)
+        @runner.send(:changed_files, %w(moo.rb views/baz.haml config/bar.yml))
         $stdout.string.split("\n").should == expected
       end
     end
     
     it "should run the full suite after a run succeded when the previous one failed" do
-      @runner.inspector.stub!(:determine_spec_files).and_return(['spec/foo_spec.rb'], ['spec/bar_spec.rb'])
+      @runner.inspector.stub!(:determine_files).and_return(['spec/foo_spec.rb'], ['spec/bar_spec.rb'])
       @runner.stub!(:options).and_return({ :retry_failed => true })
       
       capture_stdout do
         @runner.stub!(:run_spec_command)
         @runner.should_receive(:last_run_failed?).and_return(true, false)
         @runner.should_receive(:run_all_specs)
-        @runner.send(:spec_changed_files, %w(moo.rb))
+        @runner.send(:changed_files, %w(moo.rb))
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: guillaumegentil-rspactor
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: "0.4"
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -07:00
+date: 2009-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - Rakefile
 - bin/rspactor
 - bin/rspactor-system
+- lib/cucumber_growler.rb
 - lib/rspactor
 - lib/rspactor/growl.rb
 - lib/rspactor/inspector.rb