danarchy_sys 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1dc8aee4f74e525822bf6f39af45612d8a7abd9
-  data.tar.gz: 997a84b936ea0fd23e4134a2294612e654439075
+  metadata.gz: 5dd08ba1e4fcce5f446e2198ca93828f8f9271d9
+  data.tar.gz: 00c68532f44cbec2e9891bf47f820419ef57e287
 SHA512:
-  metadata.gz: 8293f2a3dfb97a1a6b947a31ba11f6c6412d09ad3ce326a2f017d3233711567f03e6831240f420bdbcd0b360117f3de5ffbfd43fd70980d8ddeb7c4007e044c2
-  data.tar.gz: f4e9bc35308b8bf9e0be45791e74c8032f5416fdc262df1c7c9349fcc8c60f539fd04667918e5b6517e5d41837fc5d5a4357b20cc84c6f43b6d6fec1d3454f4c
+  metadata.gz: 395284512dd1b5b7447cb7e3f9dafac22c5a88283d36c224f5d812389a4863628c46d3ed52f3c88e757d102dec638b59a3530e397ee6f5461ac617663dbaeec5
+  data.tar.gz: 8c8f71e0205ed5af717fc2fe95c9f1e14bc791687cbbbf97d1dfef592ba2b83cdbb60c15cd633c0dcb7c677eca98d28dac30d55e9aba93ee2acae2a3704117ae

data/README.txt

@@ -39,7 +39,7 @@ OpenStack -> os_dreamcompute
 dAnarchy_sys main menu commands:
 Enter 'help' to view available commands or 'exit' to leave.
 1. instance: Instance Manager
-2.  keypair: Keypair Manager (Not yet implemented!)
+2.  keypair: Keypair Manager
 3.     help: Outputs commands for current the menu level
 4.     exit: Exit dAnarchy_sys
 command ~: instance

data/lib/danarchy_sys/cli/instance_manager.rb

@@ -3,7 +3,7 @@ require_relative 'instance_manager/instance_status'
 
 class InstanceManager
   def self.manager(os_compute)
-    comp_inst = os_compute.compute_instances
+    comp_inst = os_compute.instances
     puts 'Instance Manager: enter \'help\' to view available commands or \'main\' for the main menu.'
     menu = Menus.numbered_menu('instance')
     instance = false
@@ -60,7 +60,7 @@ class InstanceManager
         end
         
         until status != instance.state
-          instance = os_compute.compute_instances.get_instance(instance.name)
+          instance = os_compute.instances.get_instance(instance.name)
           sleep(3)
           print ' .'
         end
@@ -68,7 +68,7 @@ class InstanceManager
         printf("\n%#{instance.name.size}s %0s %0s\n", instance.name, ' => ', instance.state)
       elsif cmd == 'connect'
         if instance.state == 'ACTIVE'
-          os_compute.compute_ssh(instance.name.to_s)
+          os_compute.ssh(instance.name.to_s)
         else
           puts "Unable to connect: #{instance.name} is not running!"
         end
@@ -82,7 +82,7 @@ class InstanceManager
   end
 
   def self.chooser(os_compute)
-    comp_inst = os_compute.compute_instances
+    comp_inst = os_compute.instances
     instances = comp_inst.all_instances
     instances_numhash = Helpers.objects_to_numhash(instances)
     instance_name = 'nil'

data/lib/danarchy_sys/cli/instance_manager/instance_status.rb

@@ -27,9 +27,9 @@ class InstanceStatus
   end
 
   def self.single_instance(os_compute, instance)
-    comp_inst = os_compute.compute_instances
-    comp_imgs = os_compute.compute_images
-    comp_flvs = os_compute.compute_flavors
+    comp_inst = os_compute.instances
+    comp_imgs = os_compute.images
+    comp_flvs = os_compute.flavors
 
     image  = comp_imgs.get_image_by_id(instance.image['id'])
     flavor = comp_flvs.get_flavor_by_id(instance.flavor['id'])

data/lib/danarchy_sys/cli/instance_manager/prompts_create_instance.rb

@@ -2,10 +2,10 @@
 # CLI Prompt to create a new instance
 class PromptsCreateInstance
   def self.create_instance(os_compute, instance_name)
-    comp_inst = os_compute.compute_instances
-    comp_imgs = os_compute.compute_images
-    comp_flvs = os_compute.compute_flavors
-    comp_keys = os_compute.compute_keypairs
+    comp_inst = os_compute.instances
+    comp_imgs = os_compute.images
+    comp_flvs = os_compute.flavors
+    comp_keys = os_compute.keypairs
 
     # Prompt for and check that instance_name is unused
     if instance_name == 'nil'
@@ -79,12 +79,12 @@ class PromptsCreateInstance
       image_name = gets.chomp
 
       if image_name =~ /^[0-9]*$/
-        until images_numbered.keys.include?(image_name)
+        until images_numbered.keys.include?(image_name.to_i)
           print "#{image_name} is not a valid Id. Enter an Id from above: "
           image_name = gets.chomp
         end
 
-        image_name = images_numbered[image_name.to_s]
+        image_name = images_numbered[image_name.to_i]
       end
 
       image_check = images_numbered.values.include?(image_name)

data/lib/danarchy_sys/cli/keypair_manager.rb

@@ -3,7 +3,7 @@ require_relative './keypair_manager/keypair_status'
 
 class KeypairManager
   def self.manager(os_compute)
-    comp_kp = os_compute.compute_keypairs
+    comp_kp = os_compute.keypairs
     puts 'Keypair Manager: enter \'help\' to view available commands or \'main\' for the main menu.'
     menu = Menus.numbered_menu('keypair')
     keypair = false
@@ -63,7 +63,7 @@ class KeypairManager
   end
 
   def self.chooser(os_compute)
-    comp_kp = os_compute.compute_keypairs
+    comp_kp = os_compute.keypairs
     keypairs = comp_kp.list_keypairs
     keypair_numhash = Helpers.array_to_numhash(keypairs)
     keypair_name = 'nil'

data/lib/danarchy_sys/cli/keypair_manager/keypair_status.rb

@@ -1,7 +1,7 @@
 
 class KeypairStatus
   def self.all_keypairs(os_compute)
-    keypairs = os_compute.compute_keypairs.all_keypairs
+    keypairs = os_compute.keypairs.all_keypairs
 
     keypairs.each do |keypair|
       single_keypair(keypair)

data/lib/danarchy_sys/openstack/compute.rb

@@ -13,24 +13,24 @@ module DanarchySys
         @compute = Fog::Compute::OpenStack.new(connection)
       end
 
-      def compute_instances
+      def instances
         ComputeInstances.new(@compute, @settings)
       end
 
-      def compute_keypairs
+      def keypairs
         ComputeKeypairs.new(@compute, @settings)
       end
 
-      def compute_images
+      def images
         ComputeImages.new(@compute)
       end
 
-      def compute_flavors
+      def flavors
         ComputeFlavors.new(@compute)
       end
 
-      def compute_ssh(instance_name)
-        (comp_inst, comp_kp, comp_img) = compute_instances, compute_keypairs, compute_images
+      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)

data/lib/danarchy_sys/version.rb

@@ -1,3 +1,3 @@
 module DanarchySys
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack