kicker 2.4.0 → 2.5.0

data/README.rdoc

@@ -1,5 +1,7 @@
 = Kicker
 
+{<img src="https://secure.travis-ci.org/alloy/kicker.png" />}[http://travis-ci.org/alloy/kicker]
+
 A lean, agnostic, flexible file-change watcher, using OS X FSEvents.
 
 https://github.com/alloy/kicker/raw/master/html/images/kikker.jpg
@@ -141,4 +143,4 @@ be important in your decision on where to specify handlers.
 * Manfred Stienstra (@manfred)
 * Cristi Balan (@evilchelu)
 * Damir Zekic (@sidonath)
-* Adam Keys (@therealadam)
+* Adam Keys (@therealadam)

data/lib/kicker.rb

@@ -1,5 +1,6 @@
 $:.unshift File.expand_path('../../vendor', __FILE__)
 
+require 'kicker/version'
 require 'kicker/fsevents'
 require 'kicker/callback_chain'
 require 'kicker/core_ext'
@@ -31,7 +32,7 @@ class Kicker #:nodoc:
     log "Watching for changes on: #{paths.join(', ')}"
     log ''
     
-    Kicker::Growl.start! if Kicker::Growl.use?
+    Kicker::Growl.start! if Kicker::Growl.usable? && Kicker::Growl.use?
     run_startup_chain
     run_watch_dog!
   end
@@ -116,4 +117,4 @@ class Kicker #:nodoc:
       end
     end
   end
-end
+end

data/lib/kicker/options.rb

@@ -41,6 +41,11 @@ class Kicker
         opt.separator "  Available recipes: #{recipes_for_display.join(", ")}."
         opt.separator " "
         
+        opt.on('-v', 'Print the Kicker version') do
+          puts VERSION
+          exit
+        end
+
         opt.on('-s', '--silent', 'Keep output to a minimum.') do |silent|
           Kicker.silent = true
         end

data/lib/kicker/recipes.rb

@@ -28,6 +28,10 @@ class Kicker
     class << self
       def reset!
         @recipes = nil
+        # Always load all the base recipes
+        load_recipe :execute_cli_command
+        load_recipe :could_not_handle_file
+        load_recipe :dot_kick
       end
       
       def recipes
@@ -86,9 +90,6 @@ class Kicker
       end
     end
     
-    # Always load all the base recipes
-    load_recipe :execute_cli_command
-    load_recipe :could_not_handle_file
-    load_recipe :dot_kick
+    reset!
   end
-end
+end

data/lib/kicker/recipes/ruby.rb

@@ -20,7 +20,7 @@ class Kicker::Recipes::Ruby
     # Defaults to `ruby' if test_type is `test' and `spec' if test_type is
     # `spec'.
     def runner_bin
-      @runner_bin ||= test_type == 'test' ? 'ruby' : 'spec'
+      @runner_bin ||= test_type == 'test' ? 'ruby' : 'rspec'
     end
     
     # Assigns the root directory of where test cases will be looked up.
@@ -68,7 +68,8 @@ class Kicker::Recipes::Ruby
     end
     
     def test_runner_command(tests)
-      runner_command(runner_bin, test_options, '-r', tests.join(' -r '), "-e ''")
+      tests_without_ext = tests.map { |f| f[0,f.size-3] }
+      runner_command(runner_bin, %w{ -I. } + test_options, '-r', tests_without_ext.join(' -r '), "-e ''")
     end
     
     # Runs the given tests with `ruby' as unit-test tests.
@@ -170,4 +171,4 @@ end
 
 recipe :ruby do
   process Kicker::Recipes::Ruby
-end
+end

data/lib/kicker/utils.rb

@@ -1,3 +1,5 @@
+require 'shellwords' if RUBY_VERSION >= "1.9"
+
 class Kicker
   module Utils #:nodoc:
     extend self
@@ -5,9 +7,9 @@ class Kicker
     def execute(command, &block)
       @last_command = command
       status = LogStatusHelper.new(block, command)
-      
       will_execute_command(status)
-      status.result(`#{command}`, last_command_succeeded?, last_command_status)
+      output = _execute(command)
+      status.result(output, last_command_succeeded?, last_command_status)
       did_execute_command(status)
     end
     
@@ -35,6 +37,37 @@ class Kicker
     private
     
     CLEAR = "\e[H\e[2J"
+
+    def _execute(command)
+      silent = Kicker.silent?
+      unless silent
+        puts
+        sync_before, $stdout.sync = $stdout.sync, true
+      end
+      output = ""
+      popen(command) do |io|
+        while str = io.read(1)
+          output << str
+          $stdout.print str unless silent
+        end
+      end
+      output
+    ensure
+      unless silent
+        $stdout.sync = sync_before
+        puts("\n\n")
+      end
+    end
+
+    def popen(command, &block)
+      if RUBY_VERSION >= "1.9"
+        args = Shellwords.shellsplit(command)
+        args << { :err => [:child, :out] }
+        IO.popen(args, &block)
+      else
+        IO.popen("#{command} 2>&1", &block)
+      end
+    end
     
     def will_execute_command(status)
       puts(CLEAR) if Kicker.clear_console?
@@ -47,12 +80,8 @@ class Kicker
       if message = status.call(:stdout)
         log(message) unless message.empty?
       else
-        if status.success? && Kicker.silent?
-          log 'Success'
-        else
-          puts("\n#{status.output.strip}\n\n")
-          log(status.success? ? "Success" : "Failed (#{status.exit_code})")
-        end
+        puts("\n#{status.output.strip}\n\n") if Kicker.silent? && !status.success?
+        log(status.success? ? "Success" : "Failed (#{status.exit_code})")
       end
       
       Kicker::Growl.result(status) if Kicker::Growl.use?

data/lib/kicker/version.rb

@@ -0,0 +1,3 @@
+class Kicker
+  VERSION = "2.5.0"
+end

metadata

@@ -1,151 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kicker
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 2.5.0
   prerelease: 
-  segments: 
-  - 2
-  - 4
-  - 0
-  version: 2.4.0
 platform: ruby
-authors: 
+authors:
 - Eloy Duran
+- Manfred Stienstra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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 
+date: 2012-02-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70258430386300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
-  version_requirements: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70258430386300
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70258430385620 !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 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   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 
+  version_requirements: *70258430385620
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70258430385060 !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 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70258430385060
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70258430384360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rb-fsevent
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70258430384360
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70258430411940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70258430411940
+- !ruby/object:Gem::Dependency
+  name: test-spec
+  requirement: &70258430407460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  version_requirements: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70258430407460
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70258430406080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rb-fsevent
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70258430406080
 description: 
-email: eloy.de.enige@gmail.com
-executables: 
+email:
+- eloy.de.enige@gmail.com
+- manfred@fngtps.com
+executables:
 - kicker
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .kick
-- .travis.yml
-- Gemfile
-- Gemfile.lock
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-- Rakefile
-- TODO.rdoc
-- VERSION
+files:
 - 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
@@ -153,62 +114,44 @@ files:
 - lib/kicker/recipes/jstest.rb
 - lib/kicker/recipes/rails.rb
 - lib/kicker/recipes/ruby.rb
+- lib/kicker/recipes.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
+- lib/kicker/version.rb
+- lib/kicker.rb
 - vendor/growlnotifier/growl.rb
 - vendor/growlnotifier/growl_helpers.rb
-has_rdoc: true
+- README.rdoc
+- LICENSE
+- html/images/kikker.jpg
 homepage: http://github.com/alloy/kicker
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - vendor
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1334081187386863213
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1334081187386863213
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A lean, agnostic, flexible file-change watcher, using OS X FSEvents.
 test_files: []
-