cloudstack_client 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3620aef025ca6411c6be895ed5db20685c82a468
-  data.tar.gz: a88760e188e72a8baf9f896a8e2089ff0cc34520
+  metadata.gz: 2e6572f2978a68ebcb38a986ac7488dc6ba8e59c
+  data.tar.gz: dd0d4dc3bc194ca89b6a40b664f3c3d404c5e72a
 SHA512:
-  metadata.gz: 5c036f121986e4e52d57d0208ea4714d3a367addcfe50787afb2b733b9b53e436b2b208efca346d7f84f2c428c0a72a705a9fe60cf3fc605a3a98758cb031783
-  data.tar.gz: 43cee73391258a369a9f10e0b26f4f7ed19d6db5f04a3eea38e714e37c94c5603ab3fbc36d129d5e8719ea3755fb017540a114779feb3aaa9653bf6f1e1c242b
+  metadata.gz: 3464332207e5b38f71113a0f733580125a4bf59c39a9a237e50a61b16ebdd9f7bc0d14015b7656a3e98bb4c5cb97d7cc2bafd4d014f10a5b1f1a3c6bd0eedfe6
+  data.tar.gz: 9189e7543dd3e651783c0cac743cb2e673e6ee2edb9f8d6474198fa9e5b68c7658809c4f6583008829b00a6688d10538bf36c6700a069a882499d8946d901a3d

data/cloudstack_client.gemspec

@@ -21,5 +21,4 @@ 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,6 +13,13 @@ 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 = {})
@@ -21,19 +28,6 @@ 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
 
     ##
@@ -76,6 +70,7 @@ module CloudstackClient
         exit 1
       end
 
+      
       if response.is_a? Net::HTTPOK
         begin 
           json = JSON.parse(response.body)

data/lib/cloudstack_client/commands/server.rb

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

data/lib/cloudstack_client/commands/system_vm.rb

@@ -23,7 +23,7 @@ module CloudstackClient
       params['podid'] = args[:podid] if args[:podid]
 
       json = send_request(params)
-      json['system_vm'] || []
+      json['systemvm'] || []
     end
 
   end

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 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 => e
+      rescue Exception => e
         puts "Unable to load '#{config_file}' : #{e}"
         exit
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -44,20 +44,6 @@ 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
@@ -70,11 +56,9 @@ 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

data/bin/cs-command-generator

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

data/lib/cloudstack_client/command_generator.rb

@@ -1,75 +0,0 @@
-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