danarchy_sys 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c3ad8faf86550ad951bf1bb6b8f4e25220264628373ba1da95fe0b1fac942f
-  data.tar.gz: 78d4d8bebebd00e899aa25840a6ce96b6d70f0bef9e3a8cd0611dddc90e396c1
+  metadata.gz: 425cdec809b087727a5dd9c9f6f4bf6752d1e23f29021921f5350c22201f8e46
+  data.tar.gz: a0a09bd3bca283330e9597d3ebbb1e1b753dff3d5e956ae14f3e427c5bc395ec
 SHA512:
-  metadata.gz: 5f8e7e628ac733cf73a28295f73e821541e8f2ce1769351b6151abf2327e4a575809abe0bb1af33b755afc2b72deac7570a2972303e3869b3bda174a9d3ad5f0
-  data.tar.gz: 6de2f4c30e92333830e293a5b5e0f08f7602561f9e540c7457c0a4201549b37104bedc1a6c175596f264dc18278ee3e7e0f1cab022d71aa0c1bdbb41223a774b
+  metadata.gz: 04a1a995b50c94b7237aabdcae302767835282189cf94c95c703442f4cc8a6f4e97d6f29a448d4521a63544ef4eae9b5b5200eb24c026cf3e7bd5ab56c1b6522
+  data.tar.gz: c2f02632a979e7b6381103fa6c191e6c6ccb3e53d0bc87a8d1f95908095ebf1f5fa7b5e29638d360e2765de5fed3773038e945575c00c330e06e75738fffef0b

data/bin/danarchy_sys

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require_relative '../lib/danarchy_sys'
 require_relative '../lib/danarchy_sys/cli'
 
 DanarchySys::CLI.new

data/lib/danarchy_sys/cli/instance_manager.rb

@@ -46,7 +46,11 @@ class InstanceManager
         end
       elsif cmd == 'status'
         instance = @os_compute.instances.get_instance(instance.name)
-        printf("%#{instance.name.size}s %0s %0s\n", instance.name, ' => ', instance.state)
+        if instance.state == 'ACTIVE' && @os_compute.ssh(instance, 'uptime')[: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)
+        end
       elsif %w(pause unpause suspend resume start stop).include?(cmd.to_s)
         status = instance.state
 
@@ -74,15 +78,14 @@ class InstanceManager
         print "Should we rebuild #{instance.name} with image: #{image.name}? (Y/N): "
         if gets.chomp =~ /^y(es)?$/i
           puts "Rebuilding #{instance.name} with #{image.name}"
-          @os_compute.instances.rebuild_instance(instance, image)
-          instance = @os_compute.instances.get_instance(instance.name)
+          instance = @os_compute.instances.rebuild_instance(instance, image)
           puts "\nRebuild in progress!"
         else
           puts "Not rebuilding #{instance.name} at this time."
         end
       elsif cmd == 'connect'
         if instance.state == 'ACTIVE'
-          @os_compute.ssh(instance.name)          
+          @os_compute.ssh(instance.name)
         else
           puts "Unable to connect: #{instance.name} is not running!"
         end

data/lib/danarchy_sys/cli.rb

@@ -1,14 +1,11 @@
-
-require_relative '../danarchy_sys'
+require_relative 'cli/menus'
+require_relative 'cli/accounts'
+require_relative 'cli/instance_manager'
+require_relative 'cli/keypair_manager'
 
 module DanarchySys
   class CLI
     def initialize
-      require_relative 'cli/menus'
-      require_relative 'cli/accounts'
-      require_relative 'cli/instance_manager'
-      require_relative 'cli/keypair_manager'
-
       danarchysys_config = DanarchySys::ConfigManager::Config.new
       account = Accounts.chooser(danarchysys_config)
       connection = danarchysys_config[:accounts][account]

data/lib/danarchy_sys/openstack/compute/instances.rb

@@ -110,18 +110,6 @@ class ComputeInstances
     instance
   end
 
-  def rebuild_instance(instance, image)
-    instance = get_instance(instance) if instance.class == String
-
-    instance.rebuild(image.id, instance.name)
-    addrs = [get_public_addresses(instance),
-             get_private_addresses(instance)].flatten.compact!
-    addrs.each { |addr| system("ssh-keygen -R #{addr} &>/dev/null") }
-
-    # instance.wait_for { ready? }
-    instance
-  end
-
   def delete_instance(instance)
     instance = get_instance(instance) if instance.class == String    
     return 1 if instance == false
@@ -142,4 +130,24 @@ class ComputeInstances
 
     return true
   end
+
+  def rebuild_instance(instance, image)
+    instance = get_instance(instance) if instance.class == String
+
+    instance.rebuild(image.id, instance.name)
+    addrs = [get_public_addresses(instance),
+             get_private_addresses(instance)].flatten.compact!
+    addrs.each { |addr| system("ssh-keygen -R #{addr} &>/dev/null") }
+
+    # instance.wait_for { ready? }
+    get_instance(instance.name)
+  end
+
+  def ssh_connector(instance)
+    addrs = get_public_addresses(instance.name)
+    { ipv4: addrs.grep(/\./).first,
+      ipv6: addrs.grep(/:/).first,
+      ssh_user: user,
+      ssh_key: pemfile }
+  end
 end

data/lib/danarchy_sys/openstack/compute.rb

@@ -2,6 +2,7 @@ require_relative 'compute/instances'
 require_relative 'compute/keypairs'
 require_relative 'compute/images'
 require_relative 'compute/flavors'
+require 'shellwords'
 
 module DanarchySys
   module OpenStack
@@ -34,19 +35,17 @@ module DanarchySys
         ComputeSecgroups.new(@compute)
       end
 
-      def ssh(instance_name)
-        (comp_inst, comp_kp, comp_img) = instances, keypairs, images
-        instance = comp_inst.get_instance(instance_name)
-        keypair_name = instance.key_name
-        pemfile = comp_kp.pemfile_path(keypair_name)
-        
-        addrs = comp_inst.get_public_addresses(instance_name)
-        ipv4 = addrs.grep(/\./).first
-        ipv6 = addrs.grep(/:/).first
+      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)
 
         # Define user by image_id
-        image_id = instance.image['id']
-        image = comp_img.get_image_by_id(image_id)
+        image = images.get_image_by_id(instance.image['id'])
 
         ssh, user = nil
         if image == nil
@@ -63,12 +62,16 @@ module DanarchySys
 
         return if !user
 
-        print "Connecting as user: #{user} @ #{ipv4} " + cmd + "\n"
-        connect = "/usr/bin/ssh -o ConnectTimeout=15 -o StrictHostKeyChecking=no -o PasswordAuthentication=no -i '#{pemfile}' #{user}@#{ipv4}"
-        system(connect)
+        connector = { ipv4: addrs.grep(/\./).first,
+                      ipv6: addrs.grep(/:/).first,
+                      ssh_user: user,
+                      ssh_key: pemfile }
+
+        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
 

data/lib/danarchy_sys/openstack.rb

@@ -1,4 +1,3 @@
-
 require 'fog/openstack'
 
 module DanarchySys

data/lib/danarchy_sys/ssh.rb

@@ -0,0 +1,35 @@
+require 'open3'
+require 'shellwords'
+
+class SSH
+  def self.new(connector, opts = {})
+    # connector: { ipv4: "str", ssh_user: "str", ssh_key: "str" }
+    # options: { command: "str", timeout: int, quiet: true|false }
+    opts[:timeout] ||= 30
+    opts[:quiet]   ||= false
+    pid, stdout, stderr = nil
+    ssh  = "ssh -i '#{connector[:ssh_key]}' #{connector[:ssh_user]}@#{connector[:ipv4]} "
+    ssh += "-o StrictHostKeyChecking=no "
+    ssh += "-o ConnectTimeout=#{opts[:timeout]} " if opts[:timeout]
+    
+    if opts[:command]
+      puts "Running '#{opts[:command]}' on '#{connector[:ipv4]}'" unless opts[:quiet]
+      ssh += Shellwords.shellescape(opts[:command])
+
+      Open3.popen3(ssh) do |i, o, e, t|
+        pid = t.pid
+        (out, err) = o.read, e.read
+        stdout = !out.empty? ? out : nil
+        stderr = !err.empty? ? err : nil
+      end
+    else
+      return system(ssh)
+    end
+
+    if opts[:quiet] == false
+      puts "------\nErrored at: #{caller_locations.first.label} Line: #{caller_locations.first.lineno}\nSTDERR: ", stderr, '------' if stderr
+      puts "------\nSTDOUT: ", stdout, '------' if stdout
+    end
+    { pid: pid, stdout: stdout, stderr: stderr }
+  end
+end

data/lib/danarchy_sys/version.rb

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

data/lib/danarchy_sys.rb

@@ -1,7 +1,6 @@
-
-require 'fog/openstack'
 require_relative 'danarchy_sys/version'
 require_relative 'danarchy_sys/helpers'
+require_relative 'danarchy_sys/ssh'
 require_relative 'danarchy_sys/config_manager'
 require_relative 'danarchy_sys/printformats'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2018-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack
@@ -114,6 +114,7 @@ files:
 - lib/danarchy_sys/openstack/compute/tests/keypairs_test.rb
 - lib/danarchy_sys/openstack/compute/tests/manage_test.rb
 - lib/danarchy_sys/printformats.rb
+- lib/danarchy_sys/ssh.rb
 - lib/danarchy_sys/version.rb
 homepage: https://github.com/danarchy85/danarchy_sys
 licenses: