vanagon 0.3.19 → 0.4.0

data/spec/lib/vanagon/platform/rpm_spec.rb

@@ -1,8 +1,7 @@
-require 'vanagon/platform/rpm'
+require 'vanagon/platform'
 
 describe "Vanagon::Platform::RPM" do
-  let(:platforms) do
-    [
+  platforms =[
       {
         :name                   => "el-5-i386",
         :os_name                => "el",
@@ -10,6 +9,7 @@ describe "Vanagon::Platform::RPM" do
         :architecture           => "i386",
         :output_dir             => "el/5/products/i386",
         :output_dir_with_target => "el/5/thing/i386",
+        :block                  => %Q[ platform "el-5-i386" do |plat| end ]
       },
       {
         :name                   => "fedora-21-x86_64",
@@ -18,24 +18,44 @@ describe "Vanagon::Platform::RPM" do
         :architecture           => "x86_64",
         :output_dir             => "fedora/21/products/x86_64",
         :output_dir_with_target => "fedora/21/thing/x86_64",
+        :block                  => %Q[ platform "fedora-21-x86_64" do |plat| end ]
+      },
+      {
+        :name                   => "cisco-wrlinux-7-x86_64",
+        :os_name                => "fedora",
+        :os_version             => "21",
+        :architecture           => "x86_64",
+        :output_dir             => "cisco-wrlinux/7/products/x86_64",
+        :output_dir_with_target => "cisco-wrlinux/7/thing/x86_64",
+        :block                  => %Q[ platform "cisco-wrlinux-7-x86_64" do |plat| end ]
       },
     ]
-  end
 
-  describe "#output_dir" do
-    it "returns an output dir consistent with the packaging repo" do
-      platforms.each do |plat|
-        cur_plat = Vanagon::Platform::RPM.new(plat[:name])
-        expect(cur_plat.output_dir).to eq(plat[:output_dir])
+  platforms.each do |plat|
+    context "on #{plat[:name]} we should behave ourselves" do
+      let(:platform) { plat }
+      let(:cur_plat) { Vanagon::Platform::DSL.new(plat[:name]) }
+
+      before do
+        cur_plat.instance_eval(plat[:block])
       end
-    end
 
-    it "adds the target repo in the right way" do
-      platforms.each do |plat|
-        cur_plat = Vanagon::Platform::RPM.new(plat[:name])
-        expect(cur_plat.output_dir('thing')).to eq(plat[:output_dir_with_target])
+      describe "#output_dir" do
+        it "returns an output dir consistent with the packaging repo" do
+          expect(cur_plat._platform.output_dir).to eq(plat[:output_dir])
+        end
+
+        it "adds the target repo in the right way" do
+          expect(cur_plat._platform.output_dir('thing')).to eq(plat[:output_dir_with_target])
+        end
+      end
+
+      describe '#rpm_defines' do
+        it "removes dashes from the dist macro" do
+          expected_dist = "--define 'dist .#{cur_plat._platform.os_name.gsub('-', '_')}#{cur_plat._platform.os_version}'"
+          expect(cur_plat._platform.rpm_defines).to include(expected_dist)
+        end
       end
     end
   end
 end
-

data/templates/Makefile.erb

@@ -4,7 +4,7 @@ export SHELL := $(shell which bash)
 tempdir := $(shell mktemp -d -p /var/tmp 2>/dev/null || mktemp -d -t 'tmp')
 workdir := $(PWD)
 
-all: <%= package_name %>
+all: file-list-before-build <%= package_name %>
 
 <%= package_name %>: <%= @name %>-<%= @version %>.tar.gz
 	<%= generate_package.join("\n\t") %>
@@ -13,20 +13,20 @@ file-list-before-build:
 <%- if dirnames.empty? -%>
 	touch file-list-before-build
 <%- else -%>
-	(find -L <%= dirnames.join(' ') %> 2>/dev/null || find <%= dirnames.join(' ') %> -follow) | sort | uniq > file-list-before-build
+	(find -L <%= dirnames.join(' ') %> 2>/dev/null || find <%= dirnames.join(' ') %> -follow 2>/dev/null) | sort | uniq > file-list-before-build
 <%- end -%>
 
 file-list-after-build: <%= @components.map {|comp| comp.name }.join(" ") %>
 <%- if dirnames.empty? -%>
 	touch file-list-after-build
 <%- else -%>
-	(find -L <%= dirnames.join(' ') %>  2>/dev/null || find <%= dirnames.join(' ') %> -follow) | sort | uniq > file-list-after-build
+	(find -L <%= dirnames.join(' ') %>  2>/dev/null || find <%= dirnames.join(' ') %> -follow 2>/dev/null) | sort | uniq > file-list-after-build
 <%- end -%>
 
 <%= @name %>-<%= @version %>.tar.gz: file-list <%= @cleanup ? 'cleanup-components' : '' %>
 	<%= pack_tarball_command %>
 
-file-list: <%= dirnames.join(' ') %> <%= @name %>-project <%= @version_file ? @version_file.path : '' %>
+file-list: file-list-before-build <%= @name %>-project
 	comm -23 file-list-after-build file-list-before-build > file-list
 	comm -23 file-list-after-build file-list-before-build | sed -e 's/\(^.*[[:space:]].*$$\)/"\1"/g' > file-list-for-rpm
 
@@ -35,8 +35,14 @@ file-list: <%= dirnames.join(' ') %> <%= @name %>-project <%= @version_file ? @v
 	echo <%= @version %> > '<%= @version_file.path %>'
 <%- end -%>
 
+<%- if @bill_of_materials -%>
+<%= @bill_of_materials %>:
+	mkdir -p '<%= @bill_of_materials.path %>'
+	mv bill-of-materials '<%= @bill_of_materials.path %>'
+<%- end -%>
+
 <%- dirnames.each do |dir| -%>
-<%= dir %>:
+<%= dir %>: file-list-before-build
 	mkdir -p <%= dir %>
 <%- end %>
 
@@ -45,7 +51,7 @@ cleanup-components: <%= @components.map {|comp| "#{comp.name}-cleanup" }.join("
 	touch cleanup-components
 <%- end -%>
 
-<%= @name %>-project: file-list-after-build
+<%= @name %>-project: <%= dirnames.join(' ') %> <%= @version_file ? @version_file.path : '' %> <%= @bill_of_materials ? @bill_of_materials.path : '' %> file-list-after-build
 	touch <%= @name %>-project
 
 <%- @components.each do |comp| -%>

data/templates/deb/control.erb

@@ -15,7 +15,7 @@ Conflicts: <%= get_replaces.map { |replace| "#{replace.replacement} #{replace.ve
 Depends: <%= get_requires.join(", ") %>
 Provides: <%= get_provides.map { |prov| prov.provide }.join(", ") %>
 Description: <%= @description.lines.first.chomp %>
- <%= @description.lines[1..-1].join("\n\s") -%>
+ <%= @description.lines[1..-1].join("\s") -%>
  .
  Contains the following components:
  <%= generate_bill_of_materials.join("\n\s") %>

data/templates/deb/docs.erb

@@ -1 +1,3 @@
+<%- unless @bill_of_materials -%>
 bill-of-materials
+<%- end -%>

data/templates/deb/postinst.erb

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #
@@ -44,3 +43,13 @@ fi
     fi
   <%- end -%>
 <%- end -%>
+
+# Run postinstall scripts on install if defined
+if [ $1 = configure ] && [ -z $2 ] ; then
+  <%= get_postinstall_actions("install") %>
+fi
+
+# Run postinstall scripts on upgrade if defined
+if [ $1 = configure ] && [ -n $2 ] ; then
+  <%= get_postinstall_actions("upgrade") %>
+fi

data/templates/deb/postrm.erb

@@ -1,5 +1,15 @@
 #!/bin/bash
 
+# Run post-removal scripts on upgrade if defined
+if [ $1 = upgrade ] && [ -n $2 ] ; then
+  <%= get_postremove_actions("upgrade") %>
+fi
+
+# Run post-removal scripts on removal if defined
+if [ $1 = remove ] && [ -z $2 ] ; then
+  <%= get_postremove_actions("removal") %>
+fi
+
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #
@@ -11,5 +21,3 @@ if [ "$1" = "purge" ] ; then
 fi
   <%- end -%>
 <%- end -%>
-
-

data/templates/deb/preinst.erb

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Run preinstall scripts on install if defined
+if [ $1 = install ] && [ -z $2 ] ; then
+  <%= get_preinstall_actions("install") %>
+fi
+
+# Run preinstall scripts on upgrade if defined
+if [ $1 = upgrade ] && [ -n $2 ] ; then
+  <%= get_preinstall_actions("upgrade") %>
+fi

data/templates/deb/prerm.erb

@@ -1,5 +1,15 @@
 #!/bin/bash
 
+# Run pre-removal scripts on upgrade if defined
+if [ $1 = upgrade ] && [ -n $2 ] ; then
+  <%= get_preremove_actions("upgrade") %>
+fi
+
+# Run pre-removal scripts on removal if defined
+if [ $1 = remove ] && [ -z $2 ] ; then
+  <%= get_preremove_actions("removal") %>
+fi
+
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #

data/templates/deb/rules.erb

@@ -14,9 +14,9 @@ override_dh_auto_install:
 	fi
 <%- end -%>
 	# Copy each of the extra files into place
-<%- get_files.map {|f| f.path.sub(/^\//,'')}.each do |file| -%>
+<%- (get_files + get_configfiles).map {|f| f.path.sub(/^\//,'')}.each do |file| -%>
 	install -d debian/tmp/<%= File.dirname(file) %>
-	cp -p <%= file %> debian/tmp/<%= File.dirname(file) %>
+	cp -Rp <%= file %> debian/tmp/<%= File.dirname(file) %>
 <%- end -%>
 
 override_dh_shlibdeps:

data/templates/rpm/project.spec.erb

@@ -87,7 +87,7 @@ install -d %{buildroot}
 # Copy each of the extra files into place
 <%- (get_files + get_configfiles).map {|f| f.path.sub(/^\//,'')}.each do |file| -%>
   install -d %{buildroot}/<%= File.dirname(file) %>
-  cp -p <%= file %> %{buildroot}/<%= File.dirname(file) %>
+  cp -Rp <%= file %> %{buildroot}/<%= File.dirname(file) %>
 <%- end -%>
 
 <%- if @platform.is_cisco_wrlinux? || @platform.is_huaweios? -%>
@@ -114,10 +114,16 @@ for entry in `cat %{SOURCE1}`; do
   fi
 done
 
+
 %pre
-<%- get_preinstall_actions.each do |task| -%>
-<%= task %>
-<%- end -%>
+# Save state so we know later if this is an upgrade or an install
+mkdir -p %{_localstatedir}/lib/rpm-state/%{name}
+if [ $1 -eq 1 ] ; then
+  touch %{_localstatedir}/lib/rpm-state/%{name}/install
+fi
+if [ $1 -eq 2 ] ; then
+  touch %{_localstatedir}/lib/rpm-state/%{name}/upgrade
+fi
 
 <%- if @user -%>
 # Add our user and group
@@ -125,12 +131,29 @@ done
 <%= @platform.add_user(@user) %>
 <%- end -%>
 
+# Run preinstall scripts on install if defined
+if [ $1 -eq 1 ] ; then
+  <%= get_preinstall_actions("install") %>
+fi
+
+# Run preinstall scripts on upgrade if defined
+if [ $1 -eq 2 ] ; then
+  <%= get_preinstall_actions("upgrade") %>
+fi
+
+
 %post
 <%- if @platform.is_aix? || (@platform.is_el? && @platform.os_version.to_i == 4) -%>
-  ## EL-4 and AIX RPM don't have %posttrans, so we'll put them here
-  <%- get_postinstall_actions.each do |task| -%>
-    <%= task %>
-  <%- end -%>
+## EL-4 and AIX RPM don't have %posttrans, so we'll put them here
+# Run postinstall scripts on install if defined
+if [ $1 -eq 1 ] ; then
+  <%= get_postinstall_actions("install") %>
+fi
+
+# Run postinstall scripts on upgrade if defined
+if [ $1 -eq 2 ] ; then
+  <%= get_postinstall_actions("upgrade") %>
+fi
 <%- end -%>
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv vs smf vs aix
@@ -152,7 +175,18 @@ done
   <%- end -%>
 <%- end -%>
 
+
 %postun
+# Run post-uninstall scripts on upgrade if defined
+if [ $1 -eq 1 ] ; then
+  <%= get_postremove_actions("upgrade") %>
+fi
+
+# Run post-uninstall scripts on removal if defined
+if [ $1 -eq 0 ] ; then
+  <%= get_postremove_actions("removal") %>
+fi
+
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv vs smf vs aix
   #
@@ -174,7 +208,18 @@ done
   <%- end -%>
 <%- end -%>
 
+
 %preun
+# Run pre-uninstall scripts on upgrade if defined
+if [ $1 -eq 1 ] ; then
+  <%= get_preremove_actions("upgrade") %>
+fi
+
+# Run pre-uninstall scripts on removal if defined
+if [ $1 -eq 0 ] ; then
+  <%= get_preremove_actions("removal") %>
+fi
+
 <%- get_services.each do |service| -%>
   <%- if @platform.servicetype == "systemd" -%>
     <%- if @platform.is_sles? -%>
@@ -192,15 +237,26 @@ done
   <%- end -%>
 <%- end -%>
 
+
 <%- unless @platform.is_aix? || (@platform.is_el? && @platform.os_version.to_i == 4) -%>
 %posttrans
-  <%- get_postinstall_actions.each do |task| -%>
-    <%= task %>
-  <%- end -%>
+# Run post-transaction scripts on install if defined
+if [ -e %{_localstatedir}/lib/rpm-state/%{name}/install ] ; then
+  <%= get_postinstall_actions("install") %>
+  rm %{_localstatedir}/lib/rpm-state/%{name}/install
+fi
+
+# Run post-transaction scripts on upgrade if defined
+if [ -e %{_localstatedir}/lib/rpm-state/%{name}/upgrade ] ; then
+  <%= get_postinstall_actions("upgrade") %>
+  rm %{_localstatedir}/lib/rpm-state/%{name}/upgrade
+fi
 <%- end -%>
 
 %files -f %{SOURCE1}
+<%- unless @bill_of_materials -%>
 %doc bill-of-materials
+<%- end -%>
 %defattr(-, root, root, 0755)
 <%- get_directories.each do |dir| -%>
 %dir %attr(<%= dir.mode || "-" %>, <%= dir.owner || "-" %>, <%= dir.group || "-" %>) <%= dir.path %>

data/templates/solaris/11/p5m.erb

@@ -21,6 +21,18 @@ set name=variant.opensolaris.zone value=global value=nonglobal
 depend fmri=pkg:/<%= requirement %> type=require
 <%- end -%>
 
+# Always drop /etc, /usr, and /var, it will cause conflicts with other system packages
+<transform dir path=etc$ -> drop>
+<transform dir path=usr$ -> drop>
+<transform dir path=var$ -> drop>
+
+# (CPR-251) In solaris 11, /var/run is a symlink to /system/volatile, which
+# causes conflicts during package installation. To avoid this, we transform any
+# directory under /var/run to repoint under /system/volatile and drop
+# /system/volatile itself to avoid conflicts.
+<transform dir -> edit path var/run system/volatile>
+<transform dir path=system/volatile$ -> drop>
+
 <%- get_root_directories.each do |dir| -%>
 <transform dir path=<%= strip_and_escape(dir.split('/')[0..-2].join('/')) %>$ -> drop>
 <%- end -%>
@@ -35,8 +47,10 @@ depend fmri=pkg:/<%= requirement %> type=require
 set name=org.opensolaris.smf.fmri <%= get_services.map {|service| "value=svc:/#{service.name}"}.join(" ") %>
 <%- end -%>
 
+<%- unless @bill_of_materials -%>
 # Move the bill-of-materials into a docdir for the package to avoid conflicts
 <transform file path=bill-of-materials$ -> set path usr/share/doc/<%= @name %>/bill-of-materials>
+<%- end -%>
 
 <%- get_configfiles.each do |config| -%>
 # Preserve the old conf file on upgrade

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.4.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -77,6 +77,8 @@ files:
 - lib/vanagon/platform/dsl.rb
 - lib/vanagon/platform/osx.rb
 - lib/vanagon/platform/rpm.rb
+- lib/vanagon/platform/rpm/aix.rb
+- lib/vanagon/platform/rpm/sles.rb
 - lib/vanagon/platform/rpm/wrl.rb
 - lib/vanagon/platform/solaris_10.rb
 - lib/vanagon/platform/solaris_11.rb
@@ -99,6 +101,7 @@ files:
 - spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform_spec.rb
@@ -114,6 +117,7 @@ files:
 - templates/deb/install.erb
 - templates/deb/postinst.erb
 - templates/deb/postrm.erb
+- templates/deb/preinst.erb
 - templates/deb/prerm.erb
 - templates/deb/rules.erb
 - templates/osx/postinstall.erb
@@ -137,9 +141,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -147,9 +151,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
 - spec/lib/vanagon/common/pathname_spec.rb
@@ -164,9 +168,11 @@ test_files:
 - spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
+has_rdoc: