uricp 0.0.15 → 0.0.16

data/lib/uricp/segmenter.rb

@@ -1,9 +1,7 @@
 require 'pathname'
 
 module Uricp
-
   class Segmenter
-
     include Methadone::CLILogging
     include Methadone::SH
     include Uricp::CurlPrimitives
@@ -15,7 +13,7 @@ module Uricp
         @stream = File.pipe?(source) || File.chardev?(source)
       else
         @source = STDIN
-	@stream = true
+        @stream = true
       end
       split_path
     end
@@ -23,9 +21,9 @@ module Uricp
     def split_path
       elements = Pathname.new(to.path).enum_for(:each_filename).to_a
       elements.shift
-      @account=elements.shift
-      @container=elements.shift
-      @object_path=File.join(elements)
+      @account = elements.shift
+      @container = elements.shift
+      @object_path = File.join(elements)
     end
 
     def upload
@@ -33,7 +31,7 @@ module Uricp
         segmented_upload
       else
         sh! curl_upload_from(options['from']),
-	  :on_fail => "Upload to #{to} failed"
+            on_fail: "Upload to #{to} failed"
       end
     end
 
@@ -54,16 +52,16 @@ module Uricp
     end
 
     def object_manifest
-      @object_manifest ||= File.join(@container, @object_path, manifest_suffix)+'/'
+      @object_manifest ||= File.join(@container, @object_path, manifest_suffix) + '/'
     end
 
     def segmented_upload
       debug "#{self.class.name}: Large upload detected - segmenting into #{segment_size} byte chunks."
       suffix = 0
       until @source.eof?
-	debug "#{self.class.name}: Uploading segment #{suffix}"
-	upload_segment(suffix)
-	suffix = suffix.next
+        debug "#{self.class.name}: Uploading segment #{suffix}"
+        upload_segment(suffix)
+        suffix = suffix.next
       end
       add_manifest
     end
@@ -71,18 +69,16 @@ module Uricp
     def upload_segment(segment_number)
       segment_name = File.join(to.to_s, manifest_suffix, '%08d' % segment_number)
       debug "Uploading with #{curl_upload_from('-', segment_name)}"
-      open('|'+curl_upload_from('-', segment_name), 'w') do |destination|
+      open('|' + curl_upload_from('-', segment_name), 'w') do |destination|
         copy_length = IO.copy_stream(@source, destination, segment_size)
-	debug "#{self.class.name}: Uploaded #{copy_length} bytes to #{segment_name}"
+        debug "#{self.class.name}: Uploaded #{copy_length} bytes to #{segment_name}"
       end
     end
 
     def add_manifest
       debug "Adding DLO object_manifest #{object_manifest}"
       sh! curl_manifest(object_manifest),
-	:on_fail => "Upload to #{to} failed"
+          on_fail: "Upload to #{to} failed"
     end
-
   end
-
 end

data/lib/uricp/strategy/cache_common.rb

@@ -1,16 +1,20 @@
 require 'fileutils'
 
 module Uricp::Strategy
-
   module CacheCommon
-    
     def validate_cache!
+      return if dry_run?
+
+      unless cache_exists?
+        raise Uricp::MissingCache,
+              "no cache found at #{cache_root}. Expected a 'cache' and 'temp' directory"
+      end
+      return if cache_name
+
       raise Uricp::MissingCache,
-	"no cache found at #{cache_root}. Expected a 'cache' and 'temp' directory" unless cache_exists?
-      raise Uricp::MissingCache,
-	"no cache name found" unless cache_name
+            'no cache name found'
     end
-      
+
     def in_cache?
       File.readable? cache_file
     end
@@ -24,7 +28,7 @@ module Uricp::Strategy
     end
 
     def cache_exists?
-      cache_root && %w{temp cache}.all? do |d|
+      cache_root && %w[temp cache].all? do |d|
         File.directory?(File.join(cache_root, d))
       end
     end
@@ -40,9 +44,5 @@ module Uricp::Strategy
     def cache_file
       @cache_file ||= File.join(cache_root, 'cache', cache_name)
     end
-
   end
-
 end
-
-

data/lib/uricp/strategy/cached_get.rb

@@ -1,48 +1,42 @@
 require 'uri'
 
 module Uricp::Strategy
-  
   class CachedGet
-
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
 
     def appropriate?
       if cache_root
         validate_cache!
-	if in_cache? || file_source?
-	  return proposal
-	else
-	  debug "#{self.class.name}: no cache entry for #{options['from_uri']}"
-	end
+        return proposal if in_cache? || file_source?
+
+        debug "#{self.class.name}: no cache entry for #{options['from_uri']}"
       else
-	debug "#{self.class.name}: not appropriate"
+        debug "#{self.class.name}: not appropriate"
       end
       false
     end
 
     def command
