uricp 0.0.23 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f12b0071b707cd164565e756677d620c77aa4433161b28b4e2aed90e764f2e68
-  data.tar.gz: 2a226104ffad1d51b15e6a9ea015d94e058ff7728e66d3f0c708092e1764205b
+  metadata.gz: 2bdc788caae911b8877f44865af0a39419c96148ca47ee2536b04d2de1630fc1
+  data.tar.gz: 0f2ae7d75bb93abc8f3eff7437eb82552fa39ef7c9ddfadd7f197f775071519d
 SHA512:
-  metadata.gz: 420a3273588f2fde0d78b12250be89b0c07fc0f82d9e4101c427780f871f021bba870ff88b14d5adf3dd9ed0c599a944474137040e8ea2f07aaadd326fa6eccc
-  data.tar.gz: 6cba1806fed37f14d5dad8402061f639f9d6e32df79caf66bd06c2bbabcbd68d460b71710ba76f676967301a1b878129b8b92bd7796f697f8159cc9a65da3c89
+  metadata.gz: 77528ea35b99174312d1bdf1aa73ec5d9e53aa1c432dfde4cf9c720c35c093746f5289a3e558c46dff05a39d5efb1a248ec71b6ae6d66192f3e52c420d5ccde1
+  data.tar.gz: 97fc3ada66b80f66374b46d03302f37459d937d31ab5c15ecb3f4ab4f0dd3856031f168ba2f804a199d18e7df31227bc6145d94e263e75c687fa6f73f2306a1c

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.23)
+    uricp (0.0.27)
       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

data/features/rbd_access.feature

@@ -41,7 +41,7 @@ Feature: Manipulate file images in ceph
     When I successfully run `uricp --dry-run --target-format=raw --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 rbd:///servers/srv-testy`
     And the output should contain:
     """
-    rbd import --no-progress --id libvirt '/tmp/uricp/cache/freedos.qcow2' 'servers/freedos.qcow2'
+    rbd import --no-progress --id libvirt - <'/tmp/uricp/cache/freedos.qcow2' 'servers/freedos.qcow2'
     """
     And the output should contain:
     """

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,11 +27,11 @@ 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
 

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,10 +94,10 @@ module Uricp::Strategy
     end
 
     PIPE_URI = URI('pipe:/')
-    DRY_SNAP = 'uricp_snap'.freeze
+    DRY_SNAP = 'uricp_snap'
 
     def rbd_base_name
-      'base'.freeze
+      'base'
     end
 
     def rbd_snapshot_name
@@ -103,7 +106,7 @@ module Uricp::Strategy
 
     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
@@ -130,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
 
@@ -158,13 +161,17 @@ 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"
+          command = 'exit 0'
         else
-          command = "exit 2"
+          command = 'exit 2'
         end
       end
       sh!(command)

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,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Uricp::Strategy
   class PipedCache
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       with_active_cache do
@@ -26,7 +27,7 @@ module Uricp::Strategy
       @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' && !rbd_cache_image_exists?(image_spec_to_check)
+      if to.scheme == 'rbd'
         @proposed_options['rbd_cache_name'] = image_spec_to_check
       end
       @proposed_options.delete('cache')

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"

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'

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
@@ -29,12 +30,8 @@ module Uricp::Strategy
     end
 
     def data_source
-      if from.scheme == 'pipe'
-        '-'
-      else
-        "'#{from.path}'"
-      end
+      return if from.scheme == 'pipe'
+      " <'#{from.path}'"
     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,16 +7,18 @@ 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
     end
 
     def command
-      "rbd clone --id #{rbd_id} '#{rbd_image_spec(from)}' '#{rbd_image_spec(to)}';"
+      "rbd clone --id #{rbd_id} '#{rbd_image_spec(from)}' "\
+        "'#{rbd_image_spec(to)}' || [ $? -eq 22 ] && "\
+        "rbd create --id #{rbd_id} -s 0 '#{rbd_image_spec(to)}';"
     end
 
     def proposal
@@ -27,6 +31,5 @@ module Uricp::Strategy
       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,18 +9,20 @@ 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
     end
 
     def command
-      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_image_spec(to)}';"
+      "rbd import --no-progress --id #{rbd_id} -#{data_source} '#{rbd_image_spec(to)}';"
     end
 
     def proposal
@@ -28,11 +32,8 @@ module Uricp::Strategy
     end
 
     def data_source
-      if from.scheme == 'pipe'
-        '-'
-      else
-        "'#{from.path}'"
-      end
+      return if from.scheme == 'pipe'
+      " <'#{from.path}'"
     end
   end
 end

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

data/lib/uricp/strategy/rbd_sweeper.rb

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

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

data/lib/uricp/version.rb

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

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.23
+  version: 0.0.27
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-02-15 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