cloudstack-cli 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.3.1)
+    cloudstack-cli (0.3.2)
       thor (~> 0.18.1)
 
 GEM

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

@@ -40,63 +40,38 @@ class Router < CloudstackCli::Base
 		end
 
 		routers.reverse! if options[:reverse]
-		if routers.size < 1
-			say "No routers found."
-		else
-		  table = [[
-		  	'Name', 'Zone', 'Account', 'Project', 'Redundant-State', 'IP', 'Linklocal IP', 'Status', 'ID'
-		  ]]
-		  table[0].delete('ID') unless options[:showid]
-      routers.each do |router|
-        table << [
-          router["name"],
-          router["zonename"],
-          router["account"],
-          router["project"],
-          router["redundantstate"],
-          router["nic"].first ? router["nic"].first['ipaddress'] : "",
-          router["linklocalip"],
-          router["state"],
-          router["id"]
-        ]
-        table[-1].delete_at(-1) unless table[0].index "ID"
-      end
-      print_table table
-      puts
-      say "Number of routers: #{routers.size}"
-	  end
+    
+    print_routers(routers, options)		
 
 	  if options[:command]
 	  	case options[:command].downcase
 	  	when "start"
-	  		exit unless yes?("Start the routers above? [y/N]:", :magenta)
-	  		routers.each do |router|
-	  			say "Start router #{router['name']}... "
-	  			say "job started ", :green if job = client.start_router(router['id'], async: false)
-	  			say "(jobid: #{job['jobid']})"
+	  		exit unless yes?("\nStart the router(s) above? [y/N]:", :magenta)
+	  		jobs = routers.map do |router|
+	  			{id: client.start_router(router['id'], async: false)['jobid'], name: "Start router #{router['name']}"}
 	  		end
 	  	when "stop"
-	  		exit unless yes?("Stop the routers above? [y/N]:", :magenta)
-	  		routers.each do |router|
-	  			say "Stop router #{router['name']}... "
-	  			say "job started ", :green if job = client.stop_router(router['id'], async: false)
-	  			say "(jobid: #{job['jobid']})"
+	  		exit unless yes?("\nStop the router(s) above? [y/N]:", :magenta)
+	  		jobs = routers.map do |router|
+	  			{id: client.stop_router(router['id'], async: false)['jobid'], name: "Stop router #{router['name']}"}
 	  		end
 	  	else
-	  		say "Command #{options[:command]} not supported", :red
-	  		exit
+	  		say "\nCommand #{options[:command]} not supported.", :red
+	  		exit 1
 	  	end
+      puts
+      watch_jobs(jobs)
 	  end
   end
 
   desc "stop NAME [NAME2 ..]", "stop virtual router(s)"
   option :force, description: "stop without asking", type: :boolean, aliases: '-f'
   def stop(*names)
-    jobs = []
-  	names.each do |name|
-  		router = get_router(name)
-  		exit unless options[:force] || yes?("Stop router #{router['name']}?", :magenta)
-  		jobs << {id: client.stop_router(router['id'], async: false)['jobid'], name: "Stop router #{name}"}
+    routers = names.map {|name| get_router(name)}
+    print_routers(routers)
+    exit unless options[:force] || yes?("\nStop router(s) above?", :magenta)
+  	jobs = routers.map do |router|
+  		{id: client.stop_router(router['id'], async: false)['jobid'], name: "Stop router #{router['name']}"}
   	end
     puts
     watch_jobs(jobs)
@@ -105,11 +80,11 @@ class Router < CloudstackCli::Base
   desc "start NAME [NAME2 ..]", "start virtual router(s)"
   option :force, description: "start without asking", type: :boolean, aliases: '-f'
   def start(*names)
-  	jobs = []
-    names.each do |name|
-      router = get_router(name)
-      exit unless options[:force] || yes?("Start router #{router['name']}?", :magenta)
-      jobs << {id: client.start_router(router['id'], async: false)['jobid'], name: "Start router #{name}"}
+    routers = names.map {|name| get_router(name)}
+    print_routers(routers)
+    exit unless options[:force] || yes?("\nStart router(s) above?", :magenta)
+  	jobs = routers.map do |router|
+      {id: client.start_router(router['id'], async: false)['jobid'], name: "Start router #{router['name']}"}
     end
     puts
     watch_jobs(jobs)
@@ -118,15 +93,18 @@ class Router < CloudstackCli::Base
   desc "destroy NAME [NAME2 ..]", "destroy virtual router(s)"
   option :force, description: "destroy without asking", type: :boolean, aliases: '-f'
   def destroy(*names)
-  	names.each do |name|
-  		router = get_router(name)
-  		exit unless options[:force] || yes?("Destroy router #{router['name']}?", :magenta)
-  		say "OK", :green if client.destroy_router(router['id'])
-  		puts
+    routers = names.map {|name| get_router(name)}
+    print_routers(routers)
+    exit unless options[:force] || yes?("\nDestroy router(s) above?", :magenta)
+  	jobs = routers.map do |router|
+  		{id: client.destroy_router(router['id'], async: false)['jobid'], name: "Destroy router #{router['name']}"}
   	end
+    puts
+    watch_jobs(jobs)
   end
 
   no_commands do
+
   	def get_router(name)
   		unless router = client.get_router(name)
   			say "Can't find router with name #{name}.", :red
@@ -134,6 +112,34 @@ class Router < CloudstackCli::Base
   		end
   		router
   	end
+
+    def print_routers(routers, options = {})
+      if routers.size < 1
+        say "No routers found."
+      else
+        table = [[
+          'Name', 'Zone', 'Account', 'Project', 'Redundant-State', 'IP', 'Linklocal IP', 'Status', 'ID'
+        ]]
+        table[0].delete('ID') unless options[:showid]
+        routers.each do |router|
+          table << [
+            router["name"],
+            router["zonename"],
+            router["account"],
+            router["project"],
+            router["redundantstate"],
+            router["nic"].first ? router["nic"].first['ipaddress'] : "",
+            router["linklocalip"],
+            router["state"],
+            router["id"]
+          ]
+          table[-1].delete_at(-1) unless table[0].index "ID"
+        end
+        print_table table
+        puts
+        say "Number of routers: #{routers.size}"
+      end
+    end
   end
 
 end

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

@@ -46,6 +46,7 @@ class Server < CloudstackCli::Base
   option :hypervisor, desc: "only used for iso deployments, default: vmware"
   option :keypair, desc: "the name of the ssh keypair to use"
   option :group, desc: "group name"
+  option :account, desc: "account name"
   def create(name)
     bootstrap_server(options.merge({name: name}))
   end

data/lib/cloudstack-cli/helper.rb

@@ -17,28 +17,47 @@ module CloudstackCli
       end
     end
 
+    ASYNC_STATES = {
+      0 => "running",
+      1 => "completed",
+      2 => "error"
+    }
+
     def watch_jobs(jobs)
       chars = %w(| / - \\)
-      async_state = {0 => "running", 1 => "completed", 2 => "error"}
       status = get_async_job_status(jobs.map {|job| job[:id]})
       call = 0
+      opts = {t_start: Time.now}
+      puts
       while status.include?(0) do
-        status = call.modulo(40) == 0 ? get_async_job_status(jobs.map {|job| job[:id]}) : status
-        print ("\r" + "\e[A\e[K" * (status.size)) if call > 0
-
-        status.each_with_index do |job_status, i|
-          puts "#{jobs[i][:name]} : job #{async_state[job_status]}  #{chars[0]}"
+        if call.modulo(40) == 0
+          t = Thread.new { status = get_async_job_status(jobs.map {|job| job[:id]}) }
+          while t.alive?
+            chars = print_job_status(jobs, status, chars, opts)
+          end
+          t.join
+        else
+          print ("\r" + "\e[A\e[K" * (status.size + 1)) if call > 0
+          chars = print_job_status(jobs, status, chars,
+            call == 0 ? opts.merge(no_clear: true) : opts
+          )
+          call += 1
         end
-
-        sleep 0.1
-        chars.push chars.shift
-        call += 1
       end
-      
-      print ("\r" + "\e[A\e[K" * (status.size))
+      print_job_status(jobs, status, chars, opts)
+    end
+
+    def print_job_status(jobs, status, spinner, opts = {t_start: Time.now})
+      print ("\r" + "\e[A\e[K" * (status.size + 1)) unless opts[:no_clear]
       status.each_with_index do |job_status, i|
-        puts "#{jobs[i][:name]} : job #{async_state[job_status]}"
+        print "#{jobs[i][:name]} : job #{ASYNC_STATES[job_status]} "
+        puts job_status == 0 ? spinner.first : ""
       end
+      t_elapsed = opts[:t_start] ? (Time.now - opts[:t_start]).round(1) : 0
+      puts "Runtime: #{t_elapsed}s"
+      sleep opts[:sleeptime] || 0.1
+      spinner.push spinner.shift
+      spinner
     end
 
     def bootstrap_server(args = {})

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/cloudstack-client/commands/server.rb

@@ -193,6 +193,7 @@ module CloudstackClient
         network['id']
       }
 
+
       params = {
           'command' => 'deployVirtualMachine',
           'serviceOfferingId' => service['id'],
@@ -209,6 +210,16 @@ module CloudstackClient
       params['group'] = args[:group] if args[:group]
       params['displayname'] = args[:displayname] if args[:displayname]
 
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
+      end
+
       json = send_async_request(params)
       json['virtualmachine']
     end

data/lib/cloudstack-client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
+  prerelease: 
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -117,7 +124,6 @@ files:
 - lib/cloudstack-client/commands/template.rb
 - lib/cloudstack-client/commands/user.rb
 - lib/cloudstack-client/commands/volume.rb
-- lib/cloudstack-client/commands/volumes.rb
 - lib/cloudstack-client/commands/zone.rb
 - lib/cloudstack-client/version.rb
 - lib/cloudstack_cli.rb
@@ -126,7 +132,6 @@ files:
 homepage: https://bitbucket.org/swisstxt/cloudstack-cli
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -134,20 +139,22 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: cloudstack-cli CloudStack API client
 test_files:
 - test/stack_example.json

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7554f6d7a5dc9ae9a56557edfb3a39b7b63778c1
-  data.tar.gz: db3d8020dc9497700d7a3e65594c5a8a35140a78
-SHA512:
-  metadata.gz: 15451bfd39437d023cba04e4da98424e1d7b66286647a538b4bb3c7c03335b00d47e16e32593a0e9f3180e76d6313ea460353bd270561af193720e89e4db93a8
-  data.tar.gz: a68d0d706ffa1e7a091eff9c8e540ea7cadaeaf4086042c2555f7bc24c306c9ef80ffbbb264269289cb856036a34787cbf96f1fc20e71060b0ac5da45824e487

data/lib/cloudstack-client/commands/volumes.rb

@@ -1,20 +0,0 @@
-module CloudstackClient
-
-	module Volumes
-
-		##
-    # Lists all volumes.
-
-    def list_volumes(project_id = nil)
-      params = {
-          'command' => 'listVolumes',
-          'listall' => true,
-      }
-      params['projectid'] = project_id if project_id
-      json = send_request(params)
-      json['network'] || []
-    end
-
-	end
-
-end