ood_packaging 0.17.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d260c5edbafe9453dc0aa565147046de23e417d8e51d65d1359b21ef4037c4
-  data.tar.gz: a000f2ac831f6ee588400d48aa4dc36682ac22e11475267267277741b0556636
+  metadata.gz: d52e564e6d4842409439c124cad2de5b9851f4d469489221e1115f26ca4c2e80
+  data.tar.gz: 31e6b22a216df84d396e455ce27b5b4322dc361418048fb235f2a5fdba39abb9
 SHA512:
-  metadata.gz: 8cfea7157f2dbabf29d06e3e7f0886aa0cf89be8d2427a33f1bf719d798a046b1a61eb62555469a8029fc4fbdafd9339a6254d74d2cc065eb2e4a71759e6c60b
-  data.tar.gz: b58b14c016fc24fcbc4d7a29035711b9ebaeb70309d3f3ee3d1661215d3a5ed307a13a4f4aa245e6173a4c1bfa0759828b6d0c331dfacfcbf352f7dbe246e589
+  metadata.gz: 8be8610c0dfd1ee8e3594e86891e201471c456ecf13a5e8acc1dbdb1a8696fc6077ed72c5f30b93d651a3405131b5317f6a67d4ef5d06ad885c48e57f27a823c
+  data.tar.gz: 7a2c2e61904eea72c991ca83c04e0c6b09db449f858f79207fedd342411ac959d2387d19f2792625fa4803eb5a3336406f1caaee15ba139fd74234f469b1ed87

data/lib/ood_packaging/build.rb

@@ -15,7 +15,7 @@ class OodPackaging::Build
   attr_accessor :build_box
 
   def initialize
-    @build_box = OodPackaging::BuildBox.new(dist: ENV['DIST'], arch: ENV['ARCH'])
+    @build_box = OodPackaging::BuildBox.new(dist: ENV.fetch('DIST', nil), arch: ENV.fetch('ARCH', nil))
   end
 
   def config
@@ -27,7 +27,7 @@ class OodPackaging::Build
   end
 
   def package
-    ENV['PACKAGE']
+    ENV.fetch('PACKAGE', nil)
   end
 
   def debug?
@@ -39,7 +39,7 @@ class OodPackaging::Build
   end
 
   def version
-    ver = ENV['VERSION']
+    ver = ENV.fetch('VERSION', nil)
     return nil if ver == ''
 
     ver
@@ -191,7 +191,7 @@ class OodPackaging::Build
 
   def bootstrap_gpg!
     puts "\tBootstrap GPG".blue
-    sh "sed -i 's|@GPG_NAME@|#{ENV['GPG_NAME']}|g' #{ctr_rpmmacros}"
+    sh "sed -i 's|@GPG_NAME@|#{ENV.fetch('GPG_NAME', nil)}|g' #{ctr_rpmmacros}"
     sh "gpg --batch --passphrase-file #{gpg_passphrase} --import #{gpg_private_key}#{cmd_suffix}"
     sh "sudo rpm --import #{ENV['GPG_PUBKEY']}#{cmd_suffix}" if ENV['GPG_PUBKEY']
   end
@@ -226,7 +226,7 @@ class OodPackaging::Build
     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'])
+      tar = File.join(work_dir, 'SOURCES', ENV.fetch('TAR_NAME', nil))
       sh "mv #{tar} #{source}" if !File.exist?(source) && File.exist?(tar)
     end
     puts "\tDownloading sources defined in #{spec_file}".blue

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

@@ -12,10 +12,10 @@ RUN dnf update -y && dnf clean all && rm -rf /var/cache/dnf/*
 RUN dnf install -y dnf-utils <%= dist =~ /^el/ ? 'epel-release' : '' %> langpacks-en glibc-langpack-en && dnf clean all && rm -rf /var/cache/dnf/*
 <% if dist == 'el8' -%>
 RUN dnf config-manager --set-enabled powertools && dnf clean all && rm -rf /var/cache/dnf/*
-<% elsif dist == 'el9' -%>
+<% elsif ['el9', 'el10'].include?(dist) -%>
 RUN dnf config-manager --set-enabled crb && dnf clean all && rm -rf /var/cache/dnf/*
 <% end -%>
-<% if dist =~ /^el/ -%>
+<% if dist =~ /^el/ && dist != 'el10' -%>
 RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
 <% end -%>
 RUN dnf install -y --allowerasing systemd sudo which wget \

data/lib/ood_packaging/build_box.rb

@@ -12,6 +12,7 @@ class OodPackaging::BuildBox
   BASE_IMAGES = {
     'el8'          => 'almalinux:8',
     'el9'          => 'almalinux:9',
+    'el10'         => 'almalinux:10',
     'ubuntu-22.04' => 'ubuntu:22.04',
     'ubuntu-24.04' => 'ubuntu:24.04',
     'debian-12'    => 'debian:12',

data/lib/ood_packaging/package.rb

@@ -107,8 +107,8 @@ class OodPackaging::Package
   def gpg_files
     [
       OpenStruct.new(private_key: @config[:gpg_private_key], passphrase: @config[:gpg_passphrase]),
-      OpenStruct.new(private_key: ENV['OOD_PACKAGING_GPG_PRIVATE_KEY'],
-                     passphrase:  ENV['OOD_PACKAGING_GPG_PASSPHRASE'])
+      OpenStruct.new(private_key: ENV.fetch('OOD_PACKAGING_GPG_PRIVATE_KEY', nil),
+                     passphrase:  ENV.fetch('OOD_PACKAGING_GPG_PASSPHRASE', nil))
     ].each do |gpg|
       next if gpg.private_key.nil? || gpg.passphrase.nil?
       return gpg if File.exist?(gpg.private_key) && File.exist?(gpg.passphrase)

data/lib/ood_packaging/rake_task.rb

@@ -5,7 +5,7 @@ require 'rake'
 require 'rake/tasklib'
 
 # Define OodPackaging rake task library
-class OodPackaging::RakeTask < ::Rake::TaskLib
+class OodPackaging::RakeTask < Rake::TaskLib
   include ::Rake::DSL if defined?(::Rake::DSL)
   include OodPackaging::Utils
 

data/lib/ood_packaging/tasks.rb

@@ -50,7 +50,7 @@ namespace :ood_packaging do
     OodPackaging::RakeTask.new(:internal, [:package, :dist, :arch]) do |t, args|
       name = args[:package].split(':').last
       t.package = File.join(proj_root, 'packages', name)
-      dist = args[:dist] || ENV['OOD_PACKAGING_DIST']
+      dist = args[:dist] || ENV.fetch('OOD_PACKAGING_DIST', nil)
       arch = args[:arch] || ENV['OOD_PACKAGING_ARCH'] || 'x86_64'
       t.dist = dist
       t.arch = arch
@@ -61,13 +61,11 @@ namespace :ood_packaging do
 
     desc 'Package ondemand-release'
     task :'ondemand-release', [:dist, :arch] do |t, args|
-      ENV['OOD_PACKAGING_GPG_SIGN'] = 'false'
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package ondemand-release-latest'
     task :'ondemand-release-latest', [:dist, :arch] do |t, args|
-      ENV['OOD_PACKAGING_GPG_SIGN'] = 'false'
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 

data/lib/ood_packaging/utils.rb

@@ -50,12 +50,12 @@ module OodPackaging::Utils
     src = File.join(cwd, filename)
     dest = File.join(cwd, filename.gsub('.erb', ''))
     content = ERB.new(File.read(src), trim_mode: '-').result(binding)
-    File.open(dest, 'w') { |f| f.write(content) }
+    File.write(dest, content)
     dest
   end
 
   def ondemand_repo_version
-    '4.0'
+    '4.1'
   end
 
   def ondemand_rpm_repo_baseurl
@@ -75,7 +75,7 @@ module OodPackaging::Utils
   end
 
   def nodejs_version
-    '20'
+    '22'
   end
 
   def nodejs_package

data/lib/ood_packaging/version.rb

@@ -2,29 +2,29 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.17.1'
+  VERSION = '0.19.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
-      '(ubuntu|debian)' => '4.0.0',
-      'default'         => '4.0'
+      '(ubuntu|debian)' => '4.1.0',
+      'default'         => '4.1'
     },
     'ondemand-release-latest' => {
-      '(ubuntu|debian)' => '5',
+      '(ubuntu|debian)' => '6',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '4.0.3',
+    'ondemand-runtime'        => '4.1.0-2',
     'scl-utils'               => '2.0.3',
     'passenger'               => {
-      '(ubuntu|debian)' => '6.0.23',
-      'default'         => '6.0.23-2'
+      '(ubuntu|debian)' => '6.1.0',
+      'default'         => '6.1.0-2'
     },
     'ondemand_exporter'       => '0.11.2',
     'ondemand-compute'        => {
-      '(ubuntu|debian)' => '4.0.0',
-      'default'         => '4.0.0'
+      '(ubuntu|debian)' => '4.1.0',
+      'default'         => '4.1.0'
     },
-    'python-websockify'       => '0.11.0',
-    'turbovnc'                => '3.1.1'
+    'python-websockify'       => '0.11.0-2',
+    'turbovnc'                => '3.2.1'
   }.freeze
 
   def self.package_version(package, dist)

data/lib/ood_packaging.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# Main entry point
 module OodPackaging
   require 'ood_packaging/build'
   require 'ood_packaging/build_box'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-01 00:00:00.000000000 Z
+date: 2025-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,16 +43,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.72.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.72.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement