ood_packaging 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c70a0f572ecbb2e7e338c08dd43009335d7552750fd5f7717f154bc637d1c1a
-  data.tar.gz: 7f3e84f57c4f1c245f6d5daec190da5690a310c136efaf8a3732ba89ad2fed59
+  metadata.gz: 700861e60a7c4cbfcf42804c78d23ba5e99fc4cf143cd0a2e424144ad224cb0b
+  data.tar.gz: 63e75fd5b747215c0bddb937f1680bd884b6c1592808612e67541fd23e4851d6
 SHA512:
-  metadata.gz: 9c458f0bd60de9599fed549de0602785a9a3611fda8ea61f5547aa6201bb260fc935d9ad8adb8d68a50abe7b4a6ae1b8b029b9b711ed7bec4b3ae1309103206e
-  data.tar.gz: e0af0043f8ee483a2eea671c8849a01c941bdd71eb5ecf296c1079528a847bdf96d441ddbcb7340050303dcaaae6f571d9f96df3d2d60a9366802007f6017df9
+  metadata.gz: d9e1d7516304c4d40648e6ef6c9fafde08c16aa59d1614e6080282206e464fb29b65458becf79012a55e7f79ef664a309e8799cdb0dd4075819554a9fad6f10d
+  data.tar.gz: 806c2875b212f8186d4462422192b95ecca5bc0f9b96c722c8c4df46652186eedced6aeaf3dedce7fbb915614659a640bbe27d3bff8c5ef3d641443bffa5c65a

data/bin/ood_packaging

@@ -2,13 +2,9 @@
 # frozen_string_literal: true
 
 require 'optparse'
-begin
-  require 'ood_packaging'
-# If gem is not installed, load from location in git repo
-rescue LoadError
-  $LOAD_PATH.unshift(File.expand_path(File.join(__dir__, '../lib')))
-  require 'ood_packaging'
-end
+libdir = File.expand_path(File.join(__dir__, '../lib'))
+$LOAD_PATH.unshift(libdir) if Dir.exist?(libdir)
+require 'ood_packaging'
 
 options = {}
 OptionParser.new do |opts|

data/lib/ood_packaging/package.rb

@@ -21,8 +21,6 @@ class OodPackaging::Package
     @config = config
     @config[:dist] = 'el8' if tar_only?
     @build_box = OodPackaging::BuildBox.new(config)
-    @clean_work_dir = config[:clean_work_dir].nil? ? true : config[:clean_work_dir]
-    @clean_output_dir = config[:clean_output_dir].nil? ? true : config[:clean_output_dir]
     raise ArgumentError, 'Package is required' if package.nil?
     raise ArgumentError, 'Version is required' if version.nil?
     raise ArgumentError, "Package #{package} is not a directory" unless Dir.exist?(package)
@@ -49,10 +47,22 @@ class OodPackaging::Package
     @work_dir ||= File.expand_path(@config[:work_dir])
   end
 
+  def clean_work_dir
+    return false if ENV['OOD_PACKAGING_CLEAN_WORK_DIR'] == 'false'
+
+    @config[:clean_work_dir].nil? ? true : @config[:clean_work_dir]
+  end
+
   def output_dir
     @output_dir ||= File.expand_path(@config[:output_dir])
   end
 
+  def clean_output_dir
+    return false if ENV['OOD_PACKAGING_CLEAN_OUTPUT_DIR'] == 'false'
+
+    @config[:clean_output_dir].nil? ? true : @config[:clean_output_dir]
+  end
+
   def package
     @config[:package]
   end
@@ -200,8 +210,8 @@ class OodPackaging::Package
   end
 
   def clean!
-    sh "rm -rf #{work_dir}", verbose: debug if @clean_work_dir
-    sh "rm -rf #{output_dir}", verbose: debug if @clean_output_dir
+    sh "rm -rf #{work_dir}", verbose: debug if clean_work_dir
+    sh "rm -rf #{output_dir}", verbose: debug if clean_output_dir
   end
 
   def bootstrap!

data/lib/ood_packaging/utils.rb

@@ -59,7 +59,7 @@ module OodPackaging::Utils
   end
 
   def ruby_version
-    '2.7'
+    '3.0'
   end
 
   def scl_ruby

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',
@@ -12,7 +12,7 @@ module OodPackaging
       '(ubuntu|debian)' => '1',
       'default'         => '1-6'
     },
-    'ondemand-runtime'        => '2.1',
+    'ondemand-runtime'        => '2.1.1',
     'passenger'               => '6.0.14',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.5',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Open OnDemand packaging library