simp-rake-helpers 5.6.2 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81eff52b592008f011ce1cbf7906a2de2b5a0b1a
-  data.tar.gz: 8b23f1eee1426b3966dcfdd5497c12842393f54c
+  metadata.gz: 8a8658433c3ae0b91d796125582eab9ce67ce0e7
+  data.tar.gz: 82920a327f2f34bb31a3e1ba1abbbd8f71b06fc4
 SHA512:
-  metadata.gz: b95308bf18a70abc0ed3e6c9c1141a2d93657ead6538b0d3672b23653ca1b80af049a9639d32022137d1a51ffa06f7de4e3c2ffe5e168a45442ebf7b5748ac4c
-  data.tar.gz: c9d08045244a15fdd38c5ee09d1600a0d17a3dea637273fba9b3a8dcf9a1e381cfc2165da69e45f635c16bcf016596664c1e2927cd094fc725d439e45bc27277
+  metadata.gz: 011655550ccfafa645a3dc4f0b4160c7413c5a487f1739fe66dd9481e408bc1a6c9ea029d626784cde2a4371795120200d8d900582d147ca6f8edec60a8a9739
+  data.tar.gz: 8ad330b2c6af2373c750123d5ff6765426b98644bca04e0b449c855296320862f34bb0614650166042232ee1e758a369a5798a5b5daba00248e0ff8a0b13e49f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 5.7.0 / 2018-12-05
+* Move use of simp_rpm_helper from %post to %postrans, to fix
+  a bug in which files that should have been removed from the old
+  version during RPM upgrade are copied.
+
+### 5.6.3 / 2018-10-30
+* Add information about the distribution OS to the simp-packer `vars.json`.
+* Add builder version information to the simp-packer `vars.json`.
+* Refactor writing the vars.json to its own method.
+
 ### 5.6.2 / 2018-10-02
 * Refactor 'dev' GPG signing key logic into `Simp::LocalGpgSigningKey`
 * Add acceptance tests for GPG logic and `rake pkg:signrpms`

data/lib/simp/packer/iso_vars_json.rb

@@ -0,0 +1,87 @@
+require 'simp/rake/helpers/version'
+require 'digest'
+require 'json'
+
+module Simp
+  module Packer
+    # Write a `vars.json` file to accompany a SIMP ISO
+    class IsoVarsJson
+      # SemVer data version of file
+      #
+      #   (Starting at 1.0.0, because earlier formats didn't include versions)
+      VARS_FORMAT_VERSION = '1.0.0'.freeze
+
+      # @param file           [String] path to iso file
+      # @param target_release [String] SIMP release to build (e.g., '6.X')
+      #   This is a key from the build's `release_mappings.yaml` in simp-core
+      # @param target_data    [Hash] Unpacked hash of isos and metadata
+      #   The metadata is in the format returned by
+      #   Simp::Build::ReleaseMapper#autoscan_unpack_list
+      # @param opts           [Hash] extra options
+      def initialize(iso, target_release, target_data, opts = {})
+        @iso            = iso
+        @target_release = target_release
+        @target_data    = target_data
+        @opts           = opts
+        @opts[:silent] ||= false
+      end
+
+      # Returns a SHA256 checksum of iso file
+      # @param file [String] path to file
+      # @return [String] SHA256 sum of ISO
+      def sha256sum(file)
+        unless @opts[:silent]
+          puts
+          puts '=' * 80
+          puts "#### Checksumming (SHA256) #{file}..."
+          puts '=' * 80
+          puts
+        end
+
+        Digest::SHA256.file(file).hexdigest
+      end
+
+      # Returns a versioned vars.json data structure
+      # @return [Hash] vars data structure
+      def data
+        sum = sha256sum(@iso)
+        box_distro_release = "SIMP-#{@target_release}-#{@target_data['flavor']}-#{@target_data['os_version']}"
+        {
+          'simp_vars_version'   => VARS_FORMAT_VERSION,
+          'box_simp_release'    => @target_release,
+          'box_distro_release'  => box_distro_release,
+          'iso_url'             => @iso,
+          'iso_checksum'        => sum,
+          'iso_checksum_type'   => 'sha256',
+          'new_password'        => 'suP3rP@ssw0r!suP3rP@ssw0r!suP3rP@ssw0r!',
+          'output_directory'    => './OUTPUT',
+          'dist_os_flavor'      => @target_data['flavor'],
+          'dist_os_version'     => @target_data['os_version'],
+          'dist_os_maj_version' => @target_data['os_version'].split('.').first,
+          'dist_source_isos'    => @target_data['isos'].map { |x| File.basename(x) }.join(':'),
+          'git_commit'          => %x(git rev-parse --verify HEAD).strip,
+          'packer_src_type'     => 'simp-iso',
+          'iso_builder'         => 'rubygem-simp-rake-helpers',
+          'iso_builder_version' => Simp::Rake::Helpers::VERSION
+        }
+      end
+
+      # Write data to a vars.json file for simp-packer to use
+      #
+      # @param file [String] path to vars.json file to write
+      #   (Defaults to the same path as the .iso, with a `.json` extension)
+      def write(vars_file = @iso.sub(%r{.iso$}, '.json'))
+        unless @opts[:silent]
+          puts
+          puts '=' * 80
+          puts '#### Writing packer vars data to:'
+          puts "       '#{vars_file}'"
+          puts '=' * 80
+          puts
+        end
+
+        File.open(vars_file, 'w') { |f| f.puts data.to_json }
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ require 'simp/rake'
 require 'json'
 require 'simp/rake/build/constants'
 require 'simp/rake/helpers'
