kicker 2.1.0 → 2.2.0

data/test/recipes_test.rb

@@ -0,0 +1,39 @@
+require File.expand_path('../test_helper', __FILE__)
+
+module ReloadDotKick; end
+
+describe "Kicker::Recipes" do
+  before do
+    @recipes = Kicker::Recipes
+  end
+  
+  if File.exist?(File.expand_path('~/.kick'))
+    it "should add ~/.kick to the load path" do
+      $:.should.include File.expand_path('~/.kick')
+    end
+  else
+    puts "[!] ~/.kick does not exist, skipping an example."
+  end
+  
+  it "should load a recipe" do
+    expected_recipe = @recipes.recipes.first
+    expected_recipe.last.expects(:call)
+    recipe expected_recipe.first
+  end
+  
+  it "should define a recipe load callback" do
+    called = false
+    recipe('new_recipe') { called = true }
+    assert !called
+    recipe(:new_recipe)
+    assert called
+  end
+  
+  it "should raise if a recipe does not exist" do
+    begin
+      recipe :foobar
+    rescue LoadError => e
+      e.message.should == "Recipe `foobar' does not exist."
+    end
+  end
+end

data/test/test_helper.rb

@@ -3,4 +3,4 @@ require 'test/spec'
 require 'mocha'
 
 $:.unshift File.expand_path('../../lib', __FILE__)
-require 'kicker'
+require 'kicker'

data/test/utils_test.rb

@@ -1,83 +1,148 @@
 require File.expand_path('../test_helper', __FILE__)
 
+Kicker::Utils.send(:public, :did_execute_command)
+
 describe "A Kicker instance, concerning its utility methods" do
   before do
-    Kicker.stubs(:growl)
-    utils.stubs(:last_command_succeeded?).returns(true)
+    utils.stubs(:puts)
+  end
+  
+  after do
+    Kicker.silent = false
+    Kicker::Growl.use = true
   end
   
   it "should print a log entry with timestamp" do
     now = Time.now
     Time.stubs(:now).returns(now)
     
-    utils.expects(:puts).with("[#{now}] the message")
+    utils.expects(:puts).with("#{now.strftime('%H:%M:%S')}.#{now.usec.to_s[0,2]} | the message")
+    utils.send(:log, 'the message')
+  end
+  
+  it 'should print a log entry with no timestamp in quiet mode' do
+    before = Kicker.quiet
+    
+    utils.expects(:puts).with('the message')
+    
+    Kicker.quiet = true
     utils.send(:log, 'the message')
+    
+    Kicker.quiet = before
   end
   
   it "should log the output of the command indented by 2 spaces and whether or not the command succeeded" do
+    Kicker::Growl.use = false
+    
     utils.stubs(:`).returns("line 1\nline 2")
     
-    utils.expects(:log).with('Change occured, executing command: ls')
-    utils.expects(:log).with('  line 1')
-    utils.expects(:log).with('  line 2')
-    utils.expects(:log).with('Command succeeded')
+    utils.stubs(:last_command_succeeded?).returns(true)
+    utils.expects(:log).with('Executing: ls')
+    utils.expects(:puts).with("\nline 1\nline 2\n\n")
+    utils.expects(:log).with('Success')
     utils.execute('ls')
     
     utils.stubs(:last_command_succeeded?).returns(false)
     utils.stubs(:last_command_status).returns(123)
-    utils.expects(:log).with('Change occured, executing command: ls')
-    utils.expects(:log).with('  line 1')
-    utils.expects(:log).with('  line 2')
-    utils.expects(:log).with('Command failed (123)')
+    utils.expects(:log).with('Executing: ls')
+    utils.expects(:puts).with("\nline 1\nline 2\n\n")
+    utils.expects(:log).with('Failed (123)')
     utils.execute('ls')
   end
   
-  it "should send the Growl messages with the default click callback" do
-    utils.stubs(:log)
-    
+  it "should growl a change occurred and the output" do
     utils.stubs(:`).returns("line 1\nline 2")
-    Kicker.use_growl = true
-    
-    OSX::NSWorkspace.sharedWorkspace.expects(:launchApplication).with('Terminal').times(2)
+    utils.stubs(:last_command_succeeded?).returns(true)
+    utils.stubs(:log)
     
-    Kicker.expects(:growl).with(Kicker::GROWL_NOTIFICATIONS[:change], 'Kicker: Change occured, executing command:', 'ls')
-    Kicker.expects(:growl).with(Kicker::GROWL_NOTIFICATIONS[:succeeded], 'Kicker: Command succeeded', "line 1\nline 2").yields
+    Kicker::Growl.expects(:change_occured).with { |status| status.command == 'ls' }
+    Kicker::Growl.expects(:result).with { |status| status.output == "line 1\nline 2" }
     utils.execute('ls')
+  end
+  
+  it "should not growl that a change occured in silent mode" do
+    Kicker.silent = true
+    utils.stubs(:did_execute_command)
     
-    utils.stubs(:last_command_succeeded?).returns(false)
-    utils.stubs(:last_command_status).returns(123)
-    Kicker.expects(:growl).with(Kicker::GROWL_NOTIFICATIONS[:change], 'Kicker: Change occured, executing command:', 'ls')
-    Kicker.expects(:growl).with(Kicker::GROWL_NOTIFICATIONS[:failed], 'Kicker: Command failed (123)', "line 1\nline 2").yields
+    utils.expects(:log)
+    Kicker::Growl.expects(:change_occured).never
     utils.execute('ls')
   end
   
-  it "should send the Growl messages with a click callback which executes the specified growl command when succeeded" do
-    utils.stubs(:log)
+  it "should only log that is has succeeded in silent mode" do
+    Kicker.silent = true
+    Kicker::Growl.expects(:result).with { |status| status.output == "line 1\nline 2" }
     
-    utils.stubs(:`).returns("line 1\nline 2")
-    Kicker.use_growl = true
-    Kicker.growl_command = 'ls -l'
+    status = Kicker::LogStatusHelper.new(nil, 'ls -l')
+    status.result("line 1\nline 2", true, 0)
     
-    utils.expects(:system).with('ls -l').times(1)
-    OSX::NSWorkspace.sharedWorkspace.expects(:launchApplication).with('Terminal').times(1)
+    utils.expects(:log).with("Success")
+    utils.did_execute_command(status)
+  end
+  
+  it "should fully log that it has failed in silent mode" do
+    Kicker.silent = true
+    Kicker::Growl.expects(:result).with { |status| status.output == "line 1\nline 2" }
     
-    Kicker.expects(:growl).with(Kicker::GROWL_NOTIFICATIONS[:change], 'Kicker: Change occured, executing command:', 'ls')
-    Kicker.expects(:growl).with(Kicker::GROWL_NOTIFICATIONS[:succeeded], 'Kicker: Command succeeded', "line 1\nline 2").yields
-    utils.execute('ls')
+    utils.expects(:puts).with("\nline 1\nline 2\n\n")
+    utils.expects(:log).with('Failed (123)')
     
-    utils.stubs(:last_command_succeeded?).returns(false)
-    utils.stubs(:last_command_status).returns(123)
-    Kicker.expects(:growl).with(Kicker::GROWL_NOTIFICATIONS[:change], 'Kicker: Change occured, executing command:', 'ls')
-    Kicker.expects(:growl).with(Kicker::GROWL_NOTIFICATIONS[:failed], 'Kicker: Command failed (123)', "line 1\nline 2").yields
-    utils.execute('ls')
+    status = Kicker::LogStatusHelper.new(nil, 'ls -l')
+    status.result("line 1\nline 2", false, 123)
+    
+    utils.did_execute_command(status)
   end
   
   it "should store the last executed command" do
+    Kicker::Growl.use = false
     utils.stubs(:log)
+    
     utils.execute('date')
     utils.last_command.should == 'date'
   end
   
+  it "should call the block given to execute when and yield the log status helper with status success" do
+    Kicker.silent = true
+    Kicker::Growl.use = false
+    utils.stubs(:last_command_succeeded?).returns(true)
+    
+    utils.expects(:log).with('Start!')
+    utils.expects(:log).with('Done!')
+    
+    utils.execute('ls -l') do |status|
+      if status.after?
+        if status.success?
+          'Done!'
+        else
+          'Ohnoes!'
+        end
+      elsif status.before?
+        'Start!'
+      end
+    end
+  end
+  
+  it "should call the block given to execute when and yield the log status helper with status failed" do
+    Kicker.silent = true
+    Kicker::Growl.use = false
+    utils.stubs(:last_command_succeeded?).returns(false)
+    
+    utils.expects(:log).with('Start!')
+    utils.expects(:log).with('Ohnoes!')
+    
+    utils.execute('ls -l') do |status|
+      if status.after?
+        if status.success?
+          'Done!'
+        else
+          'Ohnoes!'
+        end
+      elsif status.before?
+        'Start!'
+      end
+    end
+  end
+  
   private
   
   def utils
@@ -105,16 +170,6 @@ describe "Kernel utility methods" do
     last_command.should == 'abcde'
   end
   
-  it "should call execute with the appropriate command to execute Ruby tests" do
-    utils.expects(:execute).with("ruby -r test/1.rb -r test/2.rb -e ''")
-    run_ruby_tests %w{ test/1.rb test/2.rb }
-  end
-  
-  it "should not execute anything if an empty array is given to run_ruby_tests" do
-    utils.expects(:execute).never
-    run_ruby_tests []
-  end
-  
   private
   
   def utils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kicker
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -9,45 +9,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 +02:00
-default_executable: 
+date: 2009-11-29 00:00:00 +01:00
+default_executable: kicker
 dependencies: []
 
 description: 
 email: eloy.de.enige@gmail.com
 executables: 
 - kicker
-- kicker
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
+- .kick
 - LICENSE
 - README.rdoc
 - Rakefile
 - TODO.rdoc
-- VERSION.yml
+- VERSION
 - bin/kicker
+- html/images/kikker.jpg
+- kicker.gemspec
 - lib/kicker.rb
 - lib/kicker/callback_chain.rb
 - lib/kicker/core_ext.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
-- lib/kicker/validate.rb
 - test/callback_chain_test.rb
 - test/core_ext_test.rb
 - test/filesystem_change_test.rb
 - test/fixtures/a_file_thats_reloaded.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
@@ -55,6 +62,8 @@ files:
 - 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
@@ -94,7 +103,9 @@ test_files:
 - test/core_ext_test.rb
 - test/filesystem_change_test.rb
 - test/fixtures/a_file_thats_reloaded.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
@@ -102,5 +113,7 @@ test_files:
 - 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

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:patch: 0
-:major: 2
-:minor: 1

data/lib/kicker/validate.rb

@@ -1,24 +0,0 @@
-class Kicker
-  private
-  
-  def validate_options!
-    validate_paths_and_command!
-    validate_paths_exist!
-  end
-  
-  def validate_paths_and_command!
-    if process_chain.empty? && pre_process_chain.empty?
-      puts OPTION_PARSER_CALLBACK.call(nil).help
-      exit
-    end
-  end
-  
-  def validate_paths_exist!
-    @paths.each do |path|
-      unless File.exist?(path)
-        puts "The given path `#{path}' does not exist"
-        exit 1
-      end
-    end
-  end
-end