uricp 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 054b98cbf8e67b76cc3e2b552677573fe5b5cbea
-  data.tar.gz: 85337e7757d5d33a03c72860770dbb10eea58bd8
+  metadata.gz: ad39a6e06ce8e9371def28e21ec16e128fd41b89
+  data.tar.gz: f9403707e1ffe3fa81efa9f18df76007d5c270c8
 SHA512:
-  metadata.gz: 3b774aecb700c7e3b290e2fd3a7140baafe012b188a0f5c9d2166539af35c6f79e6f96cfb92056c1858c0e25e465859492e94e2c5317bfa68d7d5b8c210bca9f
-  data.tar.gz: f4bf7e1dc1c44c0a712720d54e0f86d4ab95f332b3cdfb20c0dcd431d5d65edfbc674921bba6debdcf8290bc0491ee1476a0686456cb0177d936ba141aed9836
+  metadata.gz: 8955d60c70f1092bc8f8cc2fb768c3e80b0450024de3d34141a665efd0989afc6c47de1d8a82d261a1d30751f9ced86213b6bb59e86684e0d838444e6b463942
+  data.tar.gz: c4314e1e064c2a4d2db7ebe78c5eaa0626824e4edb10fa623f926eefff9a914c56d1c2ea9646649a217589e039adfe2d8ef72a2f3392e55f750c062201ba4f05

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.11)
+    uricp (0.0.12)
       filesize (= 0.0.2)
       methadone (~> 1.8.0)
       open4 (~> 1.3.0)

data/features/auth_download.feature

@@ -37,6 +37,14 @@ Feature: Authenticated download of images from orbit
     And a 0 byte file named "/tmp/uricp/cache/img-zeroy" should exist
     And the file named "/tmp/uricp/cache/img-zeroy" should have a file format of "raw"
 
+  Scenario: zero download to raw, cache, size limited
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I retrieve "img-zeroy" with options "--cache=/tmp/uricp --target-format=raw --max-cache=8MB" from container "test" into "file:////tmp/uricp/srv-testx"
+    Then a file named "/tmp/uricp/srv-testx" should exist
+    And the file named "/tmp/uricp/srv-testx" should have a file format of "raw"
+    And a 0 byte file named "/tmp/uricp/cache/img-zeroy" should exist
+    And the file named "/tmp/uricp/cache/img-zeroy" should have a file format of "raw"
+
   Scenario: qcow download convert to raw, cache
     Given a correctly initialised cache at "/tmp/uricp"
     When I retrieve "img-qcow2" with options "--target-format=raw --cache=/tmp/uricp" from container "test" into "file:///tmp/uricp/srv-test4"

data/lib/uricp/strategy/piped_remote_get.rb

@@ -52,10 +52,19 @@ module Uricp::Strategy
     end
 
     def size_peek
+      size_headers=headers
+      size_headers['Range'] = 'bytes=0-0'
       options['from_uri'].open(headers) do |u|
 	match = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(u.meta['content-range'])
         match && match[3].to_i
       end
+    rescue OpenURI::HTTPError => e
+      case e.io.status[0]
+      when '416'
+        0
+      else
+        raise
+      end
     rescue SocketError => e
       raise SocketError, options['from_uri'].to_s+" inaccessible: "+e.message
     end

data/lib/uricp/version.rb

@@ -1,4 +1,4 @@
 module Uricp
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
   DEFAULT_SEGMENT_SIZE = "5 GiB"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler