cloudstack-cli 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d936c9ce9b6b98ebfad8f153383bf1fe5bea27ff
-  data.tar.gz: dfd0d79bfb8a58d2610ff7d3e3a6e3a6bec89c04
+  metadata.gz: f60b7f18dbb84a5e0aafc0a4f00e4430017f3114
+  data.tar.gz: b8d49b6bb547fcb4a960316b966b660be2d68200
 SHA512:
-  metadata.gz: 5c0affd7753cca382d7eb9585e625b5e5be392687c0ee5a1a52a4a3713671f75bb458aad892c3eb74e20a3ec9d38cbb689e86ed63b3e5b088d752dae8e98b711
-  data.tar.gz: b8a2ea5f26106af1367c8fbc4f5e088aadb121a55cbbaac11ea6e857b822577dbc83f793413540b8cfb86d460db565d733ae6bf648ed0a8f4d9854641bb7c7e1
+  metadata.gz: fc3d0417144eb1aa60d8ec3a50d742126278d180cf22f43ee7e97bc3be148898013c87146a21d7474f8ee7436483593821529e6bb18dd86829eedd96e229c7f8
+  data.tar.gz: c986cd7884ef8784ea91650744aae72dcadd34aa07c9e4b3be04564284345f997ce20818afdbef9366a52bf718a3f002413d99ebda93fd7daf8c4c353fdd198e

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: git@github.com:niwo/cloudstack_client.git
-  revision: 8ad913e604d701c566061feee464b0556c5b3889
+  revision: 0421f2e3f58e726099d99d98898f48a6be7183a7
   branch: master
   specs:
