uricp 0.0.15 → 0.0.16

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,11 @@ 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::CachedGet,
       Strategy::PipedRemoteGet,
+      Strategy::PipedRbdGet,
       Strategy::PipedCacheConvert,
       Strategy::PipedCache,
       Strategy::PipedLocalDecompress,
@@ -35,14 +35,15 @@ module Uricp
       Strategy::LocalConvert,
       Strategy::LocalLink,
       Strategy::PipedCompress,
+      Strategy::RbdRemotePut,
       Strategy::SegmentedRemotePut,
       Strategy::RemotePut,
       Strategy::PipedLocalCompress,
       Strategy::PipedLocalGet,
       Strategy::PipedLocalPut,
       Strategy::Cleaner,
-      Strategy::Sweeper,
-    ]
-
+      Strategy::RbdSweeper,
+      Strategy::Sweeper
+    ].freeze
   end
 end

data/lib/uricp/version.rb

@@ -1,4 +1,4 @@
 module Uricp
-  VERSION = "0.0.15"
-  DEFAULT_SEGMENT_SIZE = "5 GiB"
+  VERSION = '0.0.16'.freeze
+  DEFAULT_SEGMENT_SIZE = '5 GiB'.freeze
 end

data/trusty/Dockerfile

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

data/uricp.gemspec

@@ -27,6 +27,5 @@ Gem::Specification.new do |spec|
   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

@@ -13,8 +13,8 @@ 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.16
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,20 +136,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,6 +160,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - Jenkinsfile
@@ -215,13 +202,15 @@ 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_remote_put.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
@@ -244,8 +233,7 @@ 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
@@ -261,4 +249,3 @@ test_files:
 - 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