simp-rake-helpers 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf37e26d7fd61c248ece71b5e56c632b38ff3237
-  data.tar.gz: fa3621dc06beb969d539fa96005f56d4d9c576f6
+  metadata.gz: 0804d79f5af26fb909c8f9dbe745c503515ed72c
+  data.tar.gz: b0fbb44adfee8b3ea53f15a88715ae33289eaaf5
 SHA512:
-  metadata.gz: 56d8d61349d574a4c289aa2535d8e1be5ad97ffcb57b5df32864884828698476682a3d7363e089f7ba8c18992cf5da10dafb4771c661fe8f33f4bfae62e1dbca
-  data.tar.gz: 4d255776d04b43274c6805d26142ee2b1c3cadbcc9cbcbf2081b45b3e6779d52c8d9facd07934e6052ea42bd4622c9c9c62bf353733df0665a78c42f9fa67861
+  metadata.gz: 4c59fd53d33e24218a21cad227ea27d01052d152c0e016cf4632b85688d12501755ced61c6d30bec16fba5c97ec8f53b1557abf84b4cd18d9897a4cb37657504
+  data.tar.gz: b431ebc4958b3de9e4e279fd079611d91de79f2f0f2302925076ca5fc69963ecf02b12a3b6a1ffea98d39e9e70d201f071401f5b0529e3dfe770ba333b8525c3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 2.4.1 / 2016-07-05
+* Fixed a misnamed variable causing build failures
+
 ### 2.4.0 / 2016-06-29
 * Add a Lua-based RPM template to the build stack allowing us to build *any*
   Puppet module as an RPM without forking.

data/README.md

@@ -6,11 +6,12 @@
 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 iptables](#setup)
+2. [Setup](#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)
+  * [RPM Generation](#rpm-generation)
 4. [Reference - An under-the-hood peek at what the gem is doing and how](#reference)
 5. [Limitations - OS compatibility, etc.](#limitations)
 6. [Development - Guide for contributing to the module](#development)
@@ -26,11 +27,10 @@ This gem is part of (the build tooling for) the [System Integrity Management Pla
 
 
 ### Features
-* supports multithreaded mock operations
+* Supports multithreaded mock operations
 * RPM packaging and signing
 * Rubygem packaging
 
-
 ## Setup
 
 ### Gemfile
@@ -74,6 +74,7 @@ end
 
 ## Usage
 ### In a Puppet module
+
 Within the project's Rakefile:
 
 ```ruby
@@ -84,6 +85,7 @@ Simp::Rake::Pupmod::Helpers.new(File.dirname(__FILE__))
 
 
 ### In a Ruby Gem
+
 Within the project's Rakefile:
 
 ```ruby
@@ -101,6 +103,41 @@ To see the extra rake tasks:
 bunde exec rake -T
 ```
 
+### RPM Generation
+
+This Gem provides the ability to generate an RPM from *any* Puppet module.
+
+By default, the information for the RPM will be pulled from the Forge
+compatible [metadata.json](https://docs.puppet.com/puppet/latest/reference/modules_metadata.html).
+
+The `name` and `version` fields *must* be present and well formatted. The
+`license` field is also used if present.
+
+*NOTE*: The dependencies in `metadata.json` are *not* used to generate RPM
+dependencies!
+
+#### RPM Changelog
+
+The Changelog is pulled from a file called `CHANGELOG` at the top level of the
+project. If this file does not start with a well formatted RPM changelog
+string, it will be ignored.
+
+The Changelog is *not* fully checked before attempting to build the RPM. Your
+RPM build will fail if the Changelog entries are not valid per the RPM
+specification.
+
+#### RPM Dependencies
+
+It is likely that you will want to declare your dependencies in your RPM. To do
+this, you can create a `build/rpm_metadata` directory at the root of your
+project. A file named `requires` in the `build/rpm_metadata` directory will be
+used to declare the dependencies of the RPM.
+
+The following directives may be declared in the `requires` file:
+  * Provides
+  * Requires
+  * Obsoletes
+
 ## Reference
 
 ### simp/rake/rpm

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

@@ -605,10 +605,9 @@ protect=1
                 pkginfo = Hash.new
                 Dir.glob('dist/*.rpm') do |rpm|
                   if not rpm =~ /.*.src.rpm/ then
-                  # get_info from each generated rpm, not the spec file, so macros in the
-                  # metadata have already been resolved in the mock chroot.
-                  pkginfo = Simp::RPM.get_info(rpm)
-                  result << [pkginfo,module_metadata]
+                    # get_info from each generated rpm, not the spec file, so macros in the
+                    # metadata have already been resolved in the mock chroot.
+                    result << Simp::RPM.get_info(rpm)
                   end
                 end
               else
@@ -619,20 +618,21 @@ protect=1
             result
           end
 
-          metadata.each do |i|
+          metadata.each do |mod|
             # Each module could generate multiple rpms, each with its own metadata.
             # Iterate over them to add all built rpms to autorequires.
-            i.each do |module_pkginfo,module_metadata|
-              next unless (module_pkginfo and module_metadata)
+            mod.each do |module_pkginfo|
+              next unless (module_pkginfo)
 
               # Set up the autorequires
-              if add_to_autoreq and not module_metadata['optional']
+              if add_to_autoreq
                 # Register the package with the autorequires
                 mode = 'r+'
                 mode = 'w+' unless File.exist?("#{@src_dir}/build/autorequires")
                 autoreq_fh = File.open("#{@src_dir}/build/autorequires",mode)
 
                 begin
+                  # Reads the autorequires file, then empties it
                   autorequires = []
                   autorequires += autoreq_fh.read.split("\n")
                   autoreq_fh.rewind

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

@@ -1,10 +1,10 @@
 module Simp; end
 module Simp::Rake; end
-module Simp::Rake::Helpers; end
-module Simp::Rake::Helpers::RPM_Spec
+class Simp::Rake::Helpers
+  module Simp::Rake::Helpers::RPM_Spec
 
-  def self.template
-    return <<-EOF
+    def self.template
+      return <<-EOF
 %{lua:
 
 --
@@ -295,6 +295,7 @@ else
   print((default_changelog:gsub('$(%w+)', default_lookup_table)))
 end
 }
-    EOF
+      EOF
+    end
   end
 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.4.0'
+  VERSION = '2.4.1'
 end

data/lib/simp/rpm.rb

@@ -65,7 +65,7 @@ module Simp
       rpm_cmd = "rpm -q --queryformat '%{NAME} %{VERSION} %{RELEASE}\n'"
 
       if mock_hash
-        rpm_cmd = mock_hash[:command] + ' ' + '"' + rpm_cmd + ' ' + mock_hash[:rpm_extras] + '"'
+        rpm_cmd = mock_hash[:command] + ' ' + '"' + rpm_cmd + ' ' + mock_hash[:rpm_extras] + ' 2>/dev/null "'
       end
 
       if File.readable?(rpm_source)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler