mislav-rspactor 0.3.3 → 0.4.0

data/Rakefile

@@ -2,56 +2,5 @@ task :default => :spec
 
 desc "starts RSpactor"
 task :spec do
-  system "ruby -Ilib bin/rspactor"
-end
-
-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.authors = ["Mislav Marohnić", "Andreas Wolff", "Pelle Braendgaard"]
-    gem.has_rdoc = false
-    
-    gem.version = GEM_VERSION
-    gem.files = FileList['Rakefile', '{bin,lib,images,spec}/**/*', 'README*', 'LICENSE*']
-    gem.executables = Dir['bin/*'].map { |f| File.basename(f) }
-  end
-  
-  spec_string = spec.to_ruby
-  
-  begin
-    Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join 
-  rescue
-    abort "unsafe gemspec: #{$!}"
-  else
-    File.open("#{spec.name}.gemspec", 'w') { |file| file.write spec_string }
-  end
-end
-
-task :bump => ["version:bump", :gemspec]
-
-namespace :version do
-  task :read do
-    unless defined? GEM_VERSION
-      GEM_VERSION = File.read("VERSION")
-    end
-  end
-  
-  task :bump => :read do
-    if ENV['VERSION']
-      GEM_VERSION.replace ENV['VERSION']
-    else
-      GEM_VERSION.sub!(/\d+$/) { |num| num.to_i + 1 }
-    end
-    
-    File.open("VERSION", 'w') { |v| v.write GEM_VERSION }
-  end
-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})
+  system "/usr/bin/ruby -Ilib bin/rspactor"
 end

data/bin/rspactor-system

@@ -0,0 +1,93 @@
+#!/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_spec_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)

data/lib/rspactor.rb

@@ -3,4 +3,5 @@ module RSpactor
   autoload :Listener, 'rspactor/listener'
   autoload :Inspector, 'rspactor/inspector'
   autoload :Runner, 'rspactor/runner'
+  autoload :Growl, 'rspactor/growl'
 end

data/lib/rspactor/growl.rb

@@ -0,0 +1,16 @@
+module RSpactor
+  module Growl
+    extend self
+    
+    IMAGE_PATH = File.expand_path File.dirname(__FILE__) + "/../../images/%s.png"
+    
+    def notify(title, msg, img, pri = 0)
+      system("growlnotify -w -n rspactor --image #{img} -p #{pri} -m #{msg.inspect} #{title} &") 
+    end
+    
+    # failed | pending | success
+    def image_path(icon)
+      IMAGE_PATH % icon
+    end
+  end
+end

data/lib/rspactor/inspector.rb

@@ -2,7 +2,7 @@ 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)
+    DEFAULT_EXTENSIONS = %w(rb erb builder haml rhtml rxml yml conf opts)
 
     def initialize(dir)
       @root = dir

data/lib/rspactor/listener.rb

@@ -4,41 +4,63 @@ OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Framewo
 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
+    attr_reader :last_check, :callback, :options, :dirs, :force_changed
 
-    def initialize(valid_extensions = nil)
-      @valid_extensions = valid_extensions
+    # Options examples:
+    #   {:extensions => ['rb', 'haml'], :relative_paths => true, :latency => .5}
+    def initialize(options = {})
+      @options = options
       timestamp_checked
-
+      @force_changed = []
+      
       @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
+        changed_files = relativize_path_names(changed_files) if options[:relative_paths]
         yield changed_files unless changed_files.empty?
       end
     end
+    
+    def relativize_path_names(files)
+      for file in files
+        if dir = @dirs.find { |p| file.index(p) == 0 }
+          file.sub!(dir + '/', '')
+        end
+      end
+    end
 
-    def run(directories)
-      dirs = Array(directories)
-      stream = OSX::FSEventStreamCreate(OSX::KCFAllocatorDefault, callback, nil, dirs, OSX::KFSEventStreamEventIdSinceNow, 0.5, 0)
-      unless stream
+    def start(directories)
+      @dirs = Array(directories)
+      since = OSX::KFSEventStreamEventIdSinceNow
+      
+      @stream = OSX::FSEventStreamCreate(OSX::KCFAllocatorDefault, callback, nil, @dirs, since, options[:latency] || 0.0, 0)
+      unless @stream
         $stderr.puts "Failed to create stream"
         exit(1)
       end
 
-      OSX::FSEventStreamScheduleWithRunLoop(stream, OSX::CFRunLoopGetCurrent(), OSX::KCFRunLoopDefaultMode)
-      unless OSX::FSEventStreamStart(stream)
+      OSX::FSEventStreamScheduleWithRunLoop(@stream, OSX.CFRunLoopGetCurrent, OSX::KCFRunLoopDefaultMode)
+      unless OSX::FSEventStreamStart(@stream)
         $stderr.puts "Failed to start stream"
         exit(1)
       end
