cloudstack-cli 0.0.5 → 0.1.0

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

@@ -1,20 +1,19 @@
-class Volume < Thor
-  desc "volume list", "list networks"
+class Volume < CloudstackCli::Base
+
+  desc "list", "list networks"
   option :project
   def list
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    if options[:project]
-      project = cs_cli.projects.select { |p| p['name'] == options[:project] }.first
-      raise "Project '#{options[:project]}' not found" unless project
-    end
-    
-    networks = cs_cli.networks(project ? project['id'] : nil)
+    project = find_project if options[:project]
+    networks = client.list_networks(project ? project['id'] : nil)
     if networks.size < 1
       puts "No networks found"
     else
+      table = [["Name", "Displaytext", "Default?"]]
       networks.each do |network|
-        puts "#{network['name']} - #{network['displaytext']} #{' - Default' if network['isdefault']}"
+        table << [network['name'], network['displaytext'], network['isdefault']]
       end
+      print_table(table)
     end
   end
+
 end

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

@@ -1,16 +1,17 @@
-class Zone < Thor
+class Zone < CloudstackCli::Base
 
-  desc "zone list", "list zones"
+  desc "list", "list zones"
   def list
-    cs_cli = CloudstackCli::Helper.new(options[:config])
-    zones = cs_cli.zones
+    zones = client.list_zones
     if zones.size < 1
       puts "No projects found"
     else
+      table = [["Name", "Description"]]
       zones.each do |zone|
-        puts "#{zone['name']} - #{zone['description']}"
+        table << [zone['name'] ,zone['description']]
       end
     end
+    print_table(table)
   end
 
 end

data/lib/cloudstack-cli/helper.rb

@@ -1,7 +1,5 @@
 module CloudstackCli
   class Helper
-    include CommandLineReporter
-
     attr_reader :cs
 
     def initialize(config_file)
@@ -13,8 +11,14 @@ module CloudstackCli
 	    )
     end
 
-    def remove_publicip(id)
-      @cs.disassociate_ip_address(id)
+    def options
+       @options ||= CloudstackClient::ConnectionHelper.load_configuration(@config_file)
+    end
+
+    def print_options(options, attr = 'name')
+      options.to_enum.with_index(1).each do |option, i|
+         puts "#{i}: #{option[attr]}"
+      end   
     end
 
     def domains(name = nil)
@@ -24,18 +28,6 @@ module CloudstackCli
     def server_offerings(domain = nil)
       @server_offerings ||= @cs.list_service_offerings(domain)
     end
-
-    def create_offering(params)
-      @cs.create_offering(params)
-    end
-
-    def delete_offering(id)
-      @cs.delete_offering(id)
-    end
-
-    def update_offering(args)
-      @cs.update_offering(args)
-    end
     
     def templates(type = 'featured', project_id = -1)
       @templates ||= @cs.list_templates(type, project_id)
@@ -53,9 +45,6 @@ module CloudstackCli
       @cs.list_networks(project_id)
     end
 
-    def physical_networks
-      @cs.list_physical_networks
-    end
 
     def volumes(project_id = nil)
       @cs.list_volumes(project_id)
@@ -64,31 +53,6 @@ module CloudstackCli
     def virtual_machines(options = {})
       @cs.list_servers(options)
     end
-    
-    def virtual_machines_table(vms)
-      table(border: true) do
-        row do
-          column 'Name', width: 20
-          column 'State'
-          column 'Offering', align: 'right'
-          column 'Template', align: 'right', width: 30
-          column 'IP\'s', width: 14
-          column 'Project'
-          column 'Account'
-        end
-        vms.each do |vm|
-          row do
-            column vm['name']
-            column vm['state']
-            column vm['serviceofferingname']
-            column vm['templatename']
-            column vm['nic'].map { |nic| nic['ipaddress']}.join(" ")
-            column vm['project']
-            column vm['account']
-          end
-        end
-      end
-    end
 
     def bootstrap_server(name, zone, template, offering, networks, pf_rules = [], project = nil)
   		puts "Create server #{name}...".color(:yellow)
@@ -128,18 +92,6 @@ module CloudstackCli
   		puts "Complete!".color(:green)
     end
 
-    def stop_server(name)
-      @cs.stop_server(name)
-    end
-
-    def start_server(name)
-      @cs.start_server(name)
-    end
-
-    def reboot_server(name)
-      @cs.reboot_server(name)
-    end
-
     def list_accounts(name = nil)
       @cs.list_accounts({ name: name })
     end 
@@ -164,36 +116,6 @@ module CloudstackCli
       end
     end
 
