cloudstack-cli 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb750b12b978a9aa9be4830641cab865210831f
-  data.tar.gz: 4cc4dcd31c03783a0c84a2d5880ec50892285258
+  metadata.gz: 647f0b772202269aa2388982c495856fda2dc2d5
+  data.tar.gz: 201869c8698ce199571dc95c01c2842acc42b188
 SHA512:
-  metadata.gz: 389c7b74def6fcdbbe23587cc86e3757989d4fcc421485c6b06521db227e52819a2b441c7b6760aad6af2148fc0eaed8f83b30bac7cf47594df51bda2e81c007
-  data.tar.gz: c29b8aec1e9f62cf0c1156a0ea4c73a2767ae37ebb125ac4da611cff8ebd2944ee6fc97a0581cc8a6dc844459a774c307456eac075b4e09a9761c852316045f5
+  metadata.gz: 75f29b11e5019373372c9ea50cdfd10a67afa28bd40006ccc92651121b164e5a7362f04196571f6400300f6f2602b53644aae56d5208dc52a62d81353005cea7
+  data.tar.gz: bb11a56d9f372575bc3669c449ebdc391d166ea6889fd4801cde2b1fd66d1848f3df0d967d75cab888d5c886a212a4964099f037085adaa81bcac1f560899f44

data/Gemfile.lock

@@ -7,23 +7,23 @@ GIT
 
 GIT
   remote: git@github.com:niwo/cloudstack_client.git
-  revision: 74c951631d0769265248c78e14c49095f82fe6c2
+  revision: 03555aca3862ecd75b8a4228afb7da753d42dfeb
   branch: master
   specs:
-    cloudstack_client (0.5.0)
+    cloudstack_client (0.6.4)
 
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.9.0)
-      cloudstack_client (~> 0.5, >= 0.5.0)
+    cloudstack-cli (0.10.0)
+      cloudstack_client (~> 0.6, >= 0.6.4)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
     json (1.8.1)
-    rake (10.3.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
 

data/cloudstack-cli.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake', '~> 10.3')
   
   gem.add_dependency('thor', '~> 0.19')
-  gem.add_dependency('cloudstack_client', '~> 0.6', '>= 0.6.0')
+  gem.add_dependency('cloudstack_client', '~> 0.6', '>= 0.6.4')
 end

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

@@ -84,7 +84,7 @@ class Server < CloudstackCli::Base
   option :port_rules, aliases: '-pr', type: :array,
     default: [],
     desc: "Port Forwarding Rules [public_ip]:port ..."
-  option :disk_offering, desc: "disk offering - data disk for template, root disk for iso"
+  option :disk_offering, desc: "disk offering (data disk for template, root disk for iso)"
   option :disk_size, desc: "disk size in GB"
   option :hypervisor, desc: "only used for iso deployments, default: vmware"
   option :keypair, desc: "the name of the ssh keypair to use"
@@ -130,7 +130,8 @@ class Server < CloudstackCli::Base
 
   desc "destroy NAME [NAME2 ..]", "destroy server(s)"
   option :project
-  option :force, description: "destroy without asking", type: :boolean, aliases: '-f'
+  option :force, desc: "destroy without asking", type: :boolean, aliases: '-f'
+  option :expunge, desc: "expunge server immediately", type: :boolean, default: false, aliases: '-E'
   def destroy(*names)
     projectid = find_project['id'] if options[:project]
     names.each do |name|
@@ -141,7 +142,12 @@ class Server < CloudstackCli::Base
         ask = "Destroy #{name} (#{server['state']})? [y/N]:"
         if options[:force] || yes?(ask, :yellow)
           say "destroying #{name} "
-          client.destroy_server(server["id"])
+          client.destroy_server(
+            server["id"], {
+              sync: false,
+              expunge: options[:expunge]
+            }
+          )
           puts  
         end
       end
@@ -185,4 +191,4 @@ class Server < CloudstackCli::Base
     puts
   end
 
-end
+end

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

@@ -9,7 +9,7 @@ class Stack < CloudstackCli::Base
     client.verbose = false
     stack["servers"].each do |instance|
       instance["name"].gsub(', ', ',').split(',').each do |name|
-        server = client.get_server(name: name, project_id: projectid)
+        server = client.get_server(name, project_id: projectid)
         if server
           say "Server #{name} (#{server["state"]}) already exists.", :yellow
           jobs << {
@@ -68,6 +68,11 @@ class Stack < CloudstackCli::Base
     type: :boolean,
     default: false,
     aliases: '-f'
+  option :expunge,
+    description: "expunge servers immediately",
+    type: :boolean,
+    default: false,
+    aliases: '-E'
   def destroy(stackfile)
     stack = parse_stackfile(stackfile)
     projectid = find_project(stack["project"])['id'] if stack["project"]
@@ -84,7 +89,10 @@ class Stack < CloudstackCli::Base
         if server
           jobs << {
             id: client.destroy_server(
-              server['id'], false
+              server['id'], {
+                sync: true,
+                expunge: options[:expunge]
+              }
             )['jobid'],
             name: "Destroy server #{name}"
           }
@@ -116,4 +124,4 @@ class Stack < CloudstackCli::Base
     end
   end
 
-end
+end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -61,7 +61,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
 description: cloudstack-cli is a CloudStack API command line client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: cloudstack-cli CloudStack API client