simp-rake-helpers 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317410017afb08939d3c6a588bd985569449aad4
-  data.tar.gz: 178a7fffc6e316a5320d532297a3e49a167411dd
+  metadata.gz: 23fa671eda74bc0725c373a76fc45fd4ae2cda88
+  data.tar.gz: 94add5ebc004fc24c4eb31b23002722b2e7f372f
 SHA512:
-  metadata.gz: 3a6b2aa76813ea66923b4f60ad9aa6a38c625cbf09565f4afa1c94fb1d7e333f411bddd6e0889dd5efd73036f526a5d8dd744a7e5134fbe8766a3378b44f6a36
-  data.tar.gz: c727cdd42449ad70be22be3f6e09a48120fde03c22d0d2698df800a5c0d47b3cd4ae7762c94b00b320db26d404f2af8525697df8df875330c4818c863668d908
+  metadata.gz: d9ca3f462ee816e218ab1a36d6585d6bf8bede6e5b40378c81873be6f98a6d722b61a8039a15facbabac47283214cfca75cc2bc721cfcff64bca5882bb380917
+  data.tar.gz: e174c5625f4dee82df208cfca252e1bbd465c7ab0e7bbde3123655a1328a01700131b7cdc9b49a793eccc5f794ec3afbeb89bd5f7cb90b1a4ce418289ad86230

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.3.0 / 2017-02-28
+* Modified to no longer add the SIMP Dev key into the GPGKEYS directory and
+  instead add it to the root level of the DVD for local reference.
+
 ### 3.2.0 / 2017-02-02
 * Updated gemspec deps to newer `simp-rake-helpers` ~> 1.0 and `rake` < 13.0
 

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

@@ -35,7 +35,8 @@ module Simp::Rake::Build
         # Have to get things set up inside the proper namespace
         task :prep,[:method] do |t,args|
 
-          if $simp6
+          # This doesn't get caught for things like 'rake clean'
+          if $simp6 && $simp6_build_dir
             @build_dir = $simp6_build_dir
             @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
           end
@@ -45,7 +46,6 @@ module Simp::Rake::Build
           @build_dirs = {
             :modules => get_module_dirs(args[:method]),
             :aux => [
-              "#{@build_dir}/GPGKEYS",
               "#{@src_dir}/rsync",
               # Anything in here gets built!
               "#{@src_dir}/assets/*",
@@ -307,20 +307,24 @@ module Simp::Rake::Build
 
             Dir.chdir(args[:key]) do
               rpm_build_keys = Dir.glob('RPM-GPG-KEY-*')
-              target_dir = File.join(@build_dir, 'GPGKEYS')
 
               fail("Could not find any RPM-GPG-KEY files in '#{Dir.pwd}'") if rpm_build_keys.empty?
-              fail("No GPGKEYS directory at '#{Dir.pwd}/#{target_dir}") unless File.directory?(target_dir)
 
-              dkfh = File.open("#{target_dir}/.dropped_keys",'w')
+              # Drop the development key in the root of the ISO for convenience
+              if args[:key] == 'dev'
+                target_dir = @dvd_src
 
-              rpm_build_keys.each do |gpgkey|
-                cp(gpgkey,target_dir, :verbose => _verbose)
-                dkfh.puts(gpgkey)
-              end
+                fail("Could not find directory '#{target_dir}'") unless File.directory?(target_dir)
 
-              dkfh.flush
-              dkfh.close
+                rpm_build_keys.each do |gpgkey|
+                  cp(gpgkey,target_dir, :verbose => _verbose)
+                end
+              # Otherwise, make sure it isn't present for the build
+              else
+                Dir.glob(File.join(@dvd_src,'RPM-GPG-KEY-SIMP*')).each do |to_del|
+                  rm(to_del)
+                end
+              end
             end
           end
         end
@@ -545,12 +549,12 @@ module Simp::Rake::Build
 
             Checks all RPM files in a directory to see if they are trusted.
               * :rpm_dir - A directory containing RPM files to check. Default #{@build_dir}/SIMP
-              * :key_dir - The path to the GPG keys you want to check the packages against. Default #{@build_dir}/GPGKEYS
+              * :key_dir - The path to the GPG keys you want to check the packages against. Default #{@src_dir}/assets/simp-gpgkeys/
         EOM
         task :checksig,[:rpm_dir,:key_dir] => [:prep] do |t,args|
           begin
             args.with_defaults(:rpm_dir => @pkg_dirs[:simp])
-            args.with_defaults(:key_dir => "#{@build_dir}/GPGKEYS")
+            args.with_defaults(:key_dir => "#{@src_dir}/assets/simp-gpgkeys")
 
             rpm_dirs = Dir.glob(args[:rpm_dir])
 

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -379,8 +379,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: |2
-      "simp-rake-helpers provides common methods for SIMP Rake Tasks"
+description: '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
+
+'
 email: simp@simp-project.org
 executables: []
 extensions: []