cloudstack-cli 0.5.5 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dfcca0f542e684213495618ed1c34536fd1490e
-  data.tar.gz: 9af0ffdc6f40c4894f27fccb44d71e097949664a
+  metadata.gz: 1b80bad1dfc75be88c1e41485ba830238d3e6905
+  data.tar.gz: 75a02bf7304b5a57b2eea1a1cf7d994ace7a8b62
 SHA512:
-  metadata.gz: 3aba197e1259357da8ca08a17129e401ceedb00afa8b6aefea6b801c795fffc659aee9ce6dc39ddecb2f4edc5a93f7af58ef44309b865a6ef0dbe57e7a64a294
-  data.tar.gz: 299ac9cc95acba6dc197ca1bb0215f2930f3aff8671fef1d60b48e8ab6b0fb79a5613ae0dac7a77a8dde9ab9bfe02f14aefcbd495b0e6d6276f0af3f6b73af97
+  metadata.gz: f3f1b99c24a31e4fb4cf689ebd336c61df93ffe1766a059df7f81ca0411f0d47e2f40d9fdad32155469c97f264bea9fe8e61199043667c80ffbcf8060cf42ba0
+  data.tar.gz: 8ddceb29263913e464bb9f6b0b55b8a452a3fb9a072ff7cedcb21aa54e088779273a5f13cbfe19a97c319318be18a8000b257b35ddf4a0fe5e05d17cfcd73099

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git@github.com:niwo/cloudstack_client.git
-  revision: 7b28996ead63220d04b36766651d734e28383f90
+  revision: daf96086199cd1b9056eb1385fe4e2453cf6cd01
   branch: master
   specs:
     cloudstack_client (0.3.6)
@@ -8,8 +8,8 @@ GIT
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.5.4)
-      cloudstack_client (>= 0.3.5)
+    cloudstack-cli (0.5.8)
+      cloudstack_client (~> 0.3, >= 0.3.6)
       thor (~> 0.18)
 
 GEM

data/lib/cloudstack-cli/base.rb

@@ -52,17 +52,20 @@ module CloudstackCli
         config
       end
 
-      def find_project(project_name = options[:project])
-        return nil unless project_name
-        unless project = client.get_project(project_name)
-          say "Project '#{options[:project]}' not found", :red
+      def find_project(name = options[:project], allow_all = true)
+        return nil unless name
+        if allow_all && %w(ALL -1).include?(name)
+          return {'id' => '-1'} 
+        end
+        unless project = client.get_project(name)
+          say "Project '#{name}' not found", :red
           exit 1
         end
         project
       end
 
-      def filter_by(objects, tag_name, tag)
-        objects.select {|r| r[tag_name].downcase == tag.downcase}
+      def filter_by(objects, key, value)
+        objects.select {|r| r[key].downcase == value.downcase}
       end
     end
   end

data/lib/cloudstack-cli/cli.rb

@@ -35,7 +35,8 @@ module CloudstackCli
         arg = arg.split('=')
         params[arg[0]] = arg[1] 
       end
-      puts JSON.pretty_generate(client.send_request params)
+      data = client.send_request(params)
+      puts JSON.pretty_generate(data)
     end
 
     # require subcommands

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

@@ -6,6 +6,7 @@ class Network < CloudstackCli::Base
   option :zone, desc: 'typehe name of the zone the network belongs to'
   option :type, desc: 'the type of the network'
   option :showid, type: :boolean, desc: 'show the network id'
+  option :showvlan, type: :boolean, desc: 'show the VLAN'
   def list
     project = find_project if options[:project]
     if options[:zone]
@@ -35,6 +36,7 @@ class Network < CloudstackCli::Base
     else
       table = [["Name", "Displaytext", "Account/Project", "Zone", "Domain", "State", "Type"]]
       table[0] << "ID" if options[:showid]
+      table[0] << "VLAN" if options[:showvlan]
       networks.each do |network|
         table << [
           network["name"],
@@ -46,6 +48,7 @@ class Network < CloudstackCli::Base
           network["type"]
         ]
         table[-1] << network["id"] if options[:showid]
+        table[-1] << network["vlan"] if options[:showvlan]
       end
       print_table table
     end

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

@@ -11,13 +11,7 @@ class Router < CloudstackCli::Base
   option :command, desc: "command to execute for each router: START or STOP"
   option :reverse, type: :boolean, default: false, desc: "reverse listing of routers"
   def list
-    if options[:project]
-   	  if ['-1', 'all'].include? options[:project]
-        projectid = '-1'
-      else
-        projectid = find_project['id']
-      end
-    end
+    projectid = find_project['id'] if options[:project]
 		routers = client.list_routers(
 			{
 				account: options[:account], 

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

@@ -9,14 +9,8 @@ class Server < CloudstackCli::Base
   option :listall
   def list
     if options[:project]
-      if %w(all -1).include? options[:project].downcase
-        options[:project_id] = -1
-        project_id = -1
-      else
-        project = find_project
-        options[:project_id] = project['id']
-        project_id = project['id']
-      end
+      project_id = find_project['id']
+      options[:project_id] = project_id
     end
     servers = client.list_servers(options)
     if servers.size < 1
@@ -67,14 +61,7 @@ class Server < CloudstackCli::Base
   desc "show NAME", "show detailed infos about a server"
   option :project
   def show(name)
-    if options[:project]
-      if options[:project].downcase == "all"
-        options[:project_id] = -1
-      else
-        project = find_project
-        options[:project_id] = project['id']
-      end
-    end
+    options[:project_id] = find_project['id']
     unless server = client.get_server(name, options)
       puts "No server found."
     else

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

@@ -7,10 +7,7 @@ class Volume < CloudstackCli::Base
   option :name, desc: 'name of the disk volume'
   option :type, desc: 'type of disk volume (ROOT or DATADISK)'
   def list
-    if options[:project]
-      projectid = find_project['id']
-      options[:project_id] = projectid if projectid
-    end
+    options[:project_id] = find_project['id'] if options[:project]
     volumes = client.list_volumes(options)
     if volumes.size < 1
       say "No volumes found."

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.5.5"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.8
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.6
 description: cloudstack-cli is a CloudStack API client written in Ruby.
@@ -80,7 +80,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -125,23 +125,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--line-numbers"
-- "--inline-source"
+- --line-numbers
+- --inline-source
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: cloudstack-cli CloudStack API client