simp-rake-helpers 4.0.1 → 4.1.0

data/lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec

@@ -41,13 +41,10 @@ package_version = "UNKNOWN"
 module_license = "UNKNOWN"
 
 --
--- Default to 2016
--- This was done due to the change in naming scheme across all of the modules.
--- The '.1' bump is there for the SIMP 6 path changes
+-- Default to 0
 --
 
-package_release = '2016.1'
-
+package_release = 0
 }
 
 %{lua:
@@ -209,6 +206,8 @@ if req_file then
 end
 }
 
+%global _binaries_in_noarch_packages_terminate_build 0
+
 %define module_name %{lua: print(module_name)}
 %define package_name %{lua: print(package_name)}
 
@@ -287,12 +286,14 @@ mkdir -p %{buildroot}/%{prefix}
 curdir=`pwd`
 dirname=`basename $curdir`
 cp -r ../$dirname %{buildroot}/%{prefix}/%{module_name}
+
+# Remove unnecessary assets
 rm -rf %{buildroot}/%{prefix}/%{module_name}/.git
-rm -f %{buildroot}/%{prefix}/*.lock
-rm -rf %{buildroot}/%{prefix}/spec/fixtures/modules
-rm -rf %{buildroot}/%{prefix}/dist
-rm -rf %{buildroot}/%{prefix}/junit
-rm -rf %{buildroot}/%{prefix}/log
+rm -f %{buildroot}/%{prefix}/%{module_name}/*.lock
+rm -rf %{buildroot}/%{prefix}/%{module_name}/spec/fixtures/modules
+rm -rf %{buildroot}/%{prefix}/%{module_name}/dist
+rm -rf %{buildroot}/%{prefix}/%{module_name}/junit
+rm -rf %{buildroot}/%{prefix}/%{module_name}/log
 
 %clean
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}

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

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

data/lib/simp/rake/pkg.rb

@@ -48,7 +48,9 @@ module Simp::Rake
       @clean_list          = []
       @ignore_changes_list = [
         'Gemfile.lock',
-        'spec/fixtures/modules'
+        'spec/fixtures/modules',
+        'build/rpm_metadata',          # this is generated
+        'build/rpm_metadata/requires'  # this is generated
       ]
       @chroot_name         = unique_name
 

data/spec/acceptance/pkg_rpm_spec.rb

@@ -91,8 +91,8 @@ shared_examples_for "a pre-SIMP6 RPM generator" do
     on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-foo)
     on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-simplib)
     on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-puppetlabs-stdlib)
-    on test_host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x "pupmod-testpackage = 0.0.1-2016")
-    on test_host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x "simp-testpackage = 0.0.1-2016")
+    on test_host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x "pupmod-testpackage = 0.0.1-0")
+    on test_host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x "simp-testpackage = 0.0.1-0")
     on test_host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^pupmod-testpackage")
     on test_host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^simp-testpackage")
 
@@ -179,7 +179,7 @@ describe 'rake pkg:rpm' do
           let(:test_host) { host }
           let(:test_dist) { dist }
           let(:build_type) {:default}
-          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-2016.1.noarch.rpm') }
+          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-0.noarch.rpm') }
 
           it 'should have a clean working environment' do
             testpackages.each do |package|
@@ -197,8 +197,8 @@ describe 'rake pkg:rpm' do
             on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-foo)
             on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-simplib)
             on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-puppetlabs-stdlib)
-            on test_host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x "pupmod-testpackage = 0.0.1-2016.1")
-            on test_host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x "simp-testpackage = 0.0.1-2016.1")
+            on test_host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x "pupmod-testpackage = 0.0.1-0")
+            on test_host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x "simp-testpackage = 0.0.1-0")
             on test_host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^pupmod-testpackage")
             on test_host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^simp-testpackage")
 
@@ -222,7 +222,7 @@ describe 'rake pkg:rpm' do
           let(:test_host) { host }
           let(:test_dist) { dist }
           let(:build_type) { :simp4 }
-          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-2016.noarch.rpm') }
+          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-0.noarch.rpm') }
 
           it 'should have a clean working environment' do
             testpackages.each do |package|
@@ -238,7 +238,7 @@ describe 'rake pkg:rpm' do
           let(:test_host) { host }
           let(:test_dist) { dist }
           let(:build_type) { :simp5 }
-          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-2016.noarch.rpm') }
+          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-0.noarch.rpm') }
 
           it 'should have a clean working environment' do
             testpackages.each do |package|

data/spec/lib/simp/rake/build/files/changed_name_mod/metadata.json

@@ -0,0 +1,65 @@
+{
+  "name": "newowner-changed_name_mod",
+  "version": "5.2.0",
+  "source": "https://github.com/newowner/puppet-changed_name_mod",
+  "author": "newowner",
+  "license": "Apache-2.0",
+  "summary": "Module for changed_name",
+  "description": "Module for changed_name",
+  "project_page": "https://github.com/newowner/puppet-changed_name_mod",
+  "issues_url": "https://github.com/newowner/puppet-changed_name_mod/issues",
+  "dependencies": [
+    {
+      "name": "foo1/bar1",
+      "version_requirement": "1.0.0"
+    },
+    {
+      "name": "foo2/bar2",
+      "version_requirement": "> 2.0.0"
+    },
+    {
+      "name": "foo3/bar3",
+      "version_requirement": "< 3.0.0"
+    },
+    {
+      "name": "foo4/bar4",
+      "version_requirement": ">= 4.0.0 < 5.0.0"
+    },
+    {
+      "name": "foo5/bar5",
+      "version_requirement": "5.x"
+    },
+    {
+      "name": "foo6/bar6",
+      "version_requirement": "6.4.x"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.3.2"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=3.2.0 <4.3.0"
+    }
+  ]
+}

data/spec/lib/simp/rake/build/files/dependencies.yaml

@@ -0,0 +1,36 @@
+# This file holds a list of RPM dependencies that apply to Puppet module RPMs.
+#
+# This is specifically needed since we do not want to fork any external modules
+# if at all possible.
+#
+# Requirement versions are pulled directly from the metadata.json file in the module
+---
+'changed_name_mod':
+  :obsoletes:
+    'pupmod-oldowner-changed_name_mod': '2.5.0-2016.1'
+  :requires:
+    - 'pupmod-foo1-bar1'
+    - 'pupmod-foo2-bar2'
+    - 'pupmod-foo3-bar3'
+    - 'pupmod-foo4-bar4'
+    - 'pupmod-foo5-bar5'
+    - 'pupmod-foo6-bar6'
+'managed_mod':
+  :requires:
+    # does NOT include puppetlabs/apt
+    - 'pupmod-puppetlabs-stdlib'
+    - 'pupmod-ceritsc-yum'
+    - 'pupmod-richardc-datacat'
+'obsoletes_too_new_mod':
+  :obsoletes:
+    'pupmod-oldowner-obsoletes_too_new_mod': '2.5.0-2016.1'
+  :requires:
+    - 'pupmod-foo1-bar1'
+    - 'pupmod-foo2-bar2'
+'unknown_dep_mod':
+  :requires:
+    - 'pupmod-foo1-bar1'
+    - 'pupmod-oops-unknown'
+'malformed_dep_meta_mod':
+  :requires:
+    - 'pupmod-foo1-bar1'

data/spec/lib/simp/rake/build/files/malformed_dep_meta_mod/metadata.json

@@ -0,0 +1,45 @@
+{
+  "name": "newowner-malformed_dep_meta_mod",
+  "version": "5.2.0",
+  "source": "https://github.com/newowner/puppet-malformed_dep_meta_mod",
+  "author": "newowner",
+  "license": "Apache-2.0",
+  "summary": "Module for malformed_dep_meta",
+  "description": "Module for malformed_dep_meta",
+  "project_page": "https://github.com/newowner/puppet-malformed_dep_meta_mod",
+  "issues_url": "https://github.com/newowner/puppet-malformed_dep_meta_mod/issues",
+  "dependencies": [
+    {
+      "name": "foo1/bar1",
+      "version_requirement": "1.0.0.1"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.3.2"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=3.2.0 <4.3.0"
+    }
+  ]
+}

data/spec/lib/simp/rake/build/files/managed_mod/metadata.json

@@ -0,0 +1,57 @@
+{
+  "name": "owner-managed_mod",
+  "version": "0.11.0",
+  "source": "https://github.com/owner/puppet-managed_mod",
+  "author": "owner",
+  "license": "Apache-2.0",
+  "summary": "Module for managed_mod",
+  "description": "Module for managed_mod",
+  "project_page": "https://github.com/owner/puppet-managed_mod",
+  "issues_url": "https://github.com/owner/puppet-managed_mod/issues",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 3.2.0 < 5.0.0"
+    },
+    {
+      "name": "puppetlabs/apt",
+      "version_requirement": ">= 1.4.0 < 3.0.0"
+    },
+    {
+      "name": "ceritsc/yum",
+      "version_requirement": ">= 0.9.6 < 1.0.0"
+    },
+    {
+      "name": "richardc/datacat",
+      "version_requirement": ">= 0.6.2 < 1.0.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.3.2"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=3.2.0 <4.3.0"
+    }
+  ]
+}

data/spec/lib/simp/rake/build/files/obsoletes_too_new_mod/metadata.json

@@ -0,0 +1,49 @@
+{
+  "name": "oldowner-obsoletes_too_new_mod",
+  "version": "2.5.0",
+  "source": "https://github.com/oldowner/puppet-obsoletes_too_new_mod",
+  "author": "oldowner",
+  "license": "Apache-2.0",
+  "summary": "Module for obsoletes_too_new",
+  "description": "Module for obsoletes_too_new",
+  "project_page": "https://github.com/oldowner/puppet-obsoletes_too_new_mod",
+  "issues_url": "https://github.com/oldowner/puppet-obsoletes_too_new_mod/issues",
+  "dependencies": [
+    {
+      "name": "foo1/bar1",
+      "version_requirement": "1.0.0"
+    },
+    {
+      "name": "foo2/bar2",
+      "version_requirement": "> 2.0.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.3.2"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=3.2.0 <4.3.0"
+    }
+  ]
+}

data/spec/lib/simp/rake/build/files/unknown_dep_mod/metadata.json

@@ -0,0 +1,45 @@
+{
+  "name": "owner-unknown_dep_mod",
+  "version": "5.2.0",
+  "source": "https://github.com/owner/puppet-unknown_dep_mod",
+  "author": "owner",
+  "license": "Apache-2.0",
+  "summary": "Module for unknown_dep",
+  "description": "Module for unknown_dep",
+  "project_page": "https://github.com/owner/puppet-unknown_dep_mod",
+  "issues_url": "https://github.com/owner/puppet-unknown_dep_mod/issues",
+  "dependencies": [
+    {
+      "name": "foo1/bar1",
+      "version_requirement": "1.0.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.3.2"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=3.2.0 <4.3.0"
+    }
+  ]
+}

data/spec/lib/simp/rake/build/files/unmanaged_mod/build/rpm_metadata/requires

@@ -0,0 +1,9 @@
+Obsoletes: pupmod-unmanaged_mod-test >= 0.0.1
+Requires: pupmod-puppetlabs-inifile < 2.0.0-0
+Requires: pupmod-puppetlabs-inifile >= 1.6.0-0
+Requires: pupmod-puppetlabs-postgresql < 5.0.0-0
+Requires: pupmod-puppetlabs-postgresql >= 4.8.0-0
+Requires: pupmod-puppetlabs-puppetdb < 6.0.0-0
+Requires: pupmod-puppetlabs-puppetdb >= 5.1.2-0
+Requires: pupmod-puppetlabs-stdlib < 5.0.0-0
+Requires: pupmod-puppetlabs-stdlib >= 4.13.1-0

data/spec/lib/simp/rake/build/files/unmanaged_mod/metadata.json

@@ -0,0 +1,50 @@
+{
+  "name": "owner-unmanaged_mod",
+  "version": "4.1.0",
+  "author": "owner",
+  "summary": "The unmanaged_mod module",
+  "license": "Apache-2.0",
+  "source": "https://github.com/owner/pupmod-unmanaged_mod",
+  "project_page": "https://github.com/owner/pupmod-unmanaged_mod",
+  "issues_url": "https://github.com/owner/puppet-unmanaged_mod/issues",
+  "dependencies": [
+    {
+      "name": "puppetlabs/inifile",
+      "version_requirement": ">= 1.6.0 < 2.0.0"
+    },
+    {
+      "name": "puppetlabs/puppetdb",
+      "version_requirement": ">= 5.1.2 < 6.0.0"
+    },
+    {
+      "name": "puppetlabs/postgresql",
+      "version_requirement": ">= 4.8.0 < 5.0.0"
+    },
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 5.0.0"
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 4.7.0 < 5.0.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ]
+}