cloudstack_cloner 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ebf91c4b2bd8269326081edb4eec3ca4d54bfcf
-  data.tar.gz: 25adc5a5e00bbfb1dbdff7cdd876f67c6b86ad19
+  metadata.gz: 9d99c3c43051263cf6a096e29674d453d5225555
+  data.tar.gz: 29bd5b7a5d0787572fbdf366ab2c9babff6fb22d
 SHA512:
-  metadata.gz: d2e1a218675ef14dd97fd9c8a69cf7ae7b544b97eb082244c760626d8b5516ae266a1e10ffaf5a8909bc01fc121d50bce941244091bfd1a95ae668031165d061
-  data.tar.gz: 65b9b539eb13548992a55e0ca693a094bf1b76b916b412e18fb5c2871c2fa7a3e3ab7e3f25fc8a14ea6b1c16a67d9b502efba57a2d83658c75ce506a18fc6852
+  metadata.gz: bb80d11c239028f0ffb0cd90303c95fae359b8928805a6575c48ef6c16b5ee726c60be571d95c6711469473a74fb695ffa1438f6ad62001302e13551502e4734
+  data.tar.gz: 7a4fe42c5f526ee6a969f71b57ceecdd5f350c0af19d95c6eb4b12ff91c3935d2c922af87d1f8ab43c6208fe8802aa61efd049de6068e795d60eb8f314b24e7a

data/cloudstack_cloner.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
 
   spec.add_dependency('thor', '~> 0.19')
-  spec.add_dependency('cloudstack_client', '~> 1.2')
+  spec.add_dependency('cloudstack_client', '~> 1.5.3')
 end

data/lib/cloudstack_cloner/cli.rb

@@ -9,9 +9,9 @@ module CloudstackCloner
     package_name "cloudstack_cloner"
 
     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_cloner/helper.rb

@@ -23,18 +23,22 @@ module CloudstackCloner
         exit 1
       end
 
-      data_volumes = opts[:data_volumes].map do |disk|
-        unless volume = client.list_volumes(
-          name: disk,
-          listall: true,
-          type: "DATADISK",
-          project_id: opts[:project_id]
-        ).first
-          say_log "Failure: ", :red
-          say "Volume #{disk} not found."
-          exit 1
+      data_volumes = if opts[:data_volumes]
+        opts[:data_volumes].map do |disk|
+          unless volume = client.list_volumes(
+            name: disk,
+            listall: true,
+            type: "DATADISK",
+            project_id: opts[:project_id]
+          ).first
+            say_log "Failure: ", :red
+            say "Volume #{disk} not found."
+            exit 1
+          end
+          volume
         end
-        volume
+      else
+        []
       end
 
       volume = client.list_volumes(opts.merge(listall: true, type: "root")).first
@@ -106,7 +110,7 @@ module CloudstackCloner
     end
 
     def client
-      @config ||= load_configuration(options[:config_file], options[:env]).first
+      @config ||= CloudstackClient::Configuration.load(options)
       @client ||= CloudstackClient::Client.new(
         @config[:url],
         @config[:api_key],
@@ -115,33 +119,5 @@ module CloudstackCloner
       )
     end
 
-    def load_configuration(config_file, env)
-      unless File.exists?(config_file)
-        puts "Configuration file #{config_file} not found."
-        puts "Please run 'cloudstack-cli environment add' to create one."
-        exit 1
-      end
-
-      begin
-        config = YAML::load(IO.read(config_file))
-      rescue
-        puts "Can't load configuration from file #{config_file}."
-        exit 1
-      end
-
-      if env ||= config[:default]
-        unless config = config[env]
-          puts "Can't find environment #{env}."
-          exit 1
-        end
-      end
-
-      unless config.key?(:url) && config.key?(:api_key) && config.key?(:secret_key)
-        puts "The environment #{env || '\'-\''} contains no valid data."
-        exit 1
-      end
-      return config, env
-    end
-
   end
 end

data/lib/cloudstack_cloner/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCloner
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/cloudstack_cloner.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_cloner
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - niwo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        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: '1.2'
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.5.3
 description: Automated CloudStack VM cloning
 email:
 - nik.wolfgramm@gmail.com
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Automated CloudStack VM cloning