cloudstack-cli 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88e9ed3ea6bd939ca74b92929498cc901bdffc0e
-  data.tar.gz: 0c2788989f092c6a5481658f7009c6b11e58b4fe
+  metadata.gz: 8ec8b7a8c50432a24255f725112f236d0a989085
+  data.tar.gz: da29cde686e0b1d81973bcf854a09c56ac72ef36
 SHA512:
-  metadata.gz: 152b0b365c78b71f34cb59fb4d644380691a761774113589e499bb611ea10d20f53d753e2a1f616556e4021a8a34e0950717236b3770c10477b13c27612689ba
-  data.tar.gz: 802fbe4dfe18c2605c8ab4b59cd5e7ba11f0e501e01cd34df32d8d81ce39e197343e57090d4daae1b195e9dfaf5cddc9bb0aaa6ead732746695f5cb4f94b4822
+  metadata.gz: b3a762d75d040d5e611a8dc669a19702cc5155f2d8af8b069d902000b3b2c2443c70247c55c406f462ae24c9720dcbc346fbeec5b225e12adfc0a9f4e54ccc40
+  data.tar.gz: 6d261e0788d3a79c3e3c5e559147028cc41a130d322227907dca27a24952f7a0d9a934587dd530ce47f4738862401a56c08323b2c3d045206ab0aca2f1c506c0

data/Gemfile.lock

@@ -1,22 +1,19 @@
 PATH
   remote: ../cloudstack_client/
   specs:
-    cloudstack_client (1.2.3)
-      multi_json (~> 1.11)
+    cloudstack_client (1.3.1)
 
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.3.2)
-      cloudstack_client (~> 1.2)
-      multi_json (~> 1.11)
+    cloudstack-cli (1.4.0)
+      cloudstack_client (~> 1.3)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    multi_json (1.11.2)
-    rake (10.5.0)
+    rake (11.1.1)
     thor (0.19.1)
 
 PLATFORMS
@@ -25,7 +22,7 @@ PLATFORMS
 DEPENDENCIES
   cloudstack-cli!
   cloudstack_client!
-  rake (~> 10.4)
+  rake (~> 11.1)
 
 BUNDLED WITH
    1.11.2

data/cloudstack-cli.gemspec

@@ -21,9 +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', '~> 10.4')
+  gem.add_development_dependency('rake', '~> 11.1')
 
-  gem.add_dependency('cloudstack_client', '~> 1.2')
+  gem.add_dependency('cloudstack_client', '~> 1.3')
   gem.add_dependency('thor', '~> 0.19')
-  gem.add_dependency('multi_json', '~> 1.11')
 end

data/lib/cloudstack-cli/base.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "cloudstack-cli/thor_patch"
+require "json"
 require "yaml"
 require "open-uri"
 
@@ -79,13 +80,34 @@ module CloudstackCli
       end
 
       def filter_by(objects, key, value)
-        objects.select {|r| r[key.to_s].downcase == value.downcase}
+        if objects.size < 2
+          return objects
+        elsif !(objects.first.has_key? key)
+          keys = objects.first.keys.join(", ")
+          say "WARNING: Filter invalid, no key \"#{key}\" found.", :yellow
+          say("DEBUG: Supported keys are, #{keys}.", :magenta) if options[:debug]
+          return objects
+        end
+        objects.select do |object|
+          object[key.to_s] =~ /#{value}/i
+        end
+      rescue RegexpError => e
+        say "ERROR: Invalid regular expression in filter - #{e.message}", :red
+        exit 1
+      end
+
+      def filter_objects(objects, filter = options[:filter])
+        filter.each do |key, value|
+          objects = filter_by(objects, key, value)
+          return objects if objects.size == 0
+        end
+        objects
       end
 
       def parse_file(file, extensions = %w(.json .yaml .yml))
         handler = case File.extname(file)
         when ".json"
-          Object.const_get "MultiJson"
+          Object.const_get "JSON"
         when ".yaml", ".yml"
           Object.const_get "YAML"
         else

data/lib/cloudstack-cli/cli.rb

@@ -68,7 +68,7 @@ module CloudstackCli
 
       data = client.send_request(params)
       if options[:format] == 'json'
-        puts options[:pretty_print] ? MultiJson.dump(data, pretty: true) : data.to_json
+        puts options[:pretty_print] ? JSON.pretty_generate(data) : data.to_json
       else
         puts data.to_yaml
       end

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

@@ -169,7 +169,7 @@ class Router < CloudstackCli::Base
         when :yaml
           puts({'routers' => routers}.to_yaml)
         when :json
-          say MultiJson.dump({ routers: routers }, pretty: true)
+          say JSON.pretty_generate({ routers: routers })
         else
           table = [%w(
             Name Zone Account/Project IP Linklocal-IP Status Version

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

@@ -7,10 +7,10 @@ class VirtualMachine < CloudstackCli::Base
   option :project, desc: "name of the project"
   option :zone, desc: "the name of the availability zone"
   option :state, desc: "state of the virtual machine"
-  option :listall, desc: "list all virtual machines", default: true
-  option :storage_id, desc: "the storage ID where vm's volumes belong to"
   option :host, desc: "the name of the hypervisor host the VM belong to"
-  option :keyword, desc: "filter by keyword"
+  option :filter, type: :hash,
+    desc: "filter objects based on arrtibutes: (attr1:regex attr2:regex ...)"
+  option :listall, desc: "list all virtual machines", default: true
   option :command,
     desc: "command to execute for the given virtual machines",
     enum: %w(START STOP REBOOT)
@@ -23,9 +23,13 @@ class VirtualMachine < CloudstackCli::Base
     resolve_project
     resolve_zone
     resolve_host
-    command = options[:command].downcase if options[:command]
-    options.delete(:command)
+    resolve_iso
+    if options[:command]
+      command = options[:command].downcase
+      options.delete(:command)
+    end
     virtual_machines = client.list_virtual_machines(options)
+    virtual_machines = filter_objects(virtual_machines) if options[:filter]
     if virtual_machines.size < 1
       puts "No virtual_machines found."
     else
@@ -267,7 +271,7 @@ class VirtualMachine < CloudstackCli::Base
       when :yaml
         puts({'virtual_machines' => virtual_machines}.to_yaml)
       when :json
-        say MultiJson.dump({ virtual_machines: virtual_machines }, pretty: true)
+        say JSON.pretty_generate({ virtual_machines: virtual_machines })
       else
         with_i_name = virtual_machines.first['instancename']
         with_h_name = virtual_machines.first['hostname']

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.3.3"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
 description: cloudstack-cli is a CloudStack API command line client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -148,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: cloudstack-cli CloudStack API client