scutil 0.2.4 → 0.3.0

data/{CHANGELOG → CHANGELOG.md}

@@ -1,6 +1,11 @@
 
 ==Changelog
 
+===0.3.0 | 2011-10-11
+
+* Added set_options method to instance.
+* Bug fixes.
+
 ===0.2.4 | 2011-10-02
 
 * More verbose logging.

data/lib/scutil.rb

@@ -30,7 +30,7 @@ require 'scutil/connection_cache'
 require 'scutil/system_connection'
 
 module Scutil
-  SCUTIL_VERSION = '0.2.4'
+  SCUTIL_VERSION = '0.3.0'
   # By default, buffer 10M of data before writing.
   DEFAULT_OUTPUT_BUFFER_SIZE = 0xA00000
   # Checks for a command starting with _sudo_ by default.
@@ -195,7 +195,6 @@ module Scutil
         end
         
         channel.exec(cmd)
-#        channel.wait
       end
       
       conn.loop
@@ -210,8 +209,4 @@ module Scutil
       return exit_status
     end
   end
-  
-  #  def xfer_file(hostname, username, src, dst, direction=:to, command=nil, options={})
-  
-  #  end
 end

data/lib/scutil/exec.rb

@@ -15,7 +15,7 @@ module Scutil
   class Exec
     include Scutil
     attr_reader :hostname,:username
-    
+
     def initialize(hostname, username, options={})
       @hostname = hostname
       @username = username
@@ -30,9 +30,13 @@ module Scutil
     # specified in the constructor.
     def exec_command(cmd, output=nil, options={})
       # Local map has precedence.
-      @options.merge!(options)
+      set_options(options)
       Scutil.exec_command(@hostname, @username, cmd, output, @options)
     end
-    # TODO: options should be customizable via an instance method.
+
+    def set_options(options={})
+      # Local map has precedence.
+      @options.merge!(options)      
+    end
   end
 end

data/scutil.gemspec

@@ -1,7 +1,8 @@
+
 Gem::Specification.new do |s|
   s.name        = 'scutil'
-  s.version     = '0.2.4'
-  s.date        = '2011-10-02'
+  s.version     = '0.3.0'
+  s.date        = '2011-10-11'
   s.summary     = 'SSH Command UTILity'
   s.description = <<-EOF
     Scutil is a library for conveniently executing commands 
@@ -11,8 +12,8 @@ EOF
   s.email       = 'marcantoniosr@gmail.com'
   s.license     = 'MIT'
   s.homepage    = 'http://marcantonio.github.com/scutil'
-  s.rdoc_options << '--title' << 'SSH Command UTILity' << '--main' << 'README'
-  s.extra_rdoc_files = ['README', 'THANKS', 'CHANGELOG']
+  s.rdoc_options << '--title' << 'SSH Command UTILity' << '--main' << 'README.rdoc'
+  s.extra_rdoc_files = ['README.rdoc', 'THANKS', 'CHANGELOG.md']
   s.add_runtime_dependency 'net-ssh', '>= 2.1.0'
   s.files = %w(
 lib/scutil.rb
@@ -21,8 +22,8 @@ lib/scutil/error.rb
 lib/scutil/exec.rb
 lib/scutil/system_connection.rb
 scutil.gemspec
-README
-CHANGELOG
+README.rdoc
+CHANGELOG.md
 THANKS
 test/test_scutil.rb
 )

data/test/test_scutil.rb

@@ -127,8 +127,84 @@ class TestScutil < Test::Unit::TestCase
     assert_instance_of(Net::SSH::Connection::Session, conn.pty_connection)
     assert_nil(conn.connection)
   end
+  
+  def test_alter_options
+    divert_stdout
+    @exec.exec_command(TRUE_COMMAND)
+    revert_stdout
+    assert_not_match(/\[#{TestScutil.hostname}\]/, @output.string)
+    
+    @exec.set_options({ :scutil_verbose => true })
+    
+    divert_stdout
+    @exec.exec_command(TRUE_COMMAND)
+    revert_stdout
+    assert_match(/\[#{TestScutil.hostname}\]/, @output.string)
+  end
+end
+
+class TestScutilAlt < Test::Unit::TestCase
+  TRUE_COMMAND  = '/bin/true'
+  FALSE_COMMAND = '/bin/false'
+  FAKE_COMMAND  = '/bin/no_such_command'
+
+  @hostname = nil
+  @port = nil
+  @user = nil
+  
+  class << self
+    attr_accessor :hostname,:port,:user
+  end
+  
+  def divert_stdout
+    @tmp_output = $stdout
+    $stdout = StringIO.new
+  end
+  
+  def revert_stdout
+    @output = $stdout
+    $stdout = @tmp_output
+  end
+  
+  def setup
+    @output = nil
+    @tmp_output = nil
+  end
+  
+  def test_exec_doesnt_raise_an_exception
+    assert_nothing_raised do
+      Scutil.exec_command(TestScutil.hostname, TestScutil.user, TRUE_COMMAND, nil, { :port => TestScutil.port })
+    end
+  end
+  
+  def test_run_successful_command
+    retval = Scutil.exec_command(TestScutil.hostname, TestScutil.user, TRUE_COMMAND, nil, { :port => TestScutil.port })
+    assert_equal 0, retval
+  end
+  
+  def test_run_failed_command
+    retval = Scutil.exec_command(TestScutil.hostname, TestScutil.user, FALSE_COMMAND, nil, { :port => TestScutil.port })
+    assert_not_equal 0, retval
+  end
+  
+  def test_added_to_cache
+    Scutil.exec_command(TestScutil.hostname, TestScutil.user, TRUE_COMMAND, nil, { :port => TestScutil.port })
+    assert(Scutil.connection_cache.exists?(TestScutil.hostname))
+  end
+  
+  def test_exec_command_output
+    divert_stdout
+    Scutil.exec_command(TestScutil.hostname, TestScutil.user, 'echo "alpha"', nil, { :port => TestScutil.port })
+    revert_stdout
+    assert_equal "alpha", @output.string.chomp
+  end
+
+  def teardown
+    Scutil.connection_cache.remove_all
+  end
 end
 
+# XXX: This breaks --name, et al.
 if ARGV[0].nil?
   puts "Usage: #{$0} host[:port]"
   exit(1)

metadata

@@ -2,7 +2,7 @@
 name: scutil
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Marc Soda
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 Z
+date: 2011-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -30,9 +30,9 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 - THANKS
-- CHANGELOG
+- CHANGELOG.md
 files: 
 - lib/scutil.rb
 - lib/scutil/connection_cache.rb
@@ -40,8 +40,8 @@ files:
 - lib/scutil/exec.rb
 - lib/scutil/system_connection.rb
 - scutil.gemspec
-- README
-- CHANGELOG
+- README.rdoc
+- CHANGELOG.md
 - THANKS
 - test/test_scutil.rb
 homepage: http://marcantonio.github.com/scutil
@@ -52,7 +52,7 @@ rdoc_options:
 - --title
 - SSH Command UTILity
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement