simp-rake-helpers 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzA4NWMyMDVjNWRkY2RiOWRkMzIwN2NiYmNhNzA3ZDZkOWY0N2IzYw==
+    ODk1NjE0ZDMwY2E2YzkxODJhN2M0MTBmOGMzZjJmYzNjNmYxM2NhOQ==
   data.tar.gz: !binary |-
-    YmU0NmExYzI4YmE4ZTEwMzRhZWE2ZWU4OTBlOTkyNDliOGQ1MTRhNg==
+    MWQwOTA1NjEzZTEwZjEwOGMxYzU3MjA1MjY1MjJkYTZlMzZkZjI4MA==
 SHA512:
   metadata.gz: !binary |-
-    NjUwYjYzYmNmMGFlMDFmMGE5N2FmOTA4MGE5NmI0NzAwYTZmM2JhMGQ4MTI1
-    YzNlNjI2NmI3MTY4OWQ1OWI1NTk3Nzg3YmZlYjBjZTRmMzY4NjkxNjk2MTE4
-    ZDRkMmQ3YWE4OTdmNDQ1M2ZkNWVlYWUxZWI3ZmFlNDM2ZjgxMzk=
+    YjUzOWYxZWMyZmFiMmQxOWRhNDU0ZjcwYjgzZGZmNDdiMzg5N2RhNWZiMmNh
+    MDY3ZmE4NWYwN2ExZDE2YTEwZjQ2MmIyMWE2ZTY2NzUwZDA0NTA0ODVhOTYy
+    YjhmMzM5YzM3MGFmYTVmNzc5Yzg0NTNlZDliZjI2ZDdlZGM5OTU=
   data.tar.gz: !binary |-
-    MzQ5MGRhZWI3Y2I0MzQ2ZTNjMTk4MGM0ZTM5YWZlZTJhYjQzODU4ZTU4OWNl
-    MjA2OGMxNjE0ZWRjZGYxYjFjMjU4MjJmMmViZmFiMWQ3OGJlOTAwM2NhZDAx
-    ODMzNGU2OWViNGE4ZTM3M2E2ZDVhNWI5NTk5YTQwYzg4NjZlNWM=
+    ODExOWRjNjQxMGQxNWNhNTQxNjUxMmNkMjBiNTE4ODlmMjc2NmUwYzg2NDdi
+    MGI0ZTgyMGUwZWRkMTk1MGU2ZDMwNDVhMzBmMTBjODU0NjdiZjE3YmNhZDdm
+    YTE1OTZjOTUxNDNhN2Q5NmU2YjBjNGI0ZWExM2UxOGVlNzZhNjA=

data/README.md

@@ -7,6 +7,7 @@
   * [This gem is part of SIMP](#this-gem-is-part-of-simp)
   * [Features](#features)
 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)
   * [In a Ruby Gem](#in-a-ruby-gem)
@@ -20,7 +21,6 @@
 ## Overview
 The `simp-rake-helpers` gem provides common Rake tasks to support the SIMP build process.
 
-
 ### This gem is part of SIMP
 This gem is part of (the build tooling for) the [System Integrity Management Platform](https://github.com/NationalSecurityAgency/SIMP), a compliance-management framework built on [Puppet](https://puppetlabs.com/).
 
@@ -31,10 +31,34 @@ This gem is part of (the build tooling for) the [System Integrity Management Pla
 
 
 ## Setup
-Within a project's Gemfile:
+
+### Gemfile
 
 ```ruby
-gem 'simp-rake-helpers'
+# Variables:
+#
+# SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
+# PUPPET_VERSION   | specifies the version of the puppet gem to load
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '~>3'
+gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
+
+gem_sources.each { |gem_source| source gem_source }
+
+group :test do
+  gem 'puppet', puppetversion
+
+  # Something in the test suites has issues with Hiera 3.1+
+  # See https://tickets.puppetlabs.com/browse/HI-505
+  gem 'hiera', '~> 3.0.0'
+
+  # simp-rake-helpers does not suport puppet 2.7.X
+  if "#{ENV['PUPPET_VERSION']}".scan(/\d+/).first != '2' &&
+      # simp-rake-helpers and ruby 1.8.7 bomb Travis tests
+      # TODO: fix upstream deps (parallel in simp-rake-helpers)
+      RUBY_VERSION.sub(/\.\d+$/,'') != '1.8'
+    gem 'simp-rake-helpers'
+  end
+end
 ```
 
 
@@ -49,7 +73,6 @@ Simp::Rake::Pupmod::Helpers.new(File.dirname(__FILE__))
 ```
 
 
-
 ### In a Ruby Gem
 Within the project's Rakefile:
 

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

@@ -222,11 +222,14 @@ module Simp::Rake::Build
             puts "     (skip with `SIMP_BUILD_unpack=no`)"
             puts '='*80
             puts
+
+            Dir.glob( File.join(staging_dir, "#{target_data['flavor']}*/") ).each do |f|
+              FileUtils.rm_f( f , :verbose => verbose )
+            end
+
             target_data['isos'].each do |iso|
-              puts "---- rake unpack[#{iso}]"
-              Dir.glob( File.join(staging_dir, "#{target_data['flavor']}*/") ).each do |f|
-                FileUtils.rm_f( f , :verbose => verbose )
-              end
+              puts "---- rake unpack[#{iso},#{do_merge},#{Dir.pwd},isoinfo,#{target_data['os_version']}]"
+              Rake::Task['unpack'].reenable
               Rake::Task['unpack'].invoke(iso,do_merge,Dir.pwd,'isoinfo',target_data['os_version'])
             end
           else

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler