guillaumegentil-rspactor 0.4.1 → 0.4.2

data/lib/rspactor/interactor.rb

@@ -2,16 +2,18 @@ require 'timeout'
 
 module RSpactor
   class Interactor
-    def initialize(dir, options = {})
-      @root = dir
-      @options = options
+    
+    attr_reader :runner
+    
+    def initialize(runner)
+      @runner = runner
       ticker
     end
     
-    def wait_for_enter_key(msg, seconds_to_wait, clear = false)
+    def wait_for_enter_key(msg, seconds_to_wait)
       begin
         Timeout::timeout(seconds_to_wait) do
-          system("clear;") if clear
+          system("clear;") if runner.options[:clear]
           ticker(:start => true, :msg => msg)
           $stdin.gets
           return true
@@ -28,12 +30,19 @@ module RSpactor
       Thread.new do
         loop do
           sleep 0.5
-          if $stdin.gets
-            if wait_for_enter_key("** Running all specs.. Hit <enter> again to exit RSpactor", 3, @options[:clear])
-              @main_thread.exit
-              exit
+          if entry = $stdin.gets
+            case entry
+            when "c\n" # Cucumber: current tagged feature
+              runner.run_cucumber_command
+            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)
+                @main_thread.exit
+                exit
+              end
+              runner.run_all_specs
             end
-            Runner.new(@root).run_all_specs
           end
         end
       end
@@ -57,7 +66,7 @@ module RSpactor
         end
       end
     end
-
+    
     def write(msg)
       $stdout.print(msg)
       $stdout.flush

data/lib/rspactor/listener.rb

@@ -5,18 +5,18 @@ module RSpactor
   # based on http://rails.aizatto.com/2007/11/28/taming-the-autotest-beast-with-fsevents/
   class Listener
     attr_reader :last_check, :callback, :valid_extensions
-
+    
     def initialize(valid_extensions = nil)
       @valid_extensions = valid_extensions
       timestamp_checked
-
+      
       @callback = lambda do |stream, ctx, num_events, paths, marks, event_ids|
         changed_files = extract_changed_files_from_paths(split_paths(paths, num_events))
         timestamp_checked
         yield changed_files unless changed_files.empty?
       end
     end
-
+    
     def run(directories)
       dirs = Array(directories)
       stream = OSX::FSEventStreamCreate(OSX::KCFAllocatorDefault, callback, nil, dirs, OSX::KFSEventStreamEventIdSinceNow, 0.5, 0)
@@ -24,13 +24,13 @@ module RSpactor
         $stderr.puts "Failed to create stream"
         exit(1)
       end
-
+      
       OSX::FSEventStreamScheduleWithRunLoop(stream, OSX::CFRunLoopGetCurrent(), OSX::KCFRunLoopDefaultMode)
       unless OSX::FSEventStreamStart(stream)
         $stderr.puts "Failed to start stream"
         exit(1)
       end
-
+      
       begin
         OSX::CFRunLoopRun()
       rescue Interrupt
@@ -39,18 +39,18 @@ module RSpactor
         OSX::FSEventStreamRelease(stream)
       end
     end
-
+    
     def timestamp_checked
       @last_check = Time.now
     end
-
+    
     def split_paths(paths, num_events)
       paths.regard_as('*')
       rpaths = []
       num_events.times { |i| rpaths << paths[i] }
       rpaths
     end
-
+    
     def extract_changed_files_from_paths(paths)
       changed_files = []
       paths.each do |path|
@@ -62,25 +62,25 @@ module RSpactor
       end
       changed_files
     end
-
+    
     def file_changed?(file)
       File.stat(file).mtime > last_check
     rescue Errno::ENOENT
       false
     end
-
+    
     def ignore_path?(path)
       path =~ /(?:^|\/)\.(git|svn)/
     end
-
+    
     def ignore_file?(file)
       File.basename(file).index('.') == 0 or not valid_extension?(file)
     end
-
+    
     def file_extension(file)
       file =~ /\.(\w+)$/ and $1
     end
-
+    
     def valid_extension?(file)
       valid_extensions.nil? or valid_extensions.include?(file_extension(file))
     end

data/lib/rspactor/runner.rb

@@ -23,8 +23,8 @@ module RSpactor
     end
     
     def start_interactor
-      @interactor = Interactor.new(dir, options)
-      aborted = @interactor.wait_for_enter_key("** Hit <enter> to skip initial spec run", 3)
+      @interactor = Interactor.new(self)
+      aborted = @interactor.wait_for_enter_key("** Hit <enter> to skip initial spec run", 2)
       @interactor.start_termination_handler
       run_all_specs unless aborted
     end
@@ -62,8 +62,10 @@ module RSpactor
       end
     end
     
-    def run_cucumber_command
-      cmd = [ruby_opts, cucumber_runner, cucumber_opts].flatten.join(' ')
+    def run_cucumber_command(tags = 'current')
+      system("clear;") if @options[:clear]
+      puts "#{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
       # if you know how doing that better, please tell me: guillaumegentil@gmail.com
@@ -86,21 +88,23 @@ module RSpactor
         all.concat inspector.determine_files(file)
       end
       unless files.empty?
-        system("clear;") if @options[:clear]
         
+        # cucumber features
         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)
-        
-        if options[:retry_failed] and previous_run_failed and not last_run_failed?
-          run_all_specs
+        unless files.empty?
+          system("clear;") if @options[:clear]
+          puts files.map { |f| f.to_s.gsub(/#{dir}/, '') }.join("\n")
+          
+          previous_run_failed = last_run_failed?
+          run_spec_command(files)
+          
+          if options[:retry_failed] and previous_run_failed and not last_run_failed?
+            run_all_specs
+          end
         end
       end
     end
@@ -121,16 +125,16 @@ module RSpactor
       opts
     end
     
-    def cucumber_opts
+    def cucumber_opts(tags)
       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 << " --tags #{tags}"
       opts << cucumber_formatter_opts
-      opts << " --require features" # because cucumber_formatter_opts overwrite default features require
+      opts << " --require features" # because using require option overwrite default require
       opts << " features"
       opts
     end

data/spec/runner_spec.rb

@@ -75,7 +75,7 @@ describe RSpactor::Runner do
       end
       
       it "should start Interactor" do
-        @interactor.should_receive(:wait_for_enter_key).with(instance_of(String), 3)
+        @interactor.should_receive(:wait_for_enter_key).with(instance_of(String), 2)
         setup
       end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: guillaumegentil-rspactor
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -07:00
+date: 2009-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: []