cloudstack-cli 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c34b7f237ea0250c6de7a9a10f22a0612202eeb0
-  data.tar.gz: c9e88bd0af1e99fa4f10163a028ca93bf9fab549
+  metadata.gz: 7f19da3cf7b9d2686ef53fd9b67d4091c1831347
+  data.tar.gz: 2a925bd77fb12aae8a15fcc36eadae05b7069091
 SHA512:
-  metadata.gz: ddd33548d44e425bde77372aafd0798387879640174427b99801873d50ef05ca01676bb92ebaf29f071ff957011991b388724e3418cb95fcf8a825be24d0cc69
-  data.tar.gz: af576f5d1083f9586da2a72c906662a20b1be6f01b6c5e708750596de0681a0f2c6f8cf39f0a5d6d7674983359a70f4e71359df22818ede0f6d234a1debbd7df
+  metadata.gz: be41e2b1289dc5f177a1ada9d94de0a231156e1398b25aa7a612eb6e9dbc61628dba8d7808843efb47c1d8b2a5ff4ae534e1768d515d7d91d64712dffd57ce89
+  data.tar.gz: 92258347ea84d3030b37129c729a6c2bc3a259739ea37d373b836876b4b627f48ddd85c2f4162c67187104812aefba62e7e4edb6eb178b3f3e17195454f6fbed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.0.0)
+    cloudstack-cli (1.0.2)
       cloudstack_client (~> 1.0.3)
       thor (~> 0.19.1)
 

data/lib/cloudstack-cli/helper.rb

@@ -18,6 +18,43 @@ module CloudstackCli
       2  => "error"
     }
 
+    def watch_jobs(jobs)
+      chars = %w(| / - \\)
+      call = 0
+      opts = {t_start: Time.now}
+      jobs = update_job_status(jobs)
+      while jobs.select{|job| job[:status].to_i < 1 }.size > 0 do
+        if call.modulo(40) == 0
+          t = Thread.new { jobs = update_job_status(jobs) }
+          while t.alive?
+            chars = print_job_status(jobs, chars,
+              call == 0 ? opts.merge(no_clear: true) : opts
+            )
+            call += 1
+          end
+          t.join
+        else
+          chars = print_job_status(jobs, chars,
+            call == 0 ? opts.merge(no_clear: true) : opts
+          )
+          call += 1
+        end
+      end
+      print_job_status(jobs, chars,
+        call == 0 ? opts.merge(no_clear: true) : opts
+      )
+    end
+
+    def update_job_status(jobs)
+      jobs.each do |job|
+        job[:status] = 0 unless job[:status]
+        if job[:status] == 0
+          job[:status] = client.query_async_job_result(job_id: job[:id])['jobstatus']
+        end
+      end
+      jobs
+    end
+
     def run_background_jobs(jobs, command)
       view_thread = Thread.new do
         chars = %w(| / - \\)
@@ -144,7 +181,7 @@ module CloudstackCli
         else
           ip_addr = frontendip ||= client.associate_ip_address(
             network_id: server["nic"].first["networkid"]
-          )
+          )["ipaddress"]
         end
         port = pf_rule.split(":")[1]
         args = {

data/lib/cloudstack-cli/option_resolver.rb

@@ -103,7 +103,7 @@ module CloudstackCli
             name: options[:iso],
             project_id: options[:project_id]
           ).first
-          say "Error: Iso '#{args[:iso]}' is invalid.", :red
+          say "Error: Iso '#{options[:iso]}' is invalid.", :red
           exit 1
         end
         unless options[:diskoffering_id]

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc