uricp 0.0.15 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a83d1c4afd7b3c2b43eeec01b42e06ff8ea55edf8450110ca70363be693d64
-  data.tar.gz: 64d75d6bc450453f5e2204ab085759a912c265116934be3d7595861f1b5dafb8
+  metadata.gz: e77694a18e045d2917d254afcb2db0a2c4cb7d81471d3ccabfe5c232bc340408
+  data.tar.gz: c063c5315485f25194e2f195c821470f0cc840cc242a0f88c174653a3a3bf167
 SHA512:
-  metadata.gz: f92262c06bf7b035a453fb51358d429e8617487c76df209520abf3d0d322644787e4cbec5d83fdd77fa8a749de41d29e30e1b00248963efd2a26bdfcaf8edc56
-  data.tar.gz: 1f6533f5334330c3653da3e952715428478f55f1b956d9fdb9b9b9290d7ff0c45391fce3363c132f8dcb85deeb47930ef4dda36cdc1baea9f52a12ae98c4d2f2
+  metadata.gz: e8af0949b1de2c8c414d8c60f69390ebc5c722189ff9d86b3c0201c3a30aecded256c8c38be244516834ba97ca7e3ee58c325444304f766cef55b11053d018af
+  data.tar.gz: db89854277d707b488ef4c86bad899407445ff62bd9815aa60259f636b473e17905a83bd53b120f287eabe60012cb20681015a45ef752d3d98660ed6e4b01f71

data/.rubocop.yml

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

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.15)
+    uricp (0.0.20)
+      childprocess (~> 1.0)
       filesize (= 0.0.2)
-      methadone (~> 2.0.0)
+      methadone (~> 2.0.2)
       open4 (~> 1.3.0)
       sendfile (~> 1.2.0)
 
@@ -14,38 +15,33 @@ 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)
     inifile (1.1.0)
     json (1.8.6)
-    methadone (2.0.0)
+    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 (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,10 +52,9 @@ DEPENDENCIES
   bundler (~> 1.7)
   cucumber (~> 1.3)
   inifile (~> 1.1)
-  rake (~> 10.4.0)
+  rake (~> 12.3)
   rdoc (~> 4.2.0)
-  rspec (~> 2.99)
   uricp!
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/Jenkinsfile

@@ -2,6 +2,8 @@ pipeline {
   environment {
     ORBIT = credentials('ced8ecd0-dbe4-4bf6-bdde-101a661565f5')
     ORBIT_URL = credentials('c0c95c56-b4e9-45c2-85c5-bf292aef7301')
+    RBD = credentials('9bfb46f5-65eb-40c3-bfda-7ac5fe469ff4')
+    CEPH_MON = credentials('ceph-mon')
     ORBIT_USER = "${ORBIT_USR}"
     ORBIT_KEY = "${ORBIT_PSW}"
   }
@@ -14,73 +16,128 @@ pipeline {
   }
   agent none
   stages {
+    stage("AlmaLinux 8") {
+      agent {
+        dockerfile {
+          dir 'almalinux8'
+          label "docker"
+          additionalBuildArgs '--build-arg CEPH_MON --build-arg RBD_USR --build-arg RBD_PSW'
+        }
+      }
+      steps {
+        sh 'rbd --id "${RBD_USR}" ls servers'
+        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("CentOS 7") {
       agent {
-	dockerfile {
-	  dir 'centos7'
-	  label "docker"
-	}
+        dockerfile {
+          dir 'centos7'
+          label "docker"
+          additionalBuildArgs '--build-arg CEPH_MON --build-arg RBD_USR --build-arg RBD_PSW'
+        }
       }
       steps {
-	sh 'bundle install --deployment'
-	sh 'bundle exec rake features:new_qemu'
+        sh 'rbd --id "${RBD_USR}" ls servers'
+        sh 'bundle install --deployment'
+        sh 'bundle exec rake features:new_qemu'
       }
       post {
         always {
-	  sh 'bundle exec rake features:clean'
-	}
+          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") {
+    stage("Focal, Ruby 2.7.0") {
       agent {
-	dockerfile {
-	  dir 'trusty'
-	  label "docker"
-	}
+        dockerfile {
+          dir 'focal'
+          label "docker"
+          additionalBuildArgs '--build-arg CEPH_MON --build-arg RBD_USR --build-arg RBD_PSW'
+        }
       }
       steps {
-	sh 'bundle install --deployment'
-	sh 'bundle exec rake features:new_qemu'
+        sh 'rbd --id "${RBD_USR}" ls servers'
+        sh 'bundle install --deployment'
+        sh 'bundle exec rake features:new_qemu'
       }
       post {
         always {
-	  sh 'bundle exec rake features:clean'
-	}
+          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"
-	}
+        dockerfile {
+          dir 'xenial'
+          label "docker"
+        }
       }
       steps {
-	sh 'bundle install --deployment'
-	sh 'bundle exec rake features:new_qemu'
+        sh 'bundle install --deployment'
+        sh 'bundle exec rake features:new_qemu'
       }
       post {
         always {
-	  sh 'bundle exec rake features:clean'
-	}
+          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"
-	}
+        dockerfile {
+          dir 'bionic'
+          label "docker"
+        }
       }
       steps {
-	sh 'bundle install --deployment'
-	sh 'bundle exec rake features:new_qemu'
+        sh 'bundle install --deployment'
+        sh 'bundle exec rake features:new_qemu'
       }
       post {
         always {
-	  sh 'bundle exec rake features:clean'
-	}
+          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/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,17 @@ namespace(:features) do
     t.fork = false
     t.profile = 'old-qemu-image'
   end
+  Cucumber::Rake::Task.new(:rbd) do |t|
+    t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty --no-source -x"
+    t.fork = false
+    t.profile = 'rbd'
+  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
+      %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
@@ -76,11 +66,9 @@ namespace(:features) do
 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/almalinux8/Dockerfile

@@ -0,0 +1,26 @@
+FROM almalinux:8
+MAINTAINER support@brightbox.co.uk
+
+RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
+RUN dnf -y install dnf-plugins-core
+RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8.4/devel/almalinux-devel.repo
+RUN dnf -y update
+RUN dnf config-manager --set-enabled powertools,devel
+RUN dnf -y group install "Development Tools"
+RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+RUN dnf -y install https://www.rdoproject.org/repos/rdo-release.el8.rpm
+RUN dnf -y install \
+    git \
+    lz4 \
+    qemu-img \
+    ruby-devel \
+    rubygems \
+    rubygem-bundler \
+    python3-swiftclient \
+    ceph-common
+RUN mkdir -p /etc/ceph
+ARG RBD_USR=libvirt
+ARG RBD_PSW
+ARG CEPH_MON
+RUN echo -e "[client.$RBD_USR]\nkey = $RBD_PSW\n" > /etc/ceph/ceph.client.$RBD_USR.keyring
+RUN echo -e "[global]\nmon_host = $CEPH_MON\n" > /etc/ceph/ceph.conf

data/bin/uricp

@@ -4,7 +4,7 @@ require 'optparse'
 require 'uri'
 require 'methadone'
 require 'filesize'
-require 'uricp.rb'
+require 'uricp'
 
 class App
   include Methadone::Main
@@ -52,20 +52,32 @@ class App
   def self.build_command
     command_sequence = Uricp::UriStrategy.choose_strategy(options)
     debug "#{self.name} Command sequence is #{command_sequence.inspect}"
-    command_sequence.map{|c| c.command}.join('')
+    command_sequence.map do |c|
+      debug c.class.name
+      c.command
+    end.join('')
   end
 
   def self.validate_options
-    unless options['cache']
-      case
-      when options['target-format']
-	raise ::OptionParser::MissingArgument,
-	  "'target-format' requires 'cache' option"
-      when options['max-cache']
-	raise ::OptionParser::MissingArgument,
-	  "'max-cache' requires 'cache' option"
-      end
+    case
+    when options['from_uri'].path.nil?
+      raise ::OptionParser::InvalidArgument,
+        "'from_uri' has missing path"
+    when options['to_uri'].path.nil?
+      raise ::OptionParser::InvalidArgument,
+        "'to_uri' has missing path"
     end
+    return if options['cache']
+
+    case
+    when options['target-format']
+      raise ::OptionParser::MissingArgument,
+        "'target-format' requires 'cache' option"
+    when options['max-cache']
+      raise ::OptionParser::MissingArgument,
+        "'max-cache' requires 'cache' option"
+    end
+
   end
 
   def self.add_cache_name
@@ -109,6 +121,8 @@ class App
     "Compress output")
   on("--[no-]dry-run",
     "Show what would be run,", "but don't run the command")
+  on("--[no-]dry-cache",
+    "On dry runs assume the cache is populated")
   on("--[no-]force",
     "Always write sparsely")
   #Arguments