cloudstack-cli 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf65435b9f87f2a26dad263cb17283cfbf11c49
-  data.tar.gz: a52d6aa1d060649024e085feddc041031e714487
+  metadata.gz: d099b0bfa2e3e253687b229068afb8bd7db8c26c
+  data.tar.gz: 9834e72d1fc6f4fea8d3e6aa8483ecf05df6a592
 SHA512:
-  metadata.gz: 578d5a63cbe75133dca255c114e3e65f79eead7038c3f1af3ad61331d8a43272f5407c7339f76789d7c768ad1a3b656310bc750d2cda1d663003db13b0b79d8b
-  data.tar.gz: 5b8f5f98ae5bc7813fd5f9c31eb661cb9a928c52558ff261808cb244c70a18feb49126de20652f69d3a4fa22d68689bade1bd2c89935da3053cc94ad11658768
+  metadata.gz: 73dac4d635ea0c72e53f09a1d7a71f99591a188aa6c3f47327c737d0024defe095c913106cac6a85dd0b0df3826082a89bbccae061035b8104ee326e57665550
+  data.tar.gz: 665f5287031e7065eaf49372cbc9679cbb9da07e2a0a92a668bd7eddc3d85ac1462ad974222b7aab0b6e4d6afd09615d6db7a2cf27cb6a5272b7f86976498a8c

data/Gemfile.lock

@@ -6,14 +6,14 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.6)
-      cloudstack_client (~> 1.4)
+    cloudstack-cli (1.5.7)
+      cloudstack_client (~> 1.4.3)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (11.2.2)
+    rake (11.3.0)
     thor (0.19.1)
 
 PLATFORMS
@@ -22,7 +22,7 @@ PLATFORMS
 DEPENDENCIES
   cloudstack-cli!
   cloudstack_client!
-  rake (~> 11.2)
+  rake (~> 11.3)
 
 BUNDLED WITH
-   1.12.5
+   1.13.2

data/README.md

@@ -162,7 +162,7 @@ Completed: 2/3 (15.4s)
 ### Example: Sort computing offerings
 
 *Sort all computing offerings by CPU and Memory grouped by domain:*
-(root admin privileges needed)
+(root admin privileges required)
 
 ```bash
 $ cloudstack-cli compute_offer sort

data/cloudstack-cli.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w(lib)
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
-  gem.add_development_dependency('rake', '~> 11.2')
+  gem.add_development_dependency('rake', '~> 11.3')
 
-  gem.add_dependency('cloudstack_client', '~> 1.4')
+  gem.add_dependency('cloudstack_client', '~> 1.4.3')
   gem.add_dependency('thor', '~> 0.19')
 end

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

@@ -14,23 +14,28 @@ class Capacity < CloudstackCli::Base
 
   desc "list", "list system capacity"
   option :zone, desc: "list capacity by zone"
+  option :cluster, desc: "list capacity by cluster"
   option :type, desc: "specify type, see types for a list of types"
   def list
-    resolve_zone if options[:zone]
+    resolve_zone
+    resolve_cluster
     capacities = client.list_capacity(options)
     table = []
     header = ["Zone", "Type", "Capacity Used", "Capacity Total", "Used"]
+    header[0] = "Cluster" if options[:cluster_id]
     capacities.each do |c|
-      table << [
-        c['zonename'],
-         CAPACITY_TYPES[c['type']][:name],
-         capacity_to_s(c, 'capacityused'),
-         capacity_to_s(c, 'capacitytotal'),
-         "#{c['percentused']}%"
-      ]
+      if CAPACITY_TYPES.include? c['type']
+        table << [
+          c['clustername'] || c['zonename'],
+          CAPACITY_TYPES[c['type']][:name],
+          capacity_to_s(c, 'capacityused'),
+          capacity_to_s(c, 'capacitytotal'),
+          "#{c['percentused']}%"
+        ]
+      end
     end
-    table = table.sort {|a, b|  [a[0], a[1]] <=> [b[0], b[1]]}.insert(0, header)
-    print_table table
+    table = table.sort {|a, b| [a[0], a[1]] <=> [b[0], b[1]]}
+    print_table table.insert(0, header)
   end
 
   desc "types", "show capacity types"

data/lib/cloudstack-cli/option_resolver.rb

@@ -240,5 +240,16 @@ module CloudstackCli
       options
     end
 
+    def resolve_cluster
+      if options[:cluster]
+        unless cluster = client.list_clusters(name: options[:cluster]).first
+          say "Error: Cluster '#{options[:cluster]}' not found.", :red
+          exit 1
+        end
+        options[:cluster_id] = cluster['id']
+      end
+      options
+    end
+
   end
 end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.6"
+  VERSION = "1.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: cloudstack-cli CloudStack API client