ztk 1.1.0 → 1.1.1

data/README.md

@@ -1,7 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/ztk.png)](http://badge.fury.io/rb/ztk)
 [![Dependency Status](https://gemnasium.com/zpatten/ztk.png)](https://gemnasium.com/zpatten/ztk)
 [![Build Status](https://secure.travis-ci.org/zpatten/ztk.png)](http://travis-ci.org/zpatten/ztk)
-[![Coverage Status](https://coveralls.io/repos/zpatten/testlab/badge.png?branch=master)](https://coveralls.io/r/zpatten/testlab)
+[![Coverage Status](https://coveralls.io/repos/zpatten/ztk/badge.png?branch=master)](https://coveralls.io/r/zpatten/ztk)
 [![Code Climate](https://codeclimate.com/github/zpatten/ztk.png)](https://codeclimate.com/github/zpatten/ztk)
 
 # ZTK

data/lib/ztk/command.rb

@@ -158,7 +158,7 @@ module ZTK
       if !options.ignore_exit_status && (exit_code != options.exit_code)
         log_and_raise(CommandError, "exec(#{command.inspect}, #{options.inspect}) failed! [#{exit_code}]")
       end
-      OpenStruct.new(:output => output, :exit_code => exit_code)
+      OpenStruct.new(:command => command, :output => output, :exit_code => exit_code)
     end
 
     # Not Supported

data/lib/ztk/logger.rb

@@ -106,12 +106,13 @@ module ZTK
     def add(severity, message=nil, progname=nil, shift=0, &block)
       return if (@level > severity)
 
-      msg = (block && block.call)
-      (msg.nil? || msg.strip.empty?) and return
-      @hostname ||= %x(hostname -s).chomp.strip
-      called_by = "#{@hostname}:#{parse_caller(caller[1+shift])}"
-      message = [message, progname, msg].flatten.compact.join(": ")
-      message = "%19s.%06d|%05d|%5s|%60s%s\n" % [Time.now.utc.strftime("%Y-%m-%d|%H:%M:%S"), Time.now.utc.usec, Process.pid, SEVERITIES[severity], called_by, message]
+      message = block.call if message.nil? && block_given?
+      return if message.nil?
+
+      called_by = parse_caller(caller[1+shift])
+
+      message = [message, progname].flatten.compact.join(": ")
+      message = "%19s.%06d|%05d|%5s|%s%s\n" % [Time.now.utc.strftime("%Y-%m-%d|%H:%M:%S"), Time.now.utc.usec, Process.pid, SEVERITIES[severity], called_by, message]
 
       @logdev.write(message)
       @logdev.respond_to?(:flush) and @logdev.flush

data/lib/ztk/ssh.rb

@@ -302,7 +302,7 @@ module ZTK
       if !options.ignore_exit_status && (exit_code != options.exit_code)
         log_and_raise(SSHError, message)
       end
-      OpenStruct.new(:output => output, :exit_code => exit_code, :exit_signal => exit_signal)
+      OpenStruct.new(:command => command, :output => output, :exit_code => exit_code, :exit_signal => exit_signal)
     end
 
     # Uploads a local file to a remote host.

data/lib/ztk/version.rb

@@ -21,6 +21,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
 end

data/spec/ztk/locator_spec.rb

@@ -34,14 +34,14 @@ describe ZTK::Locator do
 
       describe "#find" do
 
-        it "should find root" do
-          subject.find("root").should == "/root"
-        end
-
         it "should find home" do
           subject.find("home").should == "/home"
         end
 
+        it "should not find funkytown_123_abc" do
+          lambda { subject.find("funkytown_123_abc") }.should raise_error ZTK::LocatorError
+        end
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -240,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1144803051742143768
+      hash: -4015995280630629016
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1144803051742143768
+      hash: -4015995280630629016
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25