uricp 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 37bb516638075a8d54d891f2d1049e5abe1197e4
+  data.tar.gz: 31d80850767fad7b32d5f9282031e6acdaa60b3f
+SHA512:
+  metadata.gz: d137a74223d94356968ddaba23d2d855d0127fbea9f19fc2cee96a05c37f7900d3fe433fcccb3b6e12608d252174b9848fd882548319e794995c8828804bec2a
+  data.tar.gz: c49e4055788800047b66611d56de7fc0270e96bb88f2fccd0e7b0da7f329e739ca7daef0b672d44df94c3f816a9158204589c4f403f0e018e771c210193a90df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.9)
+    uricp (0.0.10)
       filesize (= 0.0.2)
       methadone (~> 1.8.0)
       open4 (~> 1.3.0)
@@ -17,22 +17,22 @@ GEM
     builder (3.2.2)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.19)
+    cucumber (1.3.20)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
     diff-lcs (1.2.5)
-    ffi (1.9.8)
+    ffi (1.9.10)
     filesize (0.0.2)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     inifile (1.1.0)
-    json (1.8.2)
+    json (1.8.3)
     methadone (1.8.0)
       bundler
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multi_test (0.1.2)
     open4 (1.3.4)
     rake (10.4.2)
@@ -45,14 +45,14 @@ GEM
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
+    rspec-mocks (2.99.4)
     sendfile (1.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
+  aruba (~> 0.6.0)
   bundler (~> 1.7)
   cucumber (~> 1.3)
   inifile (~> 1.1)

data/bin/uricp

@@ -98,6 +98,8 @@ class App
     "Compress output")
   on("--[no-]dry-run",
     "Show what would be run,", "but don't run the command")
+  on("--[no-]force",
+    "Always write sparsely")
   #Arguments
   arg :from_uri, "URI to copy from"
   arg :to_uri, "URI to copy to"

data/features/documented_options.feature

@@ -18,6 +18,7 @@ Feature: Documented Help
       |--segment|
     And the option "compress" should be documented which is negatable
     And the option "dry-run" should be documented which is negatable
+    And the option "force" should be documented which is negatable
     And the banner should document that this app's arguments are:
       |from_uri|which is required|
       |to_uri|which is required|

data/features/step_definitions/orbit_steps.rb

@@ -83,14 +83,14 @@ end
 When(/^I retrieve "([^"]*)" with options "([^"]*)" from container "([^"]*)" into "([^"]*)"$/) do |name, runoptions, container, target|
   url = File.join(@current_storage_url, container, name)
   steps %{
-    When I successfully run `uricp #{runoptions} --auth-token #{@current_auth_token} #{url} #{target}`
+    When I successfully run `uricp --force #{runoptions} --auth-token #{@current_auth_token} #{url} #{target}`
   }
 end
 
 When(/^I retrieve "([^"]*)" from container "([^"]*)" into "([^"]*)" with a userid$/) do |name, container, target|
   url = File.join(@current_storage_url, container, name)
   steps %{
-    When I successfully run `uricp --auth-user '#{@clientid}' --auth-key '#{@key}' #{url} #{target}`
+    When I successfully run `uricp --force --auth-user '#{@clientid}' --auth-key '#{@key}' #{url} #{target}`
   }
 end
 
@@ -99,7 +99,7 @@ When(/^I store "([^"]*)" into container "([^"]*)" from "([^"]*)" with a userid$/
   @current_name = name
   url = File.join(@current_storage_url, container, name)
   steps %{
-    When I successfully run `uricp --auth-user '#{@clientid}' --auth-key '#{@key}' #{source} #{url}`
+    When I successfully run `uricp --force --auth-user '#{@clientid}' --auth-key '#{@key}' #{source} #{url}`
   }
 end
 
@@ -114,7 +114,7 @@ When(/^I store "([^"]*)" with options "([^"]*)" into container "([^"]*)" from "(
   @current_name = name
   url = File.join(@current_storage_url, container, name)
   steps %{
-    When I successfully run `uricp #{runoptions} --auth-token #{@current_auth_token} #{source} #{url}`
+    When I successfully run `uricp --force #{runoptions} --auth-token #{@current_auth_token} #{source} #{url}`
   }
 end
 
@@ -123,7 +123,7 @@ When(/^I store "([^"]*)" with segment size "([^"]*)" into container "([^"]*)" fr
   @current_name = name
   url = File.join(@current_storage_url, container, name)
   steps %{
-    When I successfully run `uricp --auth-user '#{@clientid}' --auth-key '#{@key}' --segment-size '#{segment_size}' #{source} #{url}`
+    When I successfully run `uricp --force --auth-user '#{@clientid}' --auth-key '#{@key}' --segment-size '#{segment_size}' #{source} #{url}`
   }
 end
 
@@ -132,7 +132,7 @@ When(/^I store "([^"]*)" with segment size "([^"]*)" and options "([^"]*)" into
   @current_name = name
   url = File.join(@current_storage_url, container, name)
   steps %{
-    When I successfully run `uricp #{runoptions} --auth-user '#{@clientid}' --auth-key '#{@key}' --segment-size '#{segment_size}' #{source} #{url}`
+    When I successfully run `uricp --force #{runoptions} --auth-user '#{@clientid}' --auth-key '#{@key}' --segment-size '#{segment_size}' #{source} #{url}`
   }
 end
 

data/lib/uricp/strategy/common.rb

@@ -35,6 +35,10 @@ module Uricp::Strategy
       options['target-format']
     end
 
+    def always_write_sparse?
+      options['force']
+    end
+
     def lz4?(magic)
       magic.unpack('V') == [0x184D2204]
     end

data/lib/uricp/strategy/piped_local_decompress.rb

@@ -0,0 +1,42 @@
+module Uricp::Strategy
+
+  class PipedLocalDecompress
+    
+    include Uricp::Strategy::Common
+
+    def appropriate?
+      case from.scheme
+      when 'pipe'
+	if raw_target? && lz4_source? && to.scheme == 'file'
+	  if always_write_sparse?
+	    return proposal
+	  else
+	    debug "#{self.class.name}: using safe sparse expansion via stream"
+	  end
+	end
+      end
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "lz4 -qd - #{to.path};"
+    end
+
+    def proposal
+      @proposed_options = options.dup
+      @proposed_options.delete('source-format')
+      if @proposed_options['target-format']
+	@proposed_options['source-format'] = :raw
+        if @proposed_options['source-format'] == @proposed_options['target-format'] 
+	  @proposed_options.delete('source-format')
+	  @proposed_options.delete('target-format')
+	end
+      end
+      @proposed_options['from_uri'] = @proposed_options['to_uri']
+      self
+    end
+
+  end
+
+end

data/lib/uricp/strategy/piped_remote_get.rb

@@ -39,6 +39,8 @@ module Uricp::Strategy
       else
         raise
       end
+    rescue SocketError => e
+      raise SocketError, options['from_uri'].to_s+" inaccessible: "+e.message
     end
 
     def headers

data/lib/uricp/uri_strategy.rb

@@ -30,6 +30,7 @@ module Uricp
       Strategy::PipedRemoteGet,
       Strategy::PipedCacheConvert,
       Strategy::PipedCache,
+      Strategy::PipedLocalDecompress,
       Strategy::PipedDecompress,
       Strategy::LocalConvert,
       Strategy::LocalLink,

data/lib/uricp/version.rb

@@ -1,4 +1,4 @@
 module Uricp
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
   DEFAULT_SEGMENT_SIZE = "5 GiB"
 end

data/lib/uricp.rb

@@ -11,6 +11,7 @@ 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/remote_put'

data/uricp.gemspec

@@ -19,9 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency('rdoc')
-  spec.add_development_dependency('aruba')
+  spec.add_development_dependency('aruba', '~> 0.6.0')
   spec.add_development_dependency('cucumber', '~> 1.3')
   spec.add_development_dependency('rake')
   spec.add_dependency('methadone', '~> 1.8.0')

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,63 +20,41 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,23 +69,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sendfile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -252,6 +213,7 @@ files:
 - lib/uricp/strategy/piped_compress.rb
 - lib/uricp/strategy/piped_decompress.rb
 - lib/uricp/strategy/piped_local_compress.rb
+- 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_remote_get.rb
@@ -265,27 +227,26 @@ files:
 homepage: ''
 licenses:
 - gplv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Copy one URL to another with optional cacheing
 test_files:
 - features/auth_download.feature