uricp 0.0.15 → 0.0.20

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,15 @@ 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::RbdCachedGet,
+      Strategy::RbdCacheClone,
+      Strategy::RbdCacheCheck,
+      Strategy::RbdSnap,
       Strategy::CachedGet,
       Strategy::PipedRemoteGet,
+      Strategy::PipedRbdGet,
       Strategy::PipedCacheConvert,
       Strategy::PipedCache,
       Strategy::PipedLocalDecompress,
@@ -35,14 +39,19 @@ module Uricp
       Strategy::LocalConvert,
       Strategy::LocalLink,
       Strategy::PipedCompress,
+      Strategy::RbdCacheUpload,
+      Strategy::RbdCachedPut,
+      Strategy::RbdPut,
+      Strategy::RbdCacheBaseSnap,
       Strategy::SegmentedRemotePut,
       Strategy::RemotePut,
       Strategy::PipedLocalCompress,
       Strategy::PipedLocalGet,
       Strategy::PipedLocalPut,
       Strategy::Cleaner,
-      Strategy::Sweeper,
-    ]
-
+      Strategy::RbdFlattener,
+      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.15"
-  DEFAULT_SEGMENT_SIZE = "5 GiB"
+  VERSION = '0.0.20'
+  DEFAULT_SEGMENT_SIZE = '5 GiB'
 end

data/lib/uricp.rb

@@ -1,32 +1,40 @@
-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_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/segmented_remote_put'
+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_flattener'
+require 'uricp/strategy/rbd_put'
+require 'uricp/strategy/rbd_snap'
+require 'uricp/strategy/rbd_sweeper'
 require 'uricp/strategy/remote_put'
-require 'uricp/strategy/cached_get'
+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,11 +22,11 @@ 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')
-  spec.add_development_dependency('rspec', '~> 2.99')
   spec.add_development_dependency('inifile', '~> 1.1')
 end

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
@@ -13,8 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
   curl \
   ruby \
   ruby-dev \
-  python-swiftclient
+  python-swiftclient \
+  ruby-bundler
 
-RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
-RUN gem install bundler
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.20
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2021-09-14 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
@@ -136,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.99'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -174,12 +174,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- almalinux8/Dockerfile
 - bin/segment_upload
 - bin/uricp
 - bionic/Dockerfile
@@ -187,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
@@ -215,14 +221,23 @@ files:
 - lib/uricp/strategy/piped_local_decompress.rb
 - lib/uricp/strategy/piped_local_get.rb
 - 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_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_flattener.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
-- spec/something_spec.rb
-- trusty/Dockerfile
 - uricp.gemspec
 - xenial/Dockerfile
 homepage: ''
@@ -244,21 +259,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 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
-- spec/something_spec.rb

data/spec/something_spec.rb

@@ -1,5 +0,0 @@
-describe "TestSomething" do
-  it "should be true" do
-    true.should == true
-  end
-end

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
-
-RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
-RUN gem install bundler
-