uricp 0.0.17 → 0.0.22

data/lib/uricp.rb

@@ -1,32 +1,39 @@
-require 'uricp/version'
+module Uricp
+  UnsupportedURLtype = Class.new(ArgumentError)
+  MissingCache = Class.new(ArgumentError)
+  UnsupportedConversion = Class.new(ArgumentError)
+  ConversionRequired = Class.new(ArgumentError)
+end
+
 require 'uricp/curl_primitives'
+require 'uricp/orbit_auth'
 require 'uricp/strategy/common'
 require 'uricp/strategy/cache_common'
+require 'uricp/strategy/cached_get'
+require 'uricp/strategy/cleaner'
 require 'uricp/strategy/local_convert'
 require 'uricp/strategy/local_link'
 require 'uricp/strategy/piped_cache'
 require 'uricp/strategy/piped_cache_convert'
-require 'uricp/strategy/piped_local_get'
-require 'uricp/strategy/piped_rbd_get'
-require 'uricp/strategy/piped_local_put'
-require 'uricp/strategy/piped_remote_get'
 require 'uricp/strategy/piped_compress'
 require 'uricp/strategy/piped_decompress'
-require 'uricp/strategy/piped_local_decompress'
 require 'uricp/strategy/piped_local_compress'
-require 'uricp/strategy/rbd_remote_put'
-require 'uricp/strategy/segmented_remote_put'
-require 'uricp/strategy/remote_put'
-require 'uricp/strategy/cached_get'
+require 'uricp/strategy/piped_local_decompress'
+require 'uricp/strategy/piped_local_get'
+require 'uricp/strategy/piped_local_put'
+require 'uricp/strategy/piped_rbd_get'
+require 'uricp/strategy/piped_remote_get'
+require 'uricp/strategy/rbd_cache_base_snap'
+require 'uricp/strategy/rbd_cache_check'
+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_put'
+require 'uricp/strategy/rbd_snap'
 require 'uricp/strategy/rbd_sweeper'
+require 'uricp/strategy/remote_put'
+require 'uricp/strategy/segmented_remote_put'
 require 'uricp/strategy/sweeper'
-require 'uricp/strategy/cleaner'
 require 'uricp/uri_strategy'
-require 'uricp/orbit_auth'
-
-module Uricp
-  UnsupportedURLtype = Class.new(ArgumentError)
-  MissingCache = Class.new(ArgumentError)
-  UnsupportedConversion = Class.new(ArgumentError)
-  ConversionRequired = Class.new(ArgumentError)
-end
+require 'uricp/version'

data/uricp.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rdoc', '~> 4.2.0')
   spec.add_development_dependency('aruba', '~> 0.6.0')
   spec.add_development_dependency('cucumber', '~> 1.3')
-  spec.add_development_dependency('rake', '~> 10.4.0')
-  spec.add_dependency('methadone', '~> 2.0.0')
+  spec.add_development_dependency('rake', '~> 12.3')
+  spec.add_dependency('childprocess', '~> 1.0')
+  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')

data/xenial/Dockerfile

@@ -1,6 +1,8 @@
 FROM ubuntu:xenial
 MAINTAINER support@brightbox.co.uk
 
+RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
+
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common
 
 #RUN apt-add-repository ppa:brightbox/ruby-ng
@@ -16,5 +18,4 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
   python-swiftclient \
   ruby-bundler
 
-RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.22
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,28 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +181,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- almalinux8/Dockerfile
 - bin/segment_upload
 - bin/uricp
 - bionic/Dockerfile
@@ -174,15 +189,19 @@ files:
 - cucumber.yml
 - features/auth_download.feature
 - features/cacheable_from_uri.feature
+- features/check_uri_path.feature
 - features/documented_options.feature
 - features/qcow2_auth_download.feature
+- features/rbd_access.feature
 - features/remote_upload.feature
 - features/segmented_upload.feature
 - features/segmented_upload_options.feature
 - features/step_definitions/orbit_steps.rb
+- features/step_definitions/rbd_steps.rb
 - features/step_definitions/uricp_steps.rb
 - features/support/env.rb
 - features/userid_download.feature
+- focal/Dockerfile
 - lib/segment_upload.rb
 - lib/uricp.rb
 - lib/uricp/curl_primitives.rb
@@ -204,14 +223,20 @@ files:
 - lib/uricp/strategy/piped_local_put.rb
 - lib/uricp/strategy/piped_rbd_get.rb
 - lib/uricp/strategy/piped_remote_get.rb
-- lib/uricp/strategy/rbd_remote_put.rb
+- lib/uricp/strategy/rbd_cache_base_snap.rb
+- lib/uricp/strategy/rbd_cache_check.rb
+- lib/uricp/strategy/rbd_cache_clone.rb
+- 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_put.rb
+- lib/uricp/strategy/rbd_snap.rb
 - lib/uricp/strategy/rbd_sweeper.rb
 - lib/uricp/strategy/remote_put.rb
 - lib/uricp/strategy/segmented_remote_put.rb
 - lib/uricp/strategy/sweeper.rb
 - lib/uricp/uri_strategy.rb
 - lib/uricp/version.rb
-- trusty/Dockerfile
 - uricp.gemspec
 - xenial/Dockerfile
 homepage: ''
@@ -240,12 +265,15 @@ summary: Copy one URL to another with optional cacheing
 test_files:
 - features/auth_download.feature
 - features/cacheable_from_uri.feature
+- features/check_uri_path.feature
 - features/documented_options.feature
 - features/qcow2_auth_download.feature
+- features/rbd_access.feature
 - features/remote_upload.feature
 - features/segmented_upload.feature
 - features/segmented_upload_options.feature
 - features/step_definitions/orbit_steps.rb
+- features/step_definitions/rbd_steps.rb
 - features/step_definitions/uricp_steps.rb
 - features/support/env.rb
 - features/userid_download.feature

data/trusty/Dockerfile

@@ -1,20 +0,0 @@
-FROM ubuntu:trusty
-MAINTAINER support@brightbox.co.uk
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common
-
-RUN apt-add-repository ppa:brightbox/ruby-ng
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
-  build-essential \
-  git \
-  qemu-utils \
-  liblz4-tool \
-  curl \
-  ruby1.9.3 \
-  ruby-dev \
-  python-swiftclient \
-  ruby-bundler
-
-RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
-