cloudstack_client 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea9000179c05b3b2b5b8a874b69584b77eb7177
-  data.tar.gz: c891843c2401add5d1a51f2d667426d4eb5785c0
+  metadata.gz: 3620aef025ca6411c6be895ed5db20685c82a468
+  data.tar.gz: a88760e188e72a8baf9f896a8e2089ff0cc34520
 SHA512:
-  metadata.gz: 92c715f4af3ea491f448176f6c26eb72ac3132ce01bdf6c7f8e16a4f95bb872c707a3f6b0a84f10512d4bbb168467faed26d10bb0c345c7a2dcc956cb0b2150f
-  data.tar.gz: d0682349d967f461cdfa5380a7e135702d87f532563fcd942f10e4a4ec43a82000025e228049d19cc099753bf18955aad1a771b5e3010369ac64e04544ec7739
+  metadata.gz: 5c036f121986e4e52d57d0208ea4714d3a367addcfe50787afb2b733b9b53e436b2b208efca346d7f84f2c428c0a72a705a9fe60cf3fc605a3a98758cb031783
+  data.tar.gz: 43cee73391258a369a9f10e0b26f4f7ed19d6db5f04a3eea38e714e37c94c5603ab3fbc36d129d5e8719ea3755fb017540a114779feb3aaa9653bf6f1e1c242b

data/bin/cs-command-generator

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'cloudstack_client/command_generator'
+
+CloudstackClient::CommandGenerator.start

data/cloudstack_client.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('rake', '~> 10.0', '>= 10.0.4')
+  gem.add_development_dependency('thor')
 end

data/lib/cloudstack_client/client.rb

@@ -13,13 +13,6 @@ module CloudstackClient
     @@async_poll_interval = 2.0
     @@async_timeout = 400
 
-    # include all commands
-    Dir.glob(File.dirname(__FILE__) + "/commands/*.rb").each do |file| 
-      require file
-      module_name = File.basename(file, '.rb').split('_').map{|f| f.capitalize}.join
-      include Object.const_get("CloudstackClient").const_get(module_name)
-    end
-
     attr_accessor :verbose
 
     def initialize(api_url, api_key, secret_key, opts = {})
@@ -28,6 +21,19 @@ module CloudstackClient
       @secret_key = secret_key
       @verbose = opts[:quiet] ? false : true
       @debug = opts[:debug] ? true : false
+      CloudstackClient::Connection.include_commands unless opts[:no_commands]
+    end
+
+    ##
+    # Loads all commands from the commands subdirectory and includes them
+    #
+
+    def self.include_commands
+      Dir.glob(File.dirname(__FILE__) + "/commands/*.rb").each do |file| 
+        require file
+        module_name = File.basename(file, '.rb').split('_').map{|f| f.capitalize}.join
+        include Object.const_get("CloudstackClient").const_get(module_name)
+      end
     end
 
     ##
@@ -70,7 +76,6 @@ module CloudstackClient
         exit 1
       end
 
-      
       if response.is_a? Net::HTTPOK
         begin 
           json = JSON.parse(response.body)

data/lib/cloudstack_client/command_generator.rb

@@ -0,0 +1,75 @@
+require 'cloudstack_client/client'
+require 'connection_helper'
+require 'thor'
+require 'yaml'
+
+module CloudstackClient
+  class CommandGenerator < Thor
+    include Thor::Actions
+
+    class_option :config_file,
+      default: File.join(Dir.home, '.cloudstack-cli.yml'),
+      aliases: '-c',
+      desc: 'location of your cloudstack-cli configuration file'
+
+    class_option :env,
+      aliases: '-e',
+      desc: 'environment to use'
+
+    class_option :debug,
+      desc: 'enable debug output',
+      type: :boolean
+
+    desc "generate", "generate api commands using the Cloudstack API Discovery service"
+    def generate
+      json = client.send_request('command' => 'listApis')
+      commands = json['api'] || []
+      commands.each do |command|
+        puts "#{command['name']} : #{command['related']}"
+      end
+    end
+
+    no_commands do  
+      def client(opts = {})
+        @config ||= load_configuration
+        @client ||= CloudstackClient::Connection.new(
+          @config[:url],
+          @config[:api_key],
+          @config[:secret_key],
+          {no_commands: true}
+        )
+      end
+
+      def load_configuration(config_file = options[:config_file], env = options[:env])
+        unless File.exists?(config_file)
+          say "Configuration file #{config_file} not found.", :red
+          say "Please run \'cs environment add\' to create one."
+          exit 1
+        end
+
+        begin
+          config = YAML::load(IO.read(config_file))
+        rescue
+          say "Can't load configuration from file #{config_file}.", :red
+          exit 1
+        end
+        
+        env ||= config[:default]
+        if env
+          unless config = config[env]
+            say "Can't find environment #{env}.", :red
+            exit 1
+          end
+        end
+
+        unless config.key?(:url) && config.key?(:api_key) && config.key?(:secret_key)
+          say "The environment #{env || '\'-\''} contains no valid data.", :red
+          exit 1
+        end
+        config
+      end
+
+    end # no_commands
+
+	end # class
+end # module

