guillaumegentil-rspactor 0.4.3 → 0.5.1

data/Rakefile

@@ -9,9 +9,10 @@ desc "generates .gemspec file"
 task :gemspec => "version:read" do
   spec = Gem::Specification.new do |gem|
     gem.name = "rspactor"
-    gem.summary = "RSpactor is a command line tool to automatically run your changed specs (much like autotest)."
-    gem.email = "mislav.marohnic@gmail.com"
-    gem.homepage = "http://github.com/mislav/rspactor"
+    gem.summary = "RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest)."
+    gem.description = "read summary!"
+    gem.email = "guillaumegentil@gmail.com"
+    gem.homepage = "http://github.com/guillaumegentil/rspactor"
     gem.authors = ["Mislav Marohnić", "Andreas Wolff", "Pelle Braendgaard", "Thibaud Guillaume-Gentil"]
     gem.has_rdoc = false
     

data/bin/rspactor

@@ -3,7 +3,9 @@ require 'rspactor/runner'
 
 RSpactor::Runner.start({
   :coral => ARGV.delete('--coral'),
-  :kill => ARGV.delete('--kill'),
+  :celerity => ARGV.delete('--celerity'),
+  :spork => ARGV.delete('--drb'),
+  :view => ARGV.delete('--view'), # by default, rspactor didn't catch specs view
   :clear => ARGV.delete('--clear'),
   :run_in => ARGV.last
 })

data/lib/rspactor.rb

@@ -4,4 +4,6 @@ module RSpactor
   autoload :Inspector, 'rspactor/inspector'
   autoload :Runner, 'rspactor/runner'
   autoload :Growl, 'rspactor/growl'
+  autoload :Spork, 'rspactor/spork'
+  autoload :Celerity, 'rspactor/celerity'
 end

data/lib/rspactor/celerity.rb

@@ -0,0 +1,29 @@
+require 'rspactor'
+
+module RSpactor
+  class Celerity
+    
+    def self.start(dir)
+      pid_path = "#{dir}/tmp/pids/mongrel_celerity.pid"
+      if File.exist?(pid_path)
+        system("kill $(head #{pid_path}) >/dev/null 2>&1")
+        system("rm #{pid_path} >/dev/null 2>&1")
+      end
+      # kill other mongrels
+      system("kill $(ps aux | grep 'mongrel_rails' | grep -v grep | awk '//{print $2;}') >/dev/null 2>&1")
+      system("rake celerity_server:start >/dev/null 2>&1 &")
+      Interactor.ticker_msg "** Starting celerity server"
+    end
+    
+    def self.restart
+      system("rake celerity_server:stop >/dev/null 2>&1 && rake celerity_server:start >/dev/null 2>&1 &")
+      Interactor.ticker_msg "** Restarting celerity server"
+    end
+    
+    def self.kill_jruby
+      system("kill $(ps aux | grep jruby | grep -v grep | awk '//{print $2;}') >/dev/null 2>&1")
+      true
+    end
+    
+  end
+end

data/lib/rspactor/inspector.rb

@@ -1,11 +1,16 @@
+require 'rspactor'
+
 module RSpactor
   # Maps the changed filenames to list of specs to run in the next go.
   # Assumes Rails-like directory structure
   class Inspector
     EXTENSIONS = %w(rb erb builder haml rhtml rxml yml conf opts feature)
     
-    def initialize(dir)
-      @root = dir
+    attr_reader :runner, :root
+    
+    def initialize(runner)
+      @runner = runner
+      @root = runner.dir
     end
     
     def determine_files(file)
@@ -16,17 +21,17 @@ module RSpactor
       end
       files = candidates.select { |candidate| File.exists? candidate }
       
-      if files.empty? && !cucumberable
+      if files.empty? && !candidates.empty? && !cucumberable 
         $stderr.puts "doesn't exist: #{candidates.inspect}"
       end
       
       files << 'cucumber' if cucumberable
