uricp 0.0.13 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 504ac718e28c260c29336ae9089d9a58d9948f7d
-  data.tar.gz: ac2c9bc45430805b2a0845e80392e2c75ec2f471
+SHA256:
+  metadata.gz: d9944582044883ff45f3847042ca62016416d06198a0af41751de93ab992c646
+  data.tar.gz: 19c14777647bb01fec3a4e6214e8183b29432843bf47b8b0c818d0401dafaea1
 SHA512:
-  metadata.gz: b1518d8d9ae106c51d1eceb9ad5d50f0d93e3b7fbf9df43a8cca797c42d2dbdb6f44c96a7a3a4636562fd42523ca880a3859ff2b70374d70aebcf205e238a5d9
-  data.tar.gz: 419cedbe0b8be9fcbef9ba4634906adb4ad6f346b6bcdbae06d627bea6efc4c21c6d71c646d2d0d1343081c3e0cfd34df3d273cedd4362db0aafbfb55112df93
+  metadata.gz: c157e985f79891ca962fb0b792dab2a4fab89bd651c15b940e75ba4baf0e86a42922b9dc8a0f96fa53b8de4151d3e9b6aeefac256ffe59faa2ed6ad5becfad47
+  data.tar.gz: 45444dfcbc92079f7221d0f239315db22f6af749843f6a89312e949c1f12068a2254f6ffd8830a4ab00833e3b66d16d259cfcccb9388f24dde9ff23fbad99ee2

data/.gitignore

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

data/.rubocop.yml

@@ -0,0 +1,3 @@
+AllCops:
+  TargetRubyVersion: 2.4
+

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.13)
+    uricp (0.0.18)
       filesize (= 0.0.2)
-      methadone (~> 1.8.0)
+      methadone (~> 2.0.0)
       open4 (~> 1.3.0)
       sendfile (~> 1.2.0)
 
@@ -14,38 +14,33 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    builder (3.2.2)
-    childprocess (0.5.7)
-      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.2.5)
-    ffi (1.9.10)
+    diff-lcs (1.4.4)
     filesize (0.0.2)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     inifile (1.1.0)
-    json (1.8.3)
-    methadone (1.8.0)
+    json (1.8.6)
+    methadone (2.0.2)
       bundler
-    multi_json (1.11.2)
+    multi_json (1.15.0)
     multi_test (0.1.2)
     open4 (1.3.4)
-    rake (10.4.2)
-    rdoc (4.2.0)
+    rake (12.3.3)
+    rdoc (4.2.2)
       json (~> 1.4)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
+    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
@@ -56,7 +51,9 @@ DEPENDENCIES
   bundler (~> 1.7)
   cucumber (~> 1.3)
   inifile (~> 1.1)
-  rake
-  rdoc
-  rspec (~> 2.99)
+  rake (~> 12.3)
+  rdoc (~> 4.2.0)
   uricp!
+
+BUNDLED WITH
+   1.17.3

data/Jenkinsfile

@@ -0,0 +1,113 @@
+pipeline {
+  environment {
+    ORBIT = credentials('ced8ecd0-dbe4-4bf6-bdde-101a661565f5')
+    ORBIT_URL = credentials('c0c95c56-b4e9-45c2-85c5-bf292aef7301')
+    ORBIT_USER = "${ORBIT_USR}"
+    ORBIT_KEY = "${ORBIT_PSW}"
+  }
+  options {
+    disableConcurrentBuilds()
+    buildDiscarder(logRotator(numToKeepStr: '5'))
+  }
+  triggers {
+    cron('@weekly')
+  }
+  agent none
+  stages {
+    stage("CentOS 7") {
+      agent {
+	dockerfile {
+	  dir 'centos7'
+	  label "docker"
+	}
+      }
+      steps {
+	sh 'bundle install --deployment'
+	sh 'bundle exec rake features:new_qemu'
+      }
+      post {
+        always {
+	  sh 'bundle exec rake features:clean'
+	}
+	failure {
+	    mail to: 'sysadmin@brightbox.co.uk',
+		 subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
+		 body: "${env.BUILD_URL}"
+	}
+      }
+    }
+    stage("Xenial, Ruby 2.3.1") {
+      agent {
+	dockerfile {
+	  dir 'xenial'
+	  label "docker"
+	}
+      }
+      steps {
+	sh 'bundle install --deployment'
+	sh 'bundle exec rake features:new_qemu'
+      }
+      post {
+        always {
+	  sh 'bundle exec rake features:clean'
+	}
+	failure {
+	    mail to: 'sysadmin@brightbox.co.uk',
+		 subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
+		 body: "${env.BUILD_URL}"
+	}
+      }
+    }
+    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'
+	}
+	failure {
+	    mail to: 'sysadmin@brightbox.co.uk',
+		 subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
+		 body: "${env.BUILD_URL}"
+	}
+      }
+    }
+    stage("Focal, Ruby 2.7.0") {
+      agent {
+	dockerfile {
+	  dir 'focal'
+	  label "docker"
+	}
+      }
+      steps {
+	sh 'bundle install --deployment'
+	sh 'bundle exec rake features:new_qemu'
+      }
+      post {
+        always {
+	  sh 'bundle exec rake features:clean'
+	}
+	failure {
+	    mail to: 'sysadmin@brightbox.co.uk',
+		 subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
+		 body: "${env.BUILD_URL}"
+	}
+      }
+    }
+  }
+  post {
+    failure {
+	mail to: 'sysadmin@brightbox.co.uk',
+	     subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
+	     body: "${env.BUILD_URL}"
+    }
+  }
+}

data/README.md

@@ -1,6 +1,6 @@
 # Uricp
 
-TODO: Write a gem description
+Copy one URI to another with optional cache
 
 ## Installation
 
@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+
 
 ## Contributing
 

data/Rakefile

@@ -2,19 +2,19 @@ def dump_load_path
   puts $LOAD_PATH.join("\n")
   found = nil
   $LOAD_PATH.each do |path|
-    if File.exists?(File.join(path,"rspec"))
-      puts "Found rspec in #{path}"
-      if File.exists?(File.join(path,"rspec","core"))
-        puts "Found core"
-        if File.exists?(File.join(path,"rspec","core","rake_task"))
-          puts "Found rake_task"
-          found = path
-        else
-          puts "!! no rake_task"
-        end
+    next unless File.exist?(File.join(path, 'rspec'))
+
+    puts "Found rspec in #{path}"
+    if File.exist?(File.join(path, 'rspec', 'core'))
+      puts 'Found core'
+      if File.exist?(File.join(path, 'rspec', 'core', 'rake_task'))
+        puts 'Found rake_task'
+        found = path
       else
-        puts "!!! no core"
+        puts '!! no rake_task'
       end
+    else
+      puts '!!! no core'
     end
   end
   if found.nil?
@@ -26,13 +26,6 @@ end
 require 'bundler'
 require 'rake/clean'
 
-begin
-require 'rspec/core/rake_task'
-rescue LoadError
-dump_load_path
-raise
-end
-
 require 'cucumber'
 require 'cucumber/rake/task'
 gem 'rdoc' # we need the installed RDoc gem, not the system one
@@ -42,13 +35,7 @@ include Rake::DSL
 
 Bundler::GemHelper.install_tasks
 
-
-RSpec::Core::RakeTask.new do |t|
-  # Put spec opts in a file named .rspec in root
-end
-
-
-CUKE_RESULTS = 'results.html'
+CUKE_RESULTS = 'results.html'.freeze
 CLEAN << CUKE_RESULTS
 namespace(:features) do
   Cucumber::Rake::Task.new(:new_qemu) do |t|
@@ -61,14 +48,22 @@ 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|
+          puts "Delete failed: #{res.exitstatus}" unless ok
+        end
+      end
+    end
+  end
 end
 
 Rake::RDocTask.new do |rd|
-  
-  rd.main = "README.rdoc"
-  
-  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
-end
+  rd.main = 'README.rdoc'
 
-task :default => [:spec,"features:new_qemu"]
+  rd.rdoc_files.include('README.rdoc', 'lib/**/*.rb', 'bin/**/*')
+end
 
+task default: [:spec, 'features:new_qemu']

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 \
+  ruby-bundler
+
+RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
+

data/centos7/Dockerfile

@@ -0,0 +1,18 @@
+FROM centos:7
+MAINTAINER support@brightbox.co.uk
+
+RUN yum update -y && yum -y install \
+    epel-release \
+    gcc \
+    make \
+    git \
+    qemu-img \
+    ruby-devel \
+    rubygems \
+    rubygem-bundler
+
+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/orbit_steps.rb

@@ -18,17 +18,24 @@ def fetch_orbit_token
   @current_url_target = ENV['ORBIT_URL'] || 'https://orbit.brightbox.com/v1'
   cmd = "curl -I #{@current_url_target} -H 'X-Auth-User: #{@clientid}' -H 'X-Auth-Key: #{@key}'"
   run_simple(unescape(cmd))
-  stdout_from(cmd).each_line do |line|
+  output = stdout_from(cmd)
+  output.each_line do |line|
     key, value = line.strip.split(/\s*:\s*/,2)
-    @current_auth_token = value if key == 'X-Auth-Token'
-    @current_storage_url = value if key == 'X-Storage-Url'
+    case key.to_s.downcase
+    when 'x-auth-token'
+      @current_auth_token = value
+    when 'x-storage-url'
+      @current_storage_url = value
+    end
+  end
+  unless @current_auth_token && @current_storage_url
+    raise(RuntimeError, "Credentials not accepted. Can't obtain auth token for tests.\n#{output}")
   end
-  raise(RuntimeError, "Credentials not accepted. Can't obtain auth token for tests.") unless @current_auth_token && @current_storage_url 
 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,26 +203,25 @@ Then(/^a qcow2 entry should exist in container "(.*?)" called "(.*?)"$/) do |con
 end
 
 Before('@orbit') do
+  puts "Running Orbit Before"
   fetch_orbit_token
-  unless $orbit_setup
+  $first_time ||= false
+  unless $first_time
+    puts("Clearing up temporary areas")
     system("swift --quiet --insecure --os-storage-url=#{@current_storage_url} --os-auth-token=#{@current_auth_token} delete test")
     system("swift --quiet --insecure --os-storage-url=#{@current_storage_url} --os-auth-token=#{@current_auth_token} delete temp_dlo")
     system("swift --quiet --insecure --os-storage-url=#{@current_storage_url} --os-auth-token=#{@current_auth_token} delete test_upload")
-  end
-end
-
-Before('@orbitdownloads') do
-  $orbit_setup ||= false
-  unless $orbit_setup
+    puts("Setting up downloads")
     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
+    $first_time = true
   end
 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/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}"