rspactor 0.6.4 → 0.7.0.beta.1

data/lib/rspactor/runner.rb

@@ -1,195 +1,55 @@
-require 'rspactor'
+require 'growl'
 
 module RSpactor
   class Runner
-    def self.start(options = {})
-      run_in = options.delete(:run_in) || Dir.pwd
-      new(run_in, options).start
-    end
-    
-    attr_reader :dir, :options, :inspector, :interactor, :spork
-    
-    def initialize(dir, options = {})
-      @dir = dir
-      @options = options
-      @spork = Spork.new(self) if options[:spork]
-      read_git_head
-    end
-    
-    def start
-      load_dotfile
-      puts "** RSpactor, now watching at '#{dir}'"
-      spork.start if spork?
-      start_interactor
-      start_listener
-    end
-    
-    def start_interactor
-      @interactor = Interactor.new(self)
-      message = "** Hit <enter> to skip initial spec #{"& cucumber " if cucumber?}run"
-      aborted = options[:skip] || @interactor.wait_for_enter_key(message, 2, false)
-      @interactor.start_termination_handler
-      unless aborted
-        run_all_specs
-        run_cucumber_command('~@wip,~@pending', false)
-      end
-    end
-    
-    def start_listener
-      @inspector = Inspector.new(self)
-      
-      Listener.new(Inspector::EXTENSIONS) do |files|
-        changed_files(files) unless git_head_changed?
-      end.run(dir)
-    end
-    
-    def load_dotfile
-      dotfile = File.join(ENV['HOME'], '.rspactor')
-      if File.exists?(dotfile)
-        begin
-          Kernel.load dotfile
-        rescue => e
-          $stderr.puts "Error while loading #{dotfile}: #{e}"
-        end
-      end
-    end
+    attr_reader :pipe
     
-    def run_all_specs
-      run_spec_command(File.join(dir, 'spec'))
-    end
-    
-    def run_spec_command(paths)
-      paths = Array(paths)
-      if paths.empty?
-        @last_run_failed = nil
+    def start(options = {})
+      if options[:all]
+        command = rspec_command(["spec"])
+        message = "Running all specs"
       else
-        cmd = [ruby_opts, spec_runner, paths, spec_opts].flatten.join(' ')
-        @last_run_failed = run_command(cmd)
+        command = rspec_command(Inspector.spec_paths)
+        message = "Running: #{Inspector.spec_paths.join(' ') }"
       end
+      run_rspec(command, message)
     end
     
-    def run_cucumber_command(tags = '@wip:2', clear = @options[:clear])
-      return unless cucumber?
-      
-      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)
-    end
-    
-    def last_run_failed?
-      @last_run_failed == false
-    end
-    
-    def cucumber?
-      @cucumber ||= File.exist?(File.join(dir, 'features'))
-    end
-    
-    def spork?
-      spork != nil
-    end
-    
-  protected
-    
-    def run_command(cmd)
-      system(cmd)
-      $?.success?
+    def stop
+      Process.kill("ABRT", pipe.pid)
+      @pipe = nil
     end
     
-    def changed_files(files)
-      files = files.inject([]) do |all, file|
-        all.concat inspector.determine_files(file)
-      end
-      unless files.empty?
-        
-        # cucumber features
-        if files.delete('cucumber')
-          run_cucumber_command
-        end
-        
-        # 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?
-          run_spec_command(files)
-          
-          if options[:retry_failed] and previous_run_failed and not last_run_failed?
-            run_all_specs
-          end
-        end
-      end
+    def run?
+      pipe && pipe.pid != nil
     end
     
   private
     
-    def spec_opts
-      if File.exist?('spec/spec.opts')
-        opts = File.read('spec/spec.opts').gsub("\n", ' ')
-      else
-        opts = "--color"
-      end
-      opts << " --drb" if spork
-      opts << spec_formatter_opts
-      # only add the "progress" formatter unless no other (besides growl) is specified
-      opts << ' -f progress' unless opts.scan(/\s(?:-f|--format)\b/).length > 1
-      opts
-    end
-    
-    def cucumber_opts(tags)
-      opts = "--profile rspactor"
-      opts << " --drb" if spork
-      opts << " --tags #{tags}"
-      opts << cucumber_formatter_opts
-      opts << " --require features" # because using require option overwrite default require
-      opts << " features"
-      opts
-    end
-    
-    def spec_formatter_opts
-      " --require #{File.dirname(__FILE__)}/../rspec_growler.rb --format RSpecGrowler:STDOUT"
-    end
-    
-    def cucumber_formatter_opts
-      " --require #{File.dirname(__FILE__)}/../cucumber_growler.rb"
-    end
-    
-    def spec_runner
-      if File.exist?("script/spec")
-        "script/spec"
-      else
-        "spec"
-      end
-    end
-    
-    def cucumber_runner
-      if File.exist?("script/cucumber")
-        "script/cucumber"
-      else
-        "cucumber"
+    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
+        end
       end
+      @pipe = nil
     end
     
-    def ruby_opts
-      other = ENV['RUBYOPT'] ? " #{ENV['RUBYOPT']}" : ''
-      other << ' -rcoral' if options[:coral]
-      %(RUBYOPT='-Ilib:spec#{other}')
+    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 "--color"
+      cmd_parts.unshift "rspec"
+      cmd_parts.unshift "bundle exec" if bundler?
+      cmd_parts.join(" ")
     end
     
-    def git_head_changed?
-      old_git_head = @git_head
-      read_git_head
-      @git_head and old_git_head and @git_head != old_git_head
+    def bundler?
+      File.exist?("./Gemfile")
     end
     
-    def read_git_head
-      git_head_file = File.join(dir, '.git', 'HEAD')
-      @git_head = File.exists?(git_head_file) && File.read(git_head_file)
-    end
   end
-end
-
-# backward compatibility
-Runner = RSpactor::Runner
+end

data/lib/rspactor/ui.rb

@@ -0,0 +1,37 @@
+module RSpactor
+  module UI
+    class << self
+      
+      def info(message, options = {})
+        unless test?
+          reset_line if options[:reset]
+          clear      if options[:clear]
+          puts reset_color(message)
+        end
+      end
+      
+      def reset_line
+        print "\r\e "
+      end
+      
+    private
+      
+      def clear
+        system("clear;")
+      end
+      
+      def test?
+        ENV["RSPACTOR_ENV"] == "test"
+      end
+      
+      def reset_color(text)
+        color(text, "\e[0m")
+      end
+      
+      def color(text, color_code)
+        "#{color_code}#{text}\e[0m"
+      end
+      
+    end
+  end
+end

data/lib/rspactor/version.rb

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

data/lib/rspactor.rb

@@ -1,8 +1,27 @@
 module RSpactor
-  autoload :Interactor, 'rspactor/interactor'
-  autoload :Listener, 'rspactor/listener'
-  autoload :Inspector, 'rspactor/inspector'
-  autoload :Runner, 'rspactor/runner'
-  autoload :Growl, 'rspactor/growl'
-  autoload :Spork, 'rspactor/spork'
-end
+  
+  autoload :UI,             'rspactor/ui'
+  autoload :Interactor,     'rspactor/interactor'
+  autoload :Listener,       'rspactor/listener'
+  autoload :Inspector,      'rspactor/inspector'
+  autoload :Runner,         'rspactor/runner'
+  
+  class << self
+    attr_reader :options, :listener, :runner
+    
+    def start(options = {})
+      @options  = options
+      @listener = Listener.new
+      @runner   = Runner.new
+      Interactor.init_signal_traps
+      listener.watch do |files|
+        Inspector.determine_spec_paths(files)
+        runner.start if Inspector.spec_paths?
+      end
+      UI.info "RSpactor is now watching at '#{Dir.pwd}'"
+      listener.start
+    end
+    
+  end
+  
+end

metadata

@@ -1,103 +1,136 @@
 --- !ruby/object:Gem::Specification 
 name: rspactor
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 62196433
+  prerelease: true
   segments: 
   - 0
-  - 6
-  - 4
-  version: 0.6.4
+  - 7
+  - 0
+  - beta
+  - 1
+  version: 0.7.0.beta.1
 platform: ruby
 authors: 
