danarchy_sys 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b1e094ad82f2d002063b01c037957cbfd6e915f
-  data.tar.gz: 55b06fbcd0d476ea85df5a058680d2806c03c295
+  metadata.gz: 91467380d7fc7465187c4929c8421828cb7d1343
+  data.tar.gz: c97f5d4a0b6ad94e05a2e7758b8f525f8184d2ee
 SHA512:
-  metadata.gz: 3409e3db49b0d56cd2ed32d269ba41f775d04c47adedcfc6d24411bc88f609b6e4fedeb3292ccc2f22c700854a727159e0ed4719f1bb1d9ca7db90f52a9836a4
-  data.tar.gz: 0c24575f54b573901d98712b758507d8689a65d698e326bb759da25b37acf65dbb4d1dde6e4735bb12622984829dc7987ccaaa7a6dd43532f99e264a0ed1435a
+  metadata.gz: 09f9b084eba3b008aacd25310afe55d2a298ac8113649bd1224689be72418cfc5bc79674fd8f3685dc85f8e76d916cdc4d85073324e102744f4ecf1702adbada
+  data.tar.gz: be506fe3640af9e886ccc951bc8067dbb0f89b858ebaaa1bdbce4a0ee85b7c27c0ef222a575835c06c88dc8c6b242bf4c3f703704c23ccd512042aeca99ccfd2

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

@@ -62,14 +62,14 @@ class PromptsCreateInstance
   end
 
   def self.image(comp_imgs)
-    images_numbered = Helpers.objects_to_numhash(comp_imgs.all_images({'status' => 'ACTIVE'}))
+    images_numbered = Helpers.array_to_numhash(comp_imgs.all_images)
 
     # List available images in a numbered hash.
     puts "\nAvailable Images:"
-    i_name_length = images_numbered.values.collect{|i| i[:name]}.max.size
+    i_name_length = images_numbered.values.collect{|i| i.name}.max.size
     printf("%0s %-#{i_name_length}s\n", 'Id', 'Image')
     images_numbered.each do |id, image|
-      printf("%0s %-#{i_name_length}s\n", "#{id}.", image[:name])
+      printf("%0s %-#{i_name_length}s\n", "#{id}.", image.name)
     end
 
     image_name = item_chooser(images_numbered, 'image')
@@ -78,19 +78,19 @@ class PromptsCreateInstance
   end
 
   def self.flavor(comp_flvs)
-    flavors_numbered = Helpers.objects_to_numhash(comp_flvs.all_flavors.sort_by(&:ram))
-    flavor_name = nil
+    flavors_numbered = Helpers.array_to_numhash(comp_flvs.all_flavors.sort_by(&:ram))
 
     puts "\nAvailable Instance Flavors:"
     puts sprintf("%0s %-15s %-10s %-10s %0s", 'Id', 'Name', 'RAM', 'VCPUs', 'Disk')
     flavors_numbered.each do |id, flavor|
       print sprintf("%0s %-15s %-10s %-10s %0s\n",
-                    "#{id}.", flavor[:name].split('.')[1], flavor[:ram], flavor[:vcpus], flavor[:disk])
+                    "#{id}.", flavor.name.split('.')[1], flavor.ram, flavor.vcpus, flavor.disk)
     end
 
     flavor_name = item_chooser(flavors_numbered, 'flavor')
     print "Flavor Name: #{flavor_name.split('.')[1]}\n"
-    comp_flvs.get_flavor(flavor_name)
+    p comp_flvs.methods
+    comp_flvs.get_flavor_by_name(flavor_name)
   end
 
   def self.keypair(comp_keys)
@@ -147,7 +147,7 @@ Should we create a new keypair named #{keypair_name}? (Y/N): "
     item_name = nil
     print "Which #{item} should we use for this instance?: "
 
-    until items_numbered.values.collect{|i| i[:name]}.include?(item_name)
+    until items_numbered.values.collect{|i| i.name}.include?(item_name)
       item_name = gets.chomp
 
       if item_name =~ /^[0-9]*$/
@@ -156,10 +156,10 @@ Should we create a new keypair named #{keypair_name}? (Y/N): "
           item_name = gets.chomp
         end
 
-        item_name = items_numbered[item_name.to_i][:name]
+        item_name = items_numbered[item_name.to_i].name
       end
 
-      item_check = items_numbered.values.collect{|i| i[:name]}.include?(item_name)
+      item_check = items_numbered.values.collect{|i| i.name}.include?(item_name)
       print "#{item_name} is not a valid item. Please enter an option from above: " if item_check == false
     end
     item_name

data/lib/danarchy_sys/version.rb

@@ -1,3 +1,3 @@
 module DanarchySys
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-17 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack