uricp 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b231ec01854a9593c09313df2dceda58c1906c19dd59c9ec0e30fa90d373606c
-  data.tar.gz: 17253636b183f2aa33baffb50c1c8cfb5903d2d0b2474f9db236e3aa64b02ded
+  metadata.gz: d9944582044883ff45f3847042ca62016416d06198a0af41751de93ab992c646
+  data.tar.gz: 19c14777647bb01fec3a4e6214e8183b29432843bf47b8b0c818d0401dafaea1
 SHA512:
-  metadata.gz: ac00652cbf336bf0120930ddf01191ff84295743538cddd3164cbcc487fd4eff045223743e32894b2238675b18ebda48dab66e7bf083045ed5bac63837dd0842
-  data.tar.gz: b29f225b8d54068952806982f859e74cde9d47b9378e597f07bf2b6a132ddd998b86cde64e8a16eeddbcdbdfaa4619414c0b40071f82370467f73e827afafdc3
+  metadata.gz: c157e985f79891ca962fb0b792dab2a4fab89bd651c15b940e75ba4baf0e86a42922b9dc8a0f96fa53b8de4151d3e9b6aeefac256ffe59faa2ed6ad5becfad47
+  data.tar.gz: 45444dfcbc92079f7221d0f239315db22f6af749843f6a89312e949c1f12068a2254f6ffd8830a4ab00833e3b66d16d259cfcccb9388f24dde9ff23fbad99ee2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.17)
+    uricp (0.0.18)
       filesize (= 0.0.2)
       methadone (~> 2.0.0)
       open4 (~> 1.3.0)
@@ -14,17 +14,16 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    builder (3.2.3)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
+    builder (3.2.4)
+    childprocess (1.0.1)
+      rake (< 13.0)
     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.3)
-    ffi (1.9.23)
+    diff-lcs (1.4.4)
     filesize (0.0.2)
     gherkin (2.12.2)
       multi_json (~> 1.3)
@@ -32,14 +31,16 @@ GEM
     json (1.8.6)
     methadone (2.0.2)
       bundler
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     multi_test (0.1.2)
     open4 (1.3.4)
-    rake (10.4.2)
+    rake (12.3.3)
     rdoc (4.2.2)
       json (~> 1.4)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     sendfile (1.2.2)
 
 PLATFORMS
@@ -50,9 +51,9 @@ DEPENDENCIES
   bundler (~> 1.7)
   cucumber (~> 1.3)
   inifile (~> 1.1)
-  rake (~> 10.4.0)
+  rake (~> 12.3)
   rdoc (~> 4.2.0)
   uricp!
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/Jenkinsfile

@@ -36,10 +36,10 @@ pipeline {
 	}
       }
     }
-    stage("Trusty, Ruby 1.9.3") {
+    stage("Xenial, Ruby 2.3.1") {
       agent {
 	dockerfile {
-	  dir 'trusty'
+	  dir 'xenial'
 	  label "docker"
 	}
       }
@@ -58,10 +58,10 @@ pipeline {
 	}
       }
     }
-    stage("Xenial, Ruby 2.3.1") {
+    stage("Bionic, Ruby 2.5.1") {
       agent {
 	dockerfile {
-	  dir 'xenial'
+	  dir 'bionic'
 	  label "docker"
 	}
       }
@@ -80,10 +80,10 @@ pipeline {
 	}
       }
     }
-    stage("Bionic, Ruby 2.5.1") {
+    stage("Focal, Ruby 2.7.0") {
       agent {
 	dockerfile {
-	  dir 'bionic'
+	  dir 'focal'
 	  label "docker"
 	}
       }

data/centos7/Dockerfile

@@ -11,10 +11,8 @@ RUN yum update -y && yum -y install \
     rubygems \
     rubygem-bundler
 
-RUN yum -y install python-setuptools && \
-    easy_install pip && \
-    pip install --upgrade setuptools && \
-    pip install python-swiftclient
+RUN yum -y install centos-release-openstack-train && \
+    yum -y install python-swiftclient
 
 RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
 

data/features/step_definitions/uricp_steps.rb

@@ -1,8 +1,10 @@
 Then(/^the file named "(.*?)" should have a file format of "(.*?)"$/) do |filename, format|
   case format
   when 'lz4'
-    assert_exact_output([0x184D2204].pack('V'),
-      File.open(filename, 'rb') {|f| f.read(4) }.to_s)
+    assert_exact_output(
+      [0x184D2204].pack('V'),
+      File.open(filename, 'rb') { |f| f.read(4) } || String.new
+    )
   when 'qcow2v3', 'qcow3'
     steps %{
       When I successfully run `qemu-img info #{filename}`
@@ -10,8 +12,10 @@ Then(/^the file named "(.*?)" should have a file format of "(.*?)"$/) do |filena
       And the output from "qemu-img info #{filename}" should contain "compat: 1.1"
     }
   else
-    assert_no_partial_output([0x184D2204].pack('V'),
-      File.open(filename, 'rb') {|f| f.read(4) }.to_s)
+    assert_no_partial_output(
+      [0x184D2204].pack('V'),
+      File.open(filename, 'rb') { |f| f.read(4) } || 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/{trusty → focal}/Dockerfile

@@ -1,9 +1,9 @@
-FROM ubuntu:trusty
+FROM ubuntu:focal
 MAINTAINER support@brightbox.co.uk
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common
 
-RUN apt-add-repository ppa:brightbox/ruby-ng
+#RUN apt-add-repository ppa:brightbox/ruby-ng
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
   build-essential \
@@ -11,10 +11,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
   qemu-utils \
   liblz4-tool \
   curl \
-  ruby1.9.3 \
+  ruby \
   ruby-dev \
-  python-swiftclient \
+  python3-swiftclient \
   ruby-bundler
 
 RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
 
+RUN gem install bundler -v '~> 1.7'

data/lib/uricp/strategy/local_convert.rb

@@ -32,7 +32,7 @@ module Uricp::Strategy
     end
 
     def new_qemu?
-      @new_qemu ||= !!(`qemu-img convert -O qcow2 -o ? a b` =~ /^compat/m)
+      @new_qemu ||= !!(`qemu-img convert -O qcow2 -o ? a b` =~ /\bcompat\b/m)
     end
 
     def supported_conversion?

data/lib/uricp/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Uricp
-  VERSION = '0.0.17'.freeze
-  DEFAULT_SEGMENT_SIZE = '5 GiB'.freeze
+  VERSION = '0.0.18'
+  DEFAULT_SEGMENT_SIZE = '5 GiB'
 end

data/uricp.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rdoc', '~> 4.2.0')
   spec.add_development_dependency('aruba', '~> 0.6.0')
   spec.add_development_dependency('cucumber', '~> 1.3')
-  spec.add_development_dependency('rake', '~> 10.4.0')
+  spec.add_development_dependency('rake', '~> 12.3')
   spec.add_dependency('methadone', '~> 2.0.0')
   spec.add_dependency('open4', '~> 1.3.0')
   spec.add_dependency('filesize', '= 0.0.2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,7 @@ files:
 - features/step_definitions/uricp_steps.rb
 - features/support/env.rb
 - features/userid_download.feature
+- focal/Dockerfile
 - lib/segment_upload.rb
 - lib/uricp.rb
 - lib/uricp/curl_primitives.rb
@@ -211,7 +212,6 @@ files:
 - lib/uricp/strategy/sweeper.rb
 - lib/uricp/uri_strategy.rb
 - lib/uricp/version.rb
-- trusty/Dockerfile
 - uricp.gemspec
 - xenial/Dockerfile
 homepage: ''