cloudstack-cli 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffadc0abeb36e96de2834f68f1f892685a34ef55
-  data.tar.gz: 8977041739bfc80f370c07d8dde52418b744e626
+  metadata.gz: c3825bffdc7d610ccd33d5ea01d48804ad3caeaf
+  data.tar.gz: 23e2821aaf38b61cbc98091a460f91e42d75ebb9
 SHA512:
-  metadata.gz: 8400276d74958d7c19f8cf1649360190339faa317145b91cd9f3845618e84375e574ab43ad4585da9c8476d1f9feeffd04c60b4a33d5872769489a3cafafb98a
-  data.tar.gz: 1e60b27a881ff70e68c6add4a7e7801731f8ac37ab366457c616dcc8036e657b8550cd227ab548923309e832bbd69a6f9291abff293d4f36640ab1d6d72194b1
+  metadata.gz: 2eca64f2d69c815e19fbf7696087efc5a9a0f3f743acec88c5ea26c8b6a155510f1471b977bac4d6113dd351148abf393402698dec05ab4f938997be8c30a5cb
+  data.tar.gz: 7c43cc6ce81a7df4c7bffc94a967786fc76ff50da12951ec2eafda751e9da1541a83263c4c69870f525338e9687715b4a0b7c0f1244df99a540d680fab880ad2

data/Gemfile.lock

@@ -6,7 +6,7 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.8)
+    cloudstack-cli (1.5.9)
       cloudstack_client (~> 1.4.3)
       thor (~> 0.19)
 

data/lib/cloudstack-cli/commands/virtual_machine.rb

@@ -104,9 +104,7 @@ class VirtualMachine < CloudstackCli::Base
     vm_options_to_params
     say "Start deploying virtual machine#{"s" if names.size > 1}...", :green
     jobs = names.map do |name|
-      if virtual_machine = client.list_virtual_machines(
-        name: name, project_id: options[:project_id]
-        ).first
+      if virtual_machine = find_vm_by_name(name)
         say "virtual machine #{name} (#{virtual_machine["state"]}) already exists.", :yellow
         job = {id: 0, name: "Create virtual machine #{name}", status: 3}
       else
@@ -118,26 +116,27 @@ class VirtualMachine < CloudstackCli::Base
       job
     end
     watch_jobs(jobs)
-    if options[:port_rules].size > 0
+    successful_jobs = jobs.count {|job| job[:status] == 1 }
+    if options[:port_rules].size > 0 && successful_jobs > 0
       say "Create port forwarding rules...", :green
       pjobs = []
       names.each do |name|
-        virtual_machine = client.list_virtual_machine(name: name, project_id: options[:project_id]).first
-        create_port_rules(virtual_machine, options[:port_rules], false).each_with_index do |job_id, index|
+        vm = client.list_virtual_machines(name: name, project_id: options[:project_id]).first
+        create_port_rules(vm, options[:port_rules], false).each_with_index do |job_id, index|
           pjobs << {
             id: job_id,
-            name: "Create port forwarding ##{index + 1} rules for virtual machine #{virtual_machine['name']}"
+            name: "Create port forwarding ##{index + 1} rules for VM #{vm['name']}"
           }
         end
       end
       watch_jobs(pjobs)
     end
     say "Finished.", :green
-    if (jobs.count {|job| job[:status] == 1 } > 0) && yes?("Display password(s) for VM(s)? [y/N]:", :yellow)
+    if successful_jobs > 0 && yes?("Display password(s) for VM(s)? [y/N]:", :yellow)
       table = []
       jobs.each do |job|
         data = client.query_async_job_result(jobid: job[:id])["jobresult"]["virtualmachine"] rescue nil
-        table << [data["name"], data["password"]] if data
+        table << ["#{data["name"]}:", data["password"]] if data
       end
       print_table table
     end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.8"
+  VERSION = "1.5.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake