simp-rake-helpers 5.1.4 → 5.2.0

data/lib/simp/rpm.rb

@@ -387,6 +387,8 @@ EOE
     end
 
     def self.create_rpm_build_metadata(project_dir, srpms=nil, rpms=nil)
+      require 'yaml' 
+
       last_build = {
         'git_hash' => %x(git rev-list --max-count=1 HEAD).chomp,
         'srpms'    => {},

data/spec/acceptance/nodesets/default.yml

@@ -13,6 +13,7 @@ HOSTS:
       - "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
       - "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
+      - 'yum install -y facter'
       # simp build-deps
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel mock rpmdevtools clamav which'
       - 'usermod -a -G mock build_user'
@@ -48,6 +49,7 @@ HOSTS:
       - "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
       - "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
+      - 'yum install -y facter'
       # simp build-deps
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel mock rpmdevtools clamav clamav-update which'
       - 'usermod -a -G mock build_user'

data/spec/acceptance/pkg_rpm_spec.rb

@@ -1,34 +1,23 @@
 require 'spec_helper_acceptance'
 
-env_vars = {
-  :default => '',
-  :simp4 => "SIMP_BUILD_version='4.3.1'",
-  :simp5 => "SIMP_BUILD_version='5.2.1'"
-}
 
 shared_examples_for "a RPM generator" do
-  it 'should create an RPM and remove the mock directory when SIMP_RAKE_MOCK_cleanup=yes' do
-    on test_host, %(#{run_cmd} "cd #{testpackage_dir}; #{env_vars[build_type]} SIMP_RAKE_MOCK_cleanup=yes rake pkg:rpm[epel-#{test_dist}-x86_64,true]")
-    on test_host, %(test -f #{testpackage_rpm})
-    on test_host, %(test -d /var/lib/mock/epel-#{test_dist}-x86_64-pupmod-simp-testpackage__$USER), {:acceptable_exit_codes => [1]}
-  end
-
   it 'should use specified release number for the RPM' do
-    on test_host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_release; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]")
+    on test_host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_release; rake pkg:rpm")
     release_test_rpm = File.join(pkg_root_dir, 'testpackage_with_release',
       'dist', 'pupmod-simp-testpackage-0.0.1-42.noarch.rpm')
     on test_host, %(test -f #{release_test_rpm})
   end
 
   it 'should generate a changelog for the RPM when no CHANGELOG exists' do
-    on test_host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_without_changelog; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]")
+    on test_host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_without_changelog; rake pkg:rpm")
     changelog_test_rpm = File.join(pkg_root_dir, 'testpackage_without_changelog',
       'dist', File.basename(testpackage_rpm))
     on test_host, %(rpm --changelog -qp #{changelog_test_rpm} | grep -q 'Auto Changelog')
   end
 
   it 'should not require pupmod-simp-simplib for simp-simplib RPM' do
-    on test_host, %(#{run_cmd} "cd #{pkg_root_dir}/simplib; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]")
+    on test_host, %(#{run_cmd} "cd #{pkg_root_dir}/simplib; rake pkg:rpm")
     simplib_rpm = File.join(pkg_root_dir, 'simplib', 'dist',
       File.basename(testpackage_rpm).gsub(/simp-testpackage-0.0.1/,'simp-simplib-1.2.3'))
     on test_host, %(test -f #{simplib_rpm})
@@ -37,7 +26,7 @@ shared_examples_for "a RPM generator" do
 
   it 'should not fail to create an RPM when the CHANGELOG has a bad date' do
     on test_host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_bad_changelog_date; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]")
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_bad_changelog_date; rake pkg:rpm")
 
     bad_date_test_rpm = File.join(pkg_root_dir, 'testpackage_with_bad_changelog_date',
       'dist', File.basename(testpackage_rpm))
@@ -46,77 +35,41 @@ shared_examples_for "a RPM generator" do
 
   it 'should fail to create an RPM when metadata.json is missing' do
     on test_host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_metadata_file; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]"),
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_metadata_file; rake pkg:rpm"),
       :acceptable_exit_codes => [1]
   end
 
   it 'should fail to create an RPM when license metadata is missing' do
     on test_host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_license; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]"),
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_license; rake pkg:rpm"),
       :acceptable_exit_codes => [1]
   end
 
   it 'should fail to create an RPM when name metadata is missing' do
     on test_host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_name; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]"),
-              :acceptable_exit_codes => [1]
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_name; rake pkg:rpm"),
+      :acceptable_exit_codes => [1]
   end
 
   it 'should fail to create an RPM when source metadata is missing' do
     on test_host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_source; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]"),
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_source; rake pkg:rpm"),
       :acceptable_exit_codes => [1]
   end
 
   it 'should fail to create an RPM when summary metadata is missing' do
     on test_host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_summary; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]"),
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_summary; rake pkg:rpm"),
       :acceptable_exit_codes => [1]
   end
 
   it 'should fail to create an RPM when version metadata is missing' do
     on test_host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_version; #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]"),
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_version; rake pkg:rpm"),
       :acceptable_exit_codes => [1]
   end
 end
 
-shared_examples_for "a pre-SIMP6 RPM generator" do
-  it "should create an RPM and leave the mock directory when SIMP_RAKE_MOCK_cleanup=no" do
-    comment "produces RPM"
-    on test_host, %(#{run_cmd} "cd #{testpackage_dir}; SIMP_RAKE_MOCK_cleanup=no #{env_vars[build_type]} rake pkg:rpm[epel-#{test_dist}-x86_64,true]")
-    on test_host, %(test -f #{testpackage_rpm})
-
-    comment "produces RPM with appropriate dependencies"
-    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-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")
-
-    comment "RPM generated does not require simp-adapter"
-    on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q simp-adapter), {:acceptable_exit_codes => [1]}
-
-    comment "produces RPM with a sourced CHANGELOG"
-    on test_host, %(rpm --changelog -qp #{testpackage_rpm} | grep -q Stallman)
-
-    comment "produces RPM without SIMP6-specific appropriate pre/post/preun/postun"
-    on test_host,
-      %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper"),
-      {:acceptable_exit_codes => [1]}
-
-    comment "keeps mock chroot when SIMP_RAKE_MOCK_cleanup=no"
-    on test_host, %(test -d /var/lib/mock/epel-#{test_dist}-x86_64-pupmod-simp-testpackage__build_user)
-  end
-
-  it "should handle variants" do
-    pending "removed code to pass variant to mock needs to be reinstated for this feature to work"
-    fail "INSERT CHECKING CODE HERE"
-  end
-end
-
 def comment(msg, indent=10)
   logger.optionally_color(Beaker::Logger::MAGENTA, " "*indent + msg)
 end
@@ -152,14 +105,8 @@ describe 'rake pkg:rpm' do
   let(:pkg_root_dir) { '/home/build_user/host_files/spec/acceptance/files' }
   let(:testpackage_dir) { '/home/build_user/host_files/spec/acceptance/files/testpackage' }
 
-  dists = ['6', '7']
-
   hosts.each do |host|
     context "rpm building on #{host}" do
-      before :each do
-        on host, 'mkdir -p -m 0755 /var/lib/mock'
-        on host, 'rm -rf /var/lib/mock/*', :accept_all_exit_codes => true
-      end
 
       context 'prep' do
         it 'should have a local copy of the test directory' do
@@ -174,81 +121,43 @@ describe 'rake pkg:rpm' do
 
       end
 
-      dists.each do |dist|
-        context "for #{dist} distribution using simpdefault.spec" 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-0.noarch.rpm') }
-
-          it 'should have a clean working environment' do
-            testpackages.each do |package|
-              on host, %(#{run_cmd} "cd #{pkg_root_dir}/#{package}; rake clean")
-            end
-          end
+      context "using simpdefault.spec" do
+        let(:test_host) { host }
+        let(:build_type) {:default}
+        let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-0.noarch.rpm') }
 
-          it "should create an RPM for #{dist} and leave the mock directory" do
-            comment "produces RPM"
-            on test_host, %(#{run_cmd} "cd #{testpackage_dir}; SIMP_RAKE_MOCK_cleanup=no rake pkg:rpm[epel-#{dist}-x86_64,true]")
-            on test_host, %(test -f #{testpackage_rpm})
-
-            comment "produces RPM with appropriate dependencies"
-            on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q simp-adapter)
-            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-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")
-
-            comment "produces RPM with a sourced CHANGELOG"
-            on test_host, %(rpm --changelog -qp #{testpackage_rpm} | grep -q Stallman)
-
-            comment "produces RPM with appropriate pre/post/preun/postun"
-            on test_host, %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='pre' --rpm_status=\\$1")
-            on test_host, %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='post' --rpm_status=\\$1")
-            on test_host, %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='preun' --rpm_status=\\$1")
-            on test_host, %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='postun' --rpm_status=\\$1")
-
-            comment "keeps mock chroot when SIMP_RAKE_MOCK_cleanup=no"
-            on test_host, %(test -d /var/lib/mock/epel-#{dist}-x86_64-pupmod-simp-testpackage__build_user)
+        it 'should have a clean working environment' do
+          testpackages.each do |package|
+            on host, %(#{run_cmd} "cd #{pkg_root_dir}/#{package}; rake clean")
           end
-
-          it_should_behave_like "a RPM generator"
         end
 
-        context "for #{dist} distribution using simp4.spec" 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-0.noarch.rpm') }
-
-          it 'should have a clean working environment' do
-            testpackages.each do |package|
-              on test_host, %(#{run_cmd} "cd #{pkg_root_dir}/#{package}; rake clean")
-            end
-          end
-
-          it_should_behave_like "a pre-SIMP6 RPM generator"
-          it_should_behave_like "a RPM generator"
+        it "should create an RPM" do
+          comment "produces RPM"
+          on test_host, %(#{run_cmd} "cd #{testpackage_dir}; rake pkg:rpm")
+          on test_host, %(test -f #{testpackage_rpm})
+
+          comment "produces RPM with appropriate dependencies"
+          on test_host, %(rpm -qpR #{testpackage_rpm} | grep -q simp-adapter)
+          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-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")
+
+          comment "produces RPM with a sourced CHANGELOG"
+          on test_host, %(rpm --changelog -qp #{testpackage_rpm} | grep -q Stallman)
+
+          comment "produces RPM with appropriate pre/post/preun/postun"
+          on test_host, %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='pre' --rpm_status=\\$1")
+          on test_host, %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='post' --rpm_status=\\$1")
+          on test_host, %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='preun' --rpm_status=\\$1")
+          on test_host, %(rpm -qp --scripts #{testpackage_rpm} | grep -q -x "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='postun' --rpm_status=\\$1")
         end
 
-        context "for #{dist} distribution using simp5.spec" 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-0.noarch.rpm') }
-
-          it 'should have a clean working environment' do
-            testpackages.each do |package|
-              on test_host, %(#{run_cmd} "cd #{pkg_root_dir}/#{package}; rake clean")
-            end
-          end
-
-          it_should_behave_like "a pre-SIMP6 RPM generator"
-          it_should_behave_like "a RPM generator"
-        end
+        it_should_behave_like "a RPM generator"
       end
     end
   end

data/spec/lib/simp/componentinfo_changelog_regex_spec.rb

@@ -0,0 +1,120 @@
+require 'simp/relchecks'
+require 'spec_helper'
+
+describe 'Simp::ComponentInfo changelog regex' do
+
+  context 'valid initial changelog lines' do
+    it 'matches a valid line with a hyphen before version' do
+      line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      result = line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)
+      expect( result ).to_not be nil
+      expect( result[1] ).to eq 'Mon Nov 06 2017'
+      expect( result[2] ).to eq 'Tom Smith <tom.smith@simp.com>'
+      expect( result[3] ).to eq '3.8.0'
+      expect( result[4] ).to eq '0'
+    end
+
+    it 'matches a valid line without a hyphen before version' do
+      line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com>  13.28.30-RC1 '
+      result = line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)
+      expect( result ).to_not be nil
+      expect( result[1] ).to eq 'Mon Nov 06 2017'
+      expect( result[2] ).to eq 'Tom Smith <tom.smith@simp.com>'
+      expect( result[3] ).to eq '13.28.30'
+      expect( result[4] ).to eq 'RC1'
+    end
+
+    it 'matches a valid line without release qualifier' do
+      line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0'
+      result = line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)
+      expect( result ).to_not be nil
+      expect( result[1] ).to eq 'Mon Nov 06 2017'
+      expect( result[2] ).to eq 'Tom Smith <tom.smith@simp.com>'
+      expect( result[3] ).to eq '3.8.0'
+      expect( result[4] ).to be nil
+    end
+  end
+
+  context 'invalid initial changelog lines' do
+    it "does not match line that does not begin with '*'" do
+      line = '- Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line with bad weekday' do
+      line = '* Tues Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line missing weekday' do
+      line = '* Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line with invalid month' do
+      line = '* Mon June 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line missing month' do
+      line = '* Mon 06 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line with single digit day' do
+      line = '* Mon Nov 6 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line with a too-large day' do
+      line = '* Mon Nov 46 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line missing day' do
+      line = '* Mon Nov 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line with a two-digit year' do
+      line = '* Mon Nov 01 17 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line with a too-large year' do
+      line = '* Mon Nov 01 20170 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line missing year' do
+      line = '* Mon Nov 01 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line missing author name' do
+      line = '* Mon Nov 01 2017 <tom.smith@simp.com> - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line missing author email address' do
+      line = '* Mon Nov 01 20170 Tom Smith - 3.8.0-0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line missing version' do
+      line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com>'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match line with a version less than 3 parts' do
+      line = '* Mon Nov 01 20170 Tom Smith <tom.smith@simp.com> - 3.8'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+    it 'does not match a valid line with more than 3 parts in the version' do
+      line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com>  3.8.0.0'
+      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+    end
+
+  end
+end

data/spec/lib/simp/componentinfo_spec.rb

@@ -0,0 +1,278 @@
+require 'simp/componentinfo'
+require 'spec_helper'
+
+describe Simp::ComponentInfo do
+  let(:files_dir) {
+    File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
+  }
+
+  context 'with valid module input' do
+    it 'loads version and changelog info' do
+      component_dir = File.join(files_dir, 'module')
+      info = Simp::ComponentInfo.new(component_dir)
+      expect( info.component_dir ).to eq component_dir
+      expect( info.type ).to eq :module
+      expect( info.version ).to eq '3.8.0'
+      expect( info.release ).to be nil
+      expected_changelog = [
+        {
+          :date => 'Wed Nov 15 2017',
+          :version => '3.8.0',
+          :release => '0',
+          :content => [
+            '* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0',
+            '- Disable deprecation warnings by default'
+          ]
+        },
+        {
+          :date => 'Mon Nov 06 2017',
+          :version => '3.8.0',
+          :release => '0',
+          :content => [
+            '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0',
+            '- Fixes split failure when "findmnt" does not exist on Linux'
+          ]
+        },
+        {
+          :date => 'Thu Oct 26 2017',
+          :version => '3.7.0',
+          :release => '0',
+          :content => [  # +changelog_date+:: Date string of the form <weekday> <month> <day> <year>
+
+            '* Thu Oct 26 2017 Mary Jones <mary.jones@simp.com> - 3.7.0-0',
+            '- Add Mod::Macaddress data type'
+          ]
+        },
+        {
+          :date => 'Tue Sep 26 2017',
+          :version => '3.6.0',
+          :release => '0',
+          :content => [
+            '* Tue Sep 26 2017 Joe Brown <joe.brown@simp.com> - 3.6.0-0',
+            "- Convert all 'sysctl' 'kernel.shm*' entries to Strings",
+            '  - shmall and shmmax were causing Facter and newer versions of Puppet to crash',
+            '  - See FACT-1732 for additional information',
+            '- Add Puppet function `mod::assert_metadata_os()`'
+          ]
+        }
+      ]
+      expect(info.changelog).to eq expected_changelog
+    end
+
+    it 'loads version and latest changelog info' do
+      component_dir = File.join(files_dir, 'module')
+      info = Simp::ComponentInfo.new(component_dir, true)
+      expect( info.component_dir ).to eq component_dir
+      expect( info.type ).to eq :module
+      expect( info.version ).to eq '3.8.0'
+      expect( info.release ).to be nil
+      expected_changelog = [
+        {
+          :date => 'Wed Nov 15 2017',
+          :version => '3.8.0',
+          :release => '0',
+          :content => [
+            '* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0',
+            '- Disable deprecation warnings by default'
+          ]
+        },
+        {
+          :date => 'Mon Nov 06 2017',
+          :version => '3.8.0',
+          :release => '0',
+          :content => [
+            '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0',
+            '- Fixes split failure when "findmnt" does not exist on Linux'
+          ]
+        }
+      ]
+      expect(info.changelog).to eq expected_changelog
+    end
+  end
+
+  context 'with invalid module input' do
+    it 'fails when metadata.json is malformed' do
+      component_dir = File.join(files_dir, 'module_with_malformed_metadata')
+      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+        JSON::ParserError)
+    end
+
+    it 'fails when version is missing from metadata.json' do
+      component_dir = File.join(files_dir, 'module_missing_version_metadata')
+      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+        /Version missing from .*module_missing_version_metadata\/metadata.json/)
+    end
+
+    it 'fails when module CHANGELOG is missing' do
+      component_dir = File.join(files_dir, 'module_without_changelog')
+      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+        /No CHANGELOG file found in .*module_without_changelog/)
+    end
+
+    it 'fails when any changelog entry version is > top-most version' do
+      component_dir = File.join(files_dir, 'module_with_version_misordered_entries')
+      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+        /ERROR:  Changelog entries are not properly version ordered/)
+    end
+
+    it 'fails when changelog entry dates are not ordered newest to oldest' do
+      component_dir = File.join(files_dir, 'module_with_date_misordered_entries')
+      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+        /ERROR:  Changelog entries are not properly date ordered/)
+    end
+
+    it 'stops processing upon first malformed changelog signature' do
+      component_dir = File.join(files_dir, 'module_with_invalid_entries')
+      info = Simp::ComponentInfo.new(component_dir)
+      expected_changelog = [
+        {
+          :date => 'Wed Nov 15 2017',
+          :version => '3.8.0',
+          :release => '0',
+          :content => [
+            '* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0',
+            '- Disable deprecation warnings by default'
+          ]
+        }
+      ]
+      expect(info.changelog).to eq expected_changelog
+    end
+
+    it 'stops processing upon first invalid changelog weekday' do
+      component_dir = File.join(files_dir, 'module_with_invalid_weekday_entry')
+      info = Simp::ComponentInfo.new(component_dir)
+      expected_changelog = [
+        {
+          :date => 'Thu Nov 16 2017',
+          :version => '3.8.0',
+          :release => '0',
+          :content => [
+            '* Thu Nov 16 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0',
+            '- Disable deprecation warnings by default'
+          ]
+        }
+      ]
+      expect(info.changelog).to eq expected_changelog
+    end
+  end
+
+  context 'with valid asset input' do
+   it 'loads version, release and changelog info from a single-package spec file' do
+      component_dir = File.join(files_dir, 'asset_with_single_package')
+      info = Simp::ComponentInfo.new(component_dir, true)
+      expect( info.component_dir ).to eq component_dir
+      expect( info.type ).to eq :asset
+      expect( info.version ).to eq '1.0.0'
+      expect( info.release ).to eq '1'
+      expected_changelog = [
+        {
+          :date => 'Wed Oct 18 2017',
+          :version => '1.0.0',
+          :release => '1',
+          :content => [
+            '* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-1',
+            '- Fix installed file permissions'
+          ]
+        }
+      ]
+      expect(info.changelog).to eq expected_changelog
+    end
+
+    it 'loads version, release, and changelog info for primary package from a multi-package spec file' do
+      component_dir = File.join(files_dir, 'asset_with_multiple_packages')
+      info = Simp::ComponentInfo.new(component_dir)
+      expect( info.component_dir ).to eq component_dir
+      expect( info.type ).to eq :asset
+      expect( info.version ).to eq '4.0.3'
+      expect( info.release ).to eq '0'
+      expected_changelog = [
+        {
+          :date => 'Thu Aug 31 2017',
+          :version => '4.0.3',
+          :release => nil,
+          :content => [
+            '* Thu Aug 31 2017 Jane Doe <jane.doe@simp.com> - 4.0.3',
+            '- Fix bug Z',
+            '  - Thanks to Lilia Smith for the PR!'
+          ]
+        },
+        {
+          :date => 'Mon Jun 12 2017',
+          :version => '4.0.3',
+          :release => nil,
+          :content => [
+            '* Mon Jun 12 2017 Jane Doe <jane.doe@simp.com> - 4.0.3',
+            '- Prompt user for new input'
+          ]
+        },
+        {
+          :date => 'Fri Jun 02 2017',
+          :version => '4.0.2',
+          :release => '0',
+          :content => [
+            '* Fri Jun 02 2017 Jim Jones <jim.jones@simp.com> - 4.0.2-0',
+            '- Expand X',
+            '- Fix Y'
+          ]
+        }
+      ]
+      expect(info.changelog).to eq expected_changelog
+    end
+
+    it 'loads version, release, and changelog info when release includes distribution' do
+      component_dir = File.join(files_dir, 'asset_with_dist_in_release')
+      info = Simp::ComponentInfo.new(component_dir)
+      expect( info.component_dir ).to eq component_dir
+      expect( info.type ).to eq :asset
+      expect( info.version ).to eq '1.0.0'
+      expect( info.release ).to match /0/
+      expected_changelog = [
+        {
+          :date => 'Wed Oct 18 2017',
+          :version => '1.0.0',
+          :release => '0',
+          :content => [
+            '* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0',
+            '- Package with distribution in release tag'
+          ]
+        }
+      ]
+      expect(info.changelog).to eq expected_changelog
+    end
+  end
+
+ # Since same changelog parsing code is used for module and
+ # RPM changelog content, only focus on the errors not already
+ # tested above.
+  context 'with invalid asset input' do
+    it 'fails when asset RPM spec file is missing' do
+      component_dir = File.join(files_dir, 'asset_without_spec_file')
+      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+        /No RPM spec file found in .*asset_without_spec_file\/build/)
+   end
+
+   it 'fails when more than 1 asset RPM spec file is found' do
+     component_dir = File.join(files_dir, 'asset_with_two_spec_files')
+     expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+       /More than 1 RPM spec file found:/)
+   end
+
+   it 'fails when version is missing from asset RPM spec file' do
+     component_dir = File.join(files_dir, 'asset_missing_version')
+     expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+       /Could not extract version and release from /)
+   end
+
+   it 'fails when release is missing from asset RPM spec file' do
+     component_dir = File.join(files_dir, 'asset_missing_release')
+     expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
+       /Could not extract version and release from /)
+   end
+
+   # This has to be a case in which version and release can be read
+   # from spec file but the changelog (which is optional) can't.  Could
+   # be mocked, but would like a real-world test case.
+   xit 'fails when changelog cannot be read from asset RPM spec file'
+
+  end
+end