cloudkeeper 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20cfc2b81c1b5aef7d0d889525fddf6685898cec
-  data.tar.gz: f0950b52a30ebf45f36057b71d1f26f8677565be
+  metadata.gz: 7a1f66c8fe0204c321ed16a565f9ca9f720bfb4b
+  data.tar.gz: 383c7c53ba0faf825cef509dcc191bdfc301d8f3
 SHA512:
-  metadata.gz: a34479892bbc6f97f804513b5b7043fbe0b5361f2e1c2d9408d87d8bbdd4ac6b6761a52238311d8d988f1f07bba25d2429b5908059eb350992df104809f31c97
-  data.tar.gz: a8e3ddede8e0615b298f1cd873f70a860fbd132e921cf7ecd917196cf50d6970c09a4041498cd547e2f8c30adb3d82bc77483c1ba21079c9cce6b343d6b06c28
+  metadata.gz: ba4cd0c58cce7c6fcfeb0f34a29bb556eca29710cdfc71288d49d794a4aa28a3d050339b7059b5afd02542912017bbf86addc4303d6ce37e1406d5ec0d5917f3
+  data.tar.gz: 10b1c182148e3d6c68be1715b97428ded54964c7c034d7f2c0a6de91112ebfb18ad6e154a90d606ebca4f05046b34b8ea414ae0cc12702f5ae210a54fa673f25

data/.rubocop.yml

@@ -63,6 +63,11 @@ Metrics/ParameterLists:
   Exclude:
     - 'lib/cloudkeeper/entities/*.rb'
 
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'lib/cloudkeeper/entities/image_list.rb'
+    - 'lib/cloudkeeper/entities/appliance.rb'
+
 Metrics/BlockLength:
   Exclude:
     - 'Rakefile'

data/cloudkeeper.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cloudkeeper/version'
 

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

@@ -33,12 +33,22 @@ module Cloudkeeper
 
         def extract_disk
           archived_disk = disk_file
+          archived_disk_sanitized = Cloudkeeper::Utils::Filename.sanitize archived_disk
+
           disk_directory = File.dirname(file)
           extracted_file = File.join(disk_directory, archived_disk)
           Cloudkeeper::CommandExecutioner.execute('tar', '-x', '-f', file, '-C', disk_directory, archived_disk)
-          extracted_file
-        rescue Cloudkeeper::Errors::CommandExecutionError => ex
+
+          return extracted_file if archived_disk == archived_disk_sanitized
+
+          extracted_file_sanitized = File.join(disk_directory, archived_disk_sanitized)
+          logger.debug "Renaming file #{extracted_file.inspect} to #{extracted_file_sanitized.inspect}"
+          File.rename extracted_file, extracted_file_sanitized
+
+          extracted_file_sanitized
+        rescue Cloudkeeper::Errors::CommandExecutionError, ::SystemCallError => ex
           delete_if_exists extracted_file
+          delete_if_exists extracted_file_sanitized
           raise ex
         end
 

data/lib/cloudkeeper/managers/image_list_manager.rb

@@ -1,6 +1,5 @@
 require 'tmpdir'
 require 'faraday'
-require 'zaru'
 require 'openssl'
 require 'json'
 
@@ -67,7 +66,7 @@ module Cloudkeeper
       end
 
       def generate_filename(uri, dir)
-        File.join(dir, Zaru.sanitize!("#{uri.host}#{uri.path}"))
+        File.join(dir, Cloudkeeper::Utils::Filename.sanitize("#{uri.host}#{uri.path}"))
       end
 
       def convert_image_list(image_list_hash)

data/lib/cloudkeeper/managers/image_manager.rb

@@ -72,7 +72,7 @@ module Cloudkeeper
               end
 
               response.value
-              open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
+              File.open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
             end
           end
         rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::HTTPBadResponse,
@@ -88,7 +88,7 @@ module Cloudkeeper
         end
 
         def generate_filename(uri)
-          File.join(Cloudkeeper::Settings[:'image-dir'], Zaru.sanitize!(File.basename(uri.path)))
+          File.join(Cloudkeeper::Settings[:'image-dir'], Cloudkeeper::Utils::Filename.sanitize(File.basename(uri.path)))
         end
       end
     end

data/lib/cloudkeeper/utils.rb

@@ -5,5 +5,6 @@ module Cloudkeeper
     autoload :URL, 'cloudkeeper/utils/url'
     autoload :Appliance, 'cloudkeeper/utils/appliance'
     autoload :Date, 'cloudkeeper/utils/date'
+    autoload :Filename, 'cloudkeeper/utils/filename'
   end
 end

data/lib/cloudkeeper/utils/appliance.rb

@@ -52,7 +52,7 @@ module Cloudkeeper
 
         appliance.image.add_image_file image_file.send("to_#{format}".to_sym)
       rescue Cloudkeeper::Errors::Image::Format::NoRequiredFormatAvailableError, Cloudkeeper::Errors::CommandExecutionError,
-             Cloudkeeper::Errors::ArgumentError, ::IOError => ex
+             Cloudkeeper::Errors::ArgumentError, ::IOError, ::SystemCallError => ex
         raise Cloudkeeper::Errors::Image::ConversionError, "Image #{appliance.image.uri.inspect} conversion error: #{ex.message}"
       end
     end

data/lib/cloudkeeper/utils/filename.rb

@@ -0,0 +1,13 @@
+require 'zaru'
+
+module Cloudkeeper
+  module Utils
+    class Filename
+      WHITESPACES_REGEXP = /\s+/
+
+      def self.sanitize(name)
+        Zaru.sanitize!(name).gsub(WHITESPACES_REGEXP, '_')
+      end
+    end
+  end
+end

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.6.1'.freeze
+  VERSION = '1.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -403,6 +403,7 @@ files:
 - lib/cloudkeeper/utils/appliance.rb
 - lib/cloudkeeper/utils/checksum.rb
 - lib/cloudkeeper/utils/date.rb
+- lib/cloudkeeper/utils/filename.rb
 - lib/cloudkeeper/utils/hash.rb
 - lib/cloudkeeper/utils/url.rb
 - lib/cloudkeeper/version.rb