uricp 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37bb516638075a8d54d891f2d1049e5abe1197e4
-  data.tar.gz: 31d80850767fad7b32d5f9282031e6acdaa60b3f
+  metadata.gz: 054b98cbf8e67b76cc3e2b552677573fe5b5cbea
+  data.tar.gz: 85337e7757d5d33a03c72860770dbb10eea58bd8
 SHA512:
-  metadata.gz: d137a74223d94356968ddaba23d2d855d0127fbea9f19fc2cee96a05c37f7900d3fe433fcccb3b6e12608d252174b9848fd882548319e794995c8828804bec2a
-  data.tar.gz: c49e4055788800047b66611d56de7fc0270e96bb88f2fccd0e7b0da7f329e739ca7daef0b672d44df94c3f816a9158204589c4f403f0e018e771c210193a90df
+  metadata.gz: 3b774aecb700c7e3b290e2fd3a7140baafe012b188a0f5c9d2166539af35c6f79e6f96cfb92056c1858c0e25e465859492e94e2c5317bfa68d7d5b8c210bca9f
+  data.tar.gz: f4bf7e1dc1c44c0a712720d54e0f86d4ab95f332b3cdfb20c0dcd431d5d65edfbc674921bba6debdcf8290bc0491ee1476a0686456cb0177d936ba141aed9836

data/Gemfile.lock

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

data/bin/uricp

@@ -18,6 +18,9 @@ class App
     if options['segment-size']
       options['segment-size'] = Filesize.from(options['segment-size'])
     end
+    if options['max-cache']
+      options['max-cache'] = Filesize.from(options['max-cache'])
+    end
     validate_options
     Uricp::OrbitAuth.validate_options(options)
     set_auth_env
@@ -53,9 +56,15 @@ class App
   end
 
   def self.validate_options
-    if options['target-format'] && !options['cache']
-      raise ::OptionParser::MissingArgument,
-        "'target-format' requires 'cache' option"
+    unless options['cache']
+      case
+      when options['target-format']
+	raise ::OptionParser::MissingArgument,
+	  "'target-format' requires 'cache' option"
+      when options['max-cache']
+	raise ::OptionParser::MissingArgument,
+	  "'max-cache' requires 'cache' option"
+      end
     end
   end
 
@@ -90,6 +99,8 @@ class App
   Uricp::OrbitAuth.add_auth_to_optionparser(self)
   on("--cache CACHE_ROOT",
     "Root directory of cache area")
+  on("--max-cache MAX_CACHE_SIZE",
+    "Maximum size of cached file in [GMk][i]B.")
   on("--target-format FORMAT", [:qcow2, :raw, :qcow3, :qcow2v3],
     "Image format of target", "[qcow2, raw, qcow3, qcow2v3]")
   on("--segment-size SEGMENT_SIZE",

data/features/auth_download.feature

@@ -45,6 +45,21 @@ Feature: Authenticated download of images from orbit
     And a file named "/tmp/uricp/cache/img-qcow2" should exist
     And the file named "/tmp/uricp/cache/img-qcow2" should have a file format of "qcow2v3"
 
+  Scenario: qcow download convert to raw, cache, within size
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I retrieve "img-qcow2" with options "--target-format=raw --cache=/tmp/uricp --max-cache 10MB" from container "test" into "file:///tmp/uricp/srv-testq"
+    Then a file named "/tmp/uricp/srv-testq" should exist
+    And the file named "/tmp/uricp/srv-testq" should have a file format of "raw"
+    And a file named "/tmp/uricp/cache/img-qcow2" should exist
+    And the file named "/tmp/uricp/cache/img-qcow2" should have a file format of "qcow2v3"
+
+  Scenario: qcow download convert to raw, cache, size limited
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I retrieve "img-qcow2" with options "--target-format=raw --cache=/tmp/uricp --max-cache 100kB" from container "test" into "file:///tmp/uricp/srv-testj"
+    Then a file named "/tmp/uricp/srv-testj" should exist
+    And the file named "/tmp/uricp/srv-testj" should have a file format of "raw"
+    And a file named "/tmp/uricp/cache/img-qcow2" should not exist
+
   Scenario: qcow download convert to qcow2, cache
     Given a correctly initialised cache at "/tmp/uricp"
     When I retrieve "img-qcow2" with options "--target-format=qcow2 --cache=/tmp/uricp" from container "test" into "file:///tmp/uricp/srv-test5"
@@ -88,6 +103,21 @@ Feature: Authenticated download of images from orbit
     And a file named "/tmp/uricp/cache/img-lz4cy" should exist
     And the file named "/tmp/uricp/cache/img-lz4cy" should have a file format of "lz4"
 
+  Scenario: lz4 download convert to raw, cache, size limited
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I retrieve "img-lz4cy" with options "--target-format=raw --cache=/tmp/uricp --max-cache 2MB" from container "test" into "file:///tmp/uricp/srv-testf"
+    Then a file named "/tmp/uricp/srv-testf" should exist
+    And the file named "/tmp/uricp/srv-testf" should have a file format of "raw"
+    And a file named "/tmp/uricp/cache/img-lz4cy" should not exist
+
+  Scenario: lz4 download convert to raw, cache, within size
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I retrieve "img-lz4cy" with options "--target-format=raw --cache=/tmp/uricp --max-cache 10MB" from container "test" into "file:///tmp/uricp/srv-test9"
+    Then a file named "/tmp/uricp/srv-test9" should exist
+    And the file named "/tmp/uricp/srv-test9" should have a file format of "raw"
+    And a file named "/tmp/uricp/cache/img-lz4cy" should exist
+    And the file named "/tmp/uricp/cache/img-lz4cy" should have a file format of "lz4"
+
   Scenario: lz4 download convert to raw, from cache
     Given a correctly initialised cache at "/tmp/uricp"
     And a cache of "img-lz4cy" from container "test" at "/tmp/uricp"

data/features/cacheable_from_uri.feature

@@ -20,6 +20,13 @@ Feature: Download Public VM images
       And a file named "/tmp/uricp/cache/freedos.qcow2" should exist
       And the file named "/tmp/uricp/cache/freedos.qcow2" should have a file format of "qcow2"
 
+  Scenario: HTTP URI qcow2 via cache - size limited
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I successfully run `uricp --cache=/tmp/uricp --max-cache=8MB http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 file:///tmp/uricp/srv-testy`
+    Then a file named "/tmp/uricp/srv-testy" should exist
+      And the file named "/tmp/uricp/srv-testy" should have a file format of "qcow2"
+      And a file named "/tmp/uricp/cache/freedos.qcow2" should not exist
+
   Scenario: HTTP URI qcow2 to qcow2 via cache
     Given a correctly initialised cache at "/tmp/uricp"
     When I successfully run `uricp --target-format=qcow2 --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 file:///tmp/uricp/srv-testy`
@@ -28,6 +35,13 @@ Feature: Download Public VM images
       And a file named "/tmp/uricp/cache/freedos.qcow2" should exist
       And the file named "/tmp/uricp/cache/freedos.qcow2" should have a file format of "qcow2"
 
+  Scenario: HTTP URI qcow2 to qcow2 via cache - size limited
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I successfully run `uricp --target-format=qcow2 --cache=/tmp/uricp --max-cache=8Mb http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 file:///tmp/uricp/srv-testy`
+    Then a file named "/tmp/uricp/srv-testy" should exist
+      And the file named "/tmp/uricp/srv-testy" should have a file format of "qcow2"
+      And a file named "/tmp/uricp/cache/freedos.qcow2" should not exist
+
   @new-qemu-image
   Scenario: HTTP URI qcow2 to qcow2v3 via cache
     Given a correctly initialised cache at "/tmp/uricp"
@@ -45,6 +59,12 @@ Feature: Download Public VM images
       And a file named "/tmp/uricp/cache/freedos.qcow2" should exist
       And the file named "/tmp/uricp/cache/freedos.qcow2" should have a file format of "qcow2"
 
+  Scenario: HTTP URI qcow2 to raw via cache - size limited
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I successfully run `uricp --target-format=raw --cache=/tmp/uricp --max-cache=8Mb http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 file:///tmp/uricp/srv-testy`
+    Then a file named "/tmp/uricp/srv-testy" should exist
+      And the file named "/tmp/uricp/srv-testy" should have a file format of "raw"
+      And a file named "/tmp/uricp/cache/freedos.qcow2" should not exist
 
   Scenario: HTTP URI from cache
     Given a correctly initialised cache at "/tmp/uricp"

data/features/documented_options.feature

@@ -16,6 +16,7 @@ Feature: Documented Help
       |--auth-user|
       |--auth-key|
       |--segment|
+      |--max-cache|
     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
@@ -72,3 +73,13 @@ Feature: Documented Help
   When I run `uricp --segment-size 100 --auth-token abcdef file:///tmp/temp https:///orbit.brightbox.com/v1/acc-xxxxx/test/test.img`
     Then the exit status should not be 0
     And the stderr should contain "Unparseable filesize"
+
+  Scenario: should not accept plain number for max-cache size
+  When I run `uricp --max-cache 100 --cache /tmp/uricp --auth-token abcdef file:///tmp/temp https:///orbit.brightbox.com/v1/acc-xxxxx/test/test.img`
+    Then the exit status should not be 0
+    And the stderr should contain "Unparseable filesize"
+
+  Scenario: max-cache size requires cache
+  When I run `uricp --max-cache 100MB --auth-token abcdef file:///tmp/temp https:///orbit.brightbox.com/v1/acc-xxxxx/test/test.img`
+    Then the exit status should not be 0
+    And the stderr should contain "missing argument"

data/lib/uricp/strategy/cache_common.rb

@@ -6,9 +6,9 @@ module Uricp::Strategy
     
     def validate_cache!
       raise Uricp::MissingCache,
-	"No cache found at #{cache_root}. Expected a 'cache' and 'temp' directory" unless cache_exists?
+	"no cache found at #{cache_root}. Expected a 'cache' and 'temp' directory" unless cache_exists?
       raise Uricp::MissingCache,
-	"No cache name found" unless cache_name
+	"no cache name found" unless cache_name
     end
       
     def in_cache?

data/lib/uricp/strategy/piped_remote_get.rb

@@ -20,18 +20,26 @@ module Uricp::Strategy
     def proposal
       @proposed_options = options.dup
       @proposed_options['from_uri'] = PIPE_URI
-      if options['target-format']
-	@proposed_options['source-format'] = format_peek
-	if @proposed_options['source-format'] == @proposed_options['target-format']
+      if conversion_required?
+        @proposed_options['source-format'] = format_peek
+	if @proposed_options['source-format'] == @proposed_options['target-format'] 
 	  @proposed_options.delete('source-format')
 	  @proposed_options.delete('target-format')
 	end
       end
+      if options['max-cache'] &&
+        size_peek.to_i > options['max-cache'].to_i
+	  @proposed_options.delete('cache')
+	  @proposed_options.delete('cache_name')
+	  @proposed_options.delete('max-cache')
+      end
       self
     end
 
     def format_peek
-      options['from_uri'].open(headers) { |u| encoding(u) }
+      options['from_uri'].open(headers) do |u|
+        encoding(u)
+      end
     rescue OpenURI::HTTPError => e
       case e.io.status[0]
       when '416'
@@ -43,6 +51,15 @@ module Uricp::Strategy
       raise SocketError, options['from_uri'].to_s+" inaccessible: "+e.message
     end
 
+    def size_peek
+      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 SocketError => e
+      raise SocketError, options['from_uri'].to_s+" inaccessible: "+e.message
+    end
+
     def headers
       headers={'Range' => 'bytes=0-7'}
       headers['X-Auth-Token'] = options['authenticator'].call if http_authentication?

data/lib/uricp/version.rb

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

data/lib/uricp.rb

@@ -26,6 +26,7 @@ module Uricp
   UnsupportedURLtype = Class.new(ArgumentError)
   MissingCache = Class.new(ArgumentError)
   UnsupportedConversion = Class.new(ArgumentError)
+  ConversionRequired = Class.new(ArgumentError)
 
 end
 

metadata

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