uricp 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7eb722fd7b996348d00efc9f85a53db3656877be
-  data.tar.gz: ad910e9fe349262cf2f1b1139016a4cdb3651c7e
+SHA256:
+  metadata.gz: 34a83d1c4afd7b3c2b43eeec01b42e06ff8ea55edf8450110ca70363be693d64
+  data.tar.gz: 64d75d6bc450453f5e2204ab085759a912c265116934be3d7595861f1b5dafb8
 SHA512:
-  metadata.gz: 292d7a73fef2a4bf0e5138649ea25ee0cfeffd6ab1d20e52af1d84b5729cc4f2c80a5e6603b9043a816e1d659a3ab4725b77711f75baa748baf89facf7e5bbea
-  data.tar.gz: edcff4dc08c9133d23d282c87a77a6aa5c4b55c78afeb96fca3bc35b9a206fe0cf51ee984bcae976cf46d48607cdc4994c924ca64c126aec719e034c9e4c5d18
+  metadata.gz: f92262c06bf7b035a453fb51358d429e8617487c76df209520abf3d0d322644787e4cbec5d83fdd77fa8a749de41d29e30e1b00248963efd2a26bdfcaf8edc56
+  data.tar.gz: 1f6533f5334330c3653da3e952715428478f55f1b956d9fdb9b9b9290d7ff0c45391fce3363c132f8dcb85deeb47930ef4dda36cdc1baea9f52a12ae98c4d2f2

data/.gitignore

@@ -4,3 +4,5 @@ coverage
 pkg
 html
 *.swp
+vendor
+.bundle

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.14)
+    uricp (0.0.15)
       filesize (= 0.0.2)
-      methadone (~> 1.8.0)
+      methadone (~> 2.0.0)
       open4 (~> 1.3.0)
       sendfile (~> 1.2.0)
 
@@ -30,7 +30,7 @@ GEM
       multi_json (~> 1.3)
     inifile (1.1.0)
     json (1.8.6)
-    methadone (1.8.0)
+    methadone (2.0.0)
       bundler
     multi_json (1.13.1)
     multi_test (0.1.2)
@@ -62,4 +62,4 @@ DEPENDENCIES
   uricp!
 
 BUNDLED WITH
-   1.12.3
+   1.16.1

data/Jenkinsfile

@@ -25,6 +25,11 @@ pipeline {
 	sh 'bundle install --deployment'
 	sh 'bundle exec rake features:new_qemu'
       }
+      post {
+        always {
+	  sh 'bundle exec rake features:clean'
+	}
+      }
     }
     stage("Trusty, Ruby 1.9.3") {
       agent {
@@ -37,6 +42,11 @@ pipeline {
 	sh 'bundle install --deployment'
 	sh 'bundle exec rake features:new_qemu'
       }
+      post {
+        always {
+	  sh 'bundle exec rake features:clean'
+	}
+      }
     }
     stage("Xenial, Ruby 2.3.1") {
       agent {
@@ -49,6 +59,28 @@ pipeline {
 	sh 'bundle install --deployment'
 	sh 'bundle exec rake features:new_qemu'
       }
+      post {
+        always {
+	  sh 'bundle exec rake features:clean'
+	}
+      }
+    }
+    stage("Bionic, Ruby 2.5.1") {
+      agent {
+	dockerfile {
+	  dir 'bionic'
+	  label "docker"
+	}
+      }
+      steps {
+	sh 'bundle install --deployment'
+	sh 'bundle exec rake features:new_qemu'
+      }
+      post {
+        always {
+	  sh 'bundle exec rake features:clean'
+	}
+      }
     }
   }
 }

data/Rakefile

@@ -61,6 +61,18 @@ namespace(:features) do
     t.fork = false
     t.profile = 'old-qemu-image'
   end
+
+  task(:clean) do
+    if ENV['ORBIT_USER'] && ENV['ORBIT_KEY']
+      %w{temp_dlo test_upload}.each do |test_file|
+        sh "swift --quiet --insecure -A #{ENV['ORBIT_URL'] || "https://orbit.gb1.brightbox.com/v1"} -U #{ENV['ORBIT_USER']} -K #{ENV['ORBIT_KEY']} delete #{test_file}" do |ok, res|
+          if !ok
+            puts "Delete failed: #{res.exitstatus}"
+          end
+        end
+      end
+    end
+  end
 end
 
 Rake::RDocTask.new do |rd|

data/bionic/Dockerfile

@@ -0,0 +1,20 @@
+FROM ubuntu:bionic
+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-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
+  build-essential \
+  git \
+  qemu-utils \
+  liblz4-tool \
+  curl \
+  ruby \
+  ruby-dev \
+  python-swiftclient
+
+RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
+RUN gem install bundler
+

data/centos7/Dockerfile

@@ -3,7 +3,6 @@ MAINTAINER support@brightbox.co.uk
 
 RUN yum update -y && yum -y install \
     epel-release \
-    centos-release-openstack-kilo \
     gcc \
     make \
     git \
@@ -11,9 +10,10 @@ RUN yum update -y && yum -y install \
     ruby-devel \
     rubygems 
 
-RUN yum update -y && yum -y install \
-    python-swiftclient \
-    lz4
+RUN yum -y install python-setuptools && \
+    easy_install pip && \
+    pip install --upgrade setuptools && \
+    pip install python-swiftclient
 
 RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
 RUN gem install bundler

data/features/step_definitions/orbit_steps.rb

@@ -28,7 +28,7 @@ end
 
 def create_download_file(filetype, name, container)
   upload_url = File.join(@current_storage_url, container, name)
-  tempfile = '/tmp/fred55322'
+  tempfile = 'fred55322'
   FileUtils.rm_f(Dir.glob(tempfile+'*'))
   format = 'raw'
   size = '1G'
@@ -196,6 +196,7 @@ Then(/^a qcow2 entry should exist in container "(.*?)" called "(.*?)"$/) do |con
 end
 
 Before('@orbit') do
+  puts "Running Orbit Before"
   fetch_orbit_token
   $first_time ||= false
   unless $first_time
@@ -213,6 +214,7 @@ Before('@orbit') do
 end
 
 After('@orbit') do
+  puts "Running Orbit After"
   if @current_auth_token && @current_container
     system("swift --quiet --insecure --os-storage-url=#{@current_storage_url} --os-auth-token=#{@current_auth_token} delete #{@current_container} #{@current_name}")
     @current_container = @current_name = nil

data/lib/uricp/version.rb

@@ -1,4 +1,4 @@
 module Uricp
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
   DEFAULT_SEGMENT_SIZE = "5 GiB"
 end

data/uricp.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   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_dependency('methadone', '~> 1.8.0')
+  spec.add_dependency('methadone', '~> 2.0.0')
   spec.add_dependency('open4', '~> 1.3.0')
   spec.add_dependency('filesize', '= 0.0.2')
   spec.add_dependency('sendfile', '~> 1.2.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,7 @@ files:
 - Rakefile
 - bin/segment_upload
 - bin/uricp
+- bionic/Dockerfile
 - centos7/Dockerfile
 - cucumber.yml
 - features/auth_download.feature
@@ -244,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Copy one URL to another with optional cacheing