cloudstack-cli 0.2.2 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ad30d2392877c54e681e2e916aac9ee73078e956
+  data.tar.gz: 8becb1fb0bc315c5f7d450ce6db62b48a14c63ff
+SHA512:
+  metadata.gz: 4bd74f7c795a3edde19e4531b7925c3c8e39025db89639e85ad01bc9fd997ebeed105a3f89b7a5cedb0ce509147165019850b08ea376cbb3ffe9bf83d0690a4a
+  data.tar.gz: 79672ddb07f8e47bfb53c3c6b8d5c4c781d64e64fb513c4249145f18a5ff88d272839a982e5c8a064c240814fb3c91f9ab66c47a92eb114b1708f96e8bdbff33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.2.1)
+    cloudstack-cli (0.2.2)
       thor (~> 0.18.1)
 
 GEM

data/LICENSE.txt

@@ -1,7 +1,21 @@
-Copyright (c) 2013 Nik Wolfgramm 
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2013 Nik Wolfgramm
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -16,12 +16,19 @@ Create the initial configuration:
 
 cloudstack-cli expects to find a configuartion 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 loaction using the --config option.
 
+cloudstack-cli supports multiple environments using the --environment option.
+
 Example content of the configuration file:
 
     :url:         "https://my-cloudstack-server/client/api/"
     :api_key:     "cloudstack-api-key"
     :secret_key:  "cloudstack-api-secret"
 
+    test:
+      :url:         "http://my-cloudstack-testserver/client/api/"
+      :api_key:     "cloudstack-api-key"
+      :secret_key:  "cloudstack-api-secret"
+
 ## Usage
 
 For additional documentation find the RubyDoc [here](http://rubydoc.info/gems/cloudstack-cli/).

data/cloudstack-cli.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{cloudstack-cli is a CloudStack API client written in Ruby.}
   gem.summary       = %q{cloudstack-cli CloudStack API client}
   gem.homepage      = "https://bitbucket.org/swisstxt/cloudstack-cli"
+  gem.license       = 'MIT'
 
   gem.required_ruby_version = '>= 1.9.3'
   gem.files         = `git ls-files`.split($/)

data/lib/cloudstack-cli/base.rb

@@ -19,7 +19,7 @@ module CloudstackCli
 
     no_commands do  
       def client(opts = {})
-        @config ||= CloudstackClient::ConnectionHelper.load_configuration(options[:config])
+        @config ||= load_configuration
         @client ||= CloudstackClient::Connection.new(
           @config[:url],
           @config[:api_key],
@@ -28,6 +28,24 @@ module CloudstackCli
         )
       end
 
+      def load_configuration(config_file = options[:config], env = options[:environment])
+        begin
+          config = YAML::load(IO.read(config_file))
+        rescue
+          error "Can't load configuration from file #{config_file}."
+          error "To create a new configuration file run \"cs setup\"."
+          exit 1
+        end
+        if env
+          config = config[env]
+          unless config
+            error "Can't find environment #{env} in configuration file."
+            exit 1
+          end
+        end
+        config
+      end
+
       def find_project(project_name = options[:project])
         return nil unless project_name
         unless project = client.get_project(project_name)
@@ -38,7 +56,7 @@ module CloudstackCli
       end
 
       def filter_by(objects, tag_name, tag)
-        objects.select {|r| r[tag_name].downcase == tag.downcase }
+        objects.select {|r| r[tag_name].downcase == tag.downcase}
       end
     end
   end

data/lib/cloudstack-cli/cli.rb

@@ -8,7 +8,11 @@ module CloudstackCli
     class_option :config,
       default: File.join(Dir.home, '.cloudstack-cli.yml'),
       aliases: '-c',
-      desc: 'localition of your cloudstack-cli configuration file'
+      desc: 'location of your cloudstack-cli configuration file'
+
+    class_option :environment,
+      aliases: '-e',
+      desc: 'environment to load from the configuration file'
 
     desc "version", "outputs the cloudstack-cli version"
     def version
@@ -22,8 +26,9 @@ module CloudstackCli
     def setup(file = options[:config])
       config = {}
       unless options[:url]
+        say "Configuring #{options[:environment] || 'default'} environment."
         say "What's the URL of your Cloudstack API?", :yellow
-        say "Example: https://my-cloudstack-server/client/api/", :yellow
+        say "Example: https://my-cloudstack-service/client/api/"
         config[:url] = ask("URL:", :magenta)
       end
       unless options[:api_key]
@@ -32,9 +37,20 @@ module CloudstackCli
       unless options[:secret_key]
         config[:secret_key] = ask("Secret Key:", :magenta)
       end
+      if options[:environment]
+        config = {options[:environment] => config}
+      end
       if File.exists? file
+        begin
+          old_config = YAML::load(IO.read(file))
+        rescue
+          error "Can't load configuration from file #{config_file}."
+          error "To create a new configuration file run \"cs setup\"."
+          exit 1
+        end
         say "Warning: #{file} already exists.", :red
-        exit unless yes?("Overwrite [y/N]", :red)
+        exit unless yes?("Do you want to merge your settings? [y/N]", :red)
+        config = old_config.merge(config)
       end
       File.open(file, 'w+') {|f| f.write(config.to_yaml) }
     end    

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.2.2"
+  VERSION = "0.3.1"
 end

data/lib/cloudstack-client/client.rb

@@ -69,7 +69,12 @@ module CloudstackClient
         exit 1
       end
 
-      json = JSON.parse(response.body)
+      begin 
+        json = JSON.parse(response.body)
+      rescue JSON::ParserError
+        puts "Error parsing response from server."
+        exit 1
+      end
       json[params['command'].downcase + 'response']
     end
 

data/lib/cloudstack_client.rb

@@ -1,3 +1,2 @@
 require "cloudstack-client/version"
-require "cloudstack-client/client"
-require "cloudstack-client/helper"
+require "cloudstack-client/client"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -14,23 +13,20 @@ 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
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,13 +107,14 @@ files:
 - lib/cloudstack-client/commands/template.rb
 - lib/cloudstack-client/commands/volumes.rb
 - lib/cloudstack-client/commands/zone.rb
-- lib/cloudstack-client/helper.rb
 - lib/cloudstack-client/version.rb
 - lib/cloudstack_cli.rb
 - lib/cloudstack_client.rb
 - test/stack_example.json
 homepage: https://bitbucket.org/swisstxt/cloudstack-cli
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -128,22 +122,20 @@ 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: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: cloudstack-cli CloudStack API client
 test_files:
 - test/stack_example.json

data/lib/cloudstack-client/helper.rb

@@ -1,13 +0,0 @@
-module CloudstackClient
-  module ConnectionHelper
-    def self.load_configuration(config_file)
-      begin
-        return YAML::load(IO.read(config_file))
-      rescue Exception => e
-        $stderr.puts "Can't find the config file #{config_file}."
-        $stderr.puts "To create a new configuration file run \"cs setup\"."
-        exit 1
-      end
-    end
-  end
-end