simp-rake-helpers 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f87a58cc38f4d236c1c66e94f9145377b430546
-  data.tar.gz: 1f2c7a736e3974a0ce72a65d778b8cd28c75f318
+  metadata.gz: 6c1179db907c046e2587aba51d6d8bafb4387ccd
+  data.tar.gz: a8b41cc9cb002d18a0bec544ea7389328198588d
 SHA512:
-  metadata.gz: 2649f7dc066a02e254e531bd3901b568f0e846892418276a30a5ccd190c3cadbcdb468372038aaf4df245512f6b4b2f4d5931729cb1505b0083db63eed49fea2
-  data.tar.gz: eea647a6d2f28d9ace0458b12119888a179cacb248807842486339cd04bd83bd9ddef879a5ffd3bfefec9187d371fd6b8d3ea2694902b0fd941e8465cd05ba90
+  metadata.gz: 85ebb2471f4f3648d3ab3235ad2c268daa8bc09466b76c28c649b7bcb6915be019f495d7e1dd42a25a5d7e48a8613e1da6821db0d18621a0f8efcf5b68db6b03
+  data.tar.gz: b35605270a2148c09f2ca1803c55703bacf4ff56223a343ecce39b3f1732e79463e30f20614db161e4fba522240e33795ff471bb118efa3b530ac1475a8d84fa

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 3.7.0 / 2017-07-10
+* Added compare_latest_tag task
+
 ### 3.6.0 / 2017-07-03
 * Added changelog_annotation task
 

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

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

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

@@ -146,6 +146,101 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
       puts changelog[module_version]
     end
 
+    desc <<-EOM
+    Compare to latest tag.
+      ARGS:
+        * :tags_source => Set to the remote from which the tags for this
+                      project can be fetched, e.g. 'upstream' for a
+                      forked project. Defaults to 'origin'.
+        * :ignore_owner => Execute comparison even if the project owner
+                      is not 'simp'.
+        * :verbose => Set to 'true' if you want to see detailed messages
+
+      NOTES:
+      Compares mission-impacting (significant) files with the latest
+      tag and identifies the relevant files that have changed.  
+
+      Does nothing if the project owner, as specified in the
+      metadata.json file, is not 'simp'.
+
+      When mission-impacting files have changed, fails if
+      (1) Latest version cannot be extracted from the top-most
+          CHANGELOG entry.
+      (2) The latest version in the CHANGELOG (minus the release
+          qualifier) does not match the version in the metadata.json
+          file.
+      (3) A version bump is required but not recorded in both the
+          CHANGELOG and metadata.json files.
+      (4) The latest version is < latest tag.
+
+      Changes to the following files/directories are not considered
+      significant:
+      - Any hidden file/directory (entry that begins with a '.')
+      - Gemfile
+      - Gemfile.lock
+      - Rakefile
+      - spec directory
+      - doc directory
+    EOM
+    task :compare_latest_tag, [:tags_source, :ignore_owner, :verbose] do |t,args|
+      require 'json'
+      require 'puppet/util/package'
+
+      tags_source = args[:tags_source].nil? ? 'origin' : args[:tags_source]
+      ignore_owner = true if args[:ignore_owner].to_s == 'true' 
+      verbose = true if args[:verbose].to_s == 'true' 
+
+      metadata = JSON.load(File.read('metadata.json'))
+      module_version = metadata['version']
+      owner =  metadata['name'].split('-')[0]
+
+      if (owner == 'simp') or ignore_owner
+        # determine last tag
+        `git fetch -t #{tags_source} 2>/dev/null`
+        tags = `git tag -l`.split("\n")
+        puts "Available tags from #{tags_source} = #{tags}" if verbose
+        tags.delete_if { |tag| tag.include?('-') or (tag =~ /^v/) }
+
+        if tags.empty?
+          puts "No tags exist from #{tags_source}"
+        else
+          last_tag = (tags.sort { |a,b| Puppet::Util::Package::versioncmp(a,b) })[-1]
+
+          # determine mission-impacting files that have changed
+          files_changed = `git diff tags/#{last_tag} --name-only`.strip.split("\n")
+          files_changed.delete_if do |file|
+            file[0] ==  '.' or file =~ /^Gemfile/ or file == 'Rakefile' or file =~/^spec\// or file =~/^doc/
+          end
+        
+          if files_changed.empty?
+            puts "  No new tag required: No significant files have changed since '#{last_tag}' tag"
+          else
+            # determine latest CHANGELOG version
+            line = IO.readlines('CHANGELOG')[0]
+            match = line.match(/^\*\s+((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{2} \d{4})\s+(.+<.+>)(?:\s+|\s*-\s*)?(\d+\.\d+\.\d+)/)
+            unless match
+              fail("ERROR: Invalid CHANGELOG entry. Unable to extract version from '#{line}'")
+            end
+
+            changelog_version = match[3]
+            unless module_version == changelog_version
+              fail("ERROR: Version mismatch.  module version=#{module_version}  changelog version=#{changelog_version}")
+            end
+
+            cmp_result = Puppet::Util::Package::versioncmp(module_version, last_tag)
+            if cmp_result < 0
+              fail("ERROR: Version regression. '#{module_version}' < last tag '#{last_tag}'")
+            elsif cmp_result == 0
+              fail("ERROR: Version update beyond last tag '#{last_tag}' is required for changes to #{files_changed}")
+            else
+              puts "  New tag of version '#{module_version}' is required for changes to #{files_changed}"
+            end
+          end
+        end
+      else     
+        puts "  Not evaluating module owned by '#{owner}'"
+      end
+    end
 
     desc "Run syntax, lint, and spec tests."
     task :test => [

metadata

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