uricp 0.0.21 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeaa81822977930906959744feb0d8bdf9ca820afd10e6b97d32a726cbf67391
-  data.tar.gz: cd29b49f83ba53a275f4574c32cbb7f1b92c5218421cef668355a14ab5a36bec
+  metadata.gz: acf0f2c652c367c337a5df56eda0d3996799857614f6e91a3844b637b8d36fd6
+  data.tar.gz: 3778050f26b276236ca88ca1d6b6df2547adc1daf9eeb8b33a5d7e92cf424cbf
 SHA512:
-  metadata.gz: 56c0e441da6e7e709580e09cdcc68c56b3ff731fc9fd028e56160dbfca427048ecab2f79c049f490bd15bcb027a67ec1b4aa01ddd2ce801cda89ad53f9ba6efa
-  data.tar.gz: 92122076440ca0cbd0345f29bf4386503c9f3830d6a4ffbfc92a4f55e40b9ea7790ff81cc1ebf1101ce7ac4cb552c312bf2be0cc5c3c49f0b727ab0247f46f90
+  metadata.gz: ddfdf97678c6c18e1582eb4ecb17d4328f7f713c31d59bc8512209a99cd47527acbcc7fd61953f1a4056ab623bed71c100c4c0658f96569cf3be2e7e0e94a66c
+  data.tar.gz: d2ce88f8d34a54c1ce394b87d94364afc38ee2b310c8dae05a3cd3bd4c1a130d8f758caa25f49053d7692a44880aa9a0094d2c31caa696a9d0c73f49d5366aa2

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in uricp.gemspec

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.21)
+    uricp (0.0.25)
       childprocess (~> 1.0)
       filesize (= 0.0.2)
       methadone (~> 2.0.2)
       open4 (~> 1.3.0)
-      sendfile (~> 1.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -41,8 +40,7 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    sendfile (1.2.2)
+    rspec-support (3.10.3)
 
 PLATFORMS
   ruby
@@ -56,5 +54,8 @@ DEPENDENCIES
   rdoc (~> 4.2.0)
   uricp!
 
+RUBY VERSION
+   ruby 2.7.0p0
+
 BUNDLED WITH
    1.17.3

data/bin/uricp

@@ -4,6 +4,7 @@ require 'optparse'
 require 'uri'
 require 'methadone'
 require 'filesize'
+require 'securerandom'
 require 'uricp'
 
 class App
@@ -121,8 +122,8 @@ class App
     "Compress output")
   on("--[no-]dry-run",
     "Show what would be run,", "but don't run the command")
-  on("--[no-]dry-cache",
-    "On dry runs assume the cache is populated")
+  on("--dry-cache DRY_CACHE",[:rbd, :partial_rbd],
+    "On dry runs assume the cache is populated", "[rbd, partial_rbd]")
   on("--[no-]force",
     "Always write sparsely")
   #Arguments

data/features/rbd_access.feature

@@ -56,9 +56,21 @@ Feature: Manipulate file images in ceph
     rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy'
     """
 
-  Scenario: HTTP URI to rbd via populated caches
+    Scenario: HTTP URI to rbd via partial rbd caches
     Given a correctly initialised cache at "/tmp/uricp"
-    When I successfully run `uricp --dry-run --dry-cache --target-format=raw --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 rbd:///servers/srv-testy`
+    When I successfully run `uricp --dry-run --dry-cache=partial_rbd --target-format=raw --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 rbd:///servers/srv-testy`
+    And the output should not contain:
+    """
+    snap create
+    """
+    And the output should contain:
+    """
+    rbd import --no-progress --id libvirt - 'servers/srv-testy'
+    """
+
+  Scenario: HTTP URI to rbd via populated cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I successfully run `uricp --dry-run --dry-cache=rbd --target-format=raw --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 rbd:///servers/srv-testy`
     And the output should not contain:
     """
     snap create
@@ -79,13 +91,13 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/img-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/img-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/img-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/img-testy@uricp_snap'
     """
     And the output should contain:
     """
@@ -103,13 +115,13 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should not contain:
     """
@@ -131,14 +143,19 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/img-testy@base'
     """
+
+  Scenario: rbd to rbd - partial cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I run `uricp --dry-run --dry-cache=partial_rbd --cache=/tmp/uricp rbd:///servers/srv-testy rbd:///servers/img-testy`
+    Then the exit status should be 70
     And the output should contain:
     """
-    rbd flatten --id libvirt --no-progress 'servers/img-testy'
+    Unsupported transfer
     """
 
   Scenario: rbd to rbd - populated cache
     Given a correctly initialised cache at "/tmp/uricp"
-    When I successfully run `uricp --dry-run --dry-cache --cache=/tmp/uricp rbd:///servers/img-testy rbd:///servers/srv-testy`
+    When I successfully run `uricp --dry-run --dry-cache=rbd --cache=/tmp/uricp rbd:///servers/img-testy rbd:///servers/srv-testy`
     And the output should not contain:
     """
     snap create
@@ -165,7 +182,7 @@ Feature: Manipulate file images in ceph
     """
     And the output should contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should contain:
     """
@@ -174,7 +191,16 @@ Feature: Manipulate file images in ceph
 
   Scenario: RBD export with cacheing - populated cache
     Given a correctly initialised cache at "/tmp/uricp"
-    When I run `uricp --dry-run --dry-cache --compress --cache=/tmp/uricp rbd:///servers/srv-testy file:///tmp/img-testy`
+    When I run `uricp --dry-run --dry-cache=rbd --compress --cache=/tmp/uricp rbd:///servers/srv-testy file:///tmp/img-testy`
+    Then the exit status should be 70
+    And the output should contain:
+    """
+    Unsupported transfer
+    """
+
+  Scenario: RBD export with cacheing - partial cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I run `uricp --dry-run --dry-cache=partial_rbd --compress --cache=/tmp/uricp rbd:///servers/srv-testy file:///tmp/img-testy`
     Then the exit status should be 70
     And the output should contain:
     """
@@ -192,13 +218,13 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should not contain:
     """
@@ -220,7 +246,3 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/img-testy@base'
     """
-    And the output should contain:
-    """
-    rbd flatten --id libvirt --no-progress 'servers/img-testy'
-    """

data/lib/segment_upload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uricp/version'
 require 'uricp/curl_primitives'
 require 'uricp/orbit_auth'
@@ -6,31 +8,3 @@ require 'uricp/segmenter'
 module Uricp
   UnsupportedURLtype = Class.new(ArgumentError)
 end
-
-# Monkey patch a copy_stream facility in using 'sendfile'
-unless IO.respond_to? :copy_stream
-  require 'sendfile'
-
-  def IO.copy_stream(src, dst, copy_length = nil, offset = nil)
-    if src.stat.pipe?
-      amount = copy_length.to_i
-      buf_size = [amount, 2**16].min
-      buffer = ''
-      while amount > 0
-        src.read(buf_size, buffer)
-        amount_read = buffer.length
-        dst.write(buffer)
-        amount -= amount_read
-        break if src.eof?
-      end
-      copy_length.to_i - amount
-    else
-      current_pos = src.pos
-      count = dst.sendfile(src, offset || current_pos, copy_length)
-      src.seek(count, IO::SEEK_CUR)
-      count
-    end
-  rescue EOFError
-    0
-  end
-end

data/lib/uricp/curl_primitives.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::CurlPrimitives
   attr_reader :options
 

data/lib/uricp/orbit_auth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 module Uricp
   class OrbitAuth

data/lib/uricp/segmenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module Uricp
@@ -67,7 +69,7 @@ module Uricp
     end
 
     def upload_segment(segment_number)
-      segment_name = File.join(to.to_s, manifest_suffix, '%08d' % segment_number)
+      segment_name = File.join(to.to_s, manifest_suffix, format('%08d', segment_number))
       debug "Uploading with #{curl_upload_from('-', segment_name)}"
       open('|' + curl_upload_from('-', segment_name), 'w') do |destination|
         copy_length = IO.copy_stream(@source, destination, segment_size)

data/lib/uricp/strategy/cache_common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Uricp::Strategy
@@ -25,16 +27,16 @@ module Uricp::Strategy
     end
 
     def without_active_cache
-      unless cache_root
-        yield
-      else
+      if cache_root
         debug "#{self.class.name}: cache active - not appropriate"
         false
+      else
+        yield
       end
     end
 
     def in_cache?
-      File.readable?(cache_file) || options['dry-cache']
+      File.readable?(cache_file) || options['dry-cache'] == :rbd
     end
 
     def cache_root

data/lib/uricp/strategy/cached_get.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Uricp::Strategy

data/lib/uricp/strategy/cleaner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class Cleaner
     include Uricp::Strategy::Common

data/lib/uricp/strategy/common.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   module Common
     include Methadone::CLILogging
     include Uricp::CurlPrimitives
+    include Methadone::SH
 
     def initialize(options)
       @options = options
@@ -91,17 +94,19 @@ module Uricp::Strategy
     end
 
     PIPE_URI = URI('pipe:/')
+    DRY_SNAP = 'uricp_snap'
+
     def rbd_base_name
-      'base'.freeze
+      'base'
     end
 
     def rbd_snapshot_name
-      'uricp_snap'.freeze
+      @rbd_snapshot_name ||= dry_run? ? DRY_SNAP : SecureRandom.uuid
     end
 
     def get_temp_filename(base_dir)
       t = Time.now.strftime('%Y%m%d')
-      File.join(base_dir, "uricp-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}")
+      File.join(base_dir, "uricp-#{t}-#{$PROCESS_ID}-#{rand(0x100000000).to_s(36)}")
     end
 
     def proposed_path
@@ -128,7 +133,7 @@ module Uricp::Strategy
       options['rbd_cache_name']
     end
 
-    def rbd_clone_snapshot(cache=rbd_cache_name)
+    def rbd_clone_snapshot(cache = rbd_cache_name)
       "#{cache}@#{rbd_base_name}"
     end
 
@@ -156,10 +161,29 @@ module Uricp::Strategy
       uri.scheme == 'rbd' && uri.path.include?('@')
     end
 
+    def rbd_cache_upload_available?
+      rbd_cache_name && !rbd_cache_image_exists?(rbd_cache_name)
+    end
+
+    def rbd_cache_image_exists?(target)
+      command = "rbd status --id #{rbd_id} --format json #{target} 2>/dev/null"
+      if dry_run?
+        if options['dry-cache'] == :partial_rbd && options['cache_name'] !~ /srv-...../
+          command = 'exit 0'
+        else
+          command = 'exit 2'
+        end
+      end
+      sh!(command)
+      true
+    rescue Methadone::FailedCommandError
+      false
+    end
+
     def in_rbd_cache(target)
       result = false
       if dry_run?
-        result = options['dry-cache'] && options['cache_name'] !~ /srv-...../
+        result = options['dry-cache'] == :rbd && options['cache_name'] !~ /srv-...../
       else
         sh "rbd snap ls --id #{rbd_id} --format json #{target} 2>/dev/null" do |stdout|
           result = JSON.parse(stdout).any? { |x| x['name'] == rbd_base_name }

data/lib/uricp/strategy/local_convert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class LocalConvert
     include Uricp::Strategy::Common

data/lib/uricp/strategy/local_link.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class LocalLink
     include Uricp::Strategy::Common

data/lib/uricp/strategy/piped_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Uricp::Strategy
@@ -24,8 +26,9 @@ module Uricp::Strategy
     def proposal
       @proposed_options = options.dup
       @proposed_options['sweep'] = [temp_cache_file, cache_file]
+      image_spec_to_check = rbd_cache_image_spec(to)
       if to.scheme == 'rbd'
-        @proposed_options['rbd_cache_name'] = rbd_cache_image_spec(to)
+        @proposed_options['rbd_cache_name'] = image_spec_to_check
       end
       @proposed_options.delete('cache')
       @proposed_options.delete('cache_name')

data/lib/uricp/strategy/piped_cache_convert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Uricp::Strategy

data/lib/uricp/strategy/piped_compress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class PipedCompress
     include Uricp::Strategy::Common

data/lib/uricp/strategy/piped_decompress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class PipedDecompress
     include Uricp::Strategy::Common

data/lib/uricp/strategy/piped_local_compress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class PipedLocalCompress
     include Uricp::Strategy::Common

data/lib/uricp/strategy/piped_local_decompress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class PipedLocalDecompress
     include Uricp::Strategy::Common

data/lib/uricp/strategy/piped_local_get.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class PipedLocalGet
     include Uricp::Strategy::Common

data/lib/uricp/strategy/piped_local_put.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class PipedLocalPut
     include Uricp::Strategy::Common

data/lib/uricp/strategy/piped_rbd_get.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 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'
+           rbd_snapshot_spec?(from) &&
+           to.scheme != 'rbd'
           return proposal unless sequence_complete?
         end
       end

data/lib/uricp/strategy/piped_remote_get.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 module Uricp::Strategy
   class PipedRemoteGet

data/lib/uricp/strategy/rbd_cache_base_snap.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class RbdCacheBaseSnap
     include Uricp::Strategy::Common
-    include Methadone::SH
 
     def appropriate?
       if rbd_cache_name &&
-        rbd_image_spec(from) == rbd_cache_name
+         rbd_image_spec(from) == rbd_cache_name
         return proposal
       end
       debug "#{self.class.name}: not appropriate"
@@ -13,7 +14,7 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd snap create --id #{rbd_id} '#{rbd_clone_snapshot(rbd_cache_name)}' && "\
+      "rbd snap create --id #{rbd_id} '#{rbd_clone_snapshot(rbd_cache_name)}';"\
       "rbd snap protect --id #{rbd_id} '#{rbd_clone_snapshot(rbd_cache_name)}';"
     end
 

data/lib/uricp/strategy/rbd_cache_check.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Uricp::Strategy
   class RbdCacheCheck
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       unless (from.scheme == 'rbd') != (to.scheme == 'rbd')

data/lib/uricp/strategy/rbd_cache_clone.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Uricp::Strategy
   class RbdCacheClone
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       unless from.scheme == 'rbd'
@@ -15,8 +16,7 @@ module Uricp::Strategy
       with_active_cache do
         options['cache_name'] = File.basename(options['to_uri'].path)
         cache_target = rbd_cache_image_spec(from)
-        cache_check = in_rbd_cache(rbd_cache_image_spec(from))
-        if cache_check 
+        if rbd_cache_image_exists?(cache_target) || in_rbd_cache(cache_target)
           debug "#{self.class.name}: Unexpected existing cache entry for #{options['to_uri']}"
           unsupported_transfer
         end

data/lib/uricp/strategy/rbd_cache_upload.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class RbdCacheUpload
     include Uricp::Strategy::Common
-    include Methadone::SH
 
     def appropriate?
       if compression_required? || conversion_required?
         debug "#{self.class.name}: not ready to upload"
         return false
       end
-      if rbd_cache_name
+      if rbd_cache_upload_available?
         case from.scheme
         when 'pipe', 'file'
           return proposal if to.scheme == 'rbd'
@@ -19,7 +20,7 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_cache_name}' && "
+      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_cache_name}';"
     end
 
     def proposal
@@ -35,6 +36,5 @@ module Uricp::Strategy
         "'#{from.path}'"
       end
     end
-
   end
 end

data/lib/uricp/strategy/rbd_cached_get.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Uricp::Strategy
   class RbdCachedGet
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       if from.scheme != 'rbd' || rbd_snapshot_spec?(from)

data/lib/uricp/strategy/rbd_cached_put.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class RbdCachedPut
     include Uricp::Strategy::Common
@@ -5,9 +7,9 @@ module Uricp::Strategy
 
     def appropriate?
       return proposal if to.scheme == 'rbd' &&
-        rbd_snapshot_spec?(from) && 
-        rbd_cache_name.nil? &&
-        !rbd_sequence_complete?
+                         rbd_snapshot_spec?(from) &&
+                         rbd_cache_name.nil? &&
+                         !rbd_sequence_complete?
 
       debug "#{self.class.name}: not appropriate"
       false
@@ -23,11 +25,9 @@ module Uricp::Strategy
       if options['rbd_cache_target']
         @proposed_options['to_uri'] = options['rbd_cache_target']
         @proposed_options['rbd_cache_name'] = rbd_image_spec(to)
-        @proposed_options['rbd_flatten'] ||= @proposed_options['rbd_cache_name']
         @proposed_options.delete('rbd_cache_target')
       end
       self
     end
-
   end
 end

data/lib/uricp/strategy/rbd_put.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class RbdPut
     include Uricp::Strategy::Common
@@ -7,11 +9,13 @@ module Uricp::Strategy
         debug "#{self.class.name}: not ready to upload"
         return false
       end
-      unless rbd_cache_name
-        case from.scheme
-        when 'pipe', 'file'
-          return proposal if to.scheme == 'rbd'
-        end
+      if rbd_cache_upload_available?
+        debug "#{self.class.name}: cacheing in RBD instead"
+        return false
+      end
+      case from.scheme
+      when 'pipe', 'file'
+        return proposal if to.scheme == 'rbd'
       end
       debug "#{self.class.name}: not appropriate"
       false

data/lib/uricp/strategy/rbd_snap.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 require 'json'
 module Uricp::Strategy
   class RbdSnap
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       without_active_cache do
         if from.scheme == 'rbd' &&
-          options['rbd_snapshot'].nil? &&
-          !rbd_snapshot_spec?(from) &&
-          (rbd_cache_name.nil? ||
-            !from.path.include?(rbd_cache_name))
+           options['rbd_snapshot'].nil? &&
+           !rbd_snapshot_spec?(from) &&
+           (rbd_cache_name.nil? ||
+             !from.path.include?(rbd_cache_name))
           if snap_in_progress?
             debug "#{self.class.name}: detected snapshot in progress"
           else
@@ -24,17 +25,18 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd snap create --id #{rbd_id} '#{rbd_upload_snapshot(from)}' && " \
-      "rbd snap protect --id #{rbd_id} '#{rbd_upload_snapshot(from)}' && " \
+      "rbd snap create --id #{rbd_id} '#{rbd_upload_snapshot(from)}';" \
+      "rbd snap protect --id #{rbd_id} '#{rbd_upload_snapshot(from)}';" \
     end
 
     def proposal
       @proposed_options = options.dup
-      @proposed_options['rbd_snapshot'] = rbd_upload_snapshot(from)
-      @proposed_options['from_uri'] = rbd_uri(@proposed_options['rbd_snapshot'])
+      @proposed_options['from_uri'] = rbd_uri(rbd_upload_snapshot(from))
       if options['rbd_cache_target']
         @proposed_options['to_uri'] = options['rbd_cache_target']
         @proposed_options['rbd_cache_target'] = to
+      else
+        @proposed_options['rbd_snapshot'] = rbd_upload_snapshot(from) unless to.scheme == 'rbd'
       end
       self
     end

data/lib/uricp/strategy/rbd_sweeper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class RbdSweeper
     include Uricp::Strategy::Common
@@ -10,7 +12,7 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd snap unprotect --id #{rbd_id} '#{options['rbd_snapshot']}' && " \
+      "rbd snap unprotect --id #{rbd_id} '#{options['rbd_snapshot']}';" \
       "rbd snap rm --id #{rbd_id} '#{options['rbd_snapshot']}';"
     end
 

data/lib/uricp/strategy/remote_put.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class RemotePut
     include Uricp::Strategy::Common

data/lib/uricp/strategy/segmented_remote_put.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class SegmentedRemotePut
     include Uricp::Strategy::Common

data/lib/uricp/strategy/sweeper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class Sweeper
     include Uricp::Strategy::Common

data/lib/uricp/uri_strategy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Uricp
@@ -49,7 +51,6 @@ module Uricp
       Strategy::PipedLocalGet,
       Strategy::PipedLocalPut,
       Strategy::Cleaner,
-      Strategy::RbdFlattener,
       Strategy::RbdSweeper,
       Strategy::Sweeper
     ].freeze

data/lib/uricp/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Uricp
-  VERSION = '0.0.21'
+  VERSION = '0.0.25'
   DEFAULT_SEGMENT_SIZE = '5 GiB'
 end

data/lib/uricp.rb

@@ -29,7 +29,6 @@ require 'uricp/strategy/rbd_cache_clone'
 require 'uricp/strategy/rbd_cached_get'
 require 'uricp/strategy/rbd_cached_put'
 require 'uricp/strategy/rbd_cache_upload'
-require 'uricp/strategy/rbd_flattener'
 require 'uricp/strategy/rbd_put'
 require 'uricp/strategy/rbd_snap'
 require 'uricp/strategy/rbd_sweeper'

data/uricp.gemspec

@@ -1,32 +1,32 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'uricp/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "uricp"
+  spec.name          = 'uricp'
   spec.version       = Uricp::VERSION
-  spec.authors       = ["Neil Wilson"]
-  spec.email         = ["neil@aldur.co.uk"]
-  spec.summary       = %q{Copy one URL to another with optional cacheing}
-  spec.description   = %q{Copy one URL to another with optional cacheing}
-  spec.homepage      = ""
-  spec.license       = "gplv3"
+  spec.authors       = ['Neil Wilson']
+  spec.email         = ['neil@aldur.co.uk']
+  spec.summary       = 'Copy one URL to another with optional cacheing'
+  spec.description   = 'Copy one URL to another with optional cacheing'
+  spec.homepage      = ''
+  spec.license       = 'gplv3'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency('rdoc', '~> 4.2.0')
   spec.add_development_dependency('aruba', '~> 0.6.0')
+  spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency('cucumber', '~> 1.3')
+  spec.add_development_dependency('inifile', '~> 1.1')
   spec.add_development_dependency('rake', '~> 12.3')
+  spec.add_development_dependency('rdoc', '~> 4.2.0')
   spec.add_dependency('childprocess', '~> 1.0')
+  spec.add_dependency('filesize', '= 0.0.2')
   spec.add_dependency('methadone', '~> 2.0.2')
   spec.add_dependency('open4', '~> 1.3.0')
-  spec.add_dependency('filesize', '= 0.0.2')
-  spec.add_dependency('sendfile', '~> 1.2.0')
-  spec.add_development_dependency('inifile', '~> 1.1')
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.25
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,47 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: childprocess
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: methadone
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
+        version: 4.2.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -137,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: sendfile
+  name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: inifile
+  name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
+        version: 1.3.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.0
 description: Copy one URL to another with optional cacheing
 email:
 - neil@aldur.co.uk
@@ -229,7 +215,6 @@ files:
 - lib/uricp/strategy/rbd_cache_upload.rb
 - lib/uricp/strategy/rbd_cached_get.rb
 - lib/uricp/strategy/rbd_cached_put.rb
-- lib/uricp/strategy/rbd_flattener.rb
 - lib/uricp/strategy/rbd_put.rb
 - lib/uricp/strategy/rbd_snap.rb
 - lib/uricp/strategy/rbd_sweeper.rb

data/lib/uricp/strategy/rbd_flattener.rb

@@ -1,23 +0,0 @@
-module Uricp::Strategy
-  class RbdFlattener
-    include Uricp::Strategy::Common
-
-    def appropriate?
-      return proposal if options['rbd_flatten'] &&
-        rbd_sequence_complete?
-
-      debug "#{self.class.name}: not appropriate"
-      false
-    end
-
-    def command
-      "rbd flatten --id #{rbd_id} --no-progress '#{options['rbd_flatten']}' && "
-    end
-
-    def proposal
-      @proposed_options = options.dup
-      @proposed_options.delete('rbd_flatten')
-      self
-    end
-  end
-end