+require 'simp/packer/iso_vars_json'
 
 include Simp::Rake
 
@@ -102,7 +103,7 @@ module Simp::Rake::Build
           - SIMP_BUILD_staging_dir    => Path to stage big build assets
                                          [Default: './SIMP_ISO_STAGING']
           - SIMP_BUILD_rm_staging_dir => 'no' do not forcibly remove the staging dir before starting
-          - SIMP_BUILD_overlay        => 'no' uses an existing DVD overlay if found 
+          - SIMP_BUILD_overlay        => 'no' uses an existing DVD overlay if found
           - SIMP_BUILD_force_dirty    => 'yes' tries to checks out subrepos even if dirty
           - SIMP_BUILD_docs           => 'yes' builds & includes documentation
           - SIMP_BUILD_checkout       => 'no' will skip the git repo checkouts
@@ -113,7 +114,6 @@ module Simp::Rake::Build
           - SIMP_BUILD_iso_name       => Renames the output ISO filename [Default: false]
           - SIMP_BUILD_iso_tag        => Appended to the output ISO's filename [Default: false]
           - SIMP_BUILD_verbose        => 'yes' enables verbose reporting. [Default: 'no']
-          - SIMP_BUILD_packer_vars    => Write a packer vars.json to go with this ISO [Default: 'yes']
           - SIMP_BUILD_signing_key    => The name of the GPG key to use to sign packages. [Default: 'dev']
         EOM
 
@@ -139,7 +139,6 @@ module Simp::Rake::Build
           target_release   = args[:release]
           do_checksum      = (args.do_checksum = ~ /^$/ ? 'false' : args.do_checksum)
           key_name         = args[:key_name]
-          do_packer_vars   = ENV.fetch('SIMP_BUILD_packer_vars', 'yes') == 'yes'
           verbose          = ENV.fetch('SIMP_BUILD_verbose', 'no') == 'yes'
           prompt           = ENV.fetch('SIMP_BUILD_prompt', 'yes') != 'no'
           method           = ENV.fetch('SIMP_BUILD_puppetfile','tracking')
@@ -412,34 +411,8 @@ module Simp::Rake::Build
             FileUtils.mkdir_p File.dirname(iso), :verbose => verbose
             FileUtils.mv(@simp_output_iso, iso, :verbose => verbose)
 
-            # write vars.json for packer build
-            # --------------------------------------
-            vars_file = iso.sub(/.iso$/, '.json')
-            puts
-            puts '='*80
-            puts "#### Checksumming #{iso}..."
-            puts '='*80
-            puts
-
-            sum = `sha256sum "#{iso}"`.split(/ +/).first
-
-            puts
-            puts '='*80
-            puts "#### Writing packer data to:"
-            puts "       '#{vars_file}'"
-            puts '='*80
-            puts
-            box_distro_release = "SIMP-#{target_release}-#{File.basename(target_data['isos'].first).sub(/\.iso$/,'').sub(/-x86_64/,'')}"
-            packer_vars = {
-              'box_simp_release'   => target_release,
-              'box_distro_release' => box_distro_release,
-              'iso_url'            => iso,
-              'iso_checksum'       => sum,
-              'iso_checksum_type'  => 'sha256',
-              'new_password'       => 'suP3rP@ssw0r!suP3rP@ssw0r!suP3rP@ssw0r!',
-              'output_directory'   => './OUTPUT',
-            }
-            File.open(vars_file, 'w'){|f| f.puts packer_vars.to_json }
+            var_json = Simp::Packer::IsoVarsJson.new(iso, target_release, target_data, {})
+            var_json.write
 
             puts
             puts '='*80
@@ -557,6 +530,8 @@ module Simp::Rake::Build
         end
         FileUtils.mkdir_p staging_dir, :verbose => verbose
       end
+
+
     end
   end
 end

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

@@ -328,10 +328,10 @@ URL:       %{lua: print(module_source)}
 BuildRoot: %{_tmppath}/%{package_name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 
-Requires(pre): simp-adapter >= 0.0.1
-Requires(preun): simp-adapter >= 0.0.1
-Requires(preun): simp-adapter >= 0.0.1
-Requires(postun): simp-adapter >= 0.0.1
+Requires(pre): simp-adapter >= 0.1.1
+Requires(preun): simp-adapter >= 0.1.1
+Requires(preun): simp-adapter >= 0.1.1
+Requires(posttrans): simp-adapter >= 0.1.1
 
 %{lua: print(module_requires)}
 
@@ -485,11 +485,14 @@ mkdir -p %{buildroot}/%{prefix}
   -- This function should be called last
   --
   function declare_default_scriptlets(custom_content_table, declared_scriptlets_table)
+    local marker_dir = '%{_localstatedir}/lib/rpm-state/simp-adapter'
+    local marker_file = marker_dir..'/rpm_status$1.'..module_name
+
+
     local DEFAULT_SCRIPTLETS = {
-      ['pre']    = {upgrade = 2},
-      ['post']   = {upgrade = 2},
-      ['preun']  = {upgrade = 0},
-      ['postun'] = {upgrade = 0}
+      ['pre']    = {upgrade = 2, custom='mkdir -p '..marker_dir..'\ntouch '..marker_file..'\n'},
+      ['preun']  = {upgrade = 0, custom=''},
+      ['postun'] = {upgrade = 0, custom=''}
     }
     local rpm_dir = rpm.expand('%{prefix}/' .. module_name)
 
@@ -498,6 +501,7 @@ mkdir -p %{buildroot}/%{prefix}
         '# (default scriptlet for SIMP 6.x)\n'..
         '# when $1 = 1, this is an install\n'..
         '# when $1 = '.. data.upgrade ..', this is an upgrade\n'..
+        data.custom ..
         'if [ -x /usr/local/sbin/simp_rpm_helper ] ; then\n'..
         '  /usr/local/sbin/simp_rpm_helper --rpm_dir='..
         rpm_dir.." --rpm_section='"..name.."' --rpm_status=$1\n"..
@@ -506,6 +510,30 @@ mkdir -p %{buildroot}/%{prefix}
 
       define_custom_content(content, custom_content_table, declared_scriptlets_table)
     end
+
+    local install_marker_file = marker_dir..'/rpm_status1.'..module_name
+    local upgrade_marker_file = marker_dir..'/rpm_status2.'..module_name
+    local posttrans_content = ('%posttrans\n'..
+      '# (default scriptlet for SIMP 6.x)\n'..
+      '# Marker file is created in %pre and only exists for installs or upgrades\n'..
+      "# when marker file is prepended with 'rpm_status1.', this is an install\n"..
+      "# when marker file is prepended with 'rpm_status2.', this is an upgrade\n"..
+      'if [ -e '..install_marker_file..' ] ; then\n'..
+      '  rm '..install_marker_file..'\n'..
+      '  if [ -x /usr/local/sbin/simp_rpm_helper ] ; then\n'..
+      '    /usr/local/sbin/simp_rpm_helper --rpm_dir='..
+      rpm_dir.." --rpm_section='posttrans' --rpm_status=1\n"..
+      '  fi\n'..
+      'elif [ -e '..upgrade_marker_file..' ] ; then\n'..
+      '  rm '..upgrade_marker_file..'\n'..
+      '  if [ -x /usr/local/sbin/simp_rpm_helper ] ; then\n'..
+      '    /usr/local/sbin/simp_rpm_helper --rpm_dir='..
+      rpm_dir.." --rpm_section='posttrans' --rpm_status=2\n"..
+      '  fi\n'..
+      'fi\n\n'
+    )
+
+    define_custom_content(posttrans_content, custom_content_table, declared_scriptlets_table)
   end
 
 

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

@@ -328,10 +328,10 @@ URL:       %{lua: print(module_source)}
 BuildRoot: %{_tmppath}/%{package_name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 
-Requires(pre): simp-adapter >= 0.0.1
-Requires(preun): simp-adapter >= 0.0.1
-Requires(preun): simp-adapter >= 0.0.1
-Requires(postun): simp-adapter >= 0.0.1
+Requires(pre): simp-adapter >= 0.1.1
+Requires(preun): simp-adapter >= 0.1.1
+Requires(preun): simp-adapter >= 0.1.1
+Requires(posttrans): simp-adapter >= 0.1.1
 
 %{lua: print(module_requires)}
 
@@ -485,11 +485,14 @@ mkdir -p %{buildroot}/%{prefix}
   -- This function should be called last
   --
   function declare_default_scriptlets(custom_content_table, declared_scriptlets_table)
+    local marker_dir = '%{_localstatedir}/lib/rpm-state/simp-adapter'
+    local marker_file = marker_dir..'/rpm_status$1.'..module_name
+
+
     local DEFAULT_SCRIPTLETS = {
-      ['pre']    = {upgrade = 2},
-      ['post']   = {upgrade = 2},
-      ['preun']  = {upgrade = 0},
-      ['postun'] = {upgrade = 0}
+      ['pre']    = {upgrade = 2, custom='mkdir -p '..marker_dir..'\ntouch '..marker_file..'\n'},
+      ['preun']  = {upgrade = 0, custom=''},
+      ['postun'] = {upgrade = 0, custom=''}
     }
     local rpm_dir = rpm.expand('%{prefix}/' .. module_name)
 
@@ -498,6 +501,7 @@ mkdir -p %{buildroot}/%{prefix}
         '# (default scriptlet for SIMP 6.x)\n'..
         '# when $1 = 1, this is an install\n'..
         '# when $1 = '.. data.upgrade ..', this is an upgrade\n'..
+        data.custom ..
         'if [ -x /usr/local/sbin/simp_rpm_helper ] ; then\n'..
         '  /usr/local/sbin/simp_rpm_helper --rpm_dir='..
         rpm_dir.." --rpm_section='"..name.."' --rpm_status=$1\n"..
@@ -506,6 +510,30 @@ mkdir -p %{buildroot}/%{prefix}
 
       define_custom_content(content, custom_content_table, declared_scriptlets_table)
     end
+
+    local install_marker_file = marker_dir..'/rpm_status1.'..module_name
+    local upgrade_marker_file = marker_dir..'/rpm_status2.'..module_name
+    local posttrans_content = ('%posttrans\n'..
+      '# (default scriptlet for SIMP 6.x)\n'..
+      '# Marker file is created in %pre and only exists for installs or upgrades\n'..
+      "# when marker file is prepended with 'rpm_status1.', this is an install\n"..
+      "# when marker file is prepended with 'rpm_status2.', this is an upgrade\n"..
+      'if [ -e '..install_marker_file..' ] ; then\n'..
+      '  rm '..install_marker_file..'\n'..
+      '  if [ -x /usr/local/sbin/simp_rpm_helper ] ; then\n'..
+      '    /usr/local/sbin/simp_rpm_helper --rpm_dir='..
+      rpm_dir.." --rpm_section='posttrans' --rpm_status=1\n"..
+      '  fi\n'..
+      'elif [ -e '..upgrade_marker_file..' ] ; then\n'..
+      '  rm '..upgrade_marker_file..'\n'..
+      '  if [ -x /usr/local/sbin/simp_rpm_helper ] ; then\n'..
+      '    /usr/local/sbin/simp_rpm_helper --rpm_dir='..
+      rpm_dir.." --rpm_section='posttrans' --rpm_status=2\n"..
+      '  fi\n'..
+      'fi\n\n'
+    )
+
+    define_custom_content(posttrans_content, custom_content_table, declared_scriptlets_table)
   end
 
 

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

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

data/spec/acceptance/00_pkg_rpm_custom_scriptlets_spec.rb

@@ -18,7 +18,7 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
     expect(scriptlets.keys.sort).to eq [
       'pretrans',
       'preinstall',
-      'postinstall',
+      'posttrans',
       'preuninstall',
       'postuninstall',
     ].sort
@@ -34,8 +34,8 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
       "echo 'I override the default %%pre section provided by the spec file.'"
     )
 
-    comment '...remaining default scriptlets call simp_rpm_helper with correct arguments'
-    expected_simp_rpm_helper_scriptlets = scriptlet_label_map.select{|k,v| %w(post preun postun).include? v }
+    comment '...default preun postun scriptlets call simp_rpm_helper with correct arguments'
+    expected_simp_rpm_helper_scriptlets = scriptlet_label_map.select{|k,v| %w(preun postun).include? v }
     expected_simp_rpm_helper_scriptlets.each do |rpm_label, simp_helper_label|
       expected = <<EOM
 if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
@@ -44,6 +44,22 @@ fi
 EOM
       expect(scriptlets[rpm_label][:bare_content]).to eq(expected.strip)
     end
+
+    comment '...default posttrans scriptlet calls simp_rpm_helper with correct arguments'
+    expected = <<EOM
+if [ -e %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status1.testpackage ] ; then
+  rm %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status1.testpackage
+  if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
+    /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='posttrans' --rpm_status=1
+  fi
+elif [ -e %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status2.testpackage ] ; then
+  rm %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status2.testpackage
+  if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
+    /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='posttrans' --rpm_status=2
+  fi
+fi
+EOM
+    expect(scriptlets['posttrans'][:bare_content]).to eq(expected.strip)
   end
 end
 

data/spec/acceptance/10_pkg_rpm_spec.rb

@@ -135,14 +135,58 @@ describe 'rake pkg:rpm' do
             comment 'produces RPM with a sourced CHANGELOG'
             on host, %(rpm --changelog -qp #{testpackage_rpm} | grep -q Stallman)
 
-            comment 'produces RPM with appropriate pre/post/preun/postun'
-            result = on host, %(rpm -qp --scripts #{testpackage_rpm})
-            scriptlets = result.stdout.scan( %r{^.*?scriptlet.*?/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage.*?fi$}m )
-
-            expect( scriptlets.grep( %r{\Apreinstall scriptlet.*  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='pre' --rpm_status=\$1}m )).not_to be_empty
-            expect( scriptlets.grep( %r{\Apostinstall scriptlet.*  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='post' --rpm_status=\$1}m )).not_to be_empty
-            expect( scriptlets.grep( %r{\Apreuninstall scriptlet.*  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='preun' --rpm_status=\$1}m )).not_to be_empty
-            expect( scriptlets.grep( %r{\Apostuninstall scriptlet.*  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='postun' --rpm_status=\$1}m )).not_to be_empty
+            comment 'produces RPM with appropriate pre/preun/postun/posttrans'
+            scriptlets = rpm_scriptlets_for(host, testpackage_rpm)
+
+            comment '...the expected scriptlet types are present'
+            expect(scriptlets.keys.sort).to eq [
+              'preinstall',
+              'preuninstall',
+              'postuninstall',
+              'posttrans',
+            ].sort
+
+            comment '...default preinstall scriptlet'
+            expected =<<-EOM
+mkdir -p %{_localstatedir}/lib/rpm-state/simp-adapter
+touch %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status$1.testpackage
+if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
+  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='pre' --rpm_status=$1
+fi
+            EOM
+            expect(scriptlets['preinstall'][:bare_content]).to eq( expected.strip )
+
+            comment '...default preuninstall scriptlet'
+            expected =<<-EOM
+if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
+  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='preun' --rpm_status=$1
+fi
+            EOM
+            expect(scriptlets['preuninstall'][:bare_content]).to eq( expected.strip )
+
+            comment '...default postuninstall scriptlet'
+            expected =<<-EOM
+if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
+  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='postun' --rpm_status=$1
+fi
+            EOM
+            expect(scriptlets['postuninstall'][:bare_content]).to eq( expected.strip )
+
+            comment '...default posttrans scriptlet'
+            expected =<<-EOM
+if [ -e %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status1.testpackage ] ; then
+  rm %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status1.testpackage
+  if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
+    /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='posttrans' --rpm_status=1
+  fi
+elif [ -e %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status2.testpackage ] ; then
+  rm %{_localstatedir}/lib/rpm-state/simp-adapter/rpm_status2.testpackage
+  if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
+    /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='posttrans' --rpm_status=2
+  fi
+fi
+            EOM
+            expect(scriptlets['posttrans'][:bare_content]).to eq( expected.strip )
           end
 
           it_should_behave_like 'an RPM generator with edge cases'