ood_packaging 0.0.1.rc.6 → 0.0.1.rc.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 774e160312368cf79021df01d8aaf851b6f4efd7ef23890a2f02b4edb5cb6202
-  data.tar.gz: 4f169c7948828b5f870e2a0d7a05dc04f95c73b62b0fd40fe7260238c9a7417f
+  metadata.gz: 8d06c4909a16375f19e2ea2f04296382904f1605aced7628b24a32724cfdc47d
+  data.tar.gz: 3d079d84b97722071acc1960a108bd16429b841b044e4952dd4ab42b6e2ec23a
 SHA512:
-  metadata.gz: fe2cc99020a235d8cfa3caffb25e26f1ef23f8454d5278093780406e37d669e9f76af2f3c2a70cab350f9c75821f5f70fddc675563569fb0b8bc618d9e4d2758
-  data.tar.gz: 45ec1cc23b9cfdc63a2c47cb077ac153bae08facb4e5d7a5486d359c5f844dd5ac1b190d6fb33ba17f17cc3ab076fed9fc5e3b00246fb9c2f17c2ce003fb29dc
+  metadata.gz: 022faaca41616c5ae4cc2e8fe1c7c3bb2e9159bfca06ddc472ff4b311ce1af9f9d03557710648bd0d800d1af66b90bc713621908d8366068bee0c37303b2cfaf
+  data.tar.gz: 5d4df0f7b85f405ee49e637185f1fad4b25738dec1f8b5fd5d4c2fd7d670b8f2b08336428709dcb62608d796939d91908386e4e1e5db0cc235b54bcbcff9d5e8

data/lib/ood_packaging/build.rb

@@ -39,11 +39,11 @@ class OodPackaging::Build
   end
 
   def version
-    ENV['VERSION'].gsub(/^v/, '')
+    ENV['VERSION']
   end
 
   def rpm_version
-    version.split('-', 2)[0]
+    version.gsub(/^v/, '').split('-', 2)[0]
   end
 
   def rpm_release
@@ -53,8 +53,12 @@ class OodPackaging::Build
     v[1].gsub('-', '.')
   end
 
+  def deb_version
+    version.gsub(/^v/, '').gsub('-', '.')
+  end
+
   def rpm_defines
-    defines = ["--define 'git_tag #{ENV['VERSION']}'"]
+    defines = ["--define 'git_tag #{version}'"]
     defines.concat ["--define 'package_version #{rpm_version}'"]
     defines.concat ["--define 'package_release #{rpm_release}'"]
     defines.concat ["--define 'scl #{config[:scl]}'"] if config[:scl]
@@ -122,7 +126,7 @@ class OodPackaging::Build
   end
 
   def deb_name
-    "#{package}-#{version}"
+    "#{package}-#{deb_version}"
   end
 
   def rpms
@@ -206,7 +210,7 @@ class OodPackaging::Build
     puts "\tBootstrap debian build files".blue
     Dir.chdir(deb_work_dir) do
       sh "dh_make -s -y --createorig -f ../#{deb_name}.tar.gz#{cmd_suffix} || true"
-      sh "dch -b -v #{version} 'Release #{version}'#{cmd_suffix}"
+      sh "dch -b -v #{deb_version} 'Release #{deb_version}'#{cmd_suffix}"
     end
   end
 

data/lib/ood_packaging/build_box.rb

@@ -21,17 +21,17 @@ class OodPackaging::BuildBox
 
   def initialize(config = {})
     @config = config
-    raise ArgumentError, 'Must provide dist' if @config[:dist].nil?
+    raise ArgumentError, 'Must provide dist' if dist.nil?
 
     # rubocop:disable Style/GuardClause
-    unless valid_dist?(@config[:dist])
-      raise ArgumentError, "Invalid dist selected: #{@config[:dist]}. Valid choices are #{valid_dists.join(' ')}"
+    unless valid_dist?(dist)
+      raise ArgumentError, "Invalid dist selected: #{dist}. Valid choices are #{valid_dists.join(' ')}"
     end
     # rubocop:enable Style/GuardClause
   end
 
   def dist
-    @dist ||= @config[:dist]
+    @dist ||= ENV['OOD_PACKAGING_DIST'] || @config[:dist]
   end
 
   def rpm?

data/lib/ood_packaging/package.rb

@@ -75,12 +75,15 @@ class OodPackaging::Package
 
   def package_name
     name = File.basename(package)
-    if name =~ /deb|rpm/
+    case name
+    when /deb|rpm/
       name = if File.basename(File.dirname(package)) == 'packages'
                File.basename(File.dirname(File.dirname(package)))
              else
                File.basename(File.dirname(package))
              end
+    when 'packaging'
+      name = File.basename(File.dirname(package))
     end
     name
   end
@@ -275,6 +278,7 @@ class OodPackaging::Package
     env = {
       'DIST'          => build_box.dist,
       'PACKAGE'       => package_name,
+      'VERSION'       => version,
       'GPG_SIGN'      => gpg_sign,
       'GPG_NAME'      => gpg_name,
       'SKIP_DOWNLOAD' => @config[:skip_download],
@@ -282,8 +286,6 @@ class OodPackaging::Package
       'OOD_GID'       => Process.gid,
       'DEBUG'         => debug
     }
-    env['VERSION'] = rpm_version if build_box.rpm?
-    env['VERSION'] = deb_version if build_box.deb?
     env['GPG_PUBKEY'] = '/gpg.pub' if @config[:gpg_pubkey]
     env
   end

data/lib/ood_packaging/tasks.rb

@@ -7,6 +7,14 @@ require 'ood_packaging/utils'
 namespace :ood_packaging do
   include OodPackaging::Utils
 
+  desc 'Set version'
+  task :version, [:version] do |_task, args|
+    version_file = File.join(proj_root, 'lib/ood_packaging/version.rb')
+    version = args[:version].gsub(/^v/, '')
+    sh "#{sed} -i -r \"s|  VERSION =.*|  VERSION = '#{version}'|g\" #{version_file}"
+    sh 'bundle install'
+  end
+
   namespace :buildbox do
     desc 'Build buildbox image'
     task :build, [:dist] do |_task, args|
@@ -36,7 +44,7 @@ namespace :ood_packaging do
     OodPackaging::RakeTask.new(:internal, [:package, :dist]) do |t, args|
       name = args[:package].split(':').last
       t.package = File.join(proj_root, 'packages', name)
-      t.dist = args[:dist]
+      t.dist = args[:dist] || ENV['OOD_PACKAGING_DIST']
       t.version = OodPackaging.package_version(name, args[:dist])
       t.work_dir = File.join(proj_root, 'tmp/work')
       t.output_dir = File.join(proj_root, 'tmp/output')

data/lib/ood_packaging/utils.rb

@@ -15,6 +15,13 @@ module OodPackaging::Utils
     end
   end
 
+  def sed
+    @sed ||= begin
+      `which gsed 1>/dev/null 2>&1`
+      $CHILD_STATUS.success? ? 'gsed' : 'sed'
+    end
+  end
+
   def podman_runtime?
     @podman_runtime ||= ENV['CONTAINER_RT'] == 'podman' || ENV['container'] == 'podman'
   end

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.0.1.rc.6'
+  VERSION = '0.0.1.rc.7'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc.6
+  version: 0.0.1.rc.7
 platform: ruby
 authors:
 - Trey Dockendorf