ood_packaging 0.0.1.rc.7 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d06c4909a16375f19e2ea2f04296382904f1605aced7628b24a32724cfdc47d
-  data.tar.gz: 3d079d84b97722071acc1960a108bd16429b841b044e4952dd4ab42b6e2ec23a
+  metadata.gz: aa2b7436d1b6f72707cc1a9aa456bcb9a7c028ab37fb1b9b052cc6d5c23c58ce
+  data.tar.gz: 9f026d1fa74b3718018be2079f92510ca324639f0218776977741e250c184e2d
 SHA512:
-  metadata.gz: 022faaca41616c5ae4cc2e8fe1c7c3bb2e9159bfca06ddc472ff4b311ce1af9f9d03557710648bd0d800d1af66b90bc713621908d8366068bee0c37303b2cfaf
-  data.tar.gz: 5d4df0f7b85f405ee49e637185f1fad4b25738dec1f8b5fd5d4c2fd7d670b8f2b08336428709dcb62608d796939d91908386e4e1e5db0cc235b54bcbcff9d5e8
+  metadata.gz: a443b1559a488884dfbf40932f3acf5a3ccc127dc733b8cdf442f29d21aeef2ba762dbf6a4b121b072945751d98116627bb0a0e7053922f41801135bb043b3fe
+  data.tar.gz: 4b5bbb85bf7d3981179812e048d859dc132d6650f7f936e29b20fdd8615e2b56dd2dcce3fad4a817743c7baa7735dcbf62cc7e8d43e93381fc81e8ee8abb973a

data/lib/ood_packaging/build.rb

@@ -76,6 +76,8 @@ class OodPackaging::Build
                     '/package/rpm'
                   elsif Dir.exist?('/package/packaging/rpm')
                     '/package/packaging/rpm'
+                  elsif Dir.exist?('/package/packaging')
+                    '/package/packaging'
                   else
                     '/package'
                   end
@@ -190,10 +192,17 @@ class OodPackaging::Build
   def bootstrap_get_source!
     if ENV['SKIP_DOWNLOAD'] == 'true'
       puts "\tSKIP_DOWNLOAD detected, skipping download sources".blue
-    else
-      puts "\tDownloading sources defined in #{spec_file}".blue
-      sh "spectool #{rpm_defines.join(' ')} -g -R -S #{spec_file}#{cmd_suffix}"
+      return
     end
+    output = `spectool #{rpm_defines.join(' ')} -l -R -S #{spec_file} 2>&1 | grep 'Source0:'`.strip
+    exit_code = $CHILD_STATUS.exitstatus
+    if exit_code.zero?
+      source = File.join(work_dir, 'SOURCES', File.basename(output))
+      tar = File.join(work_dir, 'SOURCES', ENV['TAR_NAME'])
+      sh "mv #{tar} #{source}" if !File.exist?(source) && File.exist?(tar)
+    end
+    puts "\tDownloading sources defined in #{spec_file}".blue
+    sh "spectool #{rpm_defines.join(' ')} -g -R -S #{spec_file}#{cmd_suffix}"
   end
 
   def bootstrap_deb!

data/lib/ood_packaging/build_box/docker-image/Dockerfile.erb

@@ -9,6 +9,10 @@ RUN yum install -y yum-utils epel-release centos-release-scl && yum clean all &&
 RUN yum install -y <%= scl_ruby %>-ruby sudo which wget @buildsys-build \
     rpm-build rpmdevtools rpm-sign scl-utils-build && \
     yum clean all && rm -rf /var/cache/yum/*
+RUN rm -f /etc/yum.repos.d/CentOS-Vault.repo /etc/yum.repos.d/CentOS-Sources.repo
+RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl.repo > /etc/yum.repos.d/CentOS-SCLo.repo
+RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo >> /etc/yum.repos.d/CentOS-SCLo.repo
+RUN rm -f /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-scl.repo
 <% elsif dist =~ /^el/ -%>
 RUN dnf update -y && dnf clean all && rm -rf /var/cache/dnf/*
 RUN dnf install -y dnf-utils epel-release langpacks-en glibc-all-langpacks && dnf clean all && rm -rf /var/cache/dnf/*

data/lib/ood_packaging/package.rb

@@ -126,10 +126,23 @@ class OodPackaging::Package
     package
   end
 
-  def rpm_tar_dest_dir
-    dir = File.join(package, 'rpm')
-    return dir if Dir.exist?(dir)
+  def tar_name
+    version = if build_box.rpm?
+                rpm_version
+              else
+                deb_version
+              end
+    "#{package_name}-#{version}"
+  end
 
+  def rpm_tar_dest_dir
+    [
+      File.join(package, 'rpm'),
+      File.join(package, 'packaging/rpm'),
+      File.join(package, 'packaging')
+    ].each do |dir|
+      return dir if Dir.exist?(dir)
+    end
     File.join(package, 'packaging/rpm')
   end
 
@@ -200,14 +213,12 @@ class OodPackaging::Package
     cmd = ['git', 'ls-files', '.', '|', tar, '-c']
     if build_box.rpm?
       dir = rpm_tar_dest_dir
-      version = rpm_version
     else
       dir = deb_tar_dest_dir.tap { |p| sh "mkdir -p #{p}" }
-      version = deb_version
       cmd.concat ["--transform 'flags=r;s,packaging/deb,debian,'"]
     end
-    tar_file = "#{dir}/#{package_name}-#{version}.tar.gz"
-    cmd.concat ["--transform 's,^,#{package_name}-#{version}/,'"]
+    tar_file = "#{dir}/#{tar_name}.tar.gz"
+    cmd.concat ["--transform 's,^,#{tar_name}/,'"]
     cmd.concat ['-T', '-', '|', "gzip > #{tar_file}"]
 
     sh "rm #{tar_file}" if File.exist?(tar_file)
@@ -279,6 +290,7 @@ class OodPackaging::Package
       'DIST'          => build_box.dist,
       'PACKAGE'       => package_name,
       'VERSION'       => version,
+      'TAR_NAME'      => "#{tar_name}.tar.gz",
       'GPG_SIGN'      => gpg_sign,
       'GPG_NAME'      => gpg_name,
       'SKIP_DOWNLOAD' => @config[:skip_download],

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.0.1.rc.7'
+  VERSION = '0.1.1'
   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.7
+  version: 0.1.1
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: