polyssh 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad8c26d2952aaaad0545242abc43ef112a8e534
-  data.tar.gz: 42d8aa4d04b0fe54b61839e899e24b23cf86ec30
+  metadata.gz: 9e74e4493183db0966a98460a46f5654ac722084
+  data.tar.gz: ef43dc25ecaf23a33f1c12deb53c642fea05acc7
 SHA512:
-  metadata.gz: e366247745b56955f8ae6ec85c0b584b47756bc5f4d315da759536956d4d717b60854670423f130e19bdd0992906d052e40ef80b1dd3449483a3091fbab9a06d
-  data.tar.gz: 275fe0343cd0c2bb5d18c29ebfc092a0d26a181efe41dff44ce01fd62bb7dfdfe1d7371ab4c0979e5cd131e62088c62f9535aed18326e8dd876d9e6c18a01c25
+  metadata.gz: bb8c0d9a7762786acda31b101285b0a01912d4ddf99820bf8fe2a1e059666245f2e739d6c3c552ee43bbd7a7ad7e7cff5f4a76b1a790323edad5695b24503791
+  data.tar.gz: 69961a80e472e300605825ad51de1dbac776e5167782bcc0ee6fc9d31643fb6917ed13c40d295ecd78229176822ad1b9495fc2c310e00429bedcc303e754858d

data/README.md

@@ -36,16 +36,16 @@ We want to connect
 
 * to a remote host called ``destination`` (as user ``charlie``, on default port)
 * via a firewall (as user ``alice``, on non-default port 7222)
-* then via a router  (as user ``bob``, on default), with parameters (FIXME)
+* then via a router  (as user ``bob``, on default), with verbosity)
 
 Type the following command using polyssh :
 
-    $ polyssh alice@firewall:7222 -verbose Cypherbob@router charlie@destination
+    $ polyssh alice@firewall:7222 -verbose bob@router charlie@destination
 
 
 ## Credits
 
-* Initial idea : [Bob Muller on Stack Overflow](http://superuser.com/a/377215)
+* Initial idea & implementation : [Bob Muller on Stack Overflow](http://superuser.com/a/377215)
 * Ruby rewrite & packaging : Glenn Y. Rolland
 
 ## Contributing

data/lib/polyssh/cli.rb

@@ -2,42 +2,52 @@
 require 'net/ssh'
 require 'net/scp'
 require 'optparse'
+require 'colorize'
 
 module PolySSH
   class Cli
-    attr_reader :chain
+    attr_reader :chain, :commands
 
     def self.start args
       app = self.new
       app.parse_cmdline args
 
+      puts "Building SSH hops...".yellow
       app.build_commands app.chain
+      #app.commands.each{|x| puts x }
 
-      #app.run commands
-
+      puts "Running SSH hops...".yellow
+      app.run_commands app.commands
     end
 
     def initialize
       @chain = NodeList.new
+      @commands = []
       @options = {}
     end
 
     def parse_cmdline args
       _parse_cmdline_options args
       _parse_cmdline_hops args
-
     end
 
+    def run_commands commands
+      @commands[0..-2].each do |baseport,cmd|
+        fork { exec cmd + " >/dev/null 2>&1 " }
+        _wait_active_port baseport
+      end
+      _baseport, cmd = @commands.last
+      system cmd
+    end
 
     def build_commands chain
-      commands = chain.accept(CommandBuilder.new)
-      return commands
+      @commands = chain.accept(CommandBuilder.new)
+      return @commands
     end
 
     private 
 
     def _parse_cmdline_hops args
-      puts args
       args_current = []
       args.each do |arg|
         case arg
@@ -60,6 +70,12 @@ module PolySSH
       return @chain
     end
 
+    def _wait_active_port port
+      while !system("nc -w0 localhost #{port}") do
+        sleep 1
+      end
+    end
+
     def _parse_cmdline_options args
       OptionParser.new do |opts|
         opts.banner = "Usage: example.rb [options]"
@@ -77,6 +93,7 @@ module PolySSH
         end
       end.parse! args
     rescue FinalOption
+      # nothing 
     ensure
       return nil
     end

data/lib/polyssh/command_builder.rb

@@ -14,19 +14,22 @@ module PolySSH
         if node_list.count > 0 then
           node_list.first.accept(self)
         end
-        @commands.each do |cmd|
-          puts cmd
-          fork { exec cmd + " >/dev/null 2>&1 " }
-          sleep 2
-        end
-        puts @last_command 
-        system @last_command
     end
 
     # Visit each node entry
     def visit_polyssh_nodeentry node_entry
       cmd=""
-      if node_entry.next.nil? then
+      if @commands.empty? and node_entry.next.nil? then
+        cmd = ("ssh " +
+               "-o ForwardAgent=yes " +
+               "-o UserKnownHostsFile=/dev/null " +
+               "-o StrictHostKeyChecking=no " +
+               "-p #{node_entry.port} " +
+               "-l #{node_entry.user} " +
+               "#{node_entry.host} " 
+              )
+        @commands << [@baseport, cmd]
+      elsif node_entry.next.nil? then
         cmd = ("ssh " +
                "-o ForwardAgent=yes " +
                "-o UserKnownHostsFile=/dev/null " +
@@ -35,7 +38,7 @@ module PolySSH
                "-l #{node_entry.user} " +
                "localhost " 
               )
-        @last_command = cmd
+        @commands << [@baseport, cmd]
       else
         get_port
         next_entry = node_entry.next 
@@ -48,7 +51,7 @@ module PolySSH
           "-L#{@baseport}:#{next_entry.host}:#{next_entry.port} " +
           "-l #{node_entry.user} #{node_entry.host} "
         )
-        @commands << cmd
+        @commands << [@baseport, cmd]
         next_entry.accept(self)
       end
     end

data/lib/polyssh/version.rb

@@ -1,3 +1,3 @@
 module PolySSH
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/polyssh.gemspec

@@ -15,12 +15,13 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "net-scp"
   spec.add_runtime_dependency "net-ssh"
+  spec.add_runtime_dependency "colorize"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyssh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Glenn Y. Rolland
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- bin/polyssh
+- exe/polyssh
 - lib/polyssh.rb
 - lib/polyssh/cli.rb
 - lib/polyssh/command_builder.rb