rspactor 0.7.0.beta.3 → 0.7.0.beta.4

data/README.rdoc

@@ -1,13 +1,13 @@
 = RSpactor
 
 RSpactor allows to automatically & intelligently launch your specs when your files are modified.
-Version 0.7.x is a complete rewrite, RubyCocoa is no more needed, FSEvents are supported from scratch.
+Version 0.7.x is a complete rewrite, RubyCocoa is no more needed, FSEvents & Inotify are supported from scratch.
 
 == Features
 
 - FSEvent support on Mac OS X (without RubyCocoa!)
 - Inotify support on Linux
-- RSpec 2.0 support (from beta.14)
+- RSpec 1.x & 2.x (from beta.14) support
 - Bundler support
 - Super fast change detection
 - Automatic _spec.rb files detection (even new file created, unlike watchr)
@@ -16,7 +16,7 @@ Version 0.7.x is a complete rewrite, RubyCocoa is no more needed, FSEvents are s
 
 == Install
 
-At the moment, only Mac OS X (10.5+) & Linux are supported. Tested on ruby 1.8.7 & 1.9.2dev.
+Only Mac OS X (10.5+) & Linux are supported. Tested on Ruby 1.8.7 & 1.9.2dev.
 
 Install the gem:
 
@@ -39,11 +39,10 @@ Options list is available with:
 Signal handlers are now used to interact with RSpactor:
 
 - Ctrl-C - Quit RSpactor or quick abort running spec(s)
-- Ctrl-\  - Running all specs
+- Ctrl-\ - Running all specs
 
 == TODO
 
