runssh 0.2.2 → 0.4.0

data/lib/runsshlib/ssh_backend.rb

@@ -20,23 +20,53 @@ module RunSSHLib
 
   # A collection of ssh procedures.
   module SshBackend
+
+    class KnownHostsUtils
+      attr_reader :known_hosts_file
+
+      def initialize(known_hosts_file=File.expand_path('~/.ssh/known_hosts'))
+        @known_hosts_file = known_hosts_file
+      end
+
+      def delete_line_from_known_hosts_file(line_number)
+        `sed -i -e "#{line_number}d" #{@known_hosts_file}`
+        raise 'Error deleting line from known_hosts file! See output for details' unless
+              $? == 0
+      end
+    end
+
     module_function
 
     # run shell on remote host.
     # definition:: A Hash containing required data for
-    # making shell connection (e.g., :host_name, :login).
+    #              making shell connection (e.g., :host_name, :login).
     #
     # For running remote commands add to the _definition_ hash
     # the entire remote command as a string with a +:remote_cmd+ key.
     def shell(definition)
       raise "no hostname" unless definition[:host_name] # should never happen
+      rmtcmd_flag = (definition[:remote_cmd] && (!definition[:remote_cmd].empty?))
       command = "ssh "
+      command << "-t " if (rmtcmd_flag && (!definition[:no_pseudo_terminal]))
       command << "-l #{definition[:login]} " if definition[:login]
       command << "#{definition[:host_name]}"
-      command << " -L #{normalize_tunnel_definition definition[:local_tunnel]} " if
+      command << " -L #{normalize_tunnel_definition definition[:local_tunnel]}" if
                  definition[:local_tunnel]
-      command << %( -- "#{definition[:remote_cmd]}") if
-                 (definition[:remote_cmd] && (!definition[:remote_cmd].empty?))
+      definition[:option].each do |option|
+        command << " -o #{option}"
+      end if definition[:option]
+      command << %( -- "#{definition[:remote_cmd]}") if rmtcmd_flag
+      exec command
+    end
+
+    # Copy ssh identity file to remote host according to options
+    # options:: A hash containing host definition (:host_name, etc) and
+    #           optionally identity_file path.
+    def copy_id(options)
+      command = "ssh-copy-id "
+      command << "-i #{options[:identity_file]} " if options[:identity_file]
+      command << "#{options[:login]}@" if options[:login]
+      command << "#{options[:host_name]}"
       exec command
     end
 

data/lib/runsshlib/ssh_host_def.rb

@@ -41,9 +41,19 @@ module RunSSHLib
     alias_method :eql?, :==
 
     def to_print
-      out = "    * host: #{definition[:host_name]}"
+      out =    "    * host: #{definition[:host_name]}"
       out << "\n    * login: #{definition[:login] || 'current user'}"
+      if definition[:local_tunnel]
+        tunnel = RunSSHLib::SshBackend.normalize_tunnel_definition(definition[:local_tunnel])
+        out << "\n    * local tunnel: #{tunnel}"
+      end
+      if definition[:option] && definition[:option].any?
+        out << "\n    * ssh options:"
+        definition[:option].each do |option|
+          out << "\n      - #{option}"
+        end
+      end
       out
     end
   end
-end
+end

data/lib/runsshlib/version.rb

@@ -19,9 +19,9 @@
 module RunSSHLib
   module Version
     MAJOR = 0
-    MINOR = 2
-    BUILD = 2
+    MINOR = 4
+    BUILD = 0
 
     STRING = [MAJOR, MINOR, BUILD].compact.join('.')
   end
-end
+end

data/lib/runsshlib.rb

@@ -38,6 +38,9 @@ module RunSSHLib
   # message should contain only the older config version!
   class OlderConfigVersionError < StandardError; end
 
+  # Just a general abort with error
+  class AbortError < StandardError; end
+
   # A placeholder for host definitions
   HostDef = Struct.new(:name, :login)
 end

data/runssh.gemspec

@@ -19,11 +19,6 @@ EOF
   s.required_ruby_version = '>= 1.8.7'
   s.add_dependency('trollop', '~> 1.16.2')
   s.add_dependency('highline', '~> 1.6.1')
-  s.add_development_dependency('rspec', "~> 2.1.0")
-  s.add_development_dependency('rcov', '~> 0.9.9')
-  s.add_development_dependency('autotest', '~> 4.4.4')
-  s.add_development_dependency('autotest-fsevent', '~> 0.2.3')
-  s.add_development_dependency('autotest-growl', '~> 0.2.6')
 
   s.has_rdoc          = true
   s.extra_rdoc_files  = ['README.rdoc']