-- "Mislav Marohni\xC4\x87"
-- Andreas Wolff
-- Pelle Braendgaard
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 +02:00
-default_executable: rspactor
+date: 2010-06-30 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 83
+        segments: 
+        - 1
+        - 16
+        - 2
+        version: 1.16.2
+  name: trollop
+  prerelease: false
+  requirement: *id001
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 62196479
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 14
+        version: 2.0.0.beta.14
   name: rspec
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: *id002
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id001
-description: RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest).
-email: thibaud@thibaud.me
+        - 0
+        - 3
+        version: 1.0.3
+  name: growl
+  prerelease: false
+  requirement: *id003
+  type: :runtime
+description: RSpactor is a command line tool to automatically run your changed specs (much like autotest)
+email: 
+- thibaud@thibaud.me
 executables: 
 - rspactor
-extensions: []
+extensions: 
+- ext/fsevent/extconf.rb
+extra_rdoc_files: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
 files: 
-- .gitignore
-- .rspactor
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
 - bin/rspactor
 - images/failed.png
 - images/pending.png
 - images/success.png
-- lib/cucumber_growler.rb
-- lib/rspactor.rb
-- lib/rspactor/growl.rb
+- lib/growl/growl_formatter.rb
 - lib/rspactor/inspector.rb
 - lib/rspactor/interactor.rb
 - lib/rspactor/listener.rb
 - lib/rspactor/runner.rb
-- lib/rspactor/spork.rb
-- lib/rspec_growler.rb
-- rspactor.gemspec
-- spec/inspector_spec.rb
-- spec/listener_spec.rb
-- spec/runner_spec.rb
+- lib/rspactor/ui.rb
+- lib/rspactor/version.rb
+- lib/rspactor.rb
+- ext/fsevent/extconf.rb
+- ext/fsevent/fsevent_watch.c
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/thibaudgg/rspactor
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 21
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 7
+      version: 1.3.7
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: RSpactor is a command line tool to automatically run your changed specs & cucumber features.
-test_files: 
-- spec/inspector_spec.rb
-- spec/listener_spec.rb
-- spec/runner_spec.rb
+summary: Simpler Autotest
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/Rakefile

@@ -1,50 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rspactor"
-    gem.summary = "RSpactor is a command line tool to automatically run your changed specs & cucumber features."
-    gem.description = "RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest)."
-    gem.email = "thibaud@thibaud.me"
-    gem.homepage = "http://github.com/thibaudgg/rspactor"
-    gem.authors = ["Mislav Marohnić", "Andreas Wolff", "Pelle Braendgaard", "Thibaud Guillaume-Gentil"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-desc "starts RSpactor"
-task :rspactor do
-  system "ruby -Ilib bin/rspactor"
-end
-
-task :spec => :check_dependencies
-
-task :default => :rspactor
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rspactor #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +0,0 @@
-0.6.4

data/lib/cucumber_growler.rb

@@ -1,61 +0,0 @@
-require 'cucumber'
-require 'cucumber/formatter/console'
-require File.dirname(__FILE__) + '/rspactor/growl'
-
-module CucumberGrowler
-  include RSpactor::Growl
-
-  def self.included(base)
-    base.class_eval do
-      alias original_print_stats print_stats
-      include InstanceMethods
-
-      def print_stats(features, profiles = [])
-        title, icon, messages = '', '', []
-        [:failed, :skipped, :undefined, :pending, :passed].reverse.each do |status|
-          if step_mother.steps(status).any?
-            icon = icon_for(status)
-            # title = title_for(status)
-            messages << dump_count(step_mother.steps(status).length, "step", status.to_s)
-          end
-        end
-
-        notify "Cucumber Results", messages.reverse.join(", "), icon
-        original_print_stats(features, profiles = [])
-      end
-    end
-  end
-
-  module InstanceMethods
-    def icon_for(status)
-      case status
-      when :passed
-        'success'
-      when :pending, :undefined, :skipped
-        'pending'
-      when :failed
-        'failed'
-      end
-    end
-
-    def title_for(status)
-      case status
-      when :passed
-        'Features passed!'
-      when :pending
-        'Some steps are pending...'
-      when :undefined
-        'Some undefined steps...'
-      when :skipped
-        'Some steps skipped...'
-      when :failed
-        'Failures occurred!'
-      end
-    end
-  end
-
-end
-
-module Cucumber::Formatter::Console
-  include CucumberGrowler
-end

data/lib/rspactor/growl.rb

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