uricp 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff143aca9aad2f48ac2948322959e24a421b95cd04cb545a8921f18e601139f0
-  data.tar.gz: 719d814583ab1513f10bbc04f6c8487c0fb803a6ab8fb4a307de6c1bf6d7c39a
+  metadata.gz: acf0f2c652c367c337a5df56eda0d3996799857614f6e91a3844b637b8d36fd6
+  data.tar.gz: 3778050f26b276236ca88ca1d6b6df2547adc1daf9eeb8b33a5d7e92cf424cbf
 SHA512:
-  metadata.gz: 78a4cab2edab9ef6ca65a483dc5fe5cad0b221bfd170f891812af0c5883ae11e9b64e60b49be535fc41829d91f21820016c5fcfb94850c83487b0dcb4ba9c36b
-  data.tar.gz: 740916783658e36e3346eda72ea799a7a35e58da3cbb40619516c2f788de343c72a976c95229d85beccd5e9a3b5afcc1ebc85b726ed5cc6e85c2a9723877efaf
+  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.24)
+    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/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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   module Common
     include Methadone::CLILogging
@@ -92,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
@@ -104,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
@@ -131,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
 
@@ -167,9 +169,9 @@ module Uricp::Strategy
       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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Uricp::Strategy

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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 module Uricp::Strategy
   class PipedRbdGet
@@ -7,8 +9,8 @@ module Uricp::Strategy
     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,10 +1,12 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class RbdCacheBaseSnap
     include Uricp::Strategy::Common
 
     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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Uricp::Strategy

data/lib/uricp/strategy/rbd_cache_clone.rb

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

data/lib/uricp/strategy/rbd_cache_upload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uricp::Strategy
   class RbdCacheUpload
     include Uricp::Strategy::Common
@@ -34,6 +36,5 @@ module Uricp::Strategy
         "'#{from.path}'"
       end
     end
-
   end
 end

data/lib/uricp/strategy/rbd_cached_get.rb

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

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

data/lib/uricp/strategy/rbd_snap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 module Uricp::Strategy
   class RbdSnap
@@ -7,10 +9,10 @@ module Uricp::Strategy
     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.24'
+  VERSION = '0.0.25'
   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.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 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