simp-rake-helpers 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23fa671eda74bc0725c373a76fc45fd4ae2cda88
-  data.tar.gz: 94add5ebc004fc24c4eb31b23002722b2e7f372f
+  metadata.gz: b5744cb65933374c507bd8494480b6831d2d91dd
+  data.tar.gz: 00f0e5320287b4fb03c8c8fd31dc6b288d2ddf2c
 SHA512:
-  metadata.gz: d9ca3f462ee816e218ab1a36d6585d6bf8bede6e5b40378c81873be6f98a6d722b61a8039a15facbabac47283214cfca75cc2bc721cfcff64bca5882bb380917
-  data.tar.gz: e174c5625f4dee82df208cfca252e1bbd465c7ab0e7bbde3123655a1328a01700131b7cdc9b49a793eccc5f794ec3afbeb89bd5f7cb90b1a4ce418289ad86230
+  metadata.gz: da17f4c7cc829e748abc8a3b756c5c06d5735fc23d717541edaf69ab57415b946ef25e00f2de8cc958128aaa20874d689e1630005133b201bf1cfc58a5de80bf
+  data.tar.gz: 02bff5f622fe3aa892d1ec78526e160956de12ea440fe1a47b560f5717364a90e11b0185a7d615db9db2e3c0b4d710b8c4877c223bf298a4edf4b830ac5bc896

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 3.4.0 / 2017-03-17
+* Added a Rake task `pkg:check_version` that can be run in any module to
+  determine if it needs to have either the metadata.json or the CHANGELOG
+  version bumped
+* Should be looped and manually reviewed as a pre-build task
+
 ### 3.3.0 / 2017-02-28
 * Modified to no longer add the SIMP Dev key into the GPGKEYS directory and
   instead add it to the root level of the DVD for local reference.

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

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

data/lib/simp/rake/pkg.rb

@@ -105,6 +105,7 @@ module Simp::Rake
       define_pkg_srpm
       define_pkg_rpm
       define_pkg_scrub
+      define_pkg_check_version
       task :default => 'pkg:tar'
 
       Rake::Task['pkg:tar'].enhance(['pkg:restore_stash'])
@@ -428,9 +429,78 @@ module Simp::Rake
           cmd = %Q(#{mock_cmd} --scrub=all)
           sh cmd
         end
-
       end
+    end
 
+    def define_pkg_check_version
+      namespace :pkg do
+        # :pkg:check_version
+        # -----------------------------
+        desc <<-EOM
+        Ensure that #{@pkg_name} has a properly updated version number.
+        EOM
+        task :check_version do |t,args|
+          require 'json'
+
+          # Get the current version
+          if File.exist?('metadata.json')
+            mod_version = JSON.load(File.read('metadata.json'))['version'].strip
+            success_msg = "#{@pkg_name}: Version #{mod_version} up to date"
+
+            # If we have no tags, we need a new version
+            if %x(git tag).strip.empty?
+              puts "#{@pkg_name}: New Version Required"
+            else
+              # See if the module is newer than all tags
+              matching_tag = %x(git tag --points-at HEAD).strip.split("\n").first
+
+              if matching_tag.nil? || matching_tag.empty?
+                # We don't have a matching release
+                # Get the closest tag
+                nearest_tag = %x(git describe --abbrev=0 --tags).strip
+
+                if mod_version == nearest_tag
+                  puts "#{@pkg_name}: Error: metadata.json needs to be updated past #{mod_version}"
+                else
+                  # Check the CHANGELOG Version
+                  if File.exist?('CHANGELOG')
+                    changelog = File.read('CHANGELOG')
+                    changelog_version = nil
+
+                    # Find the first date line
+                    changelog.each_line do |line|
+                      if line =~ /\*.*(\d+\.\d+\.\d+)(-\d+)?\s*$/
+                        changelog_version = $1
+                        break
+                      end
+                    end
+
+                    if changelog_version
+                      if changelog_version == mod_version
+                        puts success_msg
+                      else
+                        puts "#{@pkg_name}: Error: CHANGELOG version #{changelog_version} out of date for version #{mod_version}"
+                      end
+                    else
+                      puts "#{@pkg_name}: Error: No CHANGELOG version found"
+                    end
+                  else
+                    puts "#{@pkg_name}: Warning: No CHANGELOG found"
+                  end
+                end
+              else
+                if mod_version != matching_tag
+                  puts "#{@pkg_name}: Error: Tag #{matching_tag} does not match version #{mod_version}"
+                else
+                  puts success_msg
+                end
+              end
+            end
+          else
+            puts "#{@pkg_name}: No metadata.json found"
+          end
+        end
+      end
     end
 
     # ------------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -379,9 +379,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
-
-'
+description: |2
+      "simp-rake-helpers provides common methods for SIMP Rake Tasks"
 email: simp@simp-project.org
 executables: []
 extensions: []