cloudkeeper 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 627d7ad80b5656af87fef1d88bdaa35fae85cda3
-  data.tar.gz: c4f5fa24ab19bf98e727e9a36be4cf1581b12005
+  metadata.gz: 1358dc8f5002e70611207126243b106695182838
+  data.tar.gz: 3665cac985a187a948f973ab8ea30f1295c660c0
 SHA512:
-  metadata.gz: feaefd01329102a82e8739c481c828f4b18df12b572bed7b4f2cde0bf4f864b1cdc5a6215db65a4434530bad569cede8ba04e6f34f5d6e4ad04d0e3394c3d8c6
-  data.tar.gz: 7a6c49eb1bbf1db0ffd46f855db2693cd02b292d03dfd5996429b22631bfec0db367d349fd7b5eb60af30ac91d9815ef9d1e2c483c3b562f64b7c69e42fc0448
+  metadata.gz: 0bf08fabfc72f259b5a962bff5a4d0d98092e8dac9679f1a2da8b2057317f0c2a65a5e73e833bba04a9e0bed2efa554b2415aa1433e2a2aa111699cd20383686
+  data.tar.gz: 4009178fe581c3c416ad48d048bf54b290cf450f4d96f87a917fb7106223799be594daed75f3ff9d48773a21e7144eda9ffe840a438812154506a71f89b95a85

data/lib/cloudkeeper/cli.rb

@@ -131,6 +131,9 @@ module Cloudkeeper
       end
     rescue Cloudkeeper::Errors::InvalidConfigurationError => ex
       abort ex.message
+    rescue => ex
+      logger.error "Unexpected error: #{ex.message}"
+      raise ex
     end
 
     desc 'version', 'Prints cloudkeeper version'

data/lib/cloudkeeper/entities/conversions.rb

@@ -7,7 +7,7 @@ module Cloudkeeper
         image_file = acceptable_image_file image
 
         CloudkeeperGrpc::Image.new mode: :LOCAL, location: image_file.file, format: image_file.format.upcase,
-                                   checksum: image_file.checksum, size: image.size.to_i, uri: image.uri
+                                   checksum: image_file.checksum, size: image_file.size.to_i, uri: image.uri
       end
 
       def convert_appliance(appliance, image_proto)

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

@@ -62,7 +62,7 @@ module Cloudkeeper
 
         def image_file(converted_file, output_format)
           Cloudkeeper::Entities::ImageFile.new converted_file, output_format.to_sym,
-                                               Cloudkeeper::Utils::Checksum.compute(converted_file), false
+                                               Cloudkeeper::Utils::Checksum.compute(converted_file), File.size(converted_file)
         end
 
         def delete_if_exists(file)

data/lib/cloudkeeper/entities/image_file.rb

@@ -1,17 +1,18 @@
 module Cloudkeeper
   module Entities
     class ImageFile
-      attr_accessor :file, :checksum, :format, :original
+      attr_accessor :file, :format, :checksum, :size, :original
 
       include Cloudkeeper::Entities::Convertables::Convertable
 
-      def initialize(file, format, checksum, original = false)
-        raise Cloudkeeper::Errors::ArgumentError, 'file, format and checksum cannot be nil nor empty'\
-          if file.blank? || format.blank? || checksum.blank?
+      def initialize(file, format, checksum, size, original = false)
+        raise Cloudkeeper::Errors::ArgumentError, 'file, format, checksum and size cannot be nil nor empty'\
+          if file.blank? || format.blank? || checksum.blank? || size.blank?
 
         @file = file
-        @checksum = checksum
         @format = format
+        @checksum = checksum
+        @size = size
         @original = original
 
         format_const_symbol = format.to_s.classify.to_sym

data/lib/cloudkeeper/managers/image_manager.rb

@@ -54,7 +54,8 @@ module Cloudkeeper
           filename = generate_filename(uri)
           retrieve_image(uri, filename)
 
-          Cloudkeeper::Entities::ImageFile.new filename, format(filename), Cloudkeeper::Utils::Checksum.compute(filename), true
+          Cloudkeeper::Entities::ImageFile.new filename, format(filename), Cloudkeeper::Utils::Checksum.compute(filename),
+                                               File.size(filename), true
         rescue Cloudkeeper::Errors::InvalidURLError, Cloudkeeper::Errors::Image::Format::RecognitionError,
                Cloudkeeper::Errors::ArgumentError, Cloudkeeper::Errors::NetworkConnectionError, ::IOError => ex
           raise Cloudkeeper::Errors::Image::DownloadError, ex

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler