revision 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d52b5583cb4ae656d41eb5389156de53000fedd75980cda75e21b97ff9a81a4f
-  data.tar.gz: f2c5381a07f171f9d5bb45f09edf6465bc1a8666adaf293db0820a58282c2a49
+  metadata.gz: adcdc2d0e9d54552cb574a4abcf0f4c305ee1b4679de002a0a6b237ece5b2844
+  data.tar.gz: f316d48ab9d95456707bd10264d99a082b4d3ebbf0c9b2056723af0df3b6e363
 SHA512:
-  metadata.gz: 341c226a4413b6e43b49ecd073ee87431c989d209f27f3bbf5d2c0e871d9998c2fbb8f67d7cb2161260d379e74695694be0a055b9f23b8975f0d172da952ef44
-  data.tar.gz: f0aa801651600773e6764a51c88316920276d6ee9bf38d03351fcc534835a7d0bc167e97dcf5b8ac4c78b58234d04072f3dfe968007f8cef08693e501c42c69b
+  metadata.gz: 236bea8efec06c900852eef6d30bbe544dc50cc9d5a3e27e68de45847f32cfeada7f1c22ddbcdff3245cc1dda2716ac20b827cf83d67d3fb914c65d339bf6187
+  data.tar.gz: 5a18f6d7d2668214c7b1c71fe4d3d25bfbfa78de9c66c3d722bc2cb85cf5097a85adb168a20e4a59b94ae60943dcbb3625417402d51107bf9d52a14397e60cf8

data/lib/revision/cli.rb

@@ -119,8 +119,26 @@ module Revision
     def do_increment(type)
       r = select_one
       increment_method = "#{type}_increment!"
-      say "Incrementing #{r.revision} to #{r.revision.public_send(increment_method)}"
-      options[:dryrun] ? r.revision.write_to_file : r.revision.write!
+      say "Incrementing #{r.revision} to #{r.revision.public_send(increment_method)} (#{r.revision.src})"
+      if options[:dryrun]
+        r.revision.write(r.revision.src + ".new")
+        r.secondary_revisions.each do |s|
+          say "Propagating revision update to #{s.src}"
+          s.major = r.revision.major
+          s.minor = r.revision.minor
+          s.patch = r.revision.patch
+          s.write(s.src + ".new")
+        end
+      else
+        r.revision.write!
+        r.secondary_revisions.each do |s|
+          say "Propagating revision update to #{s.src}"
+          s.major = r.revision.major
+          s.minor = r.revision.minor
+          s.patch = r.revision.patch
+          s.write!
+        end
+      end
       say ''
       say "The automatic commit / tag step assumes you're only checking in changes to existing files"
       say "You can answer 'n' at the prompt and use 'revision tag' to generate a commit with the latest changelog entry and an associated tag after manually adding any new files to the repo"

data/lib/revision/info.rb

@@ -15,10 +15,11 @@ class Revision::Info
   attr_accessor :regex
   attr_accessor :comment_prefix
 
-  def initialize(file, regex: nil, comment_prefix: nil)
+  def initialize(file, regex: nil, comment_prefix: nil, embed_changelog: true)
     @src=file
     @regex = regex.nil? ? DEFAULT_REGEX : /#{regex}/
     @comment_prefix = comment_prefix || DEFAULT_COMMENT_PREFIX
+    @embed_changelog = embed_changelog
     matched = false
     File.open(@src).each_line do |line|
       if line =~ @regex
@@ -65,15 +66,16 @@ class Revision::Info
     ref_info = self.class.new(@src, regex: @regex)
     raise 'No revision identifiers incremented' if ref_info.to_s == self.to_s
 
-    entry = get_changelog_entry
 
     text = File.read(@src)
     text.gsub!(@regex) { |match| "#{$~[:prefix]}#{@major}#{$~[:sep1]}#{@minor}#{$~[:sep2]}#{@patch}#{$~[:postfix]}" }
 
-    #Insert start/end tags if not present
-    text += new_changelog_placeholder unless text.match(CHANGELOG_START)
-
-    text.gsub!(CHANGELOG_START) { |match| [match, format_changelog_entry(entry)].join("\n") }
+    if @embed_changelog
+      entry = get_changelog_entry
+      #Insert start/end tags if not present
+      text += new_changelog_placeholder unless text.match(CHANGELOG_START)
+      text.gsub!(CHANGELOG_START) { |match| [match, format_changelog_entry(entry)].join("\n") }
+    end
 
     File.open(output_file_name, 'w') { |f| f.write(text) }
   end

data/lib/revision/releasable.rb

@@ -17,7 +17,7 @@ module Revision
 
     REVISION_PLACEHOLDER = /<REV>|<VER>/
 
-    attr_reader :root, :id, :revision, :build_steps, :artefacts, :git_tag_prefix
+    attr_reader :root, :id, :revision, :build_steps, :artefacts, :git_tag_prefix, :secondary_revisions
 
     # Load a file in yaml format containing one or more releasable definitions
     # @param root [String] An optional root directory argument
@@ -53,12 +53,17 @@ module Revision
     #   @git_repo
     # end
 
+    def _build_revision_info(definition, embed_changelog: true)
+      Info.new(File.join(@root,definition[:src]), regex: definition[:regex], comment_prefix: definition[:comment_prefix], embed_changelog: embed_changelog)
+    end
+
     def initialize(root: nil, config: {})
 
       root ||= Dir.getwd
       @root = Pathname.new(root).realpath
       @id = config[:id] || File.basename(@root)
-      @revision = Info.new(File.join(@root,config[:revision][:src]), regex: config[:revision][:regex], comment_prefix: config[:revision][:comment_prefix])
+      @revision = _build_revision_info(config[:revision], embed_changelog: true)
+      @secondary_revisions = config[:secondary_revisions].nil? ? [] : config[:secondary_revisions].map { |r| _build_revision_info(r, embed_changelog:false)}
       @git_tag_prefix = config[:revision][:git_tag_prefix].nil? ? 'v' : "#{config[:revision][:git_tag_prefix]}_v"
       # Legacy definition syntax compatibility
       @build_def = config[:build] ? config[:build] : { environment: { variables: {}}, steps: config[:build_steps]}

data/lib/revision/version.rb

@@ -1,10 +1,13 @@
 # Defines the revision ID for the revision gem
 module Revision
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end
 
 # <BEGIN CHANGELOG>
 # 
+# Version 1.4.0 (10 Jun 2019)
+# - Now allow the definition of one or more 'secondary_revisions', where a revision ID can be updated with or without an embedded changelog
+# 
 # Version 1.3.1 (20 May 2019)
 # - Corrected bug when deploying changelog:w
 # 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revision
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Cormac Cannon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor