uricp 0.0.5 → 0.0.6

data/features/auth_download.feature

@@ -28,6 +28,14 @@ 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: zero download convert to qcow2, cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I retrieve "img-zeroy" with options "--target-format=qcow2 --cache=/tmp/uricp" from container "test" into "file:///tmp/uricp/srv-testz"
+    Then a file named "/tmp/uricp/srv-testz" should exist
+    And the file named "/tmp/uricp/srv-testz" should have a file format of "qcow2"
+    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/features/step_definitions/orbit_steps.rb

@@ -23,8 +23,14 @@ def create_download_file(filetype, name, container)
   tempfile = '/tmp/fred55322'
   FileUtils.rm_f(Dir.glob(tempfile+'*'))
   format = 'raw'
-  format = 'qcow2' if filetype == 'qcow2'
-  cmd = "qemu-img create -q -f #{format} #{tempfile} 1G"
+  size = '1G'
+  case filetype
+  when 'qcow2'
+    format = 'qcow2'
+  when 'zero'
+    size = '0'
+  end
+  cmd = "qemu-img create -q -f #{format} #{tempfile} #{size}"
   system(unescape(cmd))
   cmd = "cat #{tempfile}"
   if filetype == 'lz4'
@@ -32,6 +38,7 @@ def create_download_file(filetype, name, container)
   end
   cmd += "| curl --silent --fail -T - -H 'X-Auth-Token: #{@current_auth_token}' #{upload_url} "
   system(unescape(cmd))
+  FileUtils.rm_f(Dir.glob(tempfile+'*'))
 end
 
 def create_container(name)
@@ -180,6 +187,7 @@ Before('@orbitdownloads') do
     create_container('test')
     create_download_file('qcow2', 'img-qcow2', 'test')
     create_download_file('lz4', 'img-lz4cy', 'test')
+    create_download_file('zero', 'img-zeroy', 'test')
     $orbit_setup = true
   end
 end

data/features/step_definitions/uricp_steps.rb

@@ -2,7 +2,7 @@ Then(/^the file named "(.*?)" should have a file format of "(.*?)"$/) do |filena
   case format
   when 'lz4'
     assert_exact_output([0x184D2204].pack('V'),
-      File.open(filename, 'rb') {|f| f.read(4) })
+      File.open(filename, 'rb') {|f| f.read(4) }.to_s)
   when 'qcow2v3', 'qcow3'
     steps %{
       When I successfully run `qemu-img info #{filename}`
@@ -11,7 +11,7 @@ Then(/^the file named "(.*?)" should have a file format of "(.*?)"$/) do |filena
     }
   else
     assert_no_partial_output([0x184D2204].pack('V'),
-      File.open(filename, 'rb') {|f| f.read(4) })
+      File.open(filename, 'rb') {|f| f.read(4) }.to_s)
     steps(%{
       When I successfully run `qemu-img info #{filename}`
       Then the output from "qemu-img info #{filename}" should contain "file format: #{format}"

data/lib/uricp/strategy/piped_remote_get.rb

@@ -21,8 +21,7 @@ module Uricp::Strategy
       @proposed_options = options.dup
       @proposed_options['from_uri'] = PIPE_URI
       if options['target-format']
-	@proposed_options['source-format'] = 
-	  options['from_uri'].open(headers) { |u| encoding(u) }
+	@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')
@@ -31,6 +30,17 @@ module Uricp::Strategy
       self
     end
 
+    def format_peek
+      options['from_uri'].open(headers) { |u| encoding(u) }
+    rescue OpenURI::HTTPError => e
+      case e.io.status[0]
+      when '416'
+        'raw'
+      else
+        raise
+      end
+    end
+
     def headers
       headers={'Range' => 'bytes=0-7'}
       headers['X-Auth-Token'] = options['auth-token'] if http_authentication?

data/lib/uricp/version.rb

@@ -1,4 +1,4 @@
 module Uricp
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   DEFAULT_SEGMENT_SIZE = "5 GiB"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler