gofer 0.1.2 → 0.2.0

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Revision History
 
+### v0.2.0 03/05/2011
+
+ * Flip ordering of username/hostname on instantiation to match that of Net::SSH
+ 
 ### v0.1.2 03/05/2011
 
  * Pass through Gofer::Host instantiation options straight through to Net::SSH.

data/README.md

@@ -14,7 +14,7 @@
 
 ### Instantiation
 
-    h = Gofer::Host.new('ubuntu', 'my.host.com', :keys => ['key.pem'])
+    h = Gofer::Host.new('my.host.com', 'ubuntu', :keys => ['key.pem'])
 
 ### Run a command
 

data/lib/gofer/host.rb

@@ -13,9 +13,20 @@ module Gofer
     # 
     # +opts+ is passed through directly to Net::SSH.start
     # See http://net-ssh.github.com/ssh/v2/api/index.html for valid arguments.
-    def initialize username, _hostname, opts={}
+    def initialize _hostname, username, opts={}
       @hostname = _hostname
-      @ssh = SshWrapper.new(username, hostname, opts)
+      
+      # support legacy positional argument use
+      if opts.is_a? String
+        opts = { :keys => [opts]}
+      end
+      
+      # support legacy identity_file argument
+      if opts[:identity_file]
+        opts[:keys] = [opts.delete(:identity_file)]
+      end
+      
+      @ssh = SshWrapper.new(hostname, username, opts)
     end
 
     # Run +command+.

data/lib/gofer/ssh_wrapper.rb

@@ -6,23 +6,8 @@ module Gofer
 
     attr_reader :last_output, :last_exit_status
 
-    def initialize username, hostname, opts={}
-      @username = username
-      @hostname = hostname
-      @last_exit_status = nil
-      @last_output = nil
-      
-      # support legacy positional argument use
-      if opts.is_a? String
-        opts = { :keys => [opts]}
-      end
-      
-      # support legacy identity_file argument
-      if opts[:identity_file]
-        opts[:keys] = [opts.delete(:identity_file)]
-      end
-      
-      @net_ssh_options = opts
+    def initialize *args
+      @net_ssh_args = args
     end
 
     def run command, opts={}
@@ -44,18 +29,13 @@ module Gofer
     private
   
     def ssh
-      @ssh ||= Net::SSH.start(*net_ssh_credentials)
+      @ssh ||= Net::SSH.start(*@net_ssh_args)
     end
     
     def scp 
       @scp ||= Net::SCP.new(ssh)
     end
 
-    def net_ssh_credentials
-      creds = [@hostname, @username, @net_ssh_options]
-      creds
-    end
-
     def ssh_execute(ssh, command, opts={})
       stdout, stderr, output = '', '', ''
       exit_code = 0

data/lib/gofer/version.rb

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

data/spec/gofer/integration_spec.rb

@@ -30,7 +30,7 @@ describe Gofer do
   end
     
   before :all do
-    @host = Gofer::Host.new(USERNAME, HOSTNAME, :keys => [IDENTITY_FILE])
+    @host = Gofer::Host.new(HOSTNAME, USERNAME, :keys => [IDENTITY_FILE])
     @tmpdir = raw_ssh("mktemp -d /tmp/gofertest.XXXXX").chomp
   end
 
@@ -44,11 +44,11 @@ describe Gofer do
   
   describe :new do
     it "should support the legacy positional argument" do
-      Gofer::Host.new(USERNAME, HOSTNAME, IDENTITY_FILE).run("echo hello", :quiet => true).should == "hello\n"
+      Gofer::Host.new(HOSTNAME, USERNAME, IDENTITY_FILE).run("echo hello", :quiet => true).should == "hello\n"
     end
     
     it "should support the legacy identity_file key" do
-      Gofer::Host.new(USERNAME, HOSTNAME, :identity_file => IDENTITY_FILE).run("echo hello", :quiet => true).should == "hello\n"
+      Gofer::Host.new(HOSTNAME, USERNAME, :identity_file => IDENTITY_FILE).run("echo hello", :quiet => true).should == "hello\n"
     end
   end
   

metadata

@@ -2,7 +2,7 @@
 name: gofer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Pearson