simp-rake-helpers 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0804d79f5af26fb909c8f9dbe745c503515ed72c
-  data.tar.gz: b0fbb44adfee8b3ea53f15a88715ae33289eaaf5
+  metadata.gz: cae0e7eed768a9536207962b3291397e21e5824c
+  data.tar.gz: 5a787d0b7846d9bee07dd63698e26fd2d35eebb2
 SHA512:
-  metadata.gz: 4c59fd53d33e24218a21cad227ea27d01052d152c0e016cf4632b85688d12501755ced61c6d30bec16fba5c97ec8f53b1557abf84b4cd18d9897a4cb37657504
-  data.tar.gz: b431ebc4958b3de9e4e279fd079611d91de79f2f0f2302925076ca5fc69963ecf02b12a3b6a1ffea98d39e9e70d201f071401f5b0529e3dfe770ba333b8525c3
+  metadata.gz: 424c5d0a81a0801799a244bc81c2fe15e9d2025c4b9fd7182b72fe591395b4a7dfce623ea5e2f825ff5d4b7eac025e00911f8fa4469f113a491f1506a829ad8c
+  data.tar.gz: 3a416aa1cef6aad13cd1ed527aba288c346f4cc139872310d9d11b9f57b28f1cfeb8305cc2b242fe58a7bb91afbbf3e73b19579db3bf5631c4f5f90fd832850a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.4.2 / 2016-07-13
+* Ensure that RPM names are properly structured between SIMP and non-SIMP RPMs
+* Make sure that the install path is proper
+
 ### 2.4.1 / 2016-07-05
 * Fixed a misnamed variable causing build failures
 

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

@@ -55,17 +55,24 @@ module_requires = ''
 
 local name_match = string.match(metadata, '"name":%s+"(.-)"%s*,')
 
+install_name = ''
+
 if name_match then
   local i = 0
   for str in string.gmatch(name_match,'[^-]+') do
-    if i ~= 0 then
-      if i == 1 then
-        module_name = str
+    if i == 0 then
+      if str ~= 'simp' then
+        module_name = ('pupmod-' .. str)
       else
-        module_name = (module_name .. '-' .. str)
+        module_name = 'pupmod'
       end
+    else
+      module_name = (module_name .. '-' .. str)
     end
 
+-- We want the last dash split item as our module path name
+    install_name = str
+
     i = i+1
   end
 end
@@ -160,8 +167,8 @@ if req_file then
 end
 }
 
-%define module_name %{lua: print(module_name)}
-%define base_name pupmod-%{module_name}
+%define install_name %{lua: print(install_name)}
+%define base_name %{lua: print(module_name)}
 
 %{lua:
 -- Determine which Variant we are going to build
@@ -205,7 +212,7 @@ else
 end
 }
 
-Summary:   %{module_name} Puppet Module
+Summary:   %{install_name} Puppet Module
 %if 0%{?_variant:1}
 Name:      %{base_name}-%{_variant}
 %else
@@ -253,7 +260,7 @@ rm -rf log
 
 curdir=`pwd`
 dirname=`basename $curdir`
-cp -r ../$dirname %{buildroot}/%{prefix}/%{module_name}
+cp -r ../$dirname %{buildroot}/%{prefix}/%{install_name}
 
 %clean
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
@@ -262,7 +269,7 @@ mkdir -p %{buildroot}/%{prefix}
 
 %files
 %defattr(0640,root,%{puppet_user},0750)
-%{prefix}/%{module_name}
+%{prefix}/%{install_name}
 
 %changelog
 %{lua:

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.1'
+  VERSION = '2.4.2'
 end

metadata

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