uricp 0.0.15 → 0.0.20

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')
@@ -36,11 +32,11 @@ module Uricp::Strategy
     end
 
     def new_qemu?
-      @new_qemu ||= !!(`qemu-img convert -O qcow2 -o ? a b` =~ /^compat/m)
+      @new_qemu ||= !!(`qemu-img convert -O qcow2 -o ? a b` =~ /\bcompat\b/m)
     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,24 +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"
-      else
-	debug "#{self.class.name}: no cacheing requested" 
+      with_active_cache do
+        case from.scheme
+        when 'pipe'
+          validate_cache!
+          return proposal
+        end
+        debug "#{self.class.name}: not appropriate"
+        false
       end
-      false
     end
 
     def command
@@ -28,13 +24,12 @@ module Uricp::Strategy
     def proposal
       @proposed_options = options.dup
       @proposed_options['sweep'] = [temp_cache_file, cache_file]
+      if to.scheme == 'rbd'
+        @proposed_options['rbd_cache_name'] = rbd_cache_image_spec(to)
+      end
       @proposed_options.delete('cache')
       @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,19 +1,15 @@
 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
@@ -27,16 +23,14 @@ module Uricp::Strategy
       @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

data/lib/uricp/strategy/piped_local_get.rb

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

data/lib/uricp/strategy/piped_local_put.rb

@@ -1,14 +1,11 @@
 module Uricp::Strategy
-  
   class PipedLocalPut
-
     include Uricp::Strategy::Common
 
     def appropriate?
-      case from.scheme
-      when 'pipe'
-        return proposal if to.scheme == 'file'
-      end
+      return proposal if to.scheme == 'file' &&
+                         from.scheme == 'pipe'
+
       debug "#{self.class.name}: not appropriate"
       false
     end
@@ -22,8 +19,5 @@ module Uricp::Strategy
       @proposed_options['from_uri'] = @proposed_options['to_uri']
       self
     end
-
   end
-
 end
-

data/lib/uricp/strategy/piped_rbd_get.rb

@@ -0,0 +1,30 @@
+require 'json'
+module Uricp::Strategy
+  class PipedRbdGet
+    include Uricp::Strategy::Common
+    include Uricp::Strategy::CacheCommon
+    include Methadone::SH
+
+    def appropriate?
+      without_active_cache do
+        if from.scheme == 'rbd' &&
+          rbd_snapshot_spec?(from) &&
+          to.scheme != 'rbd'
+          return proposal unless sequence_complete?
+        end
+      end
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "rbd export --no-progress --id #{rbd_id} '#{rbd_image_spec(from)}' - |"
+    end
+
+    def proposal
+      @proposed_options = options.dup
+      @proposed_options['from_uri'] = PIPE_URI
+      self
+    end
+  end
+end

data/lib/uricp/strategy/piped_remote_get.rb

@@ -1,8 +1,6 @@
 require 'open-uri'
 module Uricp::Strategy
-  
   class PipedRemoteGet
-
     include Uricp::Strategy::Common
 
     def appropriate?
@@ -10,33 +8,35 @@ module Uricp::Strategy
       when 'http', 'https'
         return proposal unless sequence_complete?
       else
-	debug "#{self.class.name}: not appropriate"
-	false
+        debug "#{self.class.name}: not appropriate"
+        false
       end
     end
 
-    alias :command :curl_download_to_pipe
+    alias command curl_download_to_pipe
 
     def proposal
       @proposed_options = options.dup
       @proposed_options['from_uri'] = PIPE_URI
       if conversion_required?
         @proposed_options['source-format'] = format_peek
-	if @proposed_options['source-format'] == @proposed_options['target-format'] 
-	  @proposed_options.delete('source-format')
-	  @proposed_options.delete('target-format')
-	end
+        if @proposed_options['source-format'] == @proposed_options['target-format']
+          @proposed_options.delete('source-format')
+          @proposed_options.delete('target-format')
+        end
       end
       if options['max-cache'] &&
-        size_peek.to_i > options['max-cache'].to_i
-	  @proposed_options.delete('cache')
-	  @proposed_options.delete('cache_name')
-	  @proposed_options.delete('max-cache')
+         size_peek.to_i > options['max-cache'].to_i
+        @proposed_options.delete('cache')
+        @proposed_options.delete('cache_name')
+        @proposed_options.delete('max-cache')
       end
       self
     end
 
     def format_peek
+      return options['target-format'] || 'raw' if dry_run?
+
       options['from_uri'].open(headers) do |u|
         encoding(u)
       end
@@ -48,14 +48,16 @@ module Uricp::Strategy
         raise
       end
     rescue SocketError => e
-      raise SocketError, options['from_uri'].to_s+" inaccessible: "+e.message
+      raise SocketError, options['from_uri'].to_s + ' inaccessible: ' + e.message
     end
 
     def size_peek
-      size_headers=headers
+      return options['max-cache'] if dry_run?
+
+      size_headers = headers
       size_headers['Range'] = 'bytes=0-0'
       options['from_uri'].open(headers) do |u|
-	match = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(u.meta['content-range'])
+        match = %r{bytes\s+(\d+)-(\d+)/(\d+|\*)}i.match(u.meta['content-range'])
         match && match[3].to_i
       end
     rescue OpenURI::HTTPError => e
@@ -66,15 +68,13 @@ module Uricp::Strategy
         raise
       end
     rescue SocketError => e
-      raise SocketError, options['from_uri'].to_s+" inaccessible: "+e.message
+      raise SocketError, options['from_uri'].to_s + ' inaccessible: ' + e.message
     end
 
     def headers
-      headers={'Range' => 'bytes=0-7'}
+      headers = { 'Range' => 'bytes=0-7' }
       headers['X-Auth-Token'] = options['authenticator'].call if http_authentication?
       headers
     end
-
   end
-
 end