uricp 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 054b98cbf8e67b76cc3e2b552677573fe5b5cbea
-  data.tar.gz: 85337e7757d5d33a03c72860770dbb10eea58bd8
+SHA256:
+  metadata.gz: d7db104674249fa9443799b004c877667e22b142d26a7c7a2220ef668865dfbc
+  data.tar.gz: d333e085bb1b666e09883fbd9b9006334d6c15acd17ac781629697bcc0766e5a
 SHA512:
-  metadata.gz: 3b774aecb700c7e3b290e2fd3a7140baafe012b188a0f5c9d2166539af35c6f79e6f96cfb92056c1858c0e25e465859492e94e2c5317bfa68d7d5b8c210bca9f
-  data.tar.gz: f4bf7e1dc1c44c0a712720d54e0f86d4ab95f332b3cdfb20c0dcd431d5d65edfbc674921bba6debdcf8290bc0491ee1476a0686456cb0177d936ba141aed9836
+  metadata.gz: 7e16104719cca1e2def15b5d9b2d7cbdbcb84b68f7d69a566b8eddd64e699654ea72f066102bb8949e2eb583ffd54aad9549b5094746747382930cf18a1de5a8
+  data.tar.gz: b0f839f96f8975ce95121085fdba25ecb1451fc38dbc975de250a6277ffe584a5548f6033138cb46ae8f200a0e6c063e45b2eb25b26ea4e6cefad0d592b91294

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.11)
+    uricp (0.0.16)
       filesize (= 0.0.2)
-      methadone (~> 1.8.0)
+      methadone (~> 2.0.0)
       open4 (~> 1.3.0)
       sendfile (~> 1.2.0)
 
@@ -14,8 +14,8 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    builder (3.2.2)
-    childprocess (0.5.6)
+    builder (3.2.3)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     cucumber (1.3.20)
       builder (>= 2.1.2)
@@ -23,29 +23,23 @@ GEM
       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.3)
+    ffi (1.9.23)
     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.0)
       bundler
-    multi_json (1.11.2)
+    multi_json (1.13.1)
     multi_test (0.1.2)
     open4 (1.3.4)
     rake (10.4.2)
-    rdoc (4.2.0)
+    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)
     sendfile (1.2.2)
 
 PLATFORMS
@@ -56,7 +50,9 @@ DEPENDENCIES
   bundler (~> 1.7)
   cucumber (~> 1.3)
   inifile (~> 1.1)
-  rake
-  rdoc
-  rspec (~> 2.99)
+  rake (~> 10.4.0)
+  rdoc (~> 4.2.0)
   uricp!
+
+BUNDLED WITH
+   1.16.1

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("Trusty, Ruby 1.9.3") {
+      agent {
+	dockerfile {
+	  dir 'trusty'
+	  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}"
+	}
+      }
+    }
+  }
+  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,20 @@
+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 python-setuptools && \
+    easy_install pip && \
+    pip install --upgrade setuptools && \
+    pip install python-swiftclient
+
+RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
+

data/features/auth_download.feature

@@ -37,6 +37,14 @@ Feature: Authenticated download of images from orbit
     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: zero download to raw, cache, size limited
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I retrieve "img-zeroy" with options "--cache=/tmp/uricp --target-format=raw --max-cache=8MB" from container "test" into "file:////tmp/uricp/srv-testx"
+    Then a file named "/tmp/uricp/srv-testx" should exist
+    And the file named "/tmp/uricp/srv-testx" should have a file format of "raw"
+    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"
@@ -143,3 +151,12 @@ Feature: Authenticated download of images from orbit
     And the file named "/tmp/uricp/srv-testa" should have a file format of "qcow2"
     And a file named "/tmp/uricp/cache/img-lz4cy" should exist
     And the file named "/tmp/uricp/cache/img-lz4cy" should have a file format of "lz4"
+
+  Scenario: lz4 download sparse convert to raw, cache, overwrite file
+    Given a correctly initialised cache at "/tmp/uricp"
+    And a 102400 byte file named "/tmp/uricp/srv-test9"
+    When I retrieve "img-lz4cy" with options "--force --target-format=raw --cache=/tmp/uricp" from container "test" into "file:///tmp/uricp/srv-test9"
+    Then a file named "/tmp/uricp/srv-test9" should exist
+    And the file named "/tmp/uricp/srv-test9" should have a file format of "raw"
+    And a file named "/tmp/uricp/cache/img-lz4cy" should exist
+    And the file named "/tmp/uricp/cache/img-lz4cy" should have a file format of "lz4"

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