kicker 2.3.1 → 2.4.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+
+script: "rake"

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gem 'rake'
+
+group :development do
+  gem 'mocha'
+  gem 'test-spec'
+  gem 'activesupport'
+  gem 'rb-fsevent'
+  gem 'jeweler'
+end

data/Gemfile.lock

@@ -0,0 +1,34 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.6.5)
+    metaclass (0.0.1)
+    mocha (0.10.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
+    rb-fsevent (0.9.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    test-spec (0.10.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  jeweler
+  mocha
+  rake
+  rb-fsevent
+  test-spec

data/README.rdoc

@@ -16,12 +16,12 @@ feel offended; live with it.</i>
 == The short version
 
   Usage: ./bin/kicker [options] [paths to watch]
-
-    Available recipes: active_record, ignore, jstest, rails, ruby.
-
+ 
+    Available recipes: ignore, jstest, rails, ruby.
+ 
       -s, --silent                     Keep output to a minimum.
-          --[no-]growl                 Whether or not to use Growl. Default is to use growl.
-          --growl-command [COMMAND]    The command to execute when the Growl succeeded message is clicked.
+      -q, --quiet                      Quiet output. Don't print timestamps when logging.
+      -c, --clear                      Clear console before each run.
       -l, --latency [FLOAT]            The time to collect file change events before acting on them. Defaults to 1 second.
       -r, --recipe [NAME]              A named recipe to load.
       -e, --execute [COMMAND]          The command to execute.

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.add_dependency 'rb-fsevent'
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gems.github.com"
 end
 
 Rake::TestTask.new do |t|

data/VERSION

@@ -1 +1 @@
-2.3.1
+2.4.0

data/kicker.gemspec

@@ -1,108 +1,105 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{kicker}
-  s.version = "2.3.1"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran"]
-  s.date = %q{2011-05-27}
+  s.date = %q{2012-02-03}
   s.default_executable = %q{kicker}
   s.email = %q{eloy.de.enige@gmail.com}
   s.executables = ["kicker"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     ".kick",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO.rdoc",
-     "VERSION",
-     "bin/kicker",
-     "html/images/kikker.jpg",
-     "kicker.gemspec",
-     "lib/kicker.rb",
-     "lib/kicker/callback_chain.rb",
-     "lib/kicker/core_ext.rb",
-     "lib/kicker/fsevents.rb",
-     "lib/kicker/growl.rb",
-     "lib/kicker/log_status_helper.rb",
-     "lib/kicker/options.rb",
-     "lib/kicker/recipes.rb",
-     "lib/kicker/recipes/could_not_handle_file.rb",
-     "lib/kicker/recipes/dot_kick.rb",
-     "lib/kicker/recipes/execute_cli_command.rb",
-     "lib/kicker/recipes/ignore.rb",
-     "lib/kicker/recipes/jstest.rb",
-     "lib/kicker/recipes/rails.rb",
-     "lib/kicker/recipes/ruby.rb",
-     "lib/kicker/utils.rb",
-     "test/callback_chain_test.rb",
-     "test/core_ext_test.rb",
-     "test/filesystem_change_test.rb",
-     "test/fixtures/a_file_thats_reloaded.rb",
-     "test/fsevents_test.rb",
-     "test/growl_test.rb",
-     "test/initialization_test.rb",
-     "test/log_status_helper_test.rb",
-     "test/options_test.rb",
-     "test/recipes/could_not_handle_file_test.rb",
-     "test/recipes/dot_kick_test.rb",
-     "test/recipes/execute_cli_command_test.rb",
-     "test/recipes/ignore_test.rb",
-     "test/recipes/jstest_test.rb",
-     "test/recipes/rails_test.rb",
-     "test/recipes/ruby_test.rb",
-     "test/recipes_test.rb",
-     "test/test_helper.rb",
-     "test/utils_test.rb",
-     "vendor/growlnotifier/growl.rb",
-     "vendor/growlnotifier/growl_helpers.rb"
+    ".kick",
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO.rdoc",
+    "VERSION",
+    "bin/kicker",
+    "html/images/kikker.jpg",
+    "kicker.gemspec",
+    "lib/kicker.rb",
+    "lib/kicker/callback_chain.rb",
+    "lib/kicker/core_ext.rb",
+    "lib/kicker/fsevents.rb",
+    "lib/kicker/growl.rb",
+    "lib/kicker/log_status_helper.rb",
+    "lib/kicker/options.rb",
+    "lib/kicker/recipes.rb",
+    "lib/kicker/recipes/could_not_handle_file.rb",
+    "lib/kicker/recipes/dot_kick.rb",
+    "lib/kicker/recipes/execute_cli_command.rb",
+    "lib/kicker/recipes/ignore.rb",
+    "lib/kicker/recipes/jstest.rb",
+    "lib/kicker/recipes/rails.rb",
+    "lib/kicker/recipes/ruby.rb",
+    "lib/kicker/utils.rb",
+    "test/callback_chain_test.rb",
+    "test/core_ext_test.rb",
+    "test/filesystem_change_test.rb",
+    "test/fixtures/a_file_thats_reloaded.rb",
+    "test/fsevents_test.rb",
+    "test/growl_test.rb",
+    "test/initialization_test.rb",
+    "test/log_status_helper_test.rb",
+    "test/options_test.rb",
+    "test/recipes/could_not_handle_file_test.rb",
+    "test/recipes/dot_kick_test.rb",
+    "test/recipes/execute_cli_command_test.rb",
+    "test/recipes/ignore_test.rb",
+    "test/recipes/jstest_test.rb",
+    "test/recipes/rails_test.rb",
+    "test/recipes/ruby_test.rb",
+    "test/recipes_test.rb",
+    "test/test_helper.rb",
+    "test/utils_test.rb",
+    "vendor/growlnotifier/growl.rb",
+    "vendor/growlnotifier/growl_helpers.rb"
   ]
   s.homepage = %q{http://github.com/alloy/kicker}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib", "vendor"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A lean, agnostic, flexible file-change watcher, using OS X FSEvents.}
-  s.test_files = [
-    "test/callback_chain_test.rb",
-     "test/core_ext_test.rb",
-     "test/filesystem_change_test.rb",
-     "test/fixtures/a_file_thats_reloaded.rb",
-     "test/fsevents_test.rb",
-     "test/growl_test.rb",
-     "test/initialization_test.rb",
-     "test/log_status_helper_test.rb",
-     "test/options_test.rb",
-     "test/recipes/could_not_handle_file_test.rb",
-     "test/recipes/dot_kick_test.rb",
-     "test/recipes/execute_cli_command_test.rb",
-     "test/recipes/ignore_test.rb",
-     "test/recipes/jstest_test.rb",
-     "test/recipes/rails_test.rb",
-     "test/recipes/ruby_test.rb",
-     "test/recipes_test.rb",
-     "test/test_helper.rb",
-     "test/utils_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<test-spec>, [">= 0"])
+      s.add_development_dependency(%q<activesupport>, [">= 0"])
+      s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<rb-fsevent>, [">= 0"])
     else
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<test-spec>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rb-fsevent>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<test-spec>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rb-fsevent>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rb-fsevent>, [">= 0"])
   end
 end

data/lib/kicker.rb

@@ -7,6 +7,7 @@ require 'kicker/growl'
 require 'kicker/log_status_helper'
 require 'kicker/options'
 require 'kicker/utils'
+require 'kicker/recipes'
 
 class Kicker #:nodoc:
   def self.run(argv = ARGV)
@@ -115,8 +116,4 @@ class Kicker #:nodoc:
       end
     end
   end
-end
-
-# Load this as last, because it actually loads all recipes, so everything has
-# to be defined before that.
-require 'kicker/recipes'
+end

data/lib/kicker/recipes.rb

@@ -1,9 +1,6 @@
 RECIPES_DIR      = File.expand_path('../recipes', __FILE__)
 USER_RECIPES_DIR = File.expand_path('~/.kick')
 
-$:.unshift(RECIPES_DIR)
-$:.unshift(USER_RECIPES_DIR) if File.exist?(USER_RECIPES_DIR)
-
 module Kernel
   # If only given a <tt>name</tt>, the specified recipe will be loaded. For
   # instance, the following, in a <tt>.kick</tt> file, will load the Rails
@@ -29,30 +26,69 @@ end
 class Kicker
   module Recipes #:nodoc:
     class << self
+      def reset!
+        @recipes = nil
+      end
+      
       def recipes
         @recipes ||= {}
       end
       
-      def recipe(name, &block)
-        name = name.to_sym
-        if block_given?
-          recipes[name] = block
-        else
-          if recipe = recipes[name]
-            recipe.call
-          else
-            raise LoadError, "Recipe `#{name}' does not exist."
-          end
+      def recipe_filename(name)
+        [
+          USER_RECIPES_DIR,
+          RECIPES_DIR
+        ].each do |directory|
+          filename = File.join(directory, "#{name}.rb")
+          return filename if File.exist?(filename)
         end
       end
       
+      def recipe_names
+        recipe_files.map { |filename| File.basename(filename, '.rb').to_sym }
+      end
+      
       def recipe_files
         Dir.glob(File.join(RECIPES_DIR, '*.rb')) + Dir.glob(File.join(USER_RECIPES_DIR, '*.rb'))
       end
+      
+      def define_recipe(name, &block)
+        recipes[name] = block
+      end
+      
+      def load_recipe(name)
+        if recipe_names.include?(name)
+          load recipe_filename(name)
+        else
+          raise LoadError, "Can't load recipe `#{name}', it doesn't exist on disk. Loadable recipes are: #{recipe_names[0..-2].join(', ')}, and #{recipe_names[-1]}"
+        end
+      end
+      
+      def activate_recipe(name)
+        unless recipes.has_key?(name)
+          load_recipe(name)
+        end
+        if recipe = recipes[name]
+          recipe.call
+        else
+          raise ArgumentError, "Can't activate the recipe `#{name}' because it hasn't been defined yet."
+        end
+      end
+      
+      # See Kernel#recipe for more information about the usage.
+      def recipe(name, &block)
+        name = name.to_sym
+        if block_given?
+          define_recipe(name, &block)
+        else
+          activate_recipe(name)
+        end
+      end
     end
     
-    # We don't want this option to show up at the end
-    require 'execute_cli_command'
-    recipe_files.each { |file| require file }
+    # Always load all the base recipes
+    load_recipe :execute_cli_command
+    load_recipe :could_not_handle_file
+    load_recipe :dot_kick
   end
 end

data/lib/kicker/recipes/rails.rb

@@ -1,22 +1,10 @@
-# Need to define these modules and require core_ext/module, because AS breaks
-# if these aren't defined. Need to fix that in AS...
-require 'active_support/core_ext/module'
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module String #:nodoc:
-      module Inflections #:nodoc:
-      end
-    end
-  end
-end
-
-require 'ruby'
+recipe :ruby
 
-class Rails < Ruby
+class Kicker::Recipes::Rails < Kicker::Recipes::Ruby
   class << self
     # Call these options on the Ruby class which takes the cli options.
     %w{ test_type runner_bin test_cases_root test_options }.each do |delegate|
-      define_method(delegate) { Ruby.send(delegate) }
+      define_method(delegate) { Kicker::Recipes::Ruby.send(delegate) }
     end
     
     # Maps +type+, for instance `models', to a test directory.
@@ -60,15 +48,15 @@ class Rails < Ruby
   def tests_for_model(model)
     if test_type == 'test'
       %W{
-        unit/#{model.singularize}
-        unit/helpers/#{model.pluralize}_helper
-        functional/#{model.pluralize}_controller
+        unit/#{ActiveSupport::Inflector.singularize(model)}
+        unit/helpers/#{ActiveSupport::Inflector.pluralize(model)}_helper
+        functional/#{ActiveSupport::Inflector.pluralize(model)}_controller
       }
     else
       %W{
-        models/#{model.singularize}
-        helpers/#{model.pluralize}_helper
-        controllers/#{model.pluralize}_controller
+        models/#{ActiveSupport::Inflector.singularize(model)}
+        helpers/#{ActiveSupport::Inflector.pluralize(model)}_helper
+        controllers/#{ActiveSupport::Inflector.pluralize(model)}_controller
       }
     end.map { |f| test_file f }
   end
@@ -78,7 +66,7 @@ class Rails < Ruby
       case file
       # Run all functional tests when routes.rb is saved
       when 'config/routes.rb'
-        Rails.all_controller_tests
+        Kicker::Recipes::Rails.all_controller_tests
       
       # Match lib/*
       when /^(lib\/.+)\.rb$/
@@ -92,7 +80,7 @@ class Rails < Ruby
       when %r{^app/(\w+)([\w/]*)/([\w\.]+)\.\w+$}
         type, namespace, file = $1, $2, $3
         
-        if dir = Rails.type_to_test_dir(type)
+        if dir = Kicker::Recipes::Rails.type_to_test_dir(type)
           if type == "views"
             namespace = namespace.split('/')[1..-1]
             file = "#{namespace.pop}_controller"
@@ -110,9 +98,9 @@ end
 
 recipe :rails do
   require 'rubygems' rescue LoadError
-  require 'active_support/core_ext/string'
+  require 'active_support/inflector'
   
-  process Rails
+  process Kicker::Recipes::Rails
   
   # When changing the schema, prepare the test database.
   process do |files|

data/lib/kicker/recipes/ruby.rb

@@ -1,4 +1,4 @@
-class Ruby
+class Kicker::Recipes::Ruby
   class << self
     # Assigns the type of tests to run. Eg: `test' or `spec'.
     attr_writer :test_type
@@ -42,6 +42,24 @@ class Ruby
       @test_options ||= []
     end
     
+    def reset!
+      @test_type = nil
+      @runner_bin = nil
+      @test_cases_root = nil
+      @test_options = nil
+    end
+    
+    def runner_command(*parts)
+      parts.map do |part|
+        case part
+        when Array
+          part.empty? ? nil : part.join(' ')
+        else
+          part.to_s
+        end
+      end.compact.join(' ')
+    end
+    
     # Runs the given tests, if there are any, with the method defined by
     # test_type. If test_type is `test' the run_with_test_runner method is
     # used. The same applies when test_type is `spec'.
@@ -50,7 +68,7 @@ class Ruby
     end
     
     def test_runner_command(tests)
-      "#{runner_bin} #{test_options.join(' ')} -r #{tests.join(' -r ')} -e ''"
+      runner_command(runner_bin, test_options, '-r', tests.join(' -r '), "-e ''")
     end
     
     # Runs the given tests with `ruby' as unit-test tests.
@@ -67,7 +85,7 @@ class Ruby
     end
     
     def spec_runner_command(tests)
-      "#{runner_bin} #{test_options.join(' ')} #{tests.join(' ')}"
+      runner_command(runner_bin, test_options, tests)
     end
     
     # Runs the given tests with `spec' as RSpec tests.
@@ -147,9 +165,9 @@ class Ruby
 end
 
 options.on('-b', '--ruby [PATH]', "Use an alternate Ruby binary for spawned test runners. (Default is `ruby')") do |command|
-  Ruby.runner_bin = command
+  Kicker::Recipes::Ruby.runner_bin = command
 end
 
 recipe :ruby do
-  process Ruby
+  process Kicker::Recipes::Ruby
 end

data/test/growl_test.rb

@@ -84,6 +84,4 @@ if Kicker::Growl.usable?
       @growler.failed(status)
     end
   end
-else
-  puts "Poo"
 end

data/test/recipes/rails_test.rb

@@ -1,51 +1,65 @@
 require File.expand_path('../../test_helper', __FILE__)
-
-before = Kicker.process_chain.dup
 recipe :rails
-RAILS_FILES, RAILS_SCHEMA = (Kicker.process_chain - before).first(2)
 
-describe "The Rails helper module" do
-  after do
-    Ruby.test_type = nil
-    Ruby.test_cases_root = nil
+class Kicker::Recipes::Rails
+  class << self
+    attr_accessor :tests_ran
+    def run_tests(tests)
+      self.tests_ran ||= []
+      self.tests_ran << tests
+    end
   end
-  
+end
+
+describe "The Rails handler" do
   it "should return all controller tests when test_type is `test'" do
-    Dir.expects(:glob).with("test/functional/**/*_test.rb").returns(%w{ test.rb })
-    Rails.all_controller_tests.should == %w{ test.rb }
+    tests = %w{ test.rb }
+    
+    File.use_original_exist = false
+    File.existing_files = tests
+    
+    Dir.expects(:glob).with("test/functional/**/*_test.rb").returns(tests)
+    Kicker::Recipes::Rails.all_controller_tests.should == tests
   end
   
   it "should return all controller tests when test_type is `spec'" do
-    Ruby.test_type = 'spec'
-    Ruby.test_cases_root = nil
+    specs = %w{ spec.rb }
     
-    Dir.expects(:glob).with("spec/controllers/**/*_spec.rb").returns(%w{ spec.rb })
-    Rails.all_controller_tests.should == %w{ spec.rb }
+    File.use_original_exist = false
+    File.existing_files = specs
+    
+    Kicker::Recipes::Ruby.test_type = 'spec'
+    Kicker::Recipes::Ruby.test_cases_root = nil
+    
+    Dir.expects(:glob).with("spec/controllers/**/*_spec.rb").returns(specs)
+    Kicker::Recipes::Rails.all_controller_tests.should == specs
   end
 end
 
-describe "The misc Rails handlers" do
+describe "The Rails schema handler" do
+  before do
+    # We assume the Rails schema handler is in the chain after the Rails handler
+    # because it's defined in the same recipe
+    @handler = Kicker.process_chain[Kicker.process_chain.index(Kicker::Recipes::Rails) + 1]
+  end
+  
   it "should prepare the test database if db/schema.rb is modified" do
     Kicker::Utils.expects(:execute).with('rake db:test:prepare')
-    RAILS_SCHEMA.call(%w{ db/schema.rb })
+    @handler.call(%w{ db/schema.rb })
   end
   
   it "should not prepare the test database if another file than db/schema.rb is modified" do
     Kicker::Utils.expects(:execute).never
-    RAILS_SCHEMA.call(%w{ Rakefile })
+    @handler.call(%w{ Rakefile })
   end
 end
 
 module SharedRailsHandlerHelper
-  def should_match(files, tests)
+  def should_match(files, tests, existing_files=nil)
+    File.use_original_exist = false
+    File.existing_files = existing_files || tests
     @files += files
-    
-    tests.each do |test|
-      File.stubs(:exist?).with(test).returns(true)
-    end
-    
-    Rails.expects(:run_tests).with(tests)
-    RAILS_FILES.call(@files)
+    Kicker::Recipes::Rails.call(@files)
     @files.should == %w{ Rakefile }
   end
 end
@@ -54,11 +68,14 @@ describe "An instance of the Rails handler, with test type `test'" do
   include SharedRailsHandlerHelper
   
   before do
-    Ruby.test_type = 'test'
-    File.stubs(:exist?).with('spec').returns(false)
+    Kicker::Recipes::Ruby.reset!
     @files = %w{ Rakefile }
   end
   
+  after do
+    File.use_original_exist = true
+  end
+  
   it "should map model files to test/unit" do
     should_match %w{ app/models/member.rb     app/models/article.rb },
                  %w{ test/unit/member_test.rb test/unit/article_test.rb }
@@ -86,7 +103,7 @@ describe "An instance of the Rails handler, with test type `test'" do
   
   it "should run all functional tests when config/routes.rb is saved" do
     tests = %w{ test/functional/members_controller_test.rb test/functional/admin/articles_controller_test.rb }
-    Rails.expects(:all_controller_tests).returns(tests)
+    Kicker::Recipes::Rails.expects(:all_controller_tests).returns(tests)
     should_match %w{ config/routes.rb }, tests
   end
   
@@ -97,14 +114,14 @@ describe "An instance of the Rails handler, with test type `test'" do
   
   it "should map fixtures to their unit, helper and functional tests if they exist" do
     tests = %w{ test/unit/member_test.rb test/unit/helpers/members_helper_test.rb test/functional/members_controller_test.rb }
-    File.stubs(:exist?).returns(false)
-    
-    expected_tests = []
-    tests.each do |test|
-      expected_tests << test
-      File.stubs(:exist?).with(test).returns(true)
-      should_match %w{ test/fixtures/members.yml }, expected_tests
-    end
+    should_match %w{ test/fixtures/members.yml }, tests, []
+    Kicker::Recipes::Rails.tests_ran.last.should == []
+  end
+  
+  it "should map fixtures to their unit, helper and functional tests if they exist" do
+    tests = %w{ test/unit/member_test.rb test/unit/helpers/members_helper_test.rb test/functional/members_controller_test.rb }
+    should_match %w{ test/fixtures/members.yml }, tests
+    Kicker::Recipes::Rails.tests_ran.last.should == tests
   end
 end
 
@@ -112,11 +129,15 @@ describe "An instance of the Rails handler, with test type `spec'" do
   include SharedRailsHandlerHelper
   
   before do
-    Ruby.test_type = Ruby.runner_bin = Ruby.test_cases_root = nil
-    File.stubs(:exist?).with('spec').returns(true)
+    Kicker::Recipes::Ruby.reset!
+    Kicker::Recipes::Ruby.test_type = 'spec'
     @files = %w{ Rakefile }
   end
   
+  after do
+    File.use_original_exist = true
+  end
+  
   it "should map model files to spec/models" do
     should_match %w{ app/models/member.rb       app/models/article.rb },
                  %w{ spec/models/member_spec.rb spec/models/article_spec.rb }
@@ -144,7 +165,7 @@ describe "An instance of the Rails handler, with test type `spec'" do
   
   it "should run all controller tests when config/routes.rb is saved" do
     specs = %w{ spec/controllers/members_controller_test.rb spec/controllers/admin/articles_controller_test.rb }
-    Rails.expects(:all_controller_tests).returns(specs)
+    Kicker::Recipes::Rails.expects(:all_controller_tests).returns(specs)
     should_match %w{ config/routes.rb }, specs
   end
   
@@ -159,15 +180,7 @@ describe "An instance of the Rails handler, with test type `spec'" do
   end
   
   it "should map fixtures to their model, helper and controller specs if they exist" do
-    Ruby.test_type = 'spec'
     specs = %w{ spec/models/member_spec.rb spec/helpers/members_helper_spec.rb spec/controllers/members_controller_spec.rb }
-    File.stubs(:exist?).returns(false)
-    
-    expected_specs = []
-    specs.each do |spec|
-      expected_specs << spec
-      File.stubs(:exist?).with(spec).returns(true)
-      should_match %w{ spec/fixtures/members.yml }, expected_specs
-    end
+    should_match %w{ spec/fixtures/members.yml }, specs
   end
 end

data/test/recipes/ruby_test.rb

@@ -1,102 +1,105 @@
 require File.expand_path('../../test_helper', __FILE__)
-
-before = Kicker.process_chain.dup
 recipe :ruby
-RUBY_FILES = (Kicker.process_chain - before).first
 
-class Ruby
-  def self.execute(command, &block)
-    @block = block
-  end
-  
-  def self.execute_block
-    @block
+class Kicker::Recipes::Ruby
+  class << self
+    attr_accessor :executed
+    attr_accessor :blocks
+    def execute(command, &block)
+      self.executed ||= []
+      self.blocks ||= []
+      
+      self.executed << command
+      self.blocks << block
+    end
   end
 end
 
 describe "The Ruby handler" do
   before do
-    Ruby.test_type = nil
-    Ruby.runner_bin = nil
-    Ruby.test_options = []
+    @handler = Kicker::Recipes::Ruby
+    @handler.reset!
   end
   
   after do
-    Ruby.test_type = 'test'
-    Ruby.runner_bin = nil
-    Ruby.test_options = []
+    File.use_original_exist = true
   end
   
-  it "should instantiate a Ruby instance" do
-    handler = mock('Ruby', :handle! => nil, :tests => %w{ test/1_test.rb test/namespace/2_test.rb })
-    Ruby.expects(:new).with(%w{ test/1_test.rb Rakefile test/namespace/2_test.rb }).returns(handler)
-    Ruby.expects(:run_tests).with(%w{ test/1_test.rb test/namespace/2_test.rb })
-    RUBY_FILES.call(%w{ test/1_test.rb Rakefile test/namespace/2_test.rb })
+  it "should instantiate a handler instance when called" do
+    tests = %w{ test/1_test.rb Rakefile test/namespace/2_test.rb }
+    instance = @handler.new(tests)
+    @handler.expects(:new).with(tests).returns(instance)
+    @handler.call(tests)
   end
   
   it "should discover whether to use `ruby' or `spec' as the test_type" do
-    File.expects(:exist?).with('spec').returns(false)
-    Ruby.test_type.should == 'test'
+    File.use_original_exist = false
+    
+    File.existing_files = []
+    @handler.test_type.should == 'test'
     
-    Ruby.test_type = nil
-    File.expects(:exist?).with('spec').returns(true)
-    Ruby.test_type.should == 'spec'
+    @handler.reset!
+    
+    File.existing_files = ['spec']
+    @handler.test_type.should == 'spec'
   end
   
   it "should run the given tests with a test-unit runner" do
-    Ruby.expects(:execute).with("ruby  -r test/1_test.rb -r test/namespace/2_test.rb -e ''")
-    Ruby.run_tests(%w{ test/1_test.rb test/namespace/2_test.rb })
+    @handler.run_tests(%w{ test/1_test.rb test/namespace/2_test.rb })
+    @handler.executed.last.should == "ruby -r test/1_test.rb -r test/namespace/2_test.rb -e ''"
   end
   
   it "should run the given tests with a spec runner" do
-    Ruby.stubs(:test_type).returns('spec')
-    Ruby.expects(:execute).with("spec  spec/1_spec.rb spec/namespace/2_spec.rb")
-    Ruby.run_tests(%w{ spec/1_spec.rb spec/namespace/2_spec.rb })
+    @handler.test_type = 'spec'
+    @handler.run_tests(%w{ test/1_test.rb test/namespace/2_test.rb })
+    @handler.executed.last.should == "spec test/1_test.rb test/namespace/2_test.rb"
   end
   
   it "should not try to run the tests if none were given" do
-    Ruby.expects(:execute).never
-    Ruby.run_tests([])
+    @handler.executed = []
+    @handler.run_tests([])
+    @handler.executed.should.be.empty
   end
   
   it "should be possible to override the bin path" do
-    Ruby.runner_bin = '/some/other/runner'
-    Ruby.expects(:execute).with("/some/other/runner  -r test/1_test.rb -r test/namespace/2_test.rb -e ''")
-    Ruby.run_tests(%w{ test/1_test.rb test/namespace/2_test.rb })
+    @handler.runner_bin = '/some/other/runner'
+    @handler.run_tests(%w{ test/1_test.rb test/namespace/2_test.rb })
+    @handler.executed.last.should == "/some/other/runner -r test/1_test.rb -r test/namespace/2_test.rb -e ''"
   end
   
   it "should set the alternative ruby bin path" do
     Kicker::Options.parse(%w{ -b /opt/ruby-1.9.2/bin/ruby })
-    Ruby.runner_bin.should == '/opt/ruby-1.9.2/bin/ruby'
+    @handler.runner_bin.should == '/opt/ruby-1.9.2/bin/ruby'
+    
+    @handler.reset!
     
-    Ruby.runner_bin = nil
     Kicker::Options.parse(%w{ --ruby /opt/ruby-1.9.2/bin/ruby })
-    Ruby.runner_bin.should == '/opt/ruby-1.9.2/bin/ruby'
+    @handler.runner_bin.should == '/opt/ruby-1.9.2/bin/ruby'
   end
   
   it "should be possible to add runner options when test_type is `test'" do
-    Ruby.test_type = 'test'
-    Ruby.test_options << '-I ./other'
-    Ruby.expects(:execute).with("ruby -I ./other -r test/1_test.rb -e ''")
-    Ruby.run_tests(%w{ test/1_test.rb })
+    @handler.test_type = 'test'
+    @handler.test_options << '-I ./other'
+    @handler.run_tests(%w{ test/1_test.rb })
+    @handler.executed.last.should == "ruby -I ./other -r test/1_test.rb -e ''"
   end
   
   it "should be possible to add runner options when test_type is `spec'" do
-    Ruby.test_type = 'spec'
-    Ruby.test_options << '-I ./other'
-    Ruby.expects(:execute).with("spec -I ./other spec/1_spec.rb")
-    Ruby.run_tests(%w{ spec/1_spec.rb })
+    @handler.test_type = 'spec'
+    @handler.test_options << '-I ./other'
+    @handler.run_tests(%w{ spec/1_spec.rb })
+    @handler.executed.last.should == "spec -I ./other spec/1_spec.rb"
   end
   
   it "should only show the last line of the output when growling when running test_type is `test'" do
-    Ruby.run_with_test_runner(%w{ test/1_test.rb test/namespace/2_test.rb })
-    result = Ruby.execute_block.call(mock('status', :output => "foo\nall pass", :after? => true, :growl? => true))
+    @handler.run_with_test_runner(%w{ test/1_test.rb test/namespace/2_test.rb })
+    result = @handler.blocks.last.call(mock('status', :output => "foo\nall pass", :after? => true, :growl? => true))
     result.should == 'all pass'
   end
   
   it "should only show the last line of the output when growling when running test_type is `spec'" do
-    Ruby.run_with_spec_runner(%w{ spec/1_spec.rb spec/namespace/2_spec.rb })
-    result = Ruby.execute_block.call(mock('status', :output => "foo\nall pass", :after? => true, :growl? => true))
+    @handler.run_with_spec_runner(%w{ spec/1_spec.rb spec/namespace/2_spec.rb })
+    result = @handler.blocks.last.call(mock('status', :output => "foo\nall pass", :after? => true, :growl? => true))
     result.should == 'all pass'
   end
 end
@@ -104,36 +107,41 @@ end
 %w{ test spec }.each do |type|
   describe "An instance of the Ruby handler, with test type `#{type}'" do
     before do
-      Ruby.stubs(:test_type).returns(type)
-      Ruby.stubs(:test_cases_root).returns(type)
-      File.stubs(:exist?).with("#{type}/1_#{type}.rb").returns(true)
-      File.stubs(:exist?).with("#{type}/namespace/2_#{type}.rb").returns(true)
+      @handler = Kicker::Recipes::Ruby
+      @handler.test_type = type
+      @handler.test_cases_root = type
+      
+      File.use_original_exist = false
+      File.existing_files = %W(#{type}/1_#{type}.rb #{type}/namespace/2_#{type}.rb)
+    end
+    
+    after do
+      File.use_original_exist = true
     end
     
     it "should match any test case files" do
-      files = %W{ Rakefile #{type}/1_#{type}.rb #{type}/namespace/2_#{type}.rb }
-      handler = Ruby.new(files)
+      files = %w(Rakefile) + File.existing_files
+      handler = @handler.new(files)
       handler.handle!
       
-      handler.tests.should == %W{ #{type}/1_#{type}.rb #{type}/namespace/2_#{type}.rb }
+      handler.tests.should == File.existing_files
       files.should == %W{ Rakefile }
     end
     
     it "should match files in ./lib" do
-      files = %W{ Rakefile lib/1.rb lib/namespace/2.rb }
-      handler = Ruby.new(files)
+      files = %w(Rakefile) + File.existing_files
+      handler = @handler.new(files)
       handler.handle!
       
-      handler.tests.should == %W{ #{type}/1_#{type}.rb #{type}/namespace/2_#{type}.rb }
+      handler.tests.should == File.existing_files
       files.should == %w{ Rakefile }
     end
     
     it "should match lib tests in the test root as well" do
-      File.stubs(:exist?).with("#{type}/namespace/2_#{type}.rb").returns(false)
-      File.stubs(:exist?).with("#{type}/2_#{type}.rb").returns(true)
+      File.existing_files = %W(#{type}/1_#{type}.rb #{type}/2_#{type}.rb)
       
       files = %W{ Rakefile lib/1.rb lib/namespace/2.rb }
-      handler = Ruby.new(files)
+      handler = @handler.new(files)
       handler.handle!
       
       handler.tests.should == %W{ #{type}/1_#{type}.rb #{type}/2_#{type}.rb }
@@ -141,10 +149,10 @@ end
     end
     
     it "should check if a different test case root" do
-      Ruby.stubs(:test_cases_root).returns('test/cases')
+      @handler.test_cases_root = 'test/cases'
       
       files = %W{ Rakefile test/cases/1_#{type}.rb test/cases/namespace/2_#{type}.rb }
-      handler = Ruby.new(files)
+      handler = @handler.new(files)
       handler.handle!
       
       handler.tests.should == %W{ test/cases/1_#{type}.rb test/cases/namespace/2_#{type}.rb }

data/test/recipes_test.rb

@@ -4,7 +4,30 @@ module ReloadDotKick; end
 
 describe "Kicker::Recipes" do
   before do
-    @recipes = Kicker::Recipes
+    Kicker::Recipes.reset!
+  end
+  
+  it "returns a list of recipes" do
+    recipe_files = Kicker::Recipes.recipe_files
+    if File.exist?(File.expand_path('~/.kick'))
+      Set.new(recipe_files).should == Set.new(Dir.glob('../../lib/kicker/recipes/**/*.rb'))
+    else
+      Dir.glob('../../lib/kicker/recipes/**/*.rb').each do |filename|
+        recipe_files.should.include?(filename)
+      end
+    end
+  end
+  
+  it "returns a list of recipe names" do
+    expected = Set.new(%w(could_not_handle_file dot_kick execute_cli_command ignore jstest rails ruby).map { |n| n.to_sym })
+    actual = Kicker::Recipes.recipe_names
+    if File.exist?(File.expand_path('~/.kick'))
+      actual.should == expected
+    else
+      expected.each do |name|
+        actual.should.include?(name)
+      end
+    end
   end
   
   if File.exist?(File.expand_path('~/.kick'))
@@ -12,13 +35,18 @@ describe "Kicker::Recipes" do
       $:.should.include File.expand_path('~/.kick')
     end
   else
-    puts "[!] ~/.kick does not exist, skipping an example."
+    puts "[!] ~/.kick does not exist, not testing the Kicker directory support."
   end
   
   it "should load a recipe" do
-    expected_recipe = @recipes.recipes.first
-    expected_recipe.last.expects(:call)
-    recipe expected_recipe.first
+    name = Kicker::Recipes.recipe_names.last
+    recipe name
+  end
+  
+  it "does not break when a recipe is loaded twice" do
+    name = Kicker::Recipes.recipe_names.last
+    recipe name
+    recipe name
   end
   
   it "should define a recipe load callback" do
@@ -33,7 +61,7 @@ describe "Kicker::Recipes" do
     begin
       recipe :foobar
     rescue LoadError => e
-      e.message.should == "Recipe `foobar' does not exist."
+      e.message.should.start_with "Can't load recipe `foobar', it doesn't exist on disk."
     end
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,29 @@
 require 'rubygems'
 require 'test/spec'
 require 'mocha'
+require 'set'
 
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'kicker'
+
+class File
+  class << self
+    attr_accessor :existing_files
+    attr_accessor :use_original_exist
+    
+    alias exist_without_stubbing? exist?
+    def exist?(file)
+      if use_original_exist
+        exist_without_stubbing?(file)
+      else
+        if existing_files
+          existing_files.include?(file)
+        else
+          raise "Please stub the files you want to exist by setting File.existing_files"
+        end
+      end
+    end
+  end
+end
+
+File.use_original_exist = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kicker
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 2
-  - 3
-  - 1
-  version: 2.3.1
+  - 4
+  - 0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -15,13 +15,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 +02:00
+date: 2012-02-03 00:00:00 +01:00
 default_executable: kicker
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: mocha
+  version_requirements: *id002
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: test-spec
+  version_requirements: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: activesupport
+  version_requirements: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: rb-fsevent
+  version_requirements: *id005
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,8 +99,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: jeweler
+  version_requirements: *id006
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: *id001
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rb-fsevent
+  version_requirements: *id007
+  prerelease: false
 description: 
 email: eloy.de.enige@gmail.com
 executables: 
@@ -42,8 +126,10 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - .kick
+- .travis.yml
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -94,8 +180,8 @@ homepage: http://github.com/alloy/kicker
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 - vendor
@@ -120,27 +206,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A lean, agnostic, flexible file-change watcher, using OS X FSEvents.
-test_files: 
-- test/callback_chain_test.rb
-- test/core_ext_test.rb
-- test/filesystem_change_test.rb
-- test/fixtures/a_file_thats_reloaded.rb
-- test/fsevents_test.rb
-- test/growl_test.rb
-- test/initialization_test.rb
-- test/log_status_helper_test.rb
-- test/options_test.rb
-- test/recipes/could_not_handle_file_test.rb
-- test/recipes/dot_kick_test.rb
-- test/recipes/execute_cli_command_test.rb
-- test/recipes/ignore_test.rb
-- test/recipes/jstest_test.rb
-- test/recipes/rails_test.rb
-- test/recipes/ruby_test.rb
-- test/recipes_test.rb
-- test/test_helper.rb
-- test/utils_test.rb
+test_files: []
+

data/.gitignore

@@ -1,10 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-html/*.html
-html/*.rid
-html/*.css
-html/classes
-html/files