-      files.uniq
+      files
     end
     
     # mappings for Rails are inspired by autotest mappings in rspec-rails
     def translate(file)
-      file = file.sub(%r:^#{Regexp.escape(@root)}/:, '')
+      file = file.sub(%r:^#{Regexp.escape(root)}/:, '')
       candidates = []
       
       if spec_file?(file)
@@ -42,7 +47,7 @@ module RSpactor
             candidates << 'controllers'
           elsif file == 'app/helpers/application_helper.rb'
             candidates << 'helpers' << 'views'
-          else
+          elsif !file.include?("app/views/") || runner.options[:view]
             candidates << spec_file.sub('app/', '')
             
             if file =~ %r:^app/(views/.+\.[a-z]+)\.[a-z]+$:
@@ -63,6 +68,12 @@ module RSpactor
           candidates << 'controllers' << 'helpers' << 'views' << 'routing'
         when 'config/database.yml', 'db/schema.rb', 'spec/factories.rb'
           candidates << 'models'
+        when 'config/boot.rb', 'config/environment.rb', %r:^config/environments/:, %r:^config/initializers/:, %r:^vendor/:
+          Spork.reload if runner.options[:spork]
+          Celerity.restart if runner.options[:celerity]
+          candidates << 'spec'
+        when %r:^config/:
+          # nothing
         when %r:^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$:, 'spec/spec.opts'
           candidates << 'spec'
         else
@@ -74,9 +85,9 @@ module RSpactor
         if candidate == 'cucumber'
           candidate
         elsif candidate.index('spec') == 0
-          File.join(@root, candidate)
+          File.join(root, candidate)
         else
-          File.join(@root, 'spec', candidate)
+          File.join(root, 'spec', candidate)
         end
       end
     end

data/lib/rspactor/interactor.rb

@@ -10,10 +10,20 @@ module RSpactor
       ticker
     end
     
-    def wait_for_enter_key(msg, seconds_to_wait)
+    def self.ticker_msg(msg, seconds_to_wait = 2)
+      $stdout.print msg
+      seconds_to_wait.times do
+        $stdout.print('.')
+        $stdout.flush
+        sleep 1
+      end
+      $stdout.puts "\n"
+    end
+    
+    def wait_for_enter_key(msg, seconds_to_wait, clear = runner.options[:clear])
       begin
         Timeout::timeout(seconds_to_wait) do
-          system("clear;") if runner.options[:clear]
+          system("clear;") if clear
           ticker(:start => true, :msg => msg)
           $stdin.gets
           return true
@@ -37,7 +47,7 @@ module RSpactor
             when "ca\n" # Cucumber All: ~pending tagged feature
               runner.run_cucumber_command('~pending')
             else
-              if wait_for_enter_key("** Running all specs.. Hit <enter> again to exit RSpactor", 1)
+              if wait_for_enter_key("** Running all specs... Hit <enter> again to exit RSpactor", 1)
                 @main_thread.exit
                 exit
               end

data/lib/rspactor/runner.rb

@@ -18,19 +18,24 @@ module RSpactor
     def start
       load_dotfile
       puts "** RSpactor is now watching at '#{dir}'"
+      Spork.start if options[:spork]
+      Celerity.start(dir) if options[:celerity]
       start_interactor
       start_listener
     end
     
     def start_interactor
       @interactor = Interactor.new(self)
-      aborted = @interactor.wait_for_enter_key("** Hit <enter> to skip initial spec run", 2)
+      aborted = @interactor.wait_for_enter_key("** Hit <enter> to skip initial spec & cucumber run", 2, false)
       @interactor.start_termination_handler
-      run_all_specs unless aborted
+      unless aborted
+        run_all_specs
+        run_cucumber_command('~pending', false)
+      end
     end
     
     def start_listener
-      @inspector = Inspector.new(dir)
+      @inspector = Inspector.new(self)
       
       Listener.new(Inspector::EXTENSIONS) do |files|
         changed_files(files) unless git_head_changed?
@@ -62,13 +67,13 @@ module RSpactor
       end
     end
     
-    def run_cucumber_command(tags = 'current')
-      system("clear;") if @options[:clear]
-      puts "#{tags} tagged features"
+    def run_cucumber_command(tags = 'current', clear = @options[:clear])
+      system("clear;") if clear
+      puts "** Running all #{tags} tagged features..."
       cmd = [ruby_opts, cucumber_runner, cucumber_opts(tags)].flatten.join(' ')
       @last_run_failed = run_command(cmd)
-      # Workaround for killing jruby process when used with celerity, cucumber and spork
-      system("kill $(ps aux | grep jruby | grep -v grep | awk '//{print $2;}')") if options[:kill]
+      # Workaround for killing jruby process when used with celerity and spork
+      Celerity.kill_jruby if options[:celerity] && options[:spork]
     end
     
     def last_run_failed?
@@ -96,6 +101,7 @@ module RSpactor
         # specs files
         unless files.empty?
           system("clear;") if @options[:clear]
+          files.uniq!
           puts files.map { |f| f.to_s.gsub(/#{dir}/, '') }.join("\n")
           
           previous_run_failed = last_run_failed?
@@ -128,7 +134,7 @@ module RSpactor
       if File.exist?('features/support/cucumber.opts')
         opts = File.read('features/support/cucumber.opts').gsub("\n", ' ')
       else
-        opts = "--format progress --drb "
+        opts = "--color --format progress --drb "
       end
       
       opts << " --tags #{tags}"

data/lib/rspactor/spork.rb

@@ -0,0 +1,25 @@
+require 'rspactor'
+
+module RSpactor
+  class Spork
+    
+    def self.start
+      kill_and_launch
+      Interactor.ticker_msg "** Launching Spork for rspec & cucumber"
+    end
+    
+    def self.reload
+      kill_and_launch
+      Interactor.ticker_msg "** Reloading Spork for rspec & cucumber"
+    end
+    
+  private
+    
+    def self.kill_and_launch
+      system("kill $(ps aux | awk '/spork/&&!/awk/{print $2;}') >/dev/null 2>&1")
+      system("spork >/dev/null 2>&1 < /dev/null &")
+      system("spork cu >/dev/null 2>&1 < /dev/null &")
+    end
+    
+  end
+end

data/spec/inspector_spec.rb

@@ -2,7 +2,8 @@ require 'rspactor/inspector'
 
 describe RSpactor::Inspector do
   before(:all) do
-    @inspector = described_class.new('/project')
+    options = { :view => true }
+    @inspector = described_class.new(mock('Runner', :dir => '/project', :options => options))
   end
   
   def translate(file)

data/spec/runner_spec.rb

@@ -75,16 +75,16 @@ describe RSpactor::Runner do
       end
       
       it "should start Interactor" do
-        @interactor.should_receive(:wait_for_enter_key).with(instance_of(String), 2)
+        @interactor.should_receive(:wait_for_enter_key).with(instance_of(String), 2, false)
         setup
       end
-  
+      
       it "should run all specs if Interactor isn't interrupted" do
         @interactor.should_receive(:wait_for_enter_key).and_return(nil)
         @runner.should_receive(:run_spec_command).with('/my/path/spec')
         setup
       end
-  
+      
       it "should skip running all specs if Interactor is interrupted" do
         @interactor.should_receive(:wait_for_enter_key).and_return(true)
         @runner.should_not_receive(:run_spec_command)
@@ -95,7 +95,7 @@ describe RSpactor::Runner do
     it "should initialize Inspector" do
       @runner.stub!(:load_dotfile)
       @runner.stub!(:start_interactor)
-      RSpactor::Inspector.should_receive(:new).with('/my/path')
+      RSpactor::Inspector.should_receive(:new)
       RSpactor::Listener.stub!(:new).and_return(mock('Listener').as_null_object)
       setup
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: guillaumegentil-rspactor
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -12,15 +12,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
-default_executable: 
+date: 2009-08-12 00:00:00 -07:00
+default_executable: rspactor
 dependencies: []
 
-description: 
-email: mislav.marohnic@gmail.com
+description: read summary!
+email: guillaumegentil@gmail.com
 executables: 
 - rspactor
-- rspactor-system
 extensions: []
 
 extra_rdoc_files: []
@@ -28,14 +27,15 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - bin/rspactor
-- bin/rspactor-system
 - lib/cucumber_growler.rb
 - lib/rspactor
+- lib/rspactor/celerity.rb
 - lib/rspactor/growl.rb
 - lib/rspactor/inspector.rb
 - lib/rspactor/interactor.rb
 - lib/rspactor/listener.rb
 - lib/rspactor/runner.rb
+- lib/rspactor/spork.rb
 - lib/rspactor.rb
 - lib/rspec_growler.rb
 - images/failed.png
@@ -46,7 +46,7 @@ files:
 - spec/runner_spec.rb
 - LICENSE
 has_rdoc: false
-homepage: http://github.com/mislav/rspactor
+homepage: http://github.com/guillaumegentil/rspactor
 licenses: 
 post_install_message: 
 rdoc_options: []
@@ -71,6 +71,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: RSpactor is a command line tool to automatically run your changed specs (much like autotest).
+summary: RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest).
 test_files: []
 

data/bin/rspactor-system

@@ -1,93 +0,0 @@
-#!/usr/bin/env ruby
-require 'rspactor'
-Growl = RSpactor::Growl
-
-root = ENV['HOME']
-$mappings = []
-$libs = []
-
-def map(regex, &block)
-  $mappings << [regex, block]
-end
-
-def libs
-  $libs
-end
-
-def title
-  $title
-end
-
-listener = RSpactor::Listener.new do |changed_files|
-  changed_files.reject! do |file|
-    file.index(root + "/Library/") == 0
-  end
-  
-  if changed_files.size == 1
-    changed_file = changed_files.first
-    dir = changed_file
-    hook = nil
-    
-    until hook or (dir = File.dirname(dir)) == root
-      candidate = dir + "/.rspactor"
-      hook = candidate if File.exists?(candidate)
-    end 
-    
-    if hook
-      targets = []
-      $title = "Test results"
-      $mappings.clear
-      $libs.replace ['lib']
-      load hook
-      
-      unless $mappings.empty?
-        relative_path = changed_file.sub(dir + '/', '')
-        
-        for regex, block in $mappings
-          if match = relative_path.match(regex)
-            targets.concat Array(block.call(relative_path, match))
-            break
-          end
-        end
-        
-        existing_targets = targets.select { |file| File.exist?(File.join(dir, file)) }
-      else
-        inspector = RSpactor::Inspector.new(dir)
-        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/}
-          $libs << 'test'
-        when %r{^spec/}
-          $libs << 'spec'
-        end
-        
-        Dir.chdir(dir) do
-          unless 'spec' == $libs.last
-            command = "ruby -I#{$libs.join(':')} -e 'ARGV.each{|f| load f}' "
-          else
-            command = "RUBYOPT='-I#{$libs.join(':')}' spec --color "
-          end
-          command << existing_targets.join(' ')
-          # puts command
-          puts changed_file
-          system command
-        end
-        
-        if $?.success?
-          Growl::notify $title, "You rock!", Growl::image_path('success')
-        else
-          Growl::notify $title, "YOU LOSE", Growl::image_path('failed')
-        end
-      elsif $mappings.empty?
-        $stderr.puts "-- don't know how to run #{changed_file}"
-      end
-    end
-  end
-end
-
-listener.run(root)