-      ":;" 
+      ':;'
     end
 
     def proposal
       @proposed_options = options.dup
-      unless file_source?
-	@proposed_options['from_uri'] = URI.join('file:///', cache_file)
-      end
+      @proposed_options['from_uri'] = URI.join('file:///', cache_file) unless file_source?
       @proposed_options.delete('cache')
       @proposed_options.delete('cache_name')
       if conversion_required?
-	@proposed_options['source-format'] =
-	  File.open(@proposed_options['from_uri'].path) {|f| encoding(f)}
-	if @proposed_options['source-format'] == @proposed_options['target-format']
-	  @proposed_options.delete('source-format')
-	  @proposed_options.delete('target-format')
-	end
+        unless dry_run?
+          @proposed_options['source-format'] =
+            File.open(@proposed_options['from_uri'].path) { |f| encoding(f) }
+        end
+        if @proposed_options['source-format'] == @proposed_options['target-format']
+          @proposed_options.delete('source-format')
+          @proposed_options.delete('target-format')
+        end
       end
       self
     end
-
   end
-
 end

data/lib/uricp/strategy/cleaner.rb

@@ -1,13 +1,10 @@
 module Uricp::Strategy
-  
   class Cleaner
-
     include Uricp::Strategy::Common
 
     def appropriate?
-      if options['clean'] && sequence_complete?
-        return proposal
-      end
+      return proposal if options['clean'] && sequence_complete?
+
       debug "#{self.class.name}: not appropriate"
       false
     end
@@ -21,8 +18,5 @@ module Uricp::Strategy
       @proposed_options.delete('clean')
       self
     end
-
   end
-
 end
-

data/lib/uricp/strategy/common.rb

@@ -1,7 +1,5 @@
 module Uricp::Strategy
- 
   module Common
-    
     include Methadone::CLILogging
     include Uricp::CurlPrimitives
 
@@ -14,10 +12,10 @@ module Uricp::Strategy
 
     def unsupported_transfer
       raise Uricp::UnsupportedURLtype,
-        "Unsupported transfer from #{from.to_s} to #{to.to_s}"
+            "Unsupported transfer from #{from} to #{to}"
     end
 
-    alias :command :unsupported_transfer
+    alias command unsupported_transfer
 
     def all_local_files?
       !sequence_complete? && file_source? && to.scheme == 'file'
@@ -44,24 +42,23 @@ module Uricp::Strategy
     end
 
     def qcow2?(magic)
-      magic.unpack('a3C') == ['QFI',0xfb]
+      magic.unpack('a3C') == ['QFI', 0xfb]
     end
 
     def encoding(io)
       magic = io.read(4).to_s
-      case
-      when lz4?(magic)
+      if lz4?(magic)
         :lz4
-      when qcow2?(magic)
+      elsif qcow2?(magic)
         version = io.read(4)
-	case version.unpack('N')
-	when [2]
-	  :qcow2
-	when [3]
-	  :qcow3
-	else
-	  :qcow2un
-	end
+        case version.unpack('N')
+        when [2]
+          :qcow2
+        when [3]
+          :qcow3
+        else
+          :qcow2un
+        end
       else
         :raw
       end
@@ -73,6 +70,10 @@ module Uricp::Strategy
       )
     end
 
+    def dry_run?
+      options['dry-run']
+    end
+
     def lz4_source?
       options['source-format'] == :lz4
     end
@@ -92,7 +93,7 @@ module Uricp::Strategy
     PIPE_URI = URI('pipe:/')
 
     def get_temp_filename(base_dir)
-      t = Time.now.strftime("%Y%m%d")
+      t = Time.now.strftime('%Y%m%d')
       File.join(base_dir, "uricp-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}")
     end
 
@@ -108,6 +109,12 @@ module Uricp::Strategy
       options['source-format'] && !lz4_source?
     end
 
-  end
+    def rbd_target(uri)
+      uri.path[1..-1]
+    end
 
+    def rbd_id
+      'libvirt'
+    end
+  end
 end

data/lib/uricp/strategy/local_convert.rb

@@ -1,17 +1,13 @@
 module Uricp::Strategy
-  
   class LocalConvert
-
     include Uricp::Strategy::Common
 
     def appropriate?
       if conversion_required? && file_source? && supported_source?
-	if new_qemu? || supported_conversion?
-	  return proposal
-	else
-	  raise Uricp::UnsupportedConversion,
-	    "qemu-img does not support required conversion"
-	end
+        return proposal if new_qemu? || supported_conversion?
+
+        raise Uricp::UnsupportedConversion,
+              'qemu-img does not support required conversion'
       end
       debug "#{self.class.name}: not appropriate"
       false
@@ -24,11 +20,11 @@ module Uricp::Strategy
     def proposal
       @proposed_options = options.dup
       if to.scheme == 'file'
-	@proposed_options['from_uri'] = @proposed_options['to_uri']
+        @proposed_options['from_uri'] = @proposed_options['to_uri']
       else
         @proposed_options['from_uri'] = temp_uri
-	@proposed_options['clean'] ||= []
-	@proposed_options['clean'] << proposed_path
+        @proposed_options['clean'] ||= []
+        @proposed_options['clean'] << proposed_path
       end
       @proposed_options.delete('source-format')
       @proposed_options.delete('target-format')
@@ -40,7 +36,7 @@ module Uricp::Strategy
     end
 
     def supported_conversion?
-      ([:qcow3, :qcow2v3] & [options['source-format'], options['target-format']]).empty?
+      ([:qcow3, :qcow2v3] & [options['source-format'], options['target-format']]).empty? # rubocop:disable Style/SymbolArray
     end
 
     def qemu_img_command(target)
@@ -59,14 +55,11 @@ module Uricp::Strategy
     end
 
     def compat_option
-      "-o compat=0.10" if new_qemu?
+      '-o compat=0.10' if new_qemu?
     end
 
     def compress_option
       options['compress'] && '-c'
     end
-
   end
-
 end
-

data/lib/uricp/strategy/local_link.rb

@@ -1,11 +1,13 @@
 module Uricp::Strategy
-  
   class LocalLink
-
     include Uricp::Strategy::Common
 
     def appropriate?
-      return proposal if all_local_files? && !format_change? && linkable?
+      return proposal if !compression_required? &&
+                         all_local_files? &&
+                         !format_change? &&
+                         linkable?
+
       debug "#{self.class.name}: not appropriate"
       false
     end
@@ -21,11 +23,11 @@ module Uricp::Strategy
     end
 
     def linkable?
-      File.stat(File.dirname(from.path)).dev == File.stat(File.dirname(to.path)).dev &&
-      (!File.exist?(to.path) || File.file?(to.path))
+      from_path_dir = File.dirname(from.path)
+      to_path_dir = File.dirname(to.path)
+      File.directory?(from_path_dir) && File.directory?(to_path_dir) &&
+        File.stat(from_path_dir).dev == File.stat(to_path_dir).dev &&
+        (!File.exist?(to.path) || File.file?(to.path))
     end
-
   end
-
 end
-

data/lib/uricp/strategy/piped_cache.rb

@@ -1,22 +1,20 @@
 require 'fileutils'
 
 module Uricp::Strategy
-
   class PipedCache
-    
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
 
     def appropriate?
       if cache_root
-	case from.scheme
-	when 'pipe'
-	  validate_cache!
-	  return proposal
-	end
-	debug "#{self.class.name}: not appropriate"
+        case from.scheme
+        when 'pipe'
+          validate_cache!
+          return proposal
+        end
+        debug "#{self.class.name}: not appropriate"
       else
-	debug "#{self.class.name}: no cacheing requested" 
+        debug "#{self.class.name}: no cacheing requested"
       end
       false
     end
@@ -32,9 +30,5 @@ module Uricp::Strategy
       @proposed_options.delete('cache_name')
       self
     end
-
   end
-
 end
-
-

data/lib/uricp/strategy/piped_cache_convert.rb

@@ -1,22 +1,20 @@
 require 'fileutils'
 
 module Uricp::Strategy
-
   class PipedCacheConvert
-    
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
 
     def appropriate?
-      if conversion_required? && supported_source? 
-	case from.scheme
-	when 'pipe'
-	  validate_cache! if cache_root
-	  return proposal
-	end
-	debug "#{self.class.name}: not appropriate"
+      if conversion_required? && supported_source?
+        case from.scheme
+        when 'pipe'
+          validate_cache! if cache_root
+          return proposal
+        end
+        debug "#{self.class.name}: not appropriate"
       else
-	debug "#{self.class.name}: no non-stream conversion detected" 
+        debug "#{self.class.name}: no non-stream conversion detected"
       end
       false
     end
@@ -28,18 +26,16 @@ module Uricp::Strategy
     def proposal
       @proposed_options = options.dup
       if cache_root
-	@proposed_options['from_uri'] = temp_cache_uri
-	@proposed_options['sweep'] = [temp_cache_file, cache_file]
-	@proposed_options.delete('cache')
-	@proposed_options.delete('cache_name')
+        @proposed_options['from_uri'] = temp_cache_uri
+        @proposed_options['sweep'] = [temp_cache_file, cache_file]
+        @proposed_options.delete('cache')
+        @proposed_options.delete('cache_name')
       else
         @proposed_options['from_uri'] = temp_uri
-	@proposed_options['clean'] ||= []
-	@proposed_options['clean'] << proposed_path
+        @proposed_options['clean'] ||= []
+        @proposed_options['clean'] << proposed_path
       end
       self
     end
-
   end
-
 end