-    def list_routers(args, redundant_state = nil)
-      routers = @cs.list_routers(args)
-      if redundant_state
-       return  routers.select {|r| r['redundantstate'].downcase == redundant_state.downcase }
-      end
-      routers
-    end
-
-    def destroy_router(id)
-      @cs.destroy_router(id)
-    end
-
-    def start_router(id)
-      @cs.start_router(id)
-    end
-
-    def stop_router(id)
-      @cs.stop_router(id)
-    end
-
-    def options
-    	 @options ||= CloudstackClient::ConnectionHelper.load_configuration(@config_file)
-    end
-
-    def print_options(options, attr = 'name')
-    	options.to_enum.with_index(1).each do |option, i|
-    	   puts "#{i}: #{option[attr]}"
-    	end 	
-    end
-
     def bootstrap_server_interactive
       ARGV.clear 
     	puts

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/cloudstack-client/client.rb

@@ -1,4 +1,4 @@
-# CloudstackClient by Nik Wolfgramm (<nik.wolfgramm@swisstxt.ch>) based on 
+# cloudstack-client by Nik Wolfgramm (<nik.wolfgramm@gmail.com.ch>) based on 
 # knife-cloudstack by Ryan Holmes (<rholmes@edmunds.com>), KC Braunschweig (<kcbraunschweig@gmail.com>)
 # 
 # License:: Apache License, Version 2.0
@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require 'rubygems'
 require 'base64'
 require 'openssl'
 require 'uri'
@@ -127,12 +126,8 @@ module CloudstackClient
     def list_servers(options = {})
       params = {
         'command' => 'listVirtualMachines',
+        'listAll' => true
       }
-      if options[:listall]
-        params['listAll'] = true
-        params['projectId'] = -1
-        options[:account] = nil
-      end
       params['projectid'] = options[:project_id] if options[:project_id]
       if options[:account]
         params['domainid'] = list_accounts({name: options[:account]}).first["domainid"]
@@ -668,14 +663,14 @@ module CloudstackClient
     ##
     # List loadbalancer rules
 
-    def list_load_balancer_rules(name = nil, project_name = nil)    
+    def list_load_balancer_rules(options = {})    
       params = {
         'command' => 'listLoadBalancerRules',
       }
-      params['name'] = name if name
+      params['name'] = options[:name] if options[:name]
 
-      if project_name
-        project = get_project(project_name)
+      if options[:project_name]
+        project = get_project(options[:project_name])
         params['projectid'] = project['id']
       end
 
@@ -816,6 +811,18 @@ module CloudstackClient
       json['domain'] || []
     end
 
+    ##
+    # List capacity.
+
+    def list_capacity(args = {})
+      params = {
+        'command' => 'listCapacity',
+      }
+
+      json = send_request(params)
+      json['capacity'] || []
+    end
+
     ##
     # Sends a synchronous request to the CloudStack API and returns the response as a Hash.
     #

data/lib/cloudstack_cli.rb

@@ -1,14 +1,13 @@
 require 'yaml'
 require 'rainbow'
 require "thor"
-require 'command_line_reporter'
 
 require "cloudstack-cli/version"
+require "cloudstack-cli/helper"
+require "cloudstack-cli/base"
 
 # require subcommands
 Dir[File.dirname(__FILE__) + '/../lib/cloudstack-cli/commands/*.rb'].each do |file| 
   require file
 end
-
-require "cloudstack-cli/helper"
 require "cloudstack-cli/cli"

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,24 +86,11 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: command_line_reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.1
 description: cloudstack-cli is a CloudStack API client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -110,8 +107,10 @@ files:
 - bin/cs
 - cloudstack-cli.gemspec
 - config/cloudstack.example.yml
+- lib/cloudstack-cli/base.rb
 - lib/cloudstack-cli/cli.rb
 - lib/cloudstack-cli/commands/account.rb
+- lib/cloudstack-cli/commands/capacity.rb
 - lib/cloudstack-cli/commands/domain.rb
 - lib/cloudstack-cli/commands/load_balancer.rb
 - lib/cloudstack-cli/commands/network.rb
@@ -133,7 +132,6 @@ files:
 - lib/cloudstack_client.rb
 homepage: https://bitbucket.org/swisstxt/cloudstack-cli
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -141,19 +139,21 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: cloudstack-cli CloudStack API client
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 93104eb717133f717c8c4ca3cd7eca4f1bd004f2
-  data.tar.gz: 1107b76a9e396b694f6cacfb81d83febaf60aa70
-SHA512:
-  metadata.gz: 9ab5e2a02a20bc047bf5d04635c82c8981914f21f0d6f50597f37f39fe92c7dbcf24c27bc9d0b5c38471bcf9d96fe0bc1f09622abb8e58900ca2424f561b5faa
-  data.tar.gz: 57652bbf3d82fc448836ac61e33a747b996c7908fee1f2f7a0f32c4679f9d711a88c435e4b474b8303828d809b0d222571b4d08a2534f47deba48741bb77ed71