cap-util 0.1.2 → 0.2.0

data/lib/cap-util/run.rb

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

data/lib/cap-util/say.rb

@@ -7,19 +7,15 @@ module CapUtil
   end
 
   def self.say(msg, *args)
-    Capistrano::CLI.ui.say("  #{msg}", *args)
+    Capistrano::CLI.ui.say(msg, *args)
   end
 
-  def self.log(msg, *args)
-    say("* #{msg}", *args)
+  def self.say_error(msg, *args)
+    say("    #{color "[ERROR]", :bold, :red} #{msg}", *args)
   end
 
-  def self.log_error(msg, *args)
-    say("  #{color "[ERROR]", :bold, :red} #{msg}", *args)
-  end
-
-  def self.log_warning(msg, *args)
-    say("  #{color "[WARN]", :bold, :yellow} #{msg}", *args)
+  def self.say_warning(msg, *args)
+    say("    #{color "[WARN]", :bold, :yellow} #{msg}", *args)
   end
 
   module Say
@@ -32,9 +28,8 @@ module CapUtil
     module SayMethods
       def color(*args);       CapUtil.color(*args);       end
       def say(*args);         CapUtil.say(*args);         end
-      def log(*args);         CapUtil.log(*args);         end
-      def log_error(*args);   CapUtil.log_error(*args);   end
-      def log_warning(*args); CapUtil.log_warning(*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

@@ -3,7 +3,7 @@ require 'cap-util/timer'
 module CapUtil
 
   def self.time(timer_set, name, &block)
-    timer_set[name] = CapUtil::Timer.new(name)
+    timer_set[name] ||= CapUtil::Timer.new(name)
     if !block.nil?
       begin
         timer_set[name].start

data/lib/cap-util/version.rb

@@ -1,3 +1,3 @@
 module CapUtil
-  VERSION = "0.1.2"
+  VERSION = "0.2.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, :log, :log_error, :log_warning
+    should have_imeths :color, :say, :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, :log, :log_error, :log_warning
-    should have_imeths :color, :say, :log, :log_error, :log_warning
+    should have_cmeths :color, :say, :say_error, :say_warning
+    should have_imeths :color, :say, :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: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kelly Redding