gofer 0.2.0 → 0.2.1

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Revision History
 
+### v0.2.1 08/05/2011
+
+ * Add `quiet=` to Host instance to allow setting quiet to be the default.
+
 ### v0.2.0 03/05/2011
 
  * Flip ordering of username/hostname on instantiation to match that of Net::SSH

data/README.md

@@ -36,7 +36,7 @@
     
 ### Respond to command errors
 
-    h.run "false" # this will fail
+    h.run "false" # this will raise an error
     response = h.run "false", :capture_exit_status => true # this won't ...
     puts response.exit_status # and will make the exit status available
 
@@ -50,8 +50,9 @@
 
 ### Suppress output
 
-    h.run "echo noisy", :quiet => true  # don't output from our command
-    h.run "echo noisier 1>&2", :quiet_stderr => true # don't even output stderr!
+    h.run "echo noisy", :quiet => true               # don't print stdout
+    h.run "echo noisier 1>&2", :quiet_stderr => true # don't print stderr
+    h.quiet = true                                   # never print stdout
 
 ## Planned Features
 

data/lib/gofer/host.rb

@@ -8,6 +8,7 @@ module Gofer
   class Host
     
     attr_reader :hostname
+    attr_accessor :quiet
 
     # Create a new Host connection
     # 
@@ -15,6 +16,7 @@ module Gofer
     # See http://net-ssh.github.com/ssh/v2/api/index.html for valid arguments.
     def initialize _hostname, username, opts={}
       @hostname = _hostname
+      @quiet = false
       
       # support legacy positional argument use
       if opts.is_a? String
@@ -39,10 +41,11 @@ module Gofer
     # 
     # Options:
     #
-    # +quiet+:: Don't print +stdout+
+    # +quiet+:: Don't print +stdout+, can also be set with +quiet=+ on the instance
     # +quiet_stderr+:: Don't print +stderr+
     # +capture_exit_status+:: Don't raise an error on a non-zero exit status
     def run command, opts={}
+      opts[:quiet] = quiet unless opts.include?(:quiet)
       response = @ssh.run command, opts
       if !opts[:capture_exit_status] && response.exit_status != 0
         raise HostError.new(self, "Command #{command} failed with exit status #{@ssh.last_exit_status}")

data/lib/gofer/ssh_wrapper.rb

@@ -40,6 +40,7 @@ module Gofer
       stdout, stderr, output = '', '', ''
       exit_code = 0
       ssh.open_channel do |channel|
+        
         channel.exec(command) do |ch, success|
           unless success
             raise "Couldn't execute command #{command} (ssh channel failure)"

data/lib/gofer/version.rb

@@ -1,3 +1,3 @@
 module Gofer # :nodoc:
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/gofer/integration_spec.rb

@@ -31,6 +31,7 @@ describe Gofer do
     
   before :all do
     @host = Gofer::Host.new(HOSTNAME, USERNAME, :keys => [IDENTITY_FILE])
+    @host.quiet = true
     @tmpdir = raw_ssh("mktemp -d /tmp/gofertest.XXXXX").chomp
   end
 
@@ -61,7 +62,7 @@ describe Gofer do
   describe :run do
     describe "with stdout and stderr responses" do
       before :all do 
-        @response = @host.run "echo stdout; echo stderr 1>&2", :quiet => true, :quiet_stderr => true
+        @response = @host.run "echo stdout; echo stderr 1>&2", :quiet_stderr => true
       end
     
       it "should capture stdout in @response.stdout" do
@@ -80,7 +81,7 @@ describe Gofer do
         @response.should == "stdout\n"
       end
     end
-  
+      
     it "should error if a command returns a non-zero response" do
       lambda {@host.run "false"}.should raise_error /failed with exit status/
     end

metadata

@@ -2,7 +2,7 @@
 name: gofer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Michael Pearson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +10:00
+date: 2011-05-08 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency