cloudkeeper 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876948d01d3b3b5038bc053b009c147a38c82d0a
-  data.tar.gz: a9effe6554b8e64fcd8c12fc44bc3a970e540646
+  metadata.gz: e8881b79b7f599dc69e620e5cc40b5498bea0510
+  data.tar.gz: 8fb97ca29f661d446c43ade614c2878b0083aedf
 SHA512:
-  metadata.gz: '0138d16a0c66c26e8502b92fc077c70e9e75a89b7343530465f963553ca1e88fb865fdd889e0ce8dd1c19f2c180d051e5986dac8d93e3e67f2e2b555bd1ee3d4'
-  data.tar.gz: 00ba16aa4296c9e43aa0818c09fd853d163e991803e39438615ee8aafdc8e76d5a9809d68d216a76dd62caec43323230f2ee3955a5e0682d10132fe669bafd38
+  metadata.gz: e7a1016947d951de3e02b9eafaf9999e909b4f4fbdb99e3189e4a0d27745d9fe312fb21ed845b102fba6f2cbbe12ba07a231c16f5ae1428d574f5213a6b7f2d6
+  data.tar.gz: 5fcb1d00873814fc89d0b0eb30a78a4be68756a8e9add8e8d3c0644e7eb5010bc2b4b74c2d1ddd079eee4e7c8056a26fd78d0c76e46dcf628ccde3dbed35496d

data/lib/cloudkeeper/cli.rb

@@ -139,11 +139,11 @@ module Cloudkeeper
 
     def validate_configuration!
       validate_configuration_group! :authentication,
-                                    %i(certificate key backend-certificate),
+                                    %i[certificate key backend-certificate],
                                     'Authentication configuration missing'
       validate_configuration_group! :'remote-mode',
-                                    %i(nginx-binary nginx-error-log-file nginx-access-log-file nginx-pid-file
-                                       nginx-ip-address nginx-min-port nginx-max-port),
+                                    %i[nginx-binary nginx-error-log-file nginx-access-log-file nginx-pid-file
+                                       nginx-ip-address nginx-min-port nginx-max-port],
                                     'NGINX configuration missing'
     end
 

data/lib/cloudkeeper/entities/appliance.rb

@@ -4,7 +4,7 @@ module Cloudkeeper
       attr_accessor :identifier, :description, :mpuri, :title, :group, :ram, :core, :version, :architecture
       attr_accessor :operating_system, :image, :attributes, :vo, :expiration_date, :image_list_identifier
 
-      REJECTED_ATTRIBUTES = %i(vo expiration image_list_identifier).freeze
+      REJECTED_ATTRIBUTES = %i[vo expiration image_list_identifier].freeze
 
       def initialize(identifier, mpuri, vo, expiration_date, image_list_identifier, title = '', description = '', group = '',
                      ram = 1024, core = 1, version = '', architecture = '', operating_system = '', image = nil, attributes = {})

data/lib/cloudkeeper/entities/convertables/convertable.rb

@@ -4,7 +4,7 @@ module Cloudkeeper
   module Entities
     module Convertables
       module Convertable
-        CONVERT_OUTPUT_FORMATS = %i(raw qcow2 vmdk).freeze
+        CONVERT_OUTPUT_FORMATS = %i[raw qcow2 vmdk].freeze
 
         def self.convert_output_formats
           CONVERT_OUTPUT_FORMATS

data/lib/cloudkeeper/entities/convertables/ova.rb

@@ -2,7 +2,7 @@ module Cloudkeeper
   module Entities
     module Convertables
       module Ova
-        CONVERT_OUTPUT_FORMATS = %i(raw qcow2).freeze
+        CONVERT_OUTPUT_FORMATS = %i[raw qcow2].freeze
 
         def self.convert_output_formats
           CONVERT_OUTPUT_FORMATS

data/lib/cloudkeeper/managers/appliance_manager.rb

@@ -51,6 +51,7 @@ module Cloudkeeper
       end
 
       def sync_image_list(image_list_identifier)
+        logger.debug "Synchronizing appliances for image list with id #{image_list_identifier.inspect}"
         backend_appliances = backend_connector.appliances image_list_identifier
         image_list_appliances = image_list_manager.image_lists[image_list_identifier].appliances
 

data/lib/cloudkeeper/managers/image_manager.rb

@@ -1,4 +1,4 @@
-require 'net/http'
+require 'net/https'
 
 module Cloudkeeper
   module Managers
@@ -60,16 +60,22 @@ module Cloudkeeper
         end
 
         def retrieve_image(uri, filename)
-          Net::HTTP.start(uri.host, uri.port) do |http|
+          use_ssl = uri.scheme == 'https'
+          Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
             request = Net::HTTP::Get.new(uri)
 
             http.request(request) do |response|
+              if response.is_a? Net::HTTPRedirection
+                retrieve_image URI.join(uri, response.header['location']), filename
+                break
+              end
+
               response.value
               open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
             end
           end
         rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::HTTPBadResponse,
-               Net::HTTPHeaderSyntaxError, EOFError, Net::HTTPServerException => ex
+               Net::HTTPHeaderSyntaxError, EOFError, Net::HTTPServerException, Net::HTTPRetriableError => ex
           raise Cloudkeeper::Errors::NetworkConnectionError, ex
         end
 

data/lib/cloudkeeper/utils/url.rb

@@ -1,7 +1,7 @@
 module Cloudkeeper
   module Utils
     class URL
-      URL_REGEXP = /\A#{URI.regexp(%w(http https))}\z/
+      URL_REGEXP = /\A#{URI.regexp(%w[http https])}\z/
 
       def self.check!(url)
         raise Cloudkeeper::Errors::InvalidURLError, "#{url.inspect} is not a valid URL" unless url =~ URL_REGEXP

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler