uricp 0.0.13 → 0.0.18

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,46 @@
+require 'json'
+module Uricp::Strategy
+  class PipedRbdGet
+    include Uricp::Strategy::Common
+    include Methadone::SH
+
+    def appropriate?
+      case from.scheme
+      when 'rbd'
+        return proposal unless sequence_complete? || snap_in_progress?
+      end
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "rbd snap create --id #{rbd_id} '#{rbd_snap_target(from)}' && " \
+      "rbd export --no-progress --id #{rbd_id} '#{rbd_snap_target(from)}' - |"
+    end
+
+    def proposal
+      @proposed_options = options.dup
+      @proposed_options['rbd_snapshot'] = rbd_snap_target(from)
+      @proposed_options['from_uri'] = PIPE_URI
+      @proposed_options.delete('cache')
+      @proposed_options.delete('cache_name')
+      self
+    end
+
+    RBD_SNAPSHOT = 'uricp_snap'.freeze
+
+    def rbd_snap_target(uri)
+      "#{rbd_target(uri)}@#{RBD_SNAPSHOT}"
+    end
+
+    def snap_in_progress?
+      return false if dry_run?
+
+      result = false
+      sh "rbd snap ls --id #{rbd_id} --format json #{rbd_target(from)}" do |stdout|
+        result = JSON.parse(stdout).any? { |x| x['name'] == RBD_SNAPSHOT }
+      end
+      result
+    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

data/lib/uricp/strategy/rbd_remote_put.rb

@@ -0,0 +1,36 @@
+module Uricp::Strategy
+  class RbdRemotePut
+    include Uricp::Strategy::Common
+
+    def appropriate?
+      if compression_required? || conversion_required?
+        debug "#{self.class.name}: not ready to upload"
+        return false
+      end
+      case from.scheme
+      when 'pipe', 'file'
+        return proposal if to.scheme == 'rbd'
+      end
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_target(to)}';"
+    end
+
+    def proposal
+      @proposed_options = options.dup
+      @proposed_options['from_uri'] = to
+      self
+    end
+
+    def data_source
+      if from.scheme == 'pipe'
+        '-'
+      else
+        "'#{from.path}'"
+      end
+    end
+  end
+end

data/lib/uricp/strategy/rbd_sweeper.rb

@@ -0,0 +1,22 @@
+module Uricp::Strategy
+  class RbdSweeper
+    include Uricp::Strategy::Common
+
+    def appropriate?
+      return proposal if options['rbd_snapshot'] && sequence_complete?
+
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "rbd snap rm --id #{rbd_id} '#{options['rbd_snapshot']}';"
+    end
+
+    def proposal
+      @proposed_options = options.dup
+      @proposed_options.delete('rbd_snapshot')
+      self
+    end
+  end
+end

data/lib/uricp/strategy/remote_put.rb

@@ -1,26 +1,22 @@
 module Uricp::Strategy
-  
   class RemotePut
-
     include Uricp::Strategy::Common
 
     def appropriate?
       if compression_required? || conversion_required?
         debug "#{self.class.name}: not ready to upload"
-      else
-	case to.scheme
-	when 'http', 'https'
-	  case from.scheme
-	  when 'file', 'pipe'
-	    if http_authentication?
-	      return proposal 
-	    else
-	      unsupported_transfer
-	    end
-	  end
-	end
-	debug "#{self.class.name}: not appropriate"
+        return false
+      end
+      case to.scheme
+      when 'http', 'https'
+        case from.scheme
+        when 'file', 'pipe'
+          return proposal if http_authentication?
+
+          unsupported_transfer
+        end
       end
+      debug "#{self.class.name}: not appropriate"
       false
     end
 
@@ -41,7 +37,5 @@ module Uricp::Strategy
         from.path
       end
     end
-
   end
-
 end

data/lib/uricp/strategy/segmented_remote_put.rb

@@ -1,35 +1,29 @@
 module Uricp::Strategy
-  
   class SegmentedRemotePut
-
     include Uricp::Strategy::Common
 
     def appropriate?
-      if segmented?
-        if compression_required? || conversion_required?
-	  debug "#{self.class.name}: not ready to upload"
-	else
-	  case to.scheme
-	  when 'http', 'https'
-	    case from.scheme
-	    when 'file', 'pipe'
-	      if http_authentication?
-		return proposal
-	      else
-		unsupported_transfer
-	      end
-	    end
-	  end
-	  debug "#{self.class.name}: not appropriate"
-	end
-      else
-        debug "#{self.class.name}: no segmentation requested"
+      unless segmented?
+        debug "#{self.class.name}: not appropriate"
+        return false
+      end
+      if compression_required? || conversion_required?
+        debug "#{self.class.name}: not ready to upload"
+        return false
       end
+      case to.scheme
+      when 'http', 'https'
+        case from.scheme
+        when 'file', 'pipe'
+          return proposal if http_authentication?
+        end
+      end
+      unsupported_transfer
       false
     end
 
     def command
-      "segment_upload --segment-size '#{options['segment-size']}' #{source_details} #{to.to_s};"
+      "segment_upload --segment-size '#{options['segment-size']}' #{source_details} #{to};"
     end
 
     def proposal
@@ -42,11 +36,5 @@ module Uricp::Strategy
     def source_details
       "--from #{from.path}" unless from.scheme == 'pipe'
     end
-
-    def segmented?
-      options['segment-size']
-    end
-
   end
-
 end

data/lib/uricp/strategy/sweeper.rb

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

data/lib/uricp/uri_strategy.rb

@@ -1,20 +1,21 @@
 require 'uri'
 
 module Uricp
-
   class UriStrategy
-
     include Methadone::CLILogging
 
     def self.choose_strategy(options)
-      current = options.reject {|k,v| k.is_a? Symbol}
+      current = options.reject { |k, _v| k.is_a? Symbol }
       strategy_list = []
-      while STRATEGIES.detect {|klass| @strategy = klass.new(current).appropriate? }
-	debug "#{self.name}: Selected strategy #{@strategy.class.name}"
+      while STRATEGIES.detect { |klass| @strategy = klass.new(current).appropriate? }
+        debug "#{name}: Selected strategy #{@strategy.class.name}"
         strategy_list << @strategy
-	current = @strategy.proposed_options
+        current = @strategy.proposed_options
+      end
+      if incomplete_strategy?(strategy_list)
+        raise Uricp::UnsupportedURLtype, "Unsupported transfer from #{options['from_uri']} to #{options['to_uri']}"
       end
-      raise Uricp::UnsupportedURLtype, "Unsupported transfer from #{options['from_uri']} to #{options['to_uri']}" if incomplete_strategy?(strategy_list)
+
       strategy_list
     end
 
@@ -22,12 +23,11 @@ module Uricp
       list.empty?
     end
 
-  private
-
-    #This is an ordered list from the most specific to the most general
+    # This is an ordered list from the most specific to the most general
     STRATEGIES = [
       Strategy::CachedGet,
       Strategy::PipedRemoteGet,
+      Strategy::PipedRbdGet,
       Strategy::PipedCacheConvert,
       Strategy::PipedCache,
       Strategy::PipedLocalDecompress,
@@ -35,14 +35,15 @@ module Uricp
       Strategy::LocalConvert,
       Strategy::LocalLink,
       Strategy::PipedCompress,
+      Strategy::RbdRemotePut,
       Strategy::SegmentedRemotePut,
       Strategy::RemotePut,
       Strategy::PipedLocalCompress,
       Strategy::PipedLocalGet,
       Strategy::PipedLocalPut,
       Strategy::Cleaner,
-      Strategy::Sweeper,
-    ]
-
+      Strategy::RbdSweeper,
+      Strategy::Sweeper
+    ].freeze
   end
 end

data/lib/uricp/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Uricp
-  VERSION = "0.0.13"
-  DEFAULT_SEGMENT_SIZE = "5 GiB"
+  VERSION = '0.0.18'
+  DEFAULT_SEGMENT_SIZE = '5 GiB'
 end