-    cloudstack_client (0.4.1)
+    cloudstack_client (0.4.4)
 
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.7.0)
-      cloudstack_client (~> 0.4, >= 0.4.0)
+    cloudstack-cli (0.7.1)
+      cloudstack_client (~> 0.4, >= 0.4.1)
       thor (~> 0.18)
 
 GEM

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/cloudstack-cli.png)](http://badge.fury.io/rb/cloudstack-cli)
 
-cloudstack-cli is a [CloudStack](http://cloudstack.apache.org/) API client written in Ruby.
+cloudstack-cli is a [CloudStack](http://cloudstack.apache.org/) API command line client written in Ruby.
 cloudstack-cli uses the [cloudstack_client](https://github.com/niwo/cloudstack_client) to talk to the Cloudstack API.
 
 ## Installation
@@ -44,7 +44,7 @@ See the help screen:
 
 Bootsraps a server using a template and creating port-forwarding rules for port 22 and 80.
 
-    $ cs server create server-01 --template CentOS-6.4-x64-v1.4 --offering 1cpu_1gb --port-rules :22 :80
+    $ cs server create server-01 --template CentOS-6.4-x64-v1.4 --zone DC1 --offering 1cpu_1gb --port-rules :22 :80
 
 ### Example: Run a any custom API command
 
@@ -79,7 +79,10 @@ An example stackfile looks like this (my_stackfile.json)
           "disk_offering": "Perf Storage",
           "disk_size": "5",
           "offering": "2cpu_4gb",
-          "networks": "server_network, storage_network"
+          "networks": [
+            "server_network",
+            "storage_network"
+          ]
         }
       ]
     }
@@ -107,7 +110,7 @@ Hint: You can watch the status of the command with watch.
 
 
 ## References
--  [Cloudstack API documentation](http://cloudstack.apache.org/docs/api/apidocs-4.1/TOC_Root_Admin.html)
+-  [Cloudstack API documentation](http://cloudstack.apache.org/docs/api/)
 -  This tool was inspired by the Knife extension for Cloudstack: [knife-cloudstack](https://github.com/CloudStack-extras/knife-cloudstack)
 
 

data/cloudstack-cli.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.version       = CloudstackCli::VERSION
   gem.authors       = ['Nik Wolfgramm']
   gem.email         = %w(nik.wolfgramm@gmail.com)
-  gem.description   = %q{cloudstack-cli is a CloudStack API client written in Ruby.}
+  gem.description   = %q{cloudstack-cli is a CloudStack API command line client written in Ruby.}
   gem.summary       = %q{cloudstack-cli CloudStack API client}
   gem.date          = Time.now.utc.strftime("%Y-%m-%d")
   gem.homepage      = 'https://github.com/niwo/cloudstack-cli'
@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake', '~> 10.1')
   
   gem.add_dependency('thor', '~> 0.18')
-  gem.add_dependency('cloudstack_client', '~> 0.4', '>= 0.4.1')
-end
+  gem.add_dependency('cloudstack_client', '~> 0.4', '>= 0.4.3')
+end

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

@@ -5,7 +5,7 @@ class Server < CloudstackCli::Base
   option :account
   option :zone
   option :command, desc: "command to execute for each server: START, STOP or RESTART"
-  option :status
+  option :state
   option :listall
   def list
     if options[:project]
@@ -16,7 +16,7 @@ class Server < CloudstackCli::Base
     if servers.size < 1
       puts "No servers found."
     else
-      table = [["Name", "Status", "Offering", "Zone", project_id ? "Project" : "Account", "IP's"]]
+      table = [["Name", "State", "Offering", "Zone", project_id ? "Project" : "Account", "IP's"]]
       servers.each do |server|
         table << [
           server['name'],
@@ -76,8 +76,8 @@ class Server < CloudstackCli::Base
   option :template, aliases: '-t', desc: "name of the template"
   option :iso, desc: "name of the iso", desc: "name of the iso template"
   option :offering, aliases: '-o', required: true, desc: "computing offering name"
+  option :zone, aliases: '-z', required: true, desc: "availability zone name"
   option :networks, aliases: '-n', type: :array, desc: "network names"
-  option :zone, aliases: '-z', desc: "availability zone name"
   option :project, aliases: '-p', desc: "project name"
   option :port_rules, aliases: '-pr', type: :array,
     default: [],

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, projectid)
+        server = client.get_server(name: name, project_id: projectid)
         if server
           say "Server #{name} (#{server["state"]}) already exists.", :yellow
           jobs << {
@@ -27,7 +27,7 @@ class Stack < CloudstackCli::Base
                 template: instance["template"],
                 iso: instance["iso"] ,
                 offering: instance["offering"],
-                networks: string_to_array(instance["networks"]),
+                networks: load_string_or_array(instance["networks"]),
                 project: stack["project"],
                 disk_offering: instance["disk_offering"],
                 disk_size: instance["disk_size"],
@@ -48,7 +48,7 @@ class Stack < CloudstackCli::Base
     stack["servers"].each do |instance|
       instance["name"].gsub(', ', ',').split(',').each do |name|
         if port_rules = string_to_array(instance["port_rules"])
-          server = client(quiet: true).get_server(name, projectid)
+          server = client(quiet: true).get_server(name, project_id: projectid)
           create_port_rules(server, port_rules, false).each_with_index do |job_id, index|
             jobs << {
               id: job_id,
@@ -80,7 +80,7 @@ class Stack < CloudstackCli::Base
     if options[:force] || yes?("Destroy the following servers #{servers.join(', ')}?", :yellow)
       jobs = []
       servers.each do |name|
-        server = client(quiet: true).get_server(name, projectid)
+        server = client(quiet: true).get_server(name, project_id: projectid)
         if server
           jobs << {
             id: client.destroy_server(
@@ -107,6 +107,10 @@ class Stack < CloudstackCli::Base
       end
     end
 
+    def load_string_or_array(item)
+     item.is_a?(Array) ? item : [item]
+    end
+
     def string_to_array(string)
       string ? string.gsub(', ', ',').split(',') : nil
     end

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

@@ -12,14 +12,15 @@ class Volume < CloudstackCli::Base
     if volumes.size < 1
       say "No volumes found."
     else
-      table = [%w(Name Type Size VM Storage Offeringname)]
+      table = [%w(Name Type Size VM Storage Offeringname Status)]
       volumes.each do |volume|
         table << [
           volume['name'], volume['type'],
           (volume['size'] / 1024**3).to_s + 'GB',
           volume['vmname'],
           volume['storage'],
-          volume['diskofferingname']
+          volume['diskofferingname'],
+          volume['state']
         ]
       end
       print_table(table)

data/lib/cloudstack-cli/helper.rb

@@ -104,10 +104,11 @@ module CloudstackCli
       frontendip = nil
       jobs = []
       client.verbose = async
+      project_id = server['project'] ? client.get_project(server['project'])['id'] : nil
       port_rules.each do |pf_rule|
         ip = pf_rule.split(":")[0]
         if ip != ''
-          ip_addr = client.get_public_ip_address(ip)
+          ip_addr = client.get_public_ip_address(ip, project_id)
           unless ip_addr
             say "Error: IP #{ip} not found.", :red
             next

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,78 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-19 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.4'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
-description: cloudstack-cli is a CloudStack API client written in Ruby.
+        version: 0.4.3
+description: cloudstack-cli is a CloudStack API command line client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
 executables:
@@ -80,7 +80,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -128,23 +128,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