net-ssh-cli 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36080ea8a1e4e289bc73d79d9a665a0848925799db74242e5705814a8c6081c9
-  data.tar.gz: 85cbb73ba6ff4925b39955c7416934a5c9124b8e4e5cbf0eeafc67af1bb2193f
+  metadata.gz: a38667881b73d31aba590fffbc7856fd94cb2e477b93c1f93097a955bb959dd1
+  data.tar.gz: 6afd84f95e15e87a1a9311876ad85c99d87122b36000665d2aea8dbe6d5b826f
 SHA512:
-  metadata.gz: 0e3a0db15b0bb3d14e9cc2f7a1bd8c5e3379c8e2829e09fc8e3f63a445514f6b5a467cc3de76be5da34ec33632e8545bf8eea10ea2898eade24496f6fca222cb
-  data.tar.gz: 9b15edce5dc418753069b56004480bd9836104bfd9508b3e2dc89c31acdf3433253b76717bde7959dc6e4dcc53fcbbdedea1f8dee79f95359f2615feb37f402f
+  metadata.gz: e7faec7d0e2ee50fc63be7e5847190b85f5aca55fcf8fc5ff038802ee43f7e4bec3bfee6f46e8259529ee57b92cb05e9c2981ecdbd57f040e4c67291bbbae5c1
+  data.tar.gz: 8292831d9fe0c513ae98a102830b252fb698a9ae7f6872714189e039d59d89d9f56250bcbdcec20c6c2bce6adf7ffd1d3b52e20a7fc9e7da1d49cff0ed2aeef7

data/bin/runner

@@ -7,4 +7,4 @@ require 'net/ssh/cli'
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-ARGV.each {|arg| eval arg}
+ARGV.each { |arg| eval arg }

data/lib/net/ssh/cli.rb

@@ -55,7 +55,7 @@ module Net
       def options
         @options ||= begin
           opts = OPTIONS.clone
-          opts.each do |key,value|
+          opts.each do |key, value|
             opts[key] = value.clone if value.is_a?(Hash)
           end
           opts
@@ -100,9 +100,9 @@ module Net
       end
 
       def on_stdout(data)
-        before_on_stdout_procs.each { |_name, a_proc| a_proc.call }
+        before_on_stdout_procs.each { |_name, a_proc| instance_eval(&a_proc) }
         stdout << data
-        after_on_stdout_procs.each  { |_name, a_proc| a_proc.call }
+        after_on_stdout_procs.each { |_name, a_proc| instance_eval(&a_proc) }
         process # if we receive data, we probably receive more - improves performance
         stdout
       end
@@ -150,6 +150,7 @@ module Net
         end
         self.default_prompt = read[/\n?^.*\z/]
         raise Error::PromptDetection, "couldn't detect a prompt" unless default_prompt.present?
+
         default_prompt
       end
 
@@ -184,14 +185,14 @@ module Net
       end
 
       def dialog(command, prompt, **opts)
-        opts = opts.clone.merge(prompt: prompt) 
+        opts = opts.clone.merge(prompt: prompt)
         cmd(command, opts)
       end
 
       # 'read' first on purpuse as a feature. once you cmd you ignore what happend before. otherwise use read|write directly.
       # this should avoid many horrible state issues where the prompt is not the last prompt
       def cmd(command, pre_read: true, rm_prompt: cmd_rm_prompt, rm_command: cmd_rm_command, prompt: current_prompt, **opts)
-        opts = opts.clone.merge(pre_read: pre_read, rm_prompt: rm_prompt, rm_command: rm_command, prompt: prompt) 
+        opts = opts.clone.merge(pre_read: pre_read, rm_prompt: rm_prompt, rm_command: rm_command, prompt: prompt)
         if pre_read
           pre_read_data = read
           logger.debug { "#cmd ignoring pre-command output: #{pre_read_data.inspect}" } if pre_read_data.present?
@@ -205,8 +206,8 @@ module Net
       alias command cmd
       alias exec cmd
 
-      def cmds(commands, **opts)
-        commands.map { |command| [command, cmd(command, **opts)] }
+      def cmds(*commands, **opts)
+        commands.flatten.map { |command| [command, cmd(command, **opts)] }
       end
       alias commands cmds
 
@@ -236,7 +237,7 @@ module Net
         return @net_ssh if @net_ssh
 
         logger.debug { 'Net:SSH #start' }
-        self.net_ssh = Net::SSH.start(net_ssh_options[:ip] || net_ssh_options[:host] || "localhost", net_ssh_options[:user] || ENV['USER'], formatted_net_ssh_options)
+        self.net_ssh = Net::SSH.start(net_ssh_options[:ip] || net_ssh_options[:host] || 'localhost', net_ssh_options[:user] || ENV['USER'], formatted_net_ssh_options)
       rescue StandardError => error
         self.net_ssh = nil
         raise
@@ -244,7 +245,7 @@ module Net
       alias proxy net_ssh
 
       # have a deep look at the source of Net::SSH
-      # session#process https://github.com/net-ssh/net-ssh/blob/dd13dd44d68b7fa82d4ca9a3bbe18e30c855f1d2/lib/net/ssh/connection/session.rb#L227 
+      # session#process https://github.com/net-ssh/net-ssh/blob/dd13dd44d68b7fa82d4ca9a3bbe18e30c855f1d2/lib/net/ssh/connection/session.rb#L227
       # session#loop    https://github.com/net-ssh/net-ssh/blob/dd13dd44d68b7fa82d4ca9a3bbe18e30c855f1d2/lib/net/ssh/connection/session.rb#L179
       # because the (cli) channel stays open, we always need to ensure that the ssh layer gets "processed" further. This can be done inside here automatically or outside in a separate event loop for the net_ssh connection.
       def process(time = process_time)
@@ -254,7 +255,7 @@ module Net
       end
 
       def open_channel # cli_channel
-        before_open_channel_procs.each  { |_name, a_proc| a_proc.call }
+        before_open_channel_procs.each { |_name, a_proc| instance_eval(&a_proc) }
         ::Timeout.timeout(open_channel_timeout, Error::OpenChannelTimeout) do
           net_ssh.open_channel do |new_channel|
             logger.debug 'channel is open'
@@ -268,13 +269,13 @@ module Net
             new_channel.on_data do |_ch, data|
               on_stdout(data)
             end
-            #new_channel.on_extended_data do |_ch, type, data| end
-            #new_channel.on_close do end
+            # new_channel.on_extended_data do |_ch, type, data| end
+            # new_channel.on_close do end
           end
           until channel do process end
         end
         logger.debug 'channel is ready, running callbacks now'
-        after_open_channel_procs.each  { |_name, a_proc| a_proc.call }
+        after_open_channel_procs.each { |_name, a_proc| instance_eval(&a_proc) }
         process
         self
       end
@@ -284,7 +285,7 @@ module Net
         self.channel = nil
       end
 
-      private 
+      private
 
       def with_prompts
         @with_prompts ||= []
@@ -312,7 +313,7 @@ end
 class Net::SSH::Connection::Session
   attr_accessor :cli_channels
   def cli(**opts)
-    cli_session = Net::SSH::CLI::Session.new({net_ssh: self}.merge(opts))
+    cli_session = Net::SSH::CLI::Session.new({ net_ssh: self }.merge(opts))
     cli_session.open_channel
     cli_session
   end

data/lib/net/ssh/cli/version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Net
   module SSH
     module CLI
-      VERSION = "0.3.0"
+      VERSION = '1.0.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Fabian Stillhart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Net::SSH::CLI: A library to handle CLI Sessions'