cap-util 0.2.1 → 0.3.0

data/lib/cap-util/run.rb

@@ -5,7 +5,7 @@ module CapUtil
   def self.run_locally(cmd_str)
     cmd = Scmd.new(cmd_str)
 
-    say "  * running `#{cmd}'"
+    say_bulleted "running `#{cmd}'"
     cmd.run
     say_error(cmd.stderr) if !cmd.success?
 
@@ -15,7 +15,7 @@ module CapUtil
   def self.run_locally_with_stdin(cmd_str, input)
     cmd = Scmd.new(cmd_str)
 
-    say "  * running `#{cmd}'"
+    say_bulleted "running `#{cmd}'"
     cmd.run(input)
     say_error(cmd.stderr) if !cmd.success?
 

data/lib/cap-util/say.rb

@@ -7,15 +7,19 @@ module CapUtil
   end
 
   def self.say(msg, *args)
-    Capistrano::CLI.ui.say(msg, *args)
+    Capistrano::CLI.ui.say("    #{msg}", *args)
+  end
+
+  def self.say_bulleted(msg, *args)
+    Capistrano::CLI.ui.say("  * #{msg}", *args)
   end
 
   def self.say_error(msg, *args)
-    say("    #{color "[ERROR]", :bold, :red} #{msg}", *args)
+    say("#{color "[ERROR]", :bold, :red} #{msg}", *args)
   end
 
   def self.say_warning(msg, *args)
-    say("    #{color "[WARN]", :bold, :yellow} #{msg}", *args)
+    say("#{color "[WARN]", :bold, :yellow} #{msg}", *args)
   end
 
   module Say
@@ -26,10 +30,11 @@ module CapUtil
     end
 
     module SayMethods
-      def color(*args);       CapUtil.color(*args);       end
-      def say(*args);         CapUtil.say(*args);         end
-      def say_error(*args);   CapUtil.say_error(*args);   end
-      def say_warning(*args); CapUtil.say_warning(*args); end
+      def color(*args);        CapUtil.color(*args);        end
+      def say(*args);          CapUtil.say(*args);          end
+      def say_bulleted(*args); CapUtil.say_bulleted(*args); end
+      def say_error(*args);    CapUtil.say_error(*args);    end
+      def say_warning(*args);  CapUtil.say_warning(*args);  end
     end
 
   end

data/lib/cap-util/time.rb

@@ -18,13 +18,20 @@ module CapUtil
   module Time
 
     def self.included(receiver)
-      receiver.send(:extend,  TimeMethods)
-      receiver.send(:include, TimeMethods)
+      receiver.send(:extend,  ClassMethods)
+      receiver.send(:include, InstanceMethods)
     end
 
-    module TimeMethods
+    module ClassMethods
       def time(*args, &block); CapUtil.time(*args, &block); end
     end
 
+    module InstanceMethods
+      def time(name, &block)
+        @cap_util_timers ||= {}
+        CapUtil.time(@cap_util_timers, name, &block)
+      end
+    end
+
   end
 end

data/lib/cap-util/timer.rb

@@ -15,7 +15,7 @@ module CapUtil
     end
 
     def start(time=nil)
-      CapUtil.say "    Starting #{CapUtil.color @name, :cyan}." if !@quiet
+      CapUtil.say "Starting #{CapUtil.color @name, :cyan}." if !@quiet
       @start_time = (time || ::Time.now)
     end
 
@@ -24,7 +24,7 @@ module CapUtil
       @elapsed_time = @end_time - @start_time
       if !@quiet
         elapsed = self.class.pretty_time(@elapsed_time.to_i)
-        CapUtil.say "    #{CapUtil.color @name, :bold, :yellow} completed in"\
+        CapUtil.say "#{CapUtil.color @name, :bold, :yellow} completed in"\
                     " #{CapUtil.color elapsed, :underline, :yellow}."
       end
       @end_time

data/lib/cap-util/version.rb

@@ -1,3 +1,3 @@
 module CapUtil
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/test/cap_util_tests.rb

@@ -10,7 +10,7 @@ module CapUtil
     subject { @mod }
 
     should have_imeth :halt, :time
-    should have_imeths :color, :say, :say_error, :say_warning
+    should have_imeths :color, :say, :say_bulleted, :say_error, :say_warning
     should have_imeths :run_locally, :run_locally_with_stdin
 
   end
@@ -35,8 +35,8 @@ module CapUtil
     should have_cmeth :halt
     should have_imeth :halt
 
-    should have_cmeths :color, :say, :say_error, :say_warning
-    should have_imeths :color, :say, :say_error, :say_warning
+    should have_cmeths :color, :say, :say_bulleted, :say_error, :say_warning
+    should have_imeths :color, :say, :say_bulleted, :say_error, :say_warning
 
     should have_cmeths :run_locally, :run_locally_with_stdin
     should have_imeths :run_locally, :run_locally_with_stdin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-util
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kelly Redding