data/lib/cloudstack_client/commands/server.rb

@@ -119,6 +119,7 @@ module CloudstackClient
       params['state'] = args[:state] if args[:state]
       params['state'] = args[:status] if args[:status]
       params['groupid'] = args[:group_id] if args[:group_id]
+      params['keyword'] = args[:keyword] if args[:keyword]
 
       if args[:zone]
         zone = get_zone(args[:zone])
@@ -189,7 +190,9 @@ module CloudstackClient
       params['name'] = args[:name] if args[:name]
 
       if args[:name]
-        server = get_server(args[:name], project_id: params['projectid'])
+        server = params['projectid'] ? 
+          get_server(args[:name], project_id: params['projectid']) :
+          get_server(args[:name])
         if server 
           puts "Error: Server '#{args[:name]}' already exists."
           exit 1
@@ -199,7 +202,7 @@ module CloudstackClient
       networks = []
       if args[:networks]
         args[:networks].each do |name|
-          network = get_network(name, params['projectid'])
+          network = defined?(project) ? get_network(name, project['id']) : get_network(name)
           if !network
             puts "Error: Network '#{name}' not found"
             exit 1
@@ -208,11 +211,11 @@ module CloudstackClient
         end
       end
       if networks.empty?
-        unless default_network = get_default_network
-          puts "Error: No default network found"
-          exit 1
-        end
-        networks << default_network
+        networks << get_default_network
+      end
+      if networks.empty?
+        puts "No default network found"
+        exit 1
       end
       network_ids = networks.map { |network|
         network['id']
@@ -333,15 +336,14 @@ module CloudstackClient
     # Destroy the server with the specified name.
     #
 
-    def destroy_server(id, args = {})
+    def destroy_server(id, async = true)
       params = {
           'command' => 'destroyVirtualMachine',
           'id' => id
       }
-      params['expunge'] = true if args[:expunge]
-      args[:sync] ? send_request(params) : send_async_request(params)['virtualmachine']
+      async ? send_async_request(params)['virtualmachine'] : send_request(params)
     end
   
   end
 
- end
+ end

data/lib/cloudstack_client/commands/system_vm.rb

@@ -0,0 +1,31 @@
+module CloudstackClient
+
+  module SystemVm
+
+    ##
+    # List system virtual machines.
+
+    def list_system_vms(args = {})
+      params = {
+        'command' => 'listSystemVms'
+      }
+
+      if args[:zone]
+        zone = get_zone(args[:zone])
+        unless zone
+          puts "Error: zone #{args[:project]} not found."
+          exit 1
+        end
+        params['zoneid'] = zone['id']
+      end
+
+      params['state'] = args[:state] if args[:state]
+      params['podid'] = args[:podid] if args[:podid]
+
+      json = send_request(params)
+      json['system_vm'] || []
+    end
+
+  end
+
+end

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.6.4"
-end
+  VERSION = "0.7.0"
+end

data/lib/connection_helper.rb

@@ -3,7 +3,7 @@ module CloudstackClient
     def self.load_configuration(config_file)
       begin
         return YAML::load(IO.read(config_file))
-      rescue Exception => e
+      rescue => e
         puts "Unable to load '#{config_file}' : #{e}"
         exit
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.4
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CloudStack API client written in Ruby
 email:
 - nik.wolfgramm@gmail.com
@@ -56,9 +70,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/cs-command-generator
 - cloudstack_client.gemspec
 - lib/cloudstack_client.rb
 - lib/cloudstack_client/client.rb
+- lib/cloudstack_client/command_generator.rb
 - lib/cloudstack_client/commands/account.rb
 - lib/cloudstack_client/commands/affinity_group.rb
 - lib/cloudstack_client/commands/capacity.rb
@@ -82,6 +98,7 @@ files:
 - lib/cloudstack_client/commands/snapshot.rb
 - lib/cloudstack_client/commands/ssh_key_pair.rb
 - lib/cloudstack_client/commands/storage_pool.rb
+- lib/cloudstack_client/commands/system_vm.rb
 - lib/cloudstack_client/commands/template.rb
 - lib/cloudstack_client/commands/user.rb
 - lib/cloudstack_client/commands/volume.rb
@@ -110,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: CloudStack API client written in Ruby