kicker 2.6.0 → 2.6.1

data/lib/kicker.rb

@@ -5,7 +5,6 @@ require 'kicker/fsevents'
 require 'kicker/callback_chain'
 require 'kicker/core_ext'
 require 'kicker/growl'
-require 'kicker/log_status_helper'
 require 'kicker/options'
 require 'kicker/utils'
 require 'kicker/recipes'
@@ -83,6 +82,7 @@ class Kicker #:nodoc:
   
   def process(events)
     unless (files = changed_files(events)).empty?
+      Utils.should_clear_screen = true
       full_chain.call(files)
       finished_processing!
     end

data/lib/kicker/growl.rb

@@ -49,11 +49,7 @@ begin
         end
         
         def change_occured(status)
-          growl(notifications[:change], 'Kicker: Executing', status.call(:growl) || status.command)
-        end
-        
-        def command_callback
-          lambda { system(command) } if command
+          growl(notifications[:change], 'Kicker: Executing', status.command)
         end
         
         def result(status)
@@ -61,14 +57,13 @@ begin
         end
         
         def succeeded(status)
-          callback = command_callback || DEFAULT_CALLBACK
-          body = status.call(:growl) || (Kicker.silent? ? '' : status.output)
-          growl(notifications[:succeeded], "Kicker: Success", body, &callback)
+          body = Kicker.silent? ? '' : status.output
+          growl(notifications[:succeeded], "Kicker: Success", body, &DEFAULT_CALLBACK)
         end
         
         def failed(status)
           message = "Kicker: Failed (#{status.exit_code})"
-          body = status.call(:growl) || (Kicker.silent? ? '' : status.output)
+          body = Kicker.silent? ? '' : status.output
           growl(notifications[:failed], message, body, &DEFAULT_CALLBACK)
         end
       end

data/lib/kicker/recipes/rails.rb

@@ -106,4 +106,4 @@ recipe :rails do
   process do |files|
     execute 'rake db:test:prepare' if files.delete('db/schema.rb')
   end
-end
+end

data/lib/kicker/recipes/ruby.rb

@@ -73,16 +73,8 @@ class Kicker::Recipes::Ruby
     end
     
     # Runs the given tests with `ruby' as unit-test tests.
-    #
-    # If you want to adjust the logging, stdout and growl, override this, call
-    # test_runner_command with the tests to get the command and call execute
-    # with the custom logging block.
     def run_with_test_runner(tests)
-      execute(test_runner_command(tests)) do |status|
-        if status.after? && status.growl?
-          status.output.split("\n").last
-        end
-      end
+      execute(test_runner_command(tests))
     end
     
     def spec_runner_command(tests)
@@ -90,16 +82,8 @@ class Kicker::Recipes::Ruby
     end
     
     # Runs the given tests with `spec' as RSpec tests.
-    #
-    # If you want to adjust the logging, stdout and growl, override this, call
-    # spec_runner_command with the tests to get the command and call execute
-    # with the custom logging block.
     def run_with_spec_runner(tests)
-      execute(spec_runner_command(tests)) do |status|
-        if status.after? && status.growl?
-          status.output.split("\n").last
-        end
-      end
+      execute(spec_runner_command(tests))
     end
   end
   

data/lib/kicker/utils.rb

@@ -1,22 +1,38 @@
 require 'shellwords' if RUBY_VERSION >= "1.9"
 
 class Kicker
+  Status = Struct.new(:command, :exit_code, :output) do
+    def success?
+      exit_code == 0
+    end
+  end
+
   module Utils #:nodoc:
     extend self
-    
-    def execute(command, &block)
+
+    attr_accessor :should_clear_screen
+    alias_method :should_clear_screen?, :should_clear_screen
+
+    def perform_work(command)
       @last_command = command
-      status = LogStatusHelper.new(block, command)
+      status = Status.new(command, 0, '')
       will_execute_command(status)
-      output = _execute(command)
-      status.result(output, last_command_succeeded?, last_command_status)
+      yield status
       did_execute_command(status)
+      status
     end
-    
+
+    def execute(command)
+      perform_work(command) do |status|
+        _execute(status)
+        yield status if block_given?
+      end
+    end
+
     def last_command
       @last_command
     end
-    
+
     def log(message)
       if Kicker.quiet
         puts message
@@ -31,27 +47,33 @@ class Kicker
     end
     
     def last_command_status
-      $?.to_i
+      $?.exitstatus
     end
-    
+
+    def clear_console!
+      puts(CLEAR) if Kicker.clear_console?
+    end
+
     private
-    
+
     CLEAR = "\e[H\e[2J"
 
-    def _execute(command)
+    def _execute(status)
       silent = Kicker.silent?
       unless silent
         puts
         sync_before, $stdout.sync = $stdout.sync, true
       end
       output = ""
-      popen(command) do |io|
+      popen(status.command) do |io|
         while str = io.read(1)
           output << str
           $stdout.print str unless silent
         end
       end
-      output
+      status.output = output.strip
+      status.exit_code = last_command_status
+      status
     ensure
       unless silent
         $stdout.sync = sync_before
@@ -70,20 +92,16 @@ class Kicker
     end
     
     def will_execute_command(status)
-      puts(CLEAR) if Kicker.clear_console?
-      message = status.call(:stdout) || "Executing: #{status.command}"
-      log(message) unless message.empty?
+      puts(CLEAR) if Kicker.clear_console? && should_clear_screen?
+      @should_clear_screen = false
+
+      log "Executing: #{status.command}"
       Kicker::Growl.change_occured(status) if Kicker::Growl.use? && !Kicker.silent?
     end
     
     def did_execute_command(status)
-      if message = status.call(:stdout)
-        log(message) unless message.empty?
-      else
-        puts("\n#{status.output.strip}\n\n") if Kicker.silent? && !status.success?
-        log(status.success? ? "Success" : "Failed (#{status.exit_code})")
-      end
-      
+      puts("\n#{status.output}\n\n") if Kicker.silent? && !status.success?
+      log(status.success? ? "Success" : "Failed (#{status.exit_code})")
       Kicker::Growl.result(status) if Kicker::Growl.use?
     end
   end
@@ -95,6 +113,13 @@ module Kernel
     Kicker::Utils.log(message)
   end
   
+  # When you perform some work (like shelling out a command to run without
+  # using +execute+) you need to call this method, with a block in which you
+  # perform your work, which will take care of logging the work appropriately.
+  def perform_work(command, &block)
+    Kicker::Utils.perform_work(command, &block)
+  end
+  
   # Executes the +command+, logs the output, and optionally growls.
   def execute(command, &block)
     Kicker::Utils.execute(command, &block)

data/lib/kicker/version.rb

@@ -1,3 +1,3 @@
 class Kicker
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kicker
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -140,7 +140,6 @@ files:
 - 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/could_not_handle_file.rb
 - lib/kicker/recipes/dot_kick.rb
@@ -184,3 +183,4 @@ signing_key:
 specification_version: 3
 summary: A lean, agnostic, flexible file-change watcher.
 test_files: []
+has_rdoc: 

data/lib/kicker/log_status_helper.rb

@@ -1,38 +0,0 @@
-class Kicker
-  class LogStatusHelper
-    attr_reader :command, :output, :exit_code
-    
-    def initialize(proc, command)
-      @proc, @command, @output, @success = proc, command
-    end
-    
-    def result(output, success, exit_code)
-      @output, @success, @exit_code = output, success, exit_code
-    end
-    
-    def call(logger_type)
-      @logger_type = logger_type
-      @proc.call(self) if @proc
-    end
-    
-    def stdout?
-      @logger_type == :stdout
-    end
-    
-    def growl?
-      @logger_type == :growl
-    end
-    
-    def before?
-      @output.nil?
-    end
-    
-    def after?
-      !before?
-    end
-    
-    def success?
-      @success
-    end
-  end
-end