-- RSpec 1.3 support
 - Specific files (spec_helper, factories, fixtures...) inspections
 - Spork support (when {this issue}[http://github.com/timcharper/spork/issues#issue/37] will be resolved)
 - {LiveReload}[http://github.com/mockko/livereload] support

data/bin/inotify_watch

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require 'rubygems'
 require 'rb-inotify'
 
@@ -15,13 +14,12 @@ end
 
 while true do
   notifier.process
-
+  
   if !folders.empty?
     $stdout.puts folders.join(' ')
     $stdout.flush
     folders.clear
   end
-
+  
   sleep(0.5)
-end
-
+end

data/bin/rspactor

@@ -7,6 +7,9 @@ options = Trollop::options do
   version RSpactor::VERSION
   
   opt :clear, "Clear the console beetween each spec(s) run"
+  opt :rspec_version, "Force RSpec Version (1 or 2), normally it should be automatically detected", :type => :int
 end
 
+Trollop::die :rspec_version, "not supported" unless [nil, 1, 2].include?(options[:rspec_version])
+
 RSpactor.start(options)

data/lib/formatters/rspec_formatter.rb

@@ -0,0 +1,28 @@
+module RSpecFormatter
+  
+  def rspactor_title
+    "RSpec results"
+  end
+  
+  def rspactor_message(example_count, failure_count, pending_count, duration)
+    message = "#{example_count} examples, #{failure_count} failures"
+    if pending_count > 0
+      message << " (#{pending_count} pending)"
+    end
+    message << "\nin #{duration} seconds"
+    message
+  end
+  
+  # failed | pending | success
+  def rspactor_image_path(failure_count, pending_count)
+    icon = if failure_count > 0
+      'failed'
+    elsif pending_count > 0
+      'pending'
+    else
+      'success'
+    end
+    File.expand_path(File.dirname(__FILE__) + "/images/#{icon}.png")
+  end
+  
+end

data/lib/formatters/rspec_one_formatter.rb

@@ -0,0 +1,15 @@
+require 'spec/runner/formatter/base_formatter'
+require "#{File.dirname(__FILE__)}/rspec_formatter"
+require "#{File.dirname(__FILE__)}/../rspactor/notifier"
+
+class RSpecOneFormatter < Spec::Runner::Formatter::BaseFormatter
+  include RSpecFormatter
+  
+  def dump_summary(duration, total, failures, pending)
+    message    = rspactor_message(total, failures, pending, duration)
+    image_path = rspactor_image_path(failures, pending)
+    
+    RSpactor::Notifier.notify(message, rspactor_title, image_path)
+  end
+  
+end

data/lib/formatters/rspec_two_formatter.rb

@@ -0,0 +1,26 @@
+require 'rspec/core/formatters/base_formatter'
+require "#{File.dirname(__FILE__)}/rspec_formatter"
+require "#{File.dirname(__FILE__)}/../rspactor/notifier"
+
+class RSpecTwoFormatter < RSpec::Core::Formatters::ProgressFormatter
+  include RSpecFormatter
+  
+  def dump_summary
+    super
+    message    = rspactor_message(@example_count, failure_count, pending_count, format_seconds(duration))
+    image_path = rspactor_image_path(failure_count, pending_count)
+    
+    RSpactor::Notifier.notify(message, rspactor_title, image_path)
+  end
+  
+private
+  
+  def failure_count
+    failed_examples.size
+  end
+  
+  def pending_count
+    pending_examples.size
+  end
+  
+end

data/lib/rspactor/notifier.rb

@@ -0,0 +1,23 @@
+require 'sys/uname'
+
+case Sys::Uname.sysname
+when 'Darwin'
+  require 'growl'
+when 'Linux'
+  require 'libnotify'
+end
+
+module RSpactor
+  module Notifier
+    
+    def self.notify(message, title, image_path)
+      case Sys::Uname.sysname
+      when 'Darwin'
+        Growl.notify message, :title => title, :icon => image_path, :name => "RSpactor"
+      when 'Linux'
+        Libnotify.show :body => message, :summary => title, :icon_path => image_path
+      end 
+    end
+    
+  end
+end

data/lib/rspactor/runner.rb

@@ -1,6 +1,10 @@
 module RSpactor
   class Runner
-    attr_reader :pipe
+    attr_reader :pipe, :rspec_version
+    
+    def initialize
+      @rspec_version = RSpactor.options[:rspec_version] || determine_rspec_version
+    end
     
     def start(options = {})
       if options[:all]
@@ -25,29 +29,55 @@ module RSpactor
   private
     
     def run_rspec(command, message)
-      @pipe = IO.popen(command)
       UI.info message, :reset => true, :clear => RSpactor.options[:clear]
-      while pipe && !pipe.eof?
-        if pipe && char = pipe.read(8)
-          print char
-          $stdout.flush if pipe
+      case rspec_version
+      when 1
+        # problem with color if launched via popen
+        system(command)
+      when 2
+        @pipe = IO.popen(command)
+        while pipe && !pipe.eof?
+          if pipe && char = pipe.read(32)
+            print char
+            $stdout.flush if pipe
+          end
         end
+        @pipe = nil
       end
-      @pipe = nil
     end
     
     def rspec_command(paths)
-      cmd_parts = [paths.join(' ')]
-      cmd_parts.unshift "--require #{File.dirname(__FILE__)}/../formatters/rspec2/growl_formatter.rb --format GrowlFormatter" if growl_installed?
-      cmd_parts.unshift "--require #{File.dirname(__FILE__)}/../formatters/rspec2/libnotify_formatter.rb --format LibnotifyFormatter" if notify_installed?
-      cmd_parts.unshift "--color"
-      cmd_parts.unshift "rspec"
+      cmd_parts = []
+      cmd_parts << (rspec_version == 1 ? "spec" : "rspec")
+      cmd_parts << "--color"
+      if growl_installed? || notify_installed?
+        case rspec_version
+        when 1
+          cmd_parts << "-f progress --require #{File.dirname(__FILE__)}/../formatters/rspec_one_formatter.rb --format RSpecOneFormatter:STDOUT"
+        when 2
+          cmd_parts << "--require #{File.dirname(__FILE__)}/../formatters/rspec_two_formatter.rb --format RSpecTwoFormatter"
+        end
+      end
+      cmd_parts << paths.join(' ')
       cmd_parts.unshift "bundle exec" if bundler?
       cmd_parts.join(" ")
     end
     
     def bundler?
-      File.exist?("./Gemfile")
+      File.exist?("#{Dir.pwd}/Gemfile")
+    end
+    
+    def determine_rspec_version
+      UI.info "Determine rspec_version... (can be forced with -r <i> option)"
+      if bundler?
+        # Allow RSpactor to be tested with RSpactor (bundle show inside a bundle exec)
+        ENV['BUNDLE_GEMFILE'] = "#{Dir.pwd}/Gemfile"
+        `bundle show rspec`.include?("/rspec-1.") ? 1 : 2
+      elsif File.exist?("#{Dir.pwd}/spec/spec_helper.rb")
+        File.new("#{Dir.pwd}/spec/spec_helper.rb").read.include?("Spec::Runner") ? 1 : 2
+      else
+        2
+      end
     end
     
     def growl_installed?

data/lib/rspactor/version.rb

@@ -1,3 +1,3 @@
 module RSpactor
-  VERSION = "0.7.0.beta.3"
+  VERSION = "0.7.0.beta.4"
 end

data/lib/rspactor.rb

@@ -18,7 +18,7 @@ module RSpactor
         Inspector.determine_spec_paths(files)
         runner.start if Inspector.spec_paths?
       end
-      UI.info "RSpactor is now watching at '#{Dir.pwd}'"
+      UI.info "RSpactor is now watching at '#{Dir.pwd}' using RSpec #{runner.rspec_version}.x"
       listener.start
     end
     

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspactor
 version: !ruby/object:Gem::Version 
-  hash: 62196437
+  hash: 62196443
   prerelease: true
   segments: 
   - 0
   - 7
   - 0
   - beta
-  - 3
-  version: 0.7.0.beta.3
+  - 4
+  version: 0.7.0.beta.4
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,12 +113,13 @@ files:
 - lib/formatters/images/failed.png
 - lib/formatters/images/pending.png
 - lib/formatters/images/success.png
-- lib/formatters/rspec2/growl_formatter.rb
-- lib/formatters/rspec2/libnotify_formatter.rb
-- lib/formatters/rspec2_formatter.rb
+- lib/formatters/rspec_formatter.rb
+- lib/formatters/rspec_one_formatter.rb
+- lib/formatters/rspec_two_formatter.rb
 - lib/rspactor/inspector.rb
 - lib/rspactor/interactor.rb
 - lib/rspactor/listener.rb
+- lib/rspactor/notifier.rb
 - lib/rspactor/runner.rb
 - lib/rspactor/ui.rb
 - lib/rspactor/version.rb

data/lib/formatters/rspec2/growl_formatter.rb

@@ -1,11 +0,0 @@
-require 'formatters/rspec2_formatter'
-require 'growl'
-
-class GrowlFormatter < RSpec2Formatter
-  
-  def dump_summary
-    super
-    Growl.notify rspactor_message, :title => rspactor_title, :icon => rspactor_image_path
-  end
-  
-end

data/lib/formatters/rspec2/libnotify_formatter.rb

@@ -1,11 +0,0 @@
-require 'formatters/rspec2_formatter'
-require 'libnotify'
-
-class LibnotifyFormatter < RSpec2Formatter
-  
-  def dump_summary
-    super
-    Libnotify.show :body => rspactor_message, :summary => rspactor_title, :icon_path => rspactor_image_path
-  end
-  
-end

data/lib/formatters/rspec2_formatter.rb

@@ -1,40 +0,0 @@
-require 'rspec/core/formatters/base_formatter'
-
-class RSpec2Formatter < RSpec::Core::Formatters::ProgressFormatter
-  
-  def rspactor_title
-    "RSpec results"
-  end
-  
-  def rspactor_message
-    message = "#{@example_count} examples, #{failure_count} failures"
-    if pending_count > 0
-      message << " (#{pending_count} pending)"
-    end
-    message << "\nin #{format_seconds(duration)} seconds"
-    message
-  end
-  
-  # failed | pending | success
-  def rspactor_image_path
-    icon = if failure_count > 0
-      'failed'
-    elsif pending_count > 0
-      'pending'
-    else
-      'success'
-    end
-    File.expand_path(File.dirname(__FILE__) + "/images/#{icon}.png")
-  end
-  
-private
-  
-  def failure_count
-    failed_examples.size
-  end
-  
-  def pending_count
-    pending_examples.size
-  end
-  
-end