cloudstack-cli 1.5.13 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a77b3508e84ccc8f0ad9b92ff84fe5e10b9bb83
-  data.tar.gz: 834996a13819ef70aab36bc65847cd2e1bb9ca6e
+  metadata.gz: 0301d4bcecdf17de018258aff0d4640feb06df0b
+  data.tar.gz: 6fdc68888e0e3b8bc6fef745b577031aaf633a2c
 SHA512:
-  metadata.gz: a0083726e513a42e1502684789684dbc1db227e6fc0c5eec3210d64c3f7a494bcc8f67cd35586fd00c69e83b9c08358594ef9875fd328b499ed209ccc375bb48
-  data.tar.gz: e767d1a9e01e929cc88f7d3484a1eb80c78c501a9d2eed36d51fd16437ada39fa98e1656972c3e180b7214f5a3cac3d399cfa271731dbd7c6fce1d4b3c940e5d
+  metadata.gz: 4ebfda74fea9fd907d7ff9f14225f8060e12679a137a46343d0752c122bd3be21a670c26e40f82a1cdfe3c6341e6e931e1dc9ae33fc51913119bd054a4c83bf5
+  data.tar.gz: d31110292fd60b72618aaa1d445fb87cf4ddb25ef8a072b615a58de14d62729fb73f92c766c2a47b00e48db270e67a5cb02bfd5d9319343a2f7ad77c8229a3a0

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: ../cloudstack_client/
   specs:
-    cloudstack_client (1.4.3)
+    cloudstack_client (1.5.3)
 
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.12)
-      cloudstack_client (~> 1.4.3)
+    cloudstack-cli (1.6.0)
+      cloudstack_client (~> 1.5.3)
       thor (~> 0.19.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.10.1)
+    minitest (5.10.2)
     rake (12.0.0)
     thor (0.19.4)
 

data/README.md

@@ -17,7 +17,8 @@ $ gem install cloudstack-cli
 
 ### Create a cloudstack-cli environment
 
-cloudstack-cli expects to find a configuration file with the API URL and your CloudStack credentials in your home directory named .cloudstack-cli.yml. If the file is located elsewhere you can specify the location using the --config option.
+cloudstack-cli expects to find a configuration file with the API URL and your CloudStack credentials in your home directory named .cloudstack.yml (or .cloudstack-cli.yml).
+If the file is located elsewhere you can specify the location using the --config-file option.
 
 *Create your initial environment, which defines your connection options:*
 
@@ -48,17 +49,23 @@ $ cloudstack-cli environment default [environment-name]
 
 see `cloudstack-cli help environment` for more options.
 
-Example content of the configuration file:
+Example configuration file:
 
 ```yaml
-:url:         "https://my-cloudstack-server/client/api/"
-:api_key:     "cloudstack-api-key"
-:secret_key:  "cloudstack-api-secret"
+# default environment
+:default: production
 
+# production environment
+production:
+  :url: "https://my-cloudstack-server/client/api/"
+  :api_key: "cloudstack-api-key"
+  :secret_key: "cloudstack-api-secret"
+
+# test environment
 test:
-    :url:           "http://my-cloudstack-testserver/client/api/"
-    :api_key:       "cloudstack-api-key"
-    :secret_key:    "cloudstack-api-secret"
+  :url: "http://my-cloudstack-testserver/client/api/"
+  :api_key: "cloudstack-api-key"
+  :secret_key: "cloudstack-api-secret"
 ```
 
 ### Shell tab auto-completion

data/cloudstack-cli.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake', '~> 12.0')
   gem.add_development_dependency('minitest', '~> 5.9')
 
-  gem.add_dependency('cloudstack_client', '~> 1.4.3')
+  gem.add_dependency('cloudstack_client', '~> 1.5.3')
   gem.add_dependency('thor', '~> 0.19.4')
 end

data/lib/cloudstack-cli.rb

@@ -1,4 +1,5 @@
 require "cloudstack_client"
+require "cloudstack_client/configuration"
 
 require "cloudstack-cli/version"
 require "cloudstack-cli/helper"

data/lib/cloudstack-cli/base.rb

@@ -49,34 +49,12 @@ module CloudstackCli
         @client
       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 || '\'-\''} does not contain all required keys.", :red
-          say "Please check with 'cloudstack-cli environment list' and set a valid default environment."
-          exit 1
-        end
-        config
+      def load_configuration
+        CloudstackClient::Configuration.load(options)
+      rescue CloudstackClient::ConfigurationError => e
+        say "Error: ", :red
+        say e.message
+        exit 1
       end
 
       def filter_by(objects, key, value)
@@ -91,7 +69,8 @@ module CloudstackCli
           object[key.to_s].to_s =~ /#{value}/i
         end
       rescue RegexpError => e
-        say "ERROR: Invalid regular expression in filter - #{e.message}", :red
+        say "ERROR: ", :red
+        say "Invalid regular expression in filter - #{e.message}"
         exit 1
       end
 
@@ -119,21 +98,23 @@ module CloudstackCli
         when ".yaml", ".yml"
           Object.const_get "YAML"
         else
-          say "File extension #{File.extname(file)} not supported. Supported extensions are #{extensions.join(', ')}", :red
+          say "ERROR: ", :red
+          say "File extension #{File.extname(file)} not supported. Supported extensions are #{extensions.join(', ')}"
           exit
         end
         begin
           return handler.load open(file){|f| f.read}
         rescue SystemCallError
-          say "Can't find the file #{file}.", :red
+          say "ERROR: ", :red
+          say "Can't find the file '#{file}'."
           exit 1
         rescue => e
-          say "Error parsing #{File.extname(file)} file:", :red
-          say e.message
+          say "ERROR: ", :red
+          say "Can't parse file '#{file}': #{e.message}"
           exit 1
         end
       end
     end
-    
+
   end # class
 end # module

data/lib/cloudstack-cli/cli.rb

@@ -5,9 +5,9 @@ module CloudstackCli
     package_name "cloudstack-cli"
 
     class_option :config_file,
-      default: File.join(Dir.home, '.cloudstack-cli.yml'),
+      default: CloudstackClient::Configuration.locate_config_file,
       aliases: '-c',
-      desc: 'Location of your cloudstack-cli configuration file'
+      desc: 'Location of your cloudstack configuration file'
 
     class_option :env,
       aliases: '-e',

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

@@ -17,11 +17,14 @@ class User < CloudstackCli::Base
       when :json
         puts JSON.pretty_generate(users: users)
       else
-        table = [["Account", "Type", "Name", "Email", "State", "Domain"]]
+        table = [%w(Account Type Name Username Email State Domain)]
         users.each do |user|
           table << [
-            user['account'], Account::TYPES[user['accounttype']], "#{user['firstname']} #{user['lastname']}",
-            user['email'], user['state'], user['domain']
+            user['account'],
+            Account::TYPES[user['accounttype']],
+            "#{user['firstname']} #{user['lastname']}",
+            user['username'], user['email'],
+            user['state'], user['domain']
           ]
         end
         print_table table

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.13"
+  VERSION = "1.6.0"
 end

data/spec/{cloudstack-cli.yml → cloudstack.yml}

@@ -1,4 +1,3 @@
----
 :default: development
 development:
   :url: http://127.0.0.1:8080/client/api

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require "minitest/autorun"
 require "minitest/pride"
 
 # make the config file setup awailable to all specs
-CONFIG = "--config-file=#{File.expand_path('cloudstack-cli.yml', File.dirname(__FILE__))}"
+CONFIG = "--config-file=#{File.expand_path('cloudstack.yml', File.dirname(__FILE__))}"
 ZONE = "Sandbox-simulator"
 TEMPLATE = "CentOS 5.3(64-bit) no GUI (Simulator)"
 OFFERING_S = "Small Instance"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.6.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -128,8 +128,8 @@ files:
 - lib/cloudstack-cli/option_resolver.rb
 - lib/cloudstack-cli/thor_patch.rb
 - lib/cloudstack-cli/version.rb
-- spec/cloudstack-cli.yml
 - spec/cloudstack-cli/commands/virtual_machine_spec.rb
+- spec/cloudstack.yml
 - spec/fixtures/stack.yml
 - spec/spec_helper.rb
 homepage: http://github.com/niwo/cloudstack-cli
@@ -159,7 +159,7 @@ signing_key:
 specification_version: 4
 summary: cloudstack-cli CloudStack API client
 test_files:
-- spec/cloudstack-cli.yml
 - spec/cloudstack-cli/commands/virtual_machine_spec.rb
+- spec/cloudstack.yml
 - spec/fixtures/stack.yml
 - spec/spec_helper.rb