runssh 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    runssh (0.2.0.rc.1)
+    runssh (0.2.2)
       highline (~> 1.6.1)
       trollop (~> 1.16.2)
 

data/README.rdoc

@@ -87,14 +87,18 @@ This program is distributed under the GPL v2 license.
 === 0.2.1
 * Fixed docs.
 
+=== 0.2.2
+* Enabled overriding hostname when invoking shell (Could be used to
+  bookmark a host with changing addresses - e.g. in EC2)
+* Enabled definition of (local) ssh tunneling. Currently only in the
+  +shell+ command.
+
 == TODO
-* Convert to use thor as parent for RunSSHLib::CLI
+* Refactor of RunSSHLib::CLI to avoid repetition of so many options between
+  _add_, _update_ and _shell_.
 * Create a _proper_ zsh completion script.
 * Add scp capabilities
-* Add tunneling support:
-  1. Configured tunneling
-  2. tunneling defined on the command line.
-* Remote commands (e.g, with no login).
+* Add support for bookmarking tunnels
 * Shell via gateway (connect to a firewall and from there open shell to the host).
 * Rename (or move) host definition
 * Maybe replace invoking ssh from the command line with some library.

data/lib/runsshlib/cli.rb

@@ -146,10 +146,19 @@ append "-- <remote command>" to the regular command. To list /tmp on a host
 bookmarked as "some host" run:
 runssh shell some host -- ls -l /tmp
 
+(Local) tunneling can be enabled with the -L options (correspond to
+ssh -L option). An abbreviated syntax could be used as the requested
+port if both ports are identical and host is localhost.
+e.g. -L 7070 is converted to -L 7070:localhost:7070
+
 Options:
 EOS
           opt :login, "override the login in the configuration",
               :type => :string
+          opt :host_name, 'override the name or address of the host',
+              :short => :n, :type => :string
+          opt :local_tunnel, "tunnel definition",
+              :short => :L, :type => :string
           stop_on "--"
         end
         # handle the case of remote command (indicated by --)

data/lib/runsshlib/ssh_backend.rb

@@ -33,9 +33,20 @@ module RunSSHLib
       command = "ssh "
       command << "-l #{definition[:login]} " if definition[:login]
       command << "#{definition[:host_name]}"
+      command << " -L #{normalize_tunnel_definition definition[:local_tunnel]} " if
+                 definition[:local_tunnel]
       command << %( -- "#{definition[:remote_cmd]}") if
                  (definition[:remote_cmd] && (!definition[:remote_cmd].empty?))
       exec command
     end
+
+    # Accepts abbriviated or full definition of ssh tunnel definition
+    # and converts it to full tunnel definition. If only port is
+    # supplied (abbriviated form) it uses `localhost` as the hostname
+    # and the same port on both end of the tunnel definition.
+    def normalize_tunnel_definition(tunnel_definition)
+      tunnel_definition =~ /(^\d+$)/ ? "#{$1}:localhost:#{$1}" :
+                           tunnel_definition
+    end
   end
 end

data/lib/runsshlib/version.rb

@@ -20,7 +20,7 @@ module RunSSHLib
   module Version
     MAJOR = 0
     MINOR = 2
-    BUILD = 1
+    BUILD = 2
 
     STRING = [MAJOR, MINOR, BUILD].compact.join('.')
   end

data/spec/runsshlib/cli_spec.rb

@@ -186,8 +186,9 @@ describe "The CLI interface" do
         it "should have all required arguments" do
           options = @shell_cli.instance_variable_get :@options
           options.should have_key(:login)
+          options.should have_key(:local_tunnel)
         end
-        
+
         it "should not overwrite nil arguments with saved ones when merging" do
           import_fixtures
           RunSSHLib::SshBackend.should_receive(:shell).
@@ -211,13 +212,22 @@ describe "The CLI interface" do
           cli.run
         end
 
+        it "should correctly allow overriding of hostname" do
+          import_fixtures
+          RunSSHLib::SshBackend.should_receive(:shell).
+                                with(hash_including(:host_name => "overridehost"))
+          cli = RunSSHLib::CLI.new(
+                %W(-f #{TMP_FILE} shell -n overridehost cust2 dc internal somehost))
+          cli.run
+        end
+
         it "should correctly parse remote command (indicated by --)" do
           import_fixtures
           RunSSHLib::SshBackend.should_receive(:shell).
                                 with(hash_including(:remote_cmd => "ls -l /tmp")).
                                 and_return(nil)
           cli = RunSSHLib::CLI.new(
-                %W(-f #{TMP_FILE} shell -l someuser cust2 dc internal somehost 
+                %W(-f #{TMP_FILE} shell -l someuser cust2 dc internal somehost
                    -- ls -l /tmp)
           )
           cli.run

data/spec/runsshlib/ssh_backend_spec.rb

@@ -20,7 +20,7 @@ require 'spec_helper'
 require 'runsshlib'
 
 describe RunSSHLib::SshBackend do
-  context "shell" do
+  context "#shell" do
     let(:test_data) do
       {:host_name => "a",
        :login => "user",
@@ -66,5 +66,24 @@ describe RunSSHLib::SshBackend do
                             and_return(nil)
       RunSSHLib::SshBackend.shell(data)
     end
+
+    it "should handle tunnels correctly" do
+      data = test_data.merge(:local_tunnel => "6000")
+      RunSSHLib::SshBackend.should_receive(:exec).
+                            with(/^ssh\s+.*\s-L\s+6000:localhost:6000.*/)
+      RunSSHLib::SshBackend.shell(data)
+    end
+  end
+
+  context "#normalize_tunnel_definition" do
+    it "converts abbreviated tunnel definition correctly" do
+      RunSSHLib::SshBackend.normalize_tunnel_definition("7070").should ==
+          "7070:localhost:7070"
+    end
+
+    it "return full tunnel definition as it is" do
+      RunSSHLib::SshBackend.normalize_tunnel_definition("7070:localhost:7070").
+          should == "7070:localhost:7070"
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runssh
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Haim Ashkenazi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 +02:00
+date: 2011-02-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency