danarchy_sys 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 425cdec809b087727a5dd9c9f6f4bf6752d1e23f29021921f5350c22201f8e46
-  data.tar.gz: a0a09bd3bca283330e9597d3ebbb1e1b753dff3d5e956ae14f3e427c5bc395ec
+  metadata.gz: 37afb4c44981ca4c353940933cf1b6edcb8653d2294fb783382a5554d7870321
+  data.tar.gz: e9e460d13686dde0a882425e719f7c7629f19d8e244d3edee68142bfc107611a
 SHA512:
-  metadata.gz: 04a1a995b50c94b7237aabdcae302767835282189cf94c95c703442f4cc8a6f4e97d6f29a448d4521a63544ef4eae9b5b5200eb24c026cf3e7bd5ab56c1b6522
-  data.tar.gz: c2f02632a979e7b6381103fa6c191e6c6ccb3e53d0bc87a8d1f95908095ebf1f5fa7b5e29638d360e2765de5fed3773038e945575c00c330e06e75738fffef0b
+  metadata.gz: 82fa8db40aa5f030b99faa0a16588a472d8993e8a1624213393eaf6e12ba2d30b062f2dbb965cc508885dc0b36c1ff78bfa3ba8bf197bca72b45bd48e0e03b72
+  data.tar.gz: bab5de7dd8fc27351574591cc65e04ce4658fd9a842955845a8b486f3c3311cad493c45379b432bb009d57f30510f769495069d68b028e6cc541fe4ef6eea70c

data/lib/danarchy_sys/cli.rb

@@ -21,9 +21,9 @@ module DanarchySys
 
       loop do
         print 'command ~: '
-        cmd = gets.chomp
+        cmd = gets
+        cmd = cmd ? cmd.chomp : abort('Exiting!')
 
-        next if cmd.empty?
         if cmd =~ /^[0-9]*$/
           menu[cmd.to_i].map { |k, v| cmd = k } if menu.keys.include? cmd.to_i
         end

data/lib/danarchy_sys/cli/accounts.rb

@@ -17,9 +17,8 @@ class Accounts
 
     until accounts.values.include?(account)
       print 'Which account should we use? (enter \'exit\' to leave): '
-      account = gets.chomp
-
-      abort('Exiting') if account == 'exit'
+      account = gets
+      account = account ? account.chomp : abort('Exiting!')
 
       if account =~ /^[0-9]*$/
         account = accounts[account.to_i]

data/lib/danarchy_sys/cli/instance_manager.rb

@@ -18,9 +18,8 @@ class InstanceManager
       end
 
       print "#{instance.name} ~: " if instance
-      cmd = gets.chomp
-
-      next if cmd.empty?
+      cmd = gets
+      cmd = cmd ? cmd.chomp : abort('Exiting!')
       abort('Exiting!') if cmd == 'exit'
 
       if cmd =~ /^[0-9]*$/
@@ -46,7 +45,8 @@ class InstanceManager
         end
       elsif cmd == 'status'
         instance = @os_compute.instances.get_instance(instance.name)
-        if instance.state == 'ACTIVE' && @os_compute.ssh(instance, 'uptime')[:stderr]
+        uptime_result = @os_compute.ssh(instance, 'uptime')
+        if instance.state == 'ACTIVE' && uptime_result[:stderr]
           printf("%#{instance.name.size}s %0s %0s\n", instance.name, ' => ', 'WAITING')
         else
           printf("%#{instance.name.size}s %0s %0s\n", instance.name, ' => ', instance.state)
@@ -120,13 +120,14 @@ class InstanceManager
     print 'Enter an instance to manage or enter a name for a new instance: '
 
     until instances_numhash.values.collect{|i| i[:name]}.include?(instance_name)
-      instance_name = gets.chomp
+      instance_name = gets
 
       until instance_name.empty? == false
         print 'Input was blank! Enter an instance or Id from above: '
         instance_name = gets.chomp
       end
 
+      instance_name = instance_name ? instance_name.chomp : abort('Exiting!')
       abort('Exiting') if instance_name == 'exit'
       return 'main' if instance_name == 'main'
 

data/lib/danarchy_sys/openstack/compute.rb

@@ -37,64 +37,55 @@ module DanarchySys
 
       def ssh(instance, *cmd)
         instance = instances.get_instance(instance) if instance.class == String
-        opts = { quiet: true }
-        opts[:command] = cmd ? cmd.shift : nil
         pemfile = keypairs.pemfile_path(instance.key_name)
         addrs = instances.get_public_addresses(instance)
-        # (instances, keypairs, images) = instances, keypairs, images
-        # instance = instances.get_instance(instance)
 
+        opts = { quiet: true }
+        opts[:command] = cmd ? cmd.shift : nil
+        connector = { ipv4: addrs.grep(/\./).first,
+                      ipv6: addrs.grep(/:/).first,
+                      ssh_key: pemfile,
+                      ssh_user: nil }
         # Define user by image_id
         image = images.get_image_by_id(instance.image['id'])
-
-        ssh, user = nil
         if image == nil
           puts "Image not found for #{instance.name}! This instance needs to be rebuild with a current image."
           puts "Attempting to determine the correct username and log in..."
-          ssh, user = fallback_ssh(ipv4, pemfile)
+          connector = fallback_ssh(connector)
         else
-          user = 'ubuntu' if image.name =~ /ubuntu/i
-          user = 'debian' if image.name =~ /debian/i
-          user = 'centos' if image.name =~ /centos/i
-          user = 'fedora' if image.name =~ /fedora/i
-          user = 'core'   if image.name =~ /coreos/i
+          connector[:ssh_user] = 'gentoo' if image.name =~ /gentoo/i
+          connector[:ssh_user] = 'ubuntu' if image.name =~ /ubuntu/i
+          connector[:ssh_user] = 'debian' if image.name =~ /debian/i
+          connector[:ssh_user] = 'centos' if image.name =~ /centos/i
+          connector[:ssh_user] = 'fedora' if image.name =~ /fedora/i
+          connector[:ssh_user] = 'core'   if image.name =~ /coreos/i
         end
 
-        return if !user
-
-        connector = { ipv4: addrs.grep(/\./).first,
-                      ipv6: addrs.grep(/:/).first,
-                      ssh_user: user,
-                      ssh_key: pemfile }
-
+        return if ! connector[:ssh_user]
         SSH.new(connector, opts)
       end
 
-      def fallback_ssh(ipv4, pemfile)
-        # This needs some updating to utilize the SSH module as above.
-        users = %w[debian ubuntu centos fedora core]
-        ssh, user = nil
+      def fallback_ssh(connector)
+        users = %w[gentoo debian ubuntu centos fedora core]
+        fb_opts = { quiet: true, command: 'uptime' }
 
         users.each do |username|
-          print "Attempting connection as user: #{username} @ #{ipv4} => "
-          connect = "/usr/bin/ssh -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o PasswordAuthentication=no -i '#{pemfile}' #{username}@#{ipv4}"
-          ssh = system("#{connect} 'uptime' &>/dev/null")
+          connector[:ssh_user] = username
+          print 'Attempting connection as user: '
+          print connector[:ssh_user], ' @ ', connector[:ipv4], ' => '
+          fallback_result = SSH.new(connector, fb_opts)
 
-          if ssh == true
+          if fallback_result[:stdout]
             puts 'success'
-            user = username
             break
           else
             puts 'failed'
+            connector[:ssh_user] = nil
           end
         end
 
-        if ssh == false
-          puts 'Unable to connect! User unknown or SSHd is not running on the instance.' 
-          return ssh, nil
-        else
-          return [ssh, user]
-        end
+        puts 'Unable to determine user or SSHd is not running!' if ! connector[:ssh_user]
+        connector
       end
     end
   end

data/lib/danarchy_sys/version.rb

@@ -1,3 +1,3 @@
 module DanarchySys
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack