uricp 0.0.16 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7db104674249fa9443799b004c877667e22b142d26a7c7a2220ef668865dfbc
-  data.tar.gz: d333e085bb1b666e09883fbd9b9006334d6c15acd17ac781629697bcc0766e5a
+  metadata.gz: aeaa81822977930906959744feb0d8bdf9ca820afd10e6b97d32a726cbf67391
+  data.tar.gz: cd29b49f83ba53a275f4574c32cbb7f1b92c5218421cef668355a14ab5a36bec
 SHA512:
-  metadata.gz: 7e16104719cca1e2def15b5d9b2d7cbdbcb84b68f7d69a566b8eddd64e699654ea72f066102bb8949e2eb583ffd54aad9549b5094746747382930cf18a1de5a8
-  data.tar.gz: b0f839f96f8975ce95121085fdba25ecb1451fc38dbc975de250a6277ffe584a5548f6033138cb46ae8f200a0e6c063e45b2eb25b26ea4e6cefad0d592b91294
+  metadata.gz: 56c0e441da6e7e709580e09cdcc68c56b3ff731fc9fd028e56160dbfca427048ecab2f79c049f490bd15bcb027a67ec1b4aa01ddd2ce801cda89ad53f9ba6efa
+  data.tar.gz: 92122076440ca0cbd0345f29bf4386503c9f3830d6a4ffbfc92a4f55e40b9ea7790ff81cc1ebf1101ce7ac4cb552c312bf2be0cc5c3c49f0b727ab0247f46f90

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.16)
+    uricp (0.0.21)
+      childprocess (~> 1.0)
       filesize (= 0.0.2)
-      methadone (~> 2.0.0)
+      methadone (~> 2.0.2)
       open4 (~> 1.3.0)
       sendfile (~> 1.2.0)
 
@@ -14,32 +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-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 +52,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

@@ -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,100 +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'
-	}
-	failure {
-	    mail to: 'sysadmin@brightbox.co.uk',
-		 subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
-		 body: "${env.BUILD_URL}"
-	}
+          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'
-	}
-	failure {
-	    mail to: 'sysadmin@brightbox.co.uk',
-		 subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
-		 body: "${env.BUILD_URL}"
-	}
+          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'
-	}
-	failure {
-	    mail to: 'sysadmin@brightbox.co.uk',
-		 subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
-		 body: "${env.BUILD_URL}"
-	}
+          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'
-	}
-	failure {
-	    mail to: 'sysadmin@brightbox.co.uk',
-		 subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
-		 body: "${env.BUILD_URL}"
-	}
+          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}"
+    mail to: 'sysadmin@brightbox.co.uk',
+         subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
+         body: "${env.BUILD_URL}"
     }
   }
 }

data/Rakefile

@@ -48,6 +48,11 @@ 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']

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

data/bionic/Dockerfile

@@ -1,6 +1,8 @@
 FROM ubuntu:bionic
 MAINTAINER support@brightbox.co.uk
 
+RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
+
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common
 
 #RUN apt-add-repository ppa:brightbox/ruby-ng
@@ -16,5 +18,4 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
   python-swiftclient \
   ruby-bundler
 
-RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
 

data/centos7/Dockerfile

@@ -1,20 +1,25 @@
 FROM centos:7
 MAINTAINER support@brightbox.co.uk
 
-RUN yum update -y && yum -y install \
-    epel-release \
+RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
+RUN yum update -y
+RUN yum -y install \
+    centos-release-openstack-train \
+    epel-release 
+RUN yum -y install \
     gcc \
     make \
     git \
     qemu-img \
+    lz4 \
     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"
-
+    rubygem-bundler \
+    ceph-common \
+    python-swiftclient
+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/cucumber.yml

@@ -1,3 +1,4 @@
 default: --profile new-qemu-image
 new-qemu-image: --tags ~@old-qemu-image
 old-qemu-image: --tags ~@new-qemu-image
+rbd: --tags @rbd

data/features/check_uri_path.feature

@@ -0,0 +1,14 @@
+Feature: Check URI paths
+  In order to ensure reliable uricp usage
+  As a command line user
+  I want to reject badly formed URIs
+
+  Scenario: source URI is incorrectly formatted
+        When I run `uricp --dry-run file:fred rbd:///servers/fred`
+    Then the exit status should not be 0
+    And the stderr should contain "invalid argument: 'from_uri' has missing path"
+
+  Scenario: target URI is incorrectly formatted
+        When I run `uricp --dry-run file:///fred rbd:servers/fred`
+    Then the exit status should not be 0
+    And the stderr should contain "invalid argument: 'to_uri' has missing path"