+      
+      return self
+    end
 
+    def enter_run_loop
       begin
         OSX::CFRunLoopRun()
       rescue Interrupt
-        OSX::FSEventStreamStop(stream)
-        OSX::FSEventStreamInvalidate(stream)
-        OSX::FSEventStreamRelease(stream)
+        stop
       end
     end
+    
+    def stop
+      OSX::FSEventStreamStop(@stream)
+      OSX::FSEventStreamInvalidate(@stream)
+      OSX::FSEventStreamRelease(@stream)
+    end
 
     def timestamp_checked
       @last_check = Time.now
@@ -64,7 +86,11 @@ module RSpactor
     end
 
     def file_changed?(file)
-      File.stat(file).mtime > last_check
+      return true if force_changed.delete(file)
+      file_mtime = File.stat(file).mtime
+      file_mtime > last_check
+    rescue Errno::ENOENT
+      false
     end
 
     def ignore_path?(path)
@@ -80,7 +106,7 @@ module RSpactor
     end
 
     def valid_extension?(file)
-      valid_extensions.nil? or valid_extensions.include?(file_extension(file))
+      options[:extensions].nil? or options[:extensions].include?(file_extension(file))
     end
   end
 end

data/lib/rspactor/runner.rb

@@ -31,9 +31,9 @@ module RSpactor
     def start_listener
       @inspector = Inspector.new(dir)
 
-      Listener.new(Inspector::EXTENSIONS) do |files|
+      Listener.new(:extensions => Inspector::DEFAULT_EXTENSIONS) do |files|
         spec_changed_files(files) unless git_head_changed?
-      end.run(dir)
+      end.start(dir).enter_run_loop
     end
     
     def load_dotfile

data/lib/rspec_growler.rb

@@ -1,6 +1,9 @@
 require 'spec/runner/formatter/base_formatter'
+require File.dirname(__FILE__) + '/rspactor/growl'
 
 class RSpecGrowler < Spec::Runner::Formatter::BaseFormatter
+  include RSpactor::Growl
+  
   def dump_summary(duration, total, failures, pending)
     icon = if failures > 0
       'failed'
@@ -17,11 +20,7 @@ class RSpecGrowler < Spec::Runner::Formatter::BaseFormatter
       message << " (#{pending} pending)"
     end
     
-    growl "Test Results", message, image_path, 0
-  end
-  
-  def growl(title, msg, img, pri = 0)
-    system("growlnotify -w -n rspactor --image #{img} -p #{pri} -m #{msg.inspect} #{title} &") 
+    notify "Test Results", message, image_path(icon)
   end
 end
 

data/spec/listener_spec.rb

@@ -2,7 +2,7 @@ require 'rspactor/listener'
 
 describe RSpactor::Listener do
   before(:all) do
-    @listener = described_class.new(%w(rb erb haml))
+    @listener = described_class.new(:extensions => %w(rb erb haml))
   end
   
   it "should be timestamped" do

data/spec/runner_spec.rb

@@ -96,8 +96,9 @@ describe RSpactor::Runner do
       end
       
       it "should run Listener" do
-        @listener.should_receive(:run).with('/my/path')
-        RSpactor::Listener.should_receive(:new).with(instance_of(Array)).and_return(@listener)
+        @listener.should_receive(:start).with('/my/path').and_return(@listener)
+        @listener.should_receive(:enter_run_loop).with()
+        RSpactor::Listener.should_receive(:new).with(:extensions => instance_of(Array)).and_return(@listener)
         setup
       end
     end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mislav-rspactor
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -11,14 +17,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-27 00:00:00 -07:00
-default_executable: rspactor
+date: 2010-07-21 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
-description: 
+description: RSpactor is a command line tool to automatically run your changed specs (much like autotest).
 email: mislav.marohnic@gmail.com
-executables: 
-- rspactor
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
@@ -26,7 +32,8 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - bin/rspactor
-- lib/rspactor
+- bin/rspactor-system
+- lib/rspactor/growl.rb
 - lib/rspactor/inspector.rb
 - lib/rspactor/interactor.rb
 - lib/rspactor/listener.rb
@@ -42,29 +49,37 @@ files:
 - LICENSE
 has_rdoc: false
 homepage: http://github.com/mislav/rspactor
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
-summary: RSpactor is a command line tool to automatically run your changed specs (much like autotest).
+specification_version: 3
+summary: File watcher that automatically runs changed specs
 test_files: []