rspactor 0.7.0.beta.1 → 0.7.0.beta.2

data/README.rdoc

@@ -5,24 +5,26 @@ Version 0.7.x is a complete rewrite, RubyCocoa is no more needed, FSEvents are s
 
 == Features
 
-* FSEvent support (without RubyCocoa!)
-* RSpec 2.0 support (from beta.14)
-* Bundler support
-* Super fast change detection
-* Automatic _spec.rb files detection (even new file created, unlike watchr)
-* Growl notification (please install {growlnotify}[http://growl.info/documentation/growlnotify.php])
+- FSEvent support on Mac OS X (without RubyCocoa!)
+- Inotify support on Linux
+- RSpec 2.0 support (from beta.14)
+- Bundler support
+- Super fast change detection
+- Automatic _spec.rb files detection (even new file created, unlike watchr)
+- Growl notification (please install {growlnotify}[http://growl.info/documentation/growlnotify.php])
+- Libnotify notification
 
 == Install
 
-At the moment, only Mac OS X (10.5+) is supported. Tested on ruby 1.8.7 & 1.9.2dev.
+At the moment, only Mac OS X (10.5+) & Linux are supported. Tested on ruby 1.8.7 & 1.9.2dev.
 
 Install the gem:
 
-    gem install rspactor
+    gem install rspactor --pre
 
 If you are using Bundler, please add it to your Gemfile (inside test group):
 
-    gem 'rspactor', '>= 0.7.beta.1'
+    gem 'rspactor', '>= 0.7.beta.2'
 
 == Usage
 
@@ -36,22 +38,23 @@ 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-C - Quit RSpactor or quick abort running spec(s)
+- Ctrl-\  - Running all specs
 
 == TODO
 
-* Specific files (spec_helper, factories, fixtures...) inspections
-* RSpec 1.3 support
-* Inotify support (linux)
-* Spork support (when {this issue}[http://github.com/timcharper/spork/issues#issue/37] will be resolved)
-* Cucumber support (if really needed? {Steak}[http://github.com/cavalle/steak] works fine.)
-* Other ideas?
+- 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
+- Cucumber support (You can use {Steak}[http://github.com/cavalle/steak] in the meantime)
+- .rspec options file support
+- Other ideas?
 
 == Development
 
-* Source hosted at {GitHub}[http://github.com/thibaudgg/rspactor].
-* Report issues/Questions/Feature requests on {GitHub Issues}[http://github.com/thibaudgg/rspactor/issues]
+- Source hosted at {GitHub}[http://github.com/thibaudgg/rspactor]
+- Report issues/Questions/Feature requests on {GitHub Issues}[http://github.com/thibaudgg/rspactor/issues]
 
 Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
 you make.
@@ -62,9 +65,9 @@ From version 0.7.x was completely rewritten by {Thibaud Guillaume-Gentil}[http:/
 
 Older versions authors are:
 
-* {Mislav Marohnić}[http://github.com/mislav]
-* {Andreas Wolff}[http://github.com/phunkwork]
-* {Pelle Braendgaard}[http://github.com/pelle]
-* {Thibaud Guillaume-Gentil}[http://github.com/thibaudgg]
+- {Mislav Marohnić}[http://github.com/mislav]
+- {Andreas Wolff}[http://github.com/phunkwork]
+- {Pelle Braendgaard}[http://github.com/pelle]
+- {Thibaud Guillaume-Gentil}[http://github.com/thibaudgg]
 
-Thanks to {Giovanni Cangiani}[http://github.com/multiscan] for the IO.open/FSEvent trick & {Rémy Coutable}[http://github.com/rymai] for beta testing.
+Thanks to {Giovanni Cangiani}[http://github.com/multiscan] for the IO.popen/FSEvent trick & {Rémy Coutable}[http://github.com/rymai] for beta testing.

data/bin/inotify_watch

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rb-inotify'
+
+folders = Array.new
+notifier = INotify::Notifier.new
+
+notifier.watch(ARGV.first || '.', :modify, :recursive) do |event|
+  dir = File.expand_path(File.dirname(event.absolute_name)) + '/'
+  if !folders.include?(dir)
+    folders << dir
+  end
+end
+
+while true do
+  notifier.process
+
+  if !folders.empty?
+    $stdout.puts folders.join(' ')
+    $stdout.flush
+    folders.clear
+  end
+
+  sleep(0.5)
+end
+

data/ext/fsevent/extconf.rb

@@ -1,28 +1,28 @@
-# Workaround to make Rubygems believe it builds a native gem
-
-def emulate_extension_install(extension_name)
-  File.open('Makefile', 'w') { |f| f.write "all:\n\ninstall:\n\n" }
-  File.open('make', 'w') do |f|
-    f.write '#!/bin/sh'
-    f.chmod f.stat.mode | 0111
+if `uname -s`.chomp == 'Darwin'
+  # Workaround to make Rubygems believe it builds a native gem
+  def emulate_extension_install(extension_name)
+    File.open('Makefile', 'w') { |f| f.write "all:\n\ninstall:\n\n" }
+    File.open('make', 'w') do |f|
+      f.write '#!/bin/sh'
+      f.chmod f.stat.mode | 0111
+    end
+    File.open(extension_name + '.so', 'w') {}
+    File.open(extension_name + '.dll', 'w') {}
+    File.open('nmake.bat', 'w') { |f| }
   end
-  File.open(extension_name + '.so', 'w') {}
-  File.open(extension_name + '.dll', 'w') {}
-  File.open('nmake.bat', 'w') { |f| }
-end
-
-emulate_extension_install('fsevent')
-
-# Compile the actual fsevent_watch binary
-
-raise "Only Darwin (Mac OS X) systems are supported for the moment" unless `uname -s`.chomp == 'Darwin'
-
-GEM_ROOT       = File.expand_path(File.join('..', '..'))
-DARWIN_VERSION = `uname -r`.to_i
-SDK_VERSION    = { 9 => '10.5', 10 => '10.6', 11 => '10.7' }[DARWIN_VERSION]
-
-raise "Darwin #{DARWIN_VERSION} is not supported" unless SDK_VERSION
-
-`CFLAGS='-isysroot /Developer/SDKs/MacOSX#{SDK_VERSION}.sdk -mmacosx-version-min=#{SDK_VERSION}' /usr/bin/gcc -framework CoreServices -o "#{GEM_ROOT}/bin/fsevent_watch" fsevent_watch.c`
-
-raise "Compilation of fsevent_watch failed (see README)" unless File.executable?("#{GEM_ROOT}/bin/fsevent_watch")
+  
+  emulate_extension_install('fsevent')
+  
+  gem_root      = File.expand_path(File.join('..', '..'))
+  darwin_verion = `uname -r`.to_i
+  sdk_verion    = { 9 => '10.5', 10 => '10.6', 11 => '10.7' }[darwin_verion]
+  
+  raise "Darwin #{darwin_verion} is not supported" unless sdk_verion
+  
+  # Compile the actual fsevent_watch binary
+  system("CFLAGS='-isysroot /Developer/SDKs/MacOSX#{sdk_verion}.sdk -mmacosx-version-min=#{sdk_verion}' /usr/bin/gcc -framework CoreServices -o '#{gem_root}/bin/fsevent_watch' fsevent_watch.c")
+  
+  unless File.executable?("#{gem_root}/bin/fsevent_watch")
+    raise "Compilation of fsevent_watch failed (see README)"
+  end
+end

data/lib/formatters/rspec2/growl_formatter.rb

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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/{growl/growl_formatter.rb → formatters/rspec2_formatter.rb}

@@ -1,13 +1,22 @@
 require 'rspec/core/formatters/base_formatter'
-require 'growl'
 
-class GrowlFormatter < RSpec::Core::Formatters::ProgressFormatter
+class RSpec2Formatter < RSpec::Core::Formatters::ProgressFormatter
   
-  def dump_summary
-    super
-    failure_count = failed_examples.size
-    pending_count = pending_examples.size
-    
+  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
@@ -15,21 +24,17 @@ class GrowlFormatter < RSpec::Core::Formatters::ProgressFormatter
     else
       'success'
     end
-    
-    message = "#{@example_count} examples, #{failure_count} failures"
-    if pending_count > 0
-      message << " (#{pending_count} pending)"
-    end
-    message << "\nin #{format_seconds(duration)} seconds"
-    
-    Growl.notify message, :title => "RSpec results", :icon => image_path(icon)
+    File.expand_path(File.dirname(__FILE__) + "/images/#{icon}.png")
   end
   
 private
   
-  # failed | pending | success
-  def image_path(icon)
-    File.expand_path(File.dirname(__FILE__) + "/../../images/#{icon}.png")
+  def failure_count
+    failed_examples.size
+  end
+  
+  def pending_count
+    pending_examples.size
   end
   
 end

data/lib/rspactor/interactor.rb

@@ -3,7 +3,7 @@ module RSpactor
     class << self
       
       def init_signal_traps
-        # Ctrl-/
+        # Ctrl-\
         Signal.trap('QUIT') do
           RSpactor.listener.stop
           RSpactor.runner.start(:all => true)
@@ -11,9 +11,11 @@ module RSpactor
         end
         # Ctrl-C
         Signal.trap('INT') do
+          RSpactor.listener.stop
           if RSpactor.runner.run?
             UI.info "RSpec run canceled", :reset => true, :clear => RSpactor.options[:clear]
             RSpactor.runner.stop
+            RSpactor.listener.start
           else
             UI.info "Bye bye...", :reset => true
             abort("\n")

data/lib/rspactor/listener.rb

@@ -1,3 +1,5 @@
+require 'sys/uname'
+
 module RSpactor
   class Listener
     EXTENSIONS = %w[rb erb builder haml yml]
@@ -13,7 +15,13 @@ module RSpactor
     end
     
     def start
-      @pipe = IO.popen("#{bin_path}/fsevent_watch .")
+      @pipe = case Sys::Uname.sysname
+      when 'Darwin'
+        IO.popen("#{bin_path}/fsevent_watch .")
+      when 'Linux'
+        IO.popen("#{bin_path}/inotify_watch .")
+      end
+      
       watch_change
     end
     

data/lib/rspactor/runner.rb

@@ -1,5 +1,3 @@
-require 'growl'
-
 module RSpactor
   class Runner
     attr_reader :pipe
@@ -40,7 +38,8 @@ module RSpactor
     
     def rspec_command(paths)
       cmd_parts = [paths.join(' ')]
-      cmd_parts.unshift "--require #{File.dirname(__FILE__)}/../growl/growl_formatter.rb --format GrowlFormatter" if Growl.installed?
+      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.unshift "bundle exec" if bundler?
@@ -51,5 +50,13 @@ module RSpactor
       File.exist?("./Gemfile")
     end
     
+    def growl_installed?
+      system 'which growlnotify > /dev/null 2>&1'
+    end
+    
+    def notify_installed?
+      system 'which notify-send > /dev/null 2>&1'
+    end
+    
   end
 end

data/lib/rspactor/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspactor
 version: !ruby/object:Gem::Version 
-  hash: 62196433
+  hash: 62196439
   prerelease: true
   segments: 
   - 0
   - 7
   - 0
   - beta
-  - 1
-  version: 0.7.0.beta.1
+  - 2
+  version: 0.7.0.beta.2
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -17,10 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 +02:00
+date: 2010-07-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: trollop
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,29 +35,27 @@ dependencies:
         - 16
         - 2
         version: 1.16.2
-  name: trollop
-  prerelease: false
   requirement: *id001
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: sys-uname
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196479
+        hash: 55
         segments: 
-        - 2
         - 0
-        - 0
-        - beta
-        - 14
-        version: 2.0.0.beta.14
-  name: rspec
-  prerelease: false
+        - 8
+        - 4
+        version: 0.8.4
   requirement: *id002
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: growl
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +67,23 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  name: growl
-  prerelease: false
   requirement: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
+  name: libnotify
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
+        version: 0.1.3
+  requirement: *id004
 description: RSpactor is a command line tool to automatically run your changed specs (much like autotest)
 email: 
 - thibaud@thibaud.me
@@ -80,11 +94,14 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- bin/inotify_watch
 - bin/rspactor
-- images/failed.png
-- images/pending.png
-- images/success.png
-- lib/growl/growl_formatter.rb
+- 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/rspactor/inspector.rb
 - lib/rspactor/interactor.rb
 - lib/rspactor/listener.rb