cloudstack_client 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08aaf88aa708acd6d7eae2254c90a1ff922c48db
-  data.tar.gz: bb82a1ee284c5e84f0d4c7ccde73191a00f0f9f5
+  metadata.gz: f1821ae743081017bcc2364d49c2143aa32232fe
+  data.tar.gz: fc7ecb150733a64483c8b140c17d0193c562e5d2
 SHA512:
-  metadata.gz: 6196310487a1c9ca57b291dff4c5d948a5c611635a8e296f33c4b548684edeac584f37be378b7443ade41fa08481498b235c59ed82b8607afe8b50a59bd410c4
-  data.tar.gz: dda2ccd1fcf7532cbbf32d879f842f106faf5b6b8d31e61ec10873c72e8022c541d2f2edc3b87ba4639241717480290b275bdabf79f9fb05669ed5bce9121b4b
+  metadata.gz: 771a583ce86206fbce47659de1c78cacab3a3512340fa603d8ce3291cf1b685502e2075d7adf2df76bfdccd5b9318ee0a7cd7809c19ad88d9c9db32e5cc5a6a3
+  data.tar.gz: 779249793d7cfc062b72b767f69c0f26ed7ebae87d18287ef629e1c836c3b4888e202ebe32554305513d98bb1cbda1108fbaa2d0f193c4f2a5298f5af31c7d30

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    cloudstack_client (1.4.3)
+    cloudstack_client (1.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     bond (0.5.1)
-    minitest (5.8.4)
-    rake (11.1.2)
+    minitest (5.10.1)
+    rake (12.0.0)
     ripl (0.7.1)
       bond (~> 0.5.1)
-    thor (0.19.1)
+    thor (0.19.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cloudstack_client!
-  minitest (~> 5.8)
-  rake (~> 11.1)
+  minitest (~> 5.9)
+  rake (~> 12.0)
   ripl (~> 0.7)
   thor (~> 0.19)
 
 BUNDLED WITH
-   1.12.0
+   1.13.7

data/README.md

@@ -92,7 +92,7 @@ $ gzip data/4.5.json
 ```
 
 ## References
--  [Apache CloudStack API documentation](http://cloudstack.apache.org/docs/api/)
+- [Apache CloudStack API documentation](http://cloudstack.apache.org/docs/api/)
 
 ## Contributing
 
@@ -104,6 +104,6 @@ $ gzip data/4.5.json
 
 ## License
 
-Copyright (c) 2014-2016, Nik Wolfgramm
+Copyright (c) 2014-2017, Nik Wolfgramm
 
 Released under the MIT License. See the [LICENSE](https://raw.github.com/niwo/cloudstack_client/master/LICENSE.txt) file for further details.

data/cloudstack_client.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
-  gem.add_development_dependency('rake', '~> 11.1')
+  gem.add_development_dependency('rake', '~> 12.0')
   gem.add_development_dependency('thor', '~> 0.19')
   gem.add_development_dependency('ripl', '~> 0.7')
-  gem.add_development_dependency('minitest', '~> 5.8')
+  gem.add_development_dependency('minitest', '~> 5.9')
 end

data/lib/cloudstack_client/cli.rb

@@ -1,4 +1,5 @@
 require "cloudstack_client/client"
+require "cloudstack_client/configuration"
 require "yaml"
 require "json"
 
@@ -98,14 +99,13 @@ module CloudstackClient
       puts "  try: list_virtual_machines state: \"running\""
 
       ARGV.clear
-      env = options[:env] ? options[:env] : load_configuration.last
-      Ripl.config[:prompt] = "#{env} >> "
+      Ripl.config[:prompt] = "#{@config[:environment]} >> "
       Ripl.start binding: cs_client.instance_eval{ binding }
     end
 
     no_commands do
       def client(opts = {})
-        @config ||= load_configuration.first
+        @config ||= CloudstackClient::Configuration.load(options)
         @client ||= CloudstackClient::Client.new(
           @config[:url],
           @config[:api_key],
@@ -113,35 +113,6 @@ module CloudstackClient
           opts
         )
       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 'cloudstack-cli 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
-
-        if env ||= config[:default]
-          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 || '\'-\''} does not contain all required keys.", :red
-          exit 1
-        end
-        return config, env
-      end
-
     end # no_commands
 
 	end # class

data/lib/cloudstack_client/configuration.rb

@@ -0,0 +1,33 @@
+module CloudstackClient
+  require "yaml"
+
+  module Configuration
+    def self.load(configuration)
+      unless File.exists?(configuration[:config_file])
+        message = "Configuration file '#{configuration[:config_file]}' not found."
+        raise message
+      end
+      begin
+        config = YAML::load(IO.read(configuration[:config_file]))
+      rescue => e
+        message = "Can't load configuration from file '#{configuration[:config_file]}'."
+        message += "Message: #{e.message}" if configuration[:debug]
+        message += "Backtrace:\n\t#{e.backtrace.join("\n\t")}" if configuration[:debug]
+        raise message
+      end
+
+      env ||= config[:default]
+      if env
+        unless config = config[env]
+          raise "Can't find environment #{env}."
+        end
+      end
+
+      unless config.key?(:url) && config.key?(:api_key) && config.key?(:secret_key)
+        message = "The environment #{env || '\'-\''} does not contain all required keys."
+        raise message
+      end
+      config.merge(environment: env)
+    end
+  end
+end

data/lib/cloudstack_client/connection.rb

@@ -3,7 +3,6 @@ require "openssl"
 require "uri"
 require "cgi"
 require "net/http"
-require "net/https"
 require "json"
 
 module CloudstackClient

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "1.4.3"
+  VERSION = "1.5.0"
 end

data/test/configuration_test.rb

@@ -0,0 +1,29 @@
+require "test_helper"
+require "cloudstack_client/configuration"
+
+describe CloudstackClient::Configuration do
+
+  before do
+    @config1 = CloudstackClient::Configuration.load({
+      config_file: "#{File.expand_path File.dirname(__FILE__)}/data/cloudstack-cli-1.yml",
+      debug: true
+    })
+    @config2 = CloudstackClient::Configuration.load({
+      config_file: "#{File.expand_path File.dirname(__FILE__)}/data/cloudstack-cli-2.yml",
+      debug: true
+    })
+  end
+
+  describe "when the configuration is loaded without env" do
+    it "must use the default env'" do
+      @config1[:environment].must_equal "test1"
+    end
+  end
+
+  describe "when only one env is present" do
+    it "must use the one existing configuration'" do
+      @config2[:api_key].must_equal "test-test-test-test-test-test-test-test-test-test-test-test-test-test-test-test-test"
+    end
+  end
+
+end

data/test/data/cloudstack-cli-1.yml

@@ -0,0 +1,10 @@
+---
+:default: test1
+test1:
+  :url: https://cloud.swisstxt.ch/client/api/
+  :api_key: test1test1test1test1test1test1test1test1test1test1test1test1test1test1test1test1test1
+  :secret_key: test1test1test1test1test1test1test1test1test1test1test1test1test1test1test1test1test1
+test2:
+  :url: http://testcloud.stxt.media.int/client/api
+  :api_key: test2test2test2test2test2test2test2test2test2test2test2test2test2test2test2test2test2
+  :secret_key: test2test2test2test2test2test2test2test2test2test2test2test2test2test2test2test2test2

data/test/data/cloudstack-cli-2.yml

@@ -0,0 +1,4 @@
+---
+:url: https://cloud.swisstxt.ch/client/api
+:api_key: test-test-test-test-test-test-test-test-test-test-test-test-test-test-test-test-test
+:secret_key: test-test-test-test-test-test-test-test-test-test-test-test-test-test-test-test-test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.9'
 description: CloudStack API client written in Ruby
 email:
 - nik.wolfgramm@gmail.com
@@ -88,6 +88,7 @@ files:
 - lib/cloudstack_client/api.rb
 - lib/cloudstack_client/cli.rb
 - lib/cloudstack_client/client.rb
+- lib/cloudstack_client/configuration.rb
 - lib/cloudstack_client/connection.rb
 - lib/cloudstack_client/error.rb
 - lib/cloudstack_client/utils.rb
@@ -95,8 +96,11 @@ files:
 - test/api_test.rb
 - test/benchmark.rb
 - test/client_test.rb
+- test/configuration_test.rb
 - test/data/0.42.json
 - test/data/0.42.json.gz
+- test/data/cloudstack-cli-1.yml
+- test/data/cloudstack-cli-2.yml
 - test/test_helper.rb
 homepage: https://github.com/niwo/cloudstack_client
 licenses:
@@ -120,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: CloudStack API client written in Ruby
@@ -128,6 +132,9 @@ test_files:
 - test/api_test.rb
 - test/benchmark.rb
 - test/client_test.rb
+- test/configuration_test.rb
 - test/data/0.42.json
 - test/data/0.42.json.gz
+- test/data/cloudstack-cli-1.yml
+- test/data/cloudstack-cli-2.yml
 - test/test_helper.rb