uricp 0.0.11 → 0.0.16

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
@@ -91,8 +92,9 @@ module Uricp::Strategy
 
     PIPE_URI = URI('pipe:/')
 
-    def get_temp_filename(filename)
-      Dir::Tmpname.make_tmpname(filename, nil)
+    def get_temp_filename(base_dir)
+      t = Time.now.strftime('%Y%m%d')
+      File.join(base_dir, "uricp-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}")
     end
 
     def proposed_path
@@ -107,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

data/lib/uricp/strategy/piped_compress.rb

@@ -1,30 +1,25 @@
 module Uricp::Strategy
-
   class PipedCompress
-    
     include Uricp::Strategy::Common
 
-
     def appropriate?
       case from.scheme
       when 'pipe'
-	return proposal if compression_required?
+        return proposal if compression_required?
       end
       debug "#{self.class.name}: not appropriate"
       false
     end
 
     def command
-      "lz4 |"
+      'lz4 |'
     end
 
     def proposal
       @proposed_options = options.dup
       @proposed_options.delete('compress')
-      @proposed_options['encoding']='lz4'
+      @proposed_options['encoding'] = 'lz4'
       self
     end
-
   end
-
 end

data/lib/uricp/strategy/piped_decompress.rb

@@ -1,35 +1,31 @@
 module Uricp::Strategy
-
   class PipedDecompress
-    
     include Uricp::Strategy::Common
 
     def appropriate?
       case from.scheme
       when 'pipe'
-	return proposal if lz4_source? 
+        return proposal if lz4_source?
       end
       debug "#{self.class.name}: not appropriate"
       false
     end
 
     def command
-      "lz4 -d |"
+      'lz4 -d |'
     end
 
     def proposal
       @proposed_options = options.dup
       @proposed_options.delete('source-format')
       if @proposed_options['target-format']
-	@proposed_options['source-format'] = :raw
-        if @proposed_options['source-format'] == @proposed_options['target-format'] 
-	  @proposed_options.delete('source-format')
-	  @proposed_options.delete('target-format')
-	end
+        @proposed_options['source-format'] = :raw
+        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/piped_local_compress.rb

@@ -1,7 +1,5 @@
 module Uricp::Strategy
-
   class PipedLocalCompress
-    
     include Uricp::Strategy::Common
 
     def appropriate?
@@ -24,7 +22,5 @@ module Uricp::Strategy
       @proposed_options['from_uri'] = PIPE_URI
       self
     end
-
   end
-
 end

data/lib/uricp/strategy/piped_local_decompress.rb

@@ -1,42 +1,36 @@
 module Uricp::Strategy
-
   class PipedLocalDecompress
-    
     include Uricp::Strategy::Common
 
     def appropriate?
       case from.scheme
       when 'pipe'
-	if raw_target? && lz4_source? && to.scheme == 'file'
-	  if always_write_sparse?
-	    return proposal
-	  else
-	    debug "#{self.class.name}: using safe sparse expansion via stream"
-	  end
-	end
+        if raw_target? && lz4_source? && to.scheme == 'file'
+          return proposal if always_write_sparse?
+
+          debug "#{self.class.name}: using safe sparse expansion via stream"
+        end
       end
       debug "#{self.class.name}: not appropriate"
       false
     end
 
     def command
-      "lz4 -qd - #{to.path};"
+      "lz4 -qdf - #{to.path};"
     end
 
     def proposal
       @proposed_options = options.dup
       @proposed_options.delete('source-format')
       if @proposed_options['target-format']
-	@proposed_options['source-format'] = :raw
-        if @proposed_options['source-format'] == @proposed_options['target-format'] 
-	  @proposed_options.delete('source-format')
-	  @proposed_options.delete('target-format')
-	end
+        @proposed_options['source-format'] = :raw
+        if @proposed_options['source-format'] == @proposed_options['target-format']
+          @proposed_options.delete('source-format')
+          @proposed_options.delete('target-format')
+        end
       end
       @proposed_options['from_uri'] = @proposed_options['to_uri']
       self
     end
-
   end
-
 end