simp-rake-helpers 5.1.4 → 5.2.0

data/spec/lib/simp/relchecks_compare_latest_tag_spec.rb

@@ -0,0 +1,89 @@
+require 'simp/relchecks'
+require 'spec_helper'
+
+describe 'Simp::RelChecks.compare_latest_tag' do
+  let(:files_dir) {
+    File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
+  }
+
+  let(:component_dir) {  File.join(files_dir, 'module') }
+
+  context 'with no project errors' do
+    it 'reports no tags for a project with no tags' do
+      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
+      Simp::RelChecks.expects(:`).with('git tag -l').returns("\n")
+
+      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
+        to output("  No tags exist from origin\n").to_stdout
+    end
+
+    it 'reports no new tag required when no files have changed' do
+      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
+      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0-pre\n1.0.0\n1.1.0\n")
+      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns("\n")
+
+      msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
+      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
+        to output(msg).to_stdout
+    end
+
+    it 'reports no new tag required when no significant files have changed' do
+      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
+      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\nv1.0.1\n1.1.0\n")
+      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns(
+        ".travis.yml\nRakefile\nGemfile.lock\nspec/some_spec.rb\ndoc/index.html\n")
+
+      msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
+      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
+        to output(msg).to_stdout
+    end
+
+    it 'reports a new tag is required for significant changes with bumped version' do
+      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
+      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.1.0-RC01\n")
+      Simp::RelChecks.expects(:`).with('git diff tags/1.0.0 --name-only').returns(
+         "CHANGELOG\nmetadata.json\nmanifest/init.pp\n")
+
+      msg = <<-EOM
+NOTICE: New tag of version '1.1.0' is required for 3 changed files:
+  * CHANGELOG
+  * metadata.json
+  * manifest/init.pp
+      EOM
+
+      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
+        to output(msg).to_stdout
+    end
+  end
+
+  context 'with project errors' do
+    it 'fails when latest version < latest tag' do
+      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
+      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.2.0\n")
+      Simp::RelChecks.expects(:`).with('git diff tags/1.2.0 --name-only').returns(
+         "CHANGELOG\nmetadata.json\nmanifest/init.pp\n")
+
+      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
+        to raise_error(/ERROR: Version regression. '1\.1\.0' < last tag '1\.2\.0'/)
+    end
+
+    it 'fails when significant file changes need a version bump' do
+      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
+      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.1.0\n")
+      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns(
+         "manifest/init.pp\n")
+
+      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
+        to raise_error(/ERROR: Version update beyond last tag '1.1.0' is required for 1 changed files:/)
+    end
+
+    # spot check just one of many failures handled by
+    # Simp::RelCheck.load_and_validate_changelog, as that method is 
+    # extensively tested elsewhere.
+    it 'fails when module info cannot be loaded' do
+      comp_dir = File.join(files_dir, 'module_without_changelo')
+      expect{ Simp::RelChecks.compare_latest_tag(comp_dir) }.
+        to raise_error(/No RPM spec file found in/ )
+    end
+  end
+end

data/spec/lib/simp/relchecks_create_tag_changelog_spec.rb

@@ -0,0 +1,143 @@
+require 'simp/relchecks'
+require 'spec_helper'
+
+describe 'Simp::RelChecks.create_tag_changelog' do
+  let(:files_dir) {
+    File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
+  }
+
+  describe '.create_tag_changelog' do
+    context 'with valid module input' do
+      it 'creates tag changelog from single changelog entry for latest version' do
+        component_dir = File.join(files_dir, 'module_with_single_entry')
+        module_changelog = Simp::RelChecks.create_tag_changelog(component_dir)
+        expected = <<EOM
+
+Release of 3.8.0
+
+* Tue Jun 20 2017 Mary Jones <mary.jones@simp.com> - 3.8.0
+  - Added a define, mod::instance
+    - Creates standalone connections with their own configurations
+      and services
+    - Adds systemd support
+  - Updated puppet requirement in metadata.json
+EOM
+        expect(module_changelog).to eq expected
+      end
+
+      it 'creates tag changelog from multiple changelog entries for latest version' do
+        component_dir = File.join(files_dir, 'module_with_multiple_entries')
+        module_changelog = Simp::RelChecks.create_tag_changelog(component_dir)
+        expected = <<EOM
+
+Release of 3.8.0
+
+* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0
+  - Disable deprecation warnings by default
+
+* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0
+  - Fixes split failure when "findmnt" does not exist on Linux
+EOM
+        expect(module_changelog).to eq expected
+      end
+    end
+
+    context 'with invalid module input' do
+      it 'fails when module info cannot be loaded' do
+        component_dir = File.join(files_dir, 'module_without_changelog')
+        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          /No CHANGELOG file found in .*module_without_changelog/)
+      end
+
+      it 'fails if no valid entry for the version can be found' do
+        component_dir = File.join(files_dir, 'module_with_no_entry_for_version')
+        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          /No valid changelog entry for version 4.0.0 found/)
+      end
+
+      it 'fails if entry with newer version than metadata.json is found' do
+        component_dir = File.join(files_dir, 'module_with_newer_changelog_entry')
+        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          /Changelog entry for version > 3.8.0 found:/)
+      end
+
+      it "fails if dates are out of order for the version's changelog entries" do
+        component_dir = File.join(files_dir, 'module_with_misordered_entries')
+        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          /ERROR:  Changelog entries are not properly date ordered/)
+      end
+    end
+
+    context 'with valid asset input' do
+      # since much of the changelog parsing code is shared between
+      # module and asset changelog processing, here we will focus on
+      # the parts of the code unique to asset changelog extraction
+      it 'creates tag changelog from a changelog entry for latest version for a single-package spec file' do
+        component_dir = File.join(files_dir, 'asset_with_single_package')
+        asset_changelog = Simp::RelChecks.create_tag_changelog(component_dir)
+        expected = <<EOM
+
+Release of 1.0.0
+
+* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0
+  - Single package
+EOM
+        expect(asset_changelog).to eq expected
+      end
+
+      it 'creates tag changelog from primary package changelog entries for latest version for a multi-package spec file' do
+        component_dir = File.join(files_dir, 'asset_with_multiple_packages')
+        asset_changelog = Simp::RelChecks.create_tag_changelog(component_dir)
+        expected = <<EOM
+
+Release of 4.0.3
+
+* Thu Aug 31 2017 Jane Doe <jane.doe@simp.com> - 4.0.3
+  - Fix bug Z
+    - Thanks to Lilia Smith for the PR!
+
+* Mon Jun 12 2017 Jane Doe <jane.doe@simp.com> - 4.0.3
+  - Prompt user for new input
+EOM
+        expect(asset_changelog).to eq expected
+      end
+
+      it 'creates tag changelog from a changelog entry for latest version when release includes distribution' do
+        component_dir = File.join(files_dir, 'asset_with_dist_in_release')
+        asset_changelog = Simp::RelChecks.create_tag_changelog(component_dir)
+        expected = <<EOM
+
+Release of 1.0.0
+
+* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0
+  - Package with distribution in release tag
+EOM
+        expect(asset_changelog).to eq expected
+      end
+    end
+
+    context 'with invalid asset input' do
+
+      it 'fails when asset info cannot be loaded' do
+        component_dir = File.join(files_dir, 'asset_without_spec_file')
+        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          /No RPM spec file found in .*asset_without_spec_file\/build/)
+      end
+
+      it 'fails when changelog is missing from asset RPM spec file' do
+        #NOTE:  %changelog is optional in a spec file.  So this error
+        #       is not found when the changelog is read from the spec
+        #       file, but, instead, during post-validation
+        component_dir = File.join(files_dir, 'asset_missing_changelog')
+        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          /No valid changelog entry for version 1.0.0 found/)
+      end
+
+      it 'fails when release tag and release in changelog from asset RPM spec file are mismatched' do
+        component_dir = File.join(files_dir, 'asset_mismatched_release')
+        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          /Version release does not match/)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.2.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -403,6 +403,7 @@ files:
 - README.md
 - Rakefile
 - bin/simp_rake_helpers
+- lib/simp/componentinfo.rb
 - lib/simp/rake.rb
 - lib/simp/rake/build/auto.rb
 - lib/simp/rake/build/build.rb
@@ -431,6 +432,7 @@ files:
 - lib/simp/rake/pkg.rb
 - lib/simp/rake/pupmod/helpers.rb
 - lib/simp/rake/rubygem.rb
+- lib/simp/relchecks.rb
 - lib/simp/rpm.rb
 - lib/simp/yum.rb
 - spec/acceptance/files/simplib/CHANGELOG
@@ -478,7 +480,52 @@ files:
 - spec/acceptance/files/testpackage_without_changelog/metadata.json
 - spec/acceptance/nodesets/default.yml
 - spec/acceptance/pkg_rpm_spec.rb
+- spec/lib/simp/componentinfo_changelog_regex_spec.rb
+- spec/lib/simp/componentinfo_spec.rb
 - spec/lib/simp/files/build/testpackage.spec
+- spec/lib/simp/files/componentinfo_spec/asset_missing_release/build/asset_missing_release.spec
+- spec/lib/simp/files/componentinfo_spec/asset_missing_version/build/asset_missing_version.spec
+- spec/lib/simp/files/componentinfo_spec/asset_with_dist_in_release/build/asset_with_dist_in_release.spec
+- spec/lib/simp/files/componentinfo_spec/asset_with_multiple_packages/build/asset_with_multiple_packages.spec
+- spec/lib/simp/files/componentinfo_spec/asset_with_single_package/build/asset_with_single_package.spec
+- spec/lib/simp/files/componentinfo_spec/asset_with_two_spec_files/build/asseta.spec
+- spec/lib/simp/files/componentinfo_spec/asset_with_two_spec_files/build/assetb.spec
+- spec/lib/simp/files/componentinfo_spec/asset_without_spec_file/build/README
+- spec/lib/simp/files/componentinfo_spec/module/CHANGELOG
+- spec/lib/simp/files/componentinfo_spec/module/metadata.json
+- spec/lib/simp/files/componentinfo_spec/module_missing_version_metadata/CHANGELOG
+- spec/lib/simp/files/componentinfo_spec/module_missing_version_metadata/metadata.json
+- spec/lib/simp/files/componentinfo_spec/module_with_date_misordered_entries/CHANGELOG
+- spec/lib/simp/files/componentinfo_spec/module_with_date_misordered_entries/metadata.json
+- spec/lib/simp/files/componentinfo_spec/module_with_invalid_entries/CHANGELOG
+- spec/lib/simp/files/componentinfo_spec/module_with_invalid_entries/metadata.json
+- spec/lib/simp/files/componentinfo_spec/module_with_invalid_weekday_entry/CHANGELOG
+- spec/lib/simp/files/componentinfo_spec/module_with_invalid_weekday_entry/metadata.json
+- spec/lib/simp/files/componentinfo_spec/module_with_malformed_metadata/CHANGELOG
+- spec/lib/simp/files/componentinfo_spec/module_with_malformed_metadata/metadata.json
+- spec/lib/simp/files/componentinfo_spec/module_with_version_misordered_entries/CHANGELOG
+- spec/lib/simp/files/componentinfo_spec/module_with_version_misordered_entries/metadata.json
+- spec/lib/simp/files/componentinfo_spec/module_without_changelog/metadata.json
+- spec/lib/simp/files/relchecks_compare_latest_tag_spec/module/CHANGELOG
+- spec/lib/simp/files/relchecks_compare_latest_tag_spec/module/metadata.json
+- spec/lib/simp/files/relchecks_compare_latest_tag_spec/module_without_changelog/metadata.json
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/asset_mismatched_release/build/asset_mismatched_release.spec
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/asset_missing_changelog/build/asset_missing_changelog.spec
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/asset_with_dist_in_release/build/asset_with_dist_in_release.spec
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/asset_with_multiple_packages/build/asset_with_multiple_packages.spec
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/asset_with_single_package/build/asset_with_single_package.spec
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/asset_without_spec_file/build/README
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_misordered_entries/CHANGELOG
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_misordered_entries/metadata.json
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_multiple_entries/CHANGELOG
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_multiple_entries/metadata.json
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_newer_changelog_entry/CHANGELOG
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_newer_changelog_entry/metadata.json
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_no_entry_for_version/CHANGELOG
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_no_entry_for_version/metadata.json
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_single_entry/CHANGELOG
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_single_entry/metadata.json
+- spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_without_changelog/metadata.json
 - spec/lib/simp/files/simp_build/src/assets/simp/build/simp.spec
 - spec/lib/simp/files/testpackage-1-0.el7.noarch.rpm
 - spec/lib/simp/files/testpackage-1-0.noarch.rpm
@@ -535,6 +582,8 @@ files:
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb
 - spec/lib/simp/rake/pupmod/helpers_spec.rb
 - spec/lib/simp/rake_spec.rb
+- spec/lib/simp/relchecks_compare_latest_tag_spec.rb
+- spec/lib/simp/relchecks_create_tag_changelog_spec.rb
 - spec/lib/simp/rpm_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_acceptance.rb