uricp 0.0.34 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5646c45d26dfa89933ac2cb28089ac771dff6a43719fcaba2304e741060a0b7f
-  data.tar.gz: 05172e7eab7420dc2b393ad93328d0250c2ae804b4fb3c1707c87e3f11d5180b
+  metadata.gz: fdf0146a9045790fac899c6fd9dd0a2de8d77d8ed5f6e8d652c994ae12bcd5f7
+  data.tar.gz: 6c5b2e4b0f7b210f74f56b0fca2a6ab1ada244110d82f2dba06fab7bd2aefef8
 SHA512:
-  metadata.gz: 9a8830466e53007d4f2459a610978fb458e7771e8bdd7af61a69b502b42247b68f98b50801c900d7798437f4e56d4aadfe5ceeb9d4e946856c5c969b043bb1ac
-  data.tar.gz: 57a7b66754c00b8fd48d4c8149fbbe47357ff9e7033013f9b5f33735c179a7350e1bd815e83ef03d68f8e9323c1615a853fafbe1031ad115f15dd7fa07b89c22
+  metadata.gz: e7d1e3ed8d8eda28f56714cf79785a28d2b0733c1f16fe6e2c3d30e4a30fcd6f8f046e275776f7243f43179b281c6966211c1f32192c446a85df6e9453e1e2ee
+  data.tar.gz: d389fd727dde31846e9cdd0f18b0eddb2cba12ef476fdd61819a271caf1bf77afb83f96ba83c9f21c3433f9fb1adaf412a77914028aee416c94d3ac37e527072

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.34)
+    uricp (0.0.36)
       childprocess (~> 1.0)
       filesize (= 0.0.2)
       methadone (~> 2.0.2)

data/features/cacheable_from_uri.feature

@@ -73,6 +73,14 @@ Feature: Download Public VM images
     Then a 102400 byte file named "/tmp/uricp/srv-testy" should exist
     And a 102400 byte file named "/tmp/uricp/cache/freedos.qcow2" should exist
 
+  Scenario: HTTP URI raw.xz to raw via cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I successfully run `uricp --target-format=raw --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.raw.xz 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.raw.xz" should exist
+      And the file named "/tmp/uricp/cache/freedos.raw.xz" should have a file format of "xz"
+
   Scenario: Unsupported source URI should error
     Given a correctly initialised cache at "/tmp/uricp"
     When I run `uricp --target-format=raw --cache=/tmp/uricp wibble://some/url file:///tmp/uricp/srv-testy`

data/features/step_definitions/uricp_steps.rb

@@ -2,9 +2,14 @@ Then(/^the file named "(.*?)" should have a file format of "(.*?)"$/) do |filena
   case format
   when 'lz4'
     assert_exact_output(
-      [0x184D2204].pack('V'),
+      %w[04224d18].pack('H8'),
       File.open(filename, 'rb') { |f| f.read(4) } || String.new
     )
+  when 'xz'
+    assert_exact_output(
+      %w[fd377a585a00].pack('H12'),
+      File.open(filename, 'rb') { |f| f.read(6) } || String.new
+    )
   when 'qcow2v3', 'qcow3'
     steps %{
       When I successfully run `qemu-img info #{filename}`
@@ -13,9 +18,13 @@ Then(/^the file named "(.*?)" should have a file format of "(.*?)"$/) do |filena
     }
   else
     assert_no_partial_output(
-      [0x184D2204].pack('V'),
+      %w[04224d18].pack('H8'),
       File.open(filename, 'rb') { |f| f.read(4) } || String.new
     )
+    assert_no_partial_output(
+      %w[fd377a585a00].pack('H12'),
+      File.open(filename, 'rb') { |f| f.read(6) } || String.new
+    )
     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/curl_primitives.rb

@@ -42,7 +42,7 @@ module Uricp::CurlPrimitives
   end
 
   def curl_upload_from(source, destination = to)
-    "#{curl_command} #{authentication} -T '#{source}' '#{destination}';"
+    "#{curl_command} #{authentication} -H 'Content-Type: application/octet-stream' -T '#{source}' '#{destination}';"
   end
 
   def curl_download_to_pipe
@@ -50,6 +50,6 @@ module Uricp::CurlPrimitives
   end
 
   def curl_manifest(object_manifest, destination = to)
-    "#{curl_command} #{authentication} -X PUT -H 'X-Object-Manifest: #{object_manifest}' '#{destination}' --data-binary ''"
+    "#{curl_command} #{authentication} -X PUT -H 'Content-Type: application/octet-stream' -H 'X-Object-Manifest: #{object_manifest}' '#{destination}' --data-binary ''"
   end
 end

data/lib/uricp/strategy/common.rb

@@ -50,6 +50,10 @@ module Uricp::Strategy
       magic.unpack('a3C') == ['QFI', 0xfb]
     end
 
+    def xz?(magic)
+      magic.unpack('H12') == %w[fd377a585a00]
+    end
+
     def encoding(io)
       magic = io.read(4).to_s
       if lz4?(magic)
@@ -65,7 +69,12 @@ module Uricp::Strategy
           :qcow2un
         end
       else
-        :raw
+        magic += io.read(2).to_s
+        if xz?(magic)
+          :xz
+        else
+          :raw
+        end
       end
     end
 
@@ -83,6 +92,10 @@ module Uricp::Strategy
       options['source-format'] == :lz4
     end
 
+    def xz_source?
+      options['source-format'] == :xz
+    end
+
     def raw_target?
       options['target-format'] == :raw
     end
@@ -120,7 +133,7 @@ module Uricp::Strategy
     end
 
     def supported_source?
-      options['source-format'] && !lz4_source?
+      options['source-format'] && !lz4_source? && !xz_source?
     end
 
     def rbd_image_spec(uri)

data/lib/uricp/strategy/{piped_decompress.rb → piped_decompress_lz4.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Uricp::Strategy
-  class PipedDecompress
+  class PipedDecompressLz4
     include Uricp::Strategy::Common
 
     def appropriate?

data/lib/uricp/strategy/piped_decompress_xz.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Uricp::Strategy
+  class PipedDecompressXz
+    include Uricp::Strategy::Common
+
+    def appropriate?
+      case from.scheme
+      when 'pipe'
+        return proposal if xz_source?
+      end
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      'xz -d |'
+    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
+      self
+    end
+  end
+end

data/lib/uricp/strategy/piped_remote_get.rb

@@ -59,7 +59,7 @@ module Uricp::Strategy
 
       size_headers = headers
       size_headers['Range'] = 'bytes=0-0'
-      options['from_uri'].open(headers) do |u|
+      options['from_uri'].open(size_headers) do |u|
         match = %r{bytes\s+(\d+)-(\d+)/(\d+|\*)}i.match(u.meta['content-range'])
         match && match[3].to_i
       end

data/lib/uricp/uri_strategy.rb

@@ -37,7 +37,8 @@ module Uricp
       Strategy::PipedCacheConvert,
       Strategy::PipedCache,
       Strategy::PipedLocalDecompress,
-      Strategy::PipedDecompress,
+      Strategy::PipedDecompressLz4,
+      Strategy::PipedDecompressXz,
       Strategy::LocalConvert,
       Strategy::LocalLink,
       Strategy::PipedCompress,

data/lib/uricp/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Uricp
-  VERSION = '0.0.34'
+  VERSION = '0.0.36'
   DEFAULT_SEGMENT_SIZE = '5 GiB'
 end

data/lib/uricp.rb

@@ -16,7 +16,8 @@ require 'uricp/strategy/local_link'
 require 'uricp/strategy/piped_cache'
 require 'uricp/strategy/piped_cache_convert'
 require 'uricp/strategy/piped_compress'
-require 'uricp/strategy/piped_decompress'
+require 'uricp/strategy/piped_decompress_lz4'
+require 'uricp/strategy/piped_decompress_xz'
 require 'uricp/strategy/piped_local_compress'
 require 'uricp/strategy/piped_local_decompress'
 require 'uricp/strategy/piped_local_get'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.36
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -202,7 +202,8 @@ files:
 - lib/uricp/strategy/piped_cache.rb
 - lib/uricp/strategy/piped_cache_convert.rb
 - lib/uricp/strategy/piped_compress.rb
-- lib/uricp/strategy/piped_decompress.rb
+- lib/uricp/strategy/piped_decompress_lz4.rb
+- lib/uricp/strategy/piped_decompress_xz.rb
 - lib/uricp/strategy/piped_local_compress.rb
 - lib/uricp/strategy/piped_local_decompress.rb
 - lib/uricp/strategy/piped_local_get.rb