cloudstack-cli 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b11471c299adace0851b9aae26162928755ae80f
-  data.tar.gz: 09187a0c3bb5e5ffa504a9fc84811e8759d837c0
+  metadata.gz: a876ce7d8ef2e32233cf613eb044b3564ae4abd2
+  data.tar.gz: e46d3829f5265ee233cc168cc1408b17d99d79d2
 SHA512:
-  metadata.gz: c50f031e9f05e41f419bcffcc27695b162680d43c54922fa7b20c3dc16c4a691bae62296c059c7869a702bf3bc2d45b9c19a128e5f3bb70af8b1834c5b8aecf6
-  data.tar.gz: ec8442e1444e4bca685896f0daf3f1f6d56710905c1d770ca86b919752daf58e82d7217ff9bd56530ea05951d959d3cad3f409c07b865d53ce3c089c5d02808b
+  metadata.gz: 5fbc6528cc8be324cd5c0c0c921b1b0b9cc6703cec975af99421ee3568136a1cb03bbd30c864d1a50e233c4423ba77f0051b3bc34f6dfec82e6d2e1a87140787
+  data.tar.gz: 6946f2bb6999ecc5b66e8e0cdc93f39b4fa99e453b8eed1ac145fba762167ebefc3d37c99c6ac39a859ea3972552f420ff431f59a3cde7b5ee23c7e31ce0ebc7

data/Gemfile.lock

@@ -2,13 +2,13 @@ PATH
   remote: .
   specs:
     cloudstack-cli (0.4.0)
-      cloudstack_client (~> 0.2.10)
+      cloudstack_client (~> 0.2.13)
       thor (~> 0.18.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (0.2.10)
+    cloudstack_client (0.2.13)
     json (1.8.1)
     rake (10.0.4)
     rdoc (4.0.1)

data/README.md

@@ -1,6 +1,7 @@
 # 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 client written in Ruby.
+cloudstack-cli uses the [cloudstack_client](https://bitbucket.org/swisstxt/cloudstack_client) to talk to the Cloudstack API.
 
 ## Installation
 
@@ -37,25 +38,21 @@ See the help screen:
 
     $ cs
 
-### Example 1
+### Example: Bootsrapping a server
 
-Bootsrap a server:
+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 193.218.104.10:22 193.218.104.10:80
+    $ cs server create server-01 --template CentOS-6.4-x64-v1.4 --offering 1cpu_1gb --port-rules :22 :80
 
-### Example 2
+### Example: Run a any custom API command
 
-Run a custom API command:
+Run the "listAlerts" command against the Cloudstack API with an argument of type=8:
 
     $ cs command listAlerts type=8
 
-### Example 3
+### Example: Creating a complete stack of servers
 
-Create a stack of servers:
-
-    $ cs stack create my_stackfile.json
-
-An example stackfile looks like this
+An example stackfile looks like this (my_stackfile.json)
 
     {
       "name": "web_stack-a",
@@ -85,13 +82,17 @@ An example stackfile looks like this
       ]
     }
 
-### Example 4
+Create the stack of servers from above:
+
+    $ cs stack create my_stackfile.json
+
+### Example: Sort computing offerings
 
 Sort all computing offerings by CPU and Memory grouped my Domain:
 
     $ cs offering sort
 
-### Example 5
+### Example: Stop all backup routers of a given project
 
 Stop all virtual routers of project Demo (you could filter by zone too):
 (This command is helpful if you have to deploy new versions of Cloudstack when using redundant routers)

data/cloudstack-cli.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake', '~> 10.0.4')
   
   gem.add_dependency('thor', '~> 0.18.1')
-  gem.add_dependency('cloudstack_client', '~> 0.2.10')
+  gem.add_dependency('cloudstack_client', '~> 0.2.13')
 end

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

@@ -14,8 +14,9 @@ class Capacity < CloudstackCli::Base
 
   desc "capacity list", "list system capacity"
   option :zone
+  option :type, desc: "specify type, see types for a list of types"
   def list
-  	capacities = client.list_capacity
+  	capacities = client.list_capacity(options)
   	table = []
     header = ["Zone", "Type", "Capacity Used", "Capacity Total", "Used"]
     capacities.each do |c|
@@ -31,6 +32,15 @@ class Capacity < CloudstackCli::Base
     print_table table
   end
 
+  desc "capacity types", "show capacity types"
+  def types
+    table = [['type', 'name']]
+    CAPACITY_TYPES.each_pair do |type, data|
+      table << [type, data[:name]]
+    end
+    print_table table
+  end
+
   no_commands do
 
     def capacity_to_s(capacity, entity)
@@ -38,7 +48,7 @@ class Capacity < CloudstackCli::Base
         (capacity[entity] / CAPACITY_TYPES[capacity['type']][:divider]).round(1) : 
         capacity[entity]
       CAPACITY_TYPES[capacity['type']][:unit] ? 
-        "#{value}#{CAPACITY_TYPES[capacity['type']][:unit]}" :
+        "#{value} #{CAPACITY_TYPES[capacity['type']][:unit]}" :
         value.to_s
     end
 

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

@@ -12,7 +12,11 @@ class Router < CloudstackCli::Base
   option :reverse, type: :boolean, default: false, desc: "reverse listing of routers"
   def list
     if options[:project]
-   	  projectid = options[:project] =~ /-1|all/ ? '-1' : find_project['id']
+   	  if ['-1', 'all'].include? options[:project]
+        projectid = '-1'
+      else
+        projectid = find_project['id']
+      end
     end
 		routers = client.list_routers(
 			{

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.10
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.10
+        version: 0.2.13
 description: cloudstack-cli is a CloudStack API client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com