simp-rake-helpers 2.0.2 → 2.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTg4Yzk3Zjk0ZWYzYzE3YzJiNTZhOTllNjQxZTUwZmIzYzllYThmZQ==
-  data.tar.gz: !binary |-
-    ZTk4MmFhODMyMjMwZjA0YjZjZTYyY2I0YTU4MTY0OTVmNWQyYzRmMQ==
+SHA1:
+  metadata.gz: 0318aa8407685d0cc6d24564f78d0f1d5441ae00
+  data.tar.gz: 55cde5a0e8f6d301079cd482d1983012441517fb
 SHA512:
-  metadata.gz: !binary |-
-    N2VjNmRhZDFmM2NlODgyMWQ2OTQwMWU1MDg0NjZjNGMzNTA3ZjQyOTAzNWI5
-    OTYwMTc2ZTQyNTczYjJmNWM0ZWIyMDg2YmJlYjU2ZmRlNjAzMzE4OGViZWE5
-    YjU4MDg3NjU2OWNjMjQyOWRhYjliYjQzOThiZjIyNmM1MDYxZTA=
-  data.tar.gz: !binary |-
-    Nzc5NWVjZGE5OWVlMGY5ZTE3ZTc2MzQ5N2JiYWQzYTU2NjY3OWRmZmI3ODVk
-    MjdhNDhhNDU4OTA4MTk1MjczMTBkNWE2N2U4NjI3Nzk1NTRhMWQwMjE0MmI1
-    YzJkNGM4ZDMwNjE4MDIyODQyYjY1NWIwOThkZmIxZDI5YzAxZjg=
+  metadata.gz: 708e58e986a3116ae8792ec9a5ac666d8fe9b85a998b7a5e1a3a0482cb28f21a7a5ee6ba066dc5b3bfe6db3b1e9dcfd33c283cd4586505a6fb9be720ff7266bd
+  data.tar.gz: 44210df514558a96369bbb0bdd13a2cfcc6669d2b3b2e4501348d4c02299b864e19cfbc9be772ff9965ec4d9fa14324aef9ac4de788c7541c4daaa480648966c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.1.0 / 2016-04-15
+* ISOs will now build with EFI mode enabled
+* The pkglist file will be read from the tarball during build:auto
+
 ### 2.0.1 / 2016-04-05
 * Fix a bug where deps:checkout failed on unknown repos being present
 

data/README.md

@@ -1,12 +1,12 @@
 # simp-rake-helpers
-[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) [![Build Status](https://travis-ci.org/simp/rubygem-simp-rake-helpers.svg?branch=master)](https://travis-ci.org/simp/rubygems-simp-rake-helpers)
+[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) [![Build Status](https://travis-ci.org/simp/rubygems-simp-rake-helpers.svg?branch=master)](https://travis-ci.org/simp/rubygems-simp-rake-helpers)
 
 #### Table of Contents
 
 1. [Overview](#overview)
   * [This gem is part of SIMP](#this-gem-is-part-of-simp)
   * [Features](#features)
-2. [Setup - The basics of getting started with simp-rake-helpers](#setup)
+2. [Setup - The basics of getting started with iptables](#setup)
    * [Gemfile](#gemfile)
 3. [Usage - Configuration options and additional functionality](#usage)
   * [In a Puppet Module](#in-a-puppet-module)
@@ -26,10 +26,8 @@ This gem is part of (the build tooling for) the [System Integrity Management Pla
 
 
 ### Features
-* Provides rake tasks for Puppet modules:
-  * supports multithreaded mock operations
-  * RPM packaging and signing
-  * Fully automatic ISO build
+* supports multithreaded mock operations
+* RPM packaging and signing
 
 
 ## Setup

data/lib/simp/rake/build/auto.rb

@@ -122,7 +122,7 @@ module Simp::Rake::Build
 
           # check out subrepos
           # --------------------
-          if do_checkout
+          if do_checkout && !tarball
             puts
             puts '='*80
             puts "## Checking out subrepositories"
@@ -172,18 +172,6 @@ module Simp::Rake::Build
             puts
             puts '-'*80
 
-            ver=target_data['os_version'].split('.').first
-            repo_pkglist_file = File.expand_path( "src/DVD/#{ver}-simp_pkglist.txt",
-                                                  repo_root_dir
-                                                )
-            if File.file? repo_pkglist_file
-              puts "#### setting SIMP_PKGLIST_FILE=#{repo_pkglist_file}"
-              ENV['SIMP_PKGLIST_FILE']=repo_pkglist_file
-            else
-              puts "#### WARNING: repo pkglist file not found:"
-              puts "              '#{repo_pkglist_file}'"
-              puts
-            end
           else
             puts
             puts '='*80

data/lib/simp/rake/build/iso.rb

@@ -252,8 +252,33 @@ module Simp::Rake::Build
 
               # Do some sane chmod'ing and build ISO
               system("chmod -fR u+rwX,g+rX,o=g #{dir}")
-              @simp_output_iso = "SIMP-#{simpver}-#{baseos}-#{baseosver}-#{arch}.iso"
-              system("mkisofs -uid 0 -gid 0 -o #{@simp_output_iso} -b isolinux/isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -r -m TRANS.TBL #{dir}")
+              simp_output_name = "SIMP-#{simpver}-#{baseos}-#{baseosver}-#{arch}"
+              @simp_output_iso = "#{simp_output_name}.iso"
+
+              mkisofs_cmd = [
+                'mkisofs',
+                "-A SIMP-#{simpver}",
+                "-V SIMP-#{simpver}",
+                "-volset SIMP-#{simpver}",
+                '-uid 0',
+                '-gid 0',
+                '-J',
+                '-joliet-long',
+                '-r',
+                '-v',
+                '-T',
+                '-b isolinux/isolinux.bin',
+                '-c boot.cat',
+                '-boot-load-size 4',
+                '-boot-info-table',
+                '-no-emul-boot',
+                '-m TRANS.TBL',
+                '-x ./lost+found',
+                "-o #{@simp_output_iso}",
+                dir
+              ]
+
+              system(mkisofs_cmd.join(' '))
             end
           end # End of tarfiles loop
         end

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,14 +57,14 @@ dependencies:
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -183,14 +183,14 @@ dependencies:
   name: pager
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -242,7 +242,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :development
@@ -252,7 +252,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
@@ -353,9 +353,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-description: ! '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
-
-'
+description: |2
+      "simp-rake-helpers provides common methods for SIMP Rake Tasks"
 email: simp@simp-project.org
 executables: []
 extensions: []
@@ -420,12 +419,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []