revision 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7fe914a06832d3670e34dc1a9b607fe8343058aa64528d8a0e322acf61b9611
-  data.tar.gz: 563e66def7cb78a08d246c1a0036ea8754a9346b36bc91e08230d15c6b38508d
+  metadata.gz: 06454aa0fe518877aa5506845e96d39e0d8e2ce7db5339a9b1ee71364c8b673e
+  data.tar.gz: 9aedcfc26333c5e7e8ab2c5704e9c5f18269b4eacf36dc81fafc5a78ca85f88c
 SHA512:
-  metadata.gz: 8f39382493167e12af0f420a698d41769b773c1720d065bd01705f1c9b1959e4505b3da25fdb7b571372afca6ca0103dfa029077d16026b2f4720cc591b26853
-  data.tar.gz: c51c1ab72e3d9f31885d5e1817152ddbecc21d57ee8866d4ef5985360a27ba37971f86cbc5f595638e12d3fe7d1b976ee2d3681078691d72eab361b35bf8dd44
+  metadata.gz: be25f3b19f88933a0cf26c5afc36e8b339715c876b10ce3f3dd9737441660fd02a4791f88c070c2a920f604f5008dcbf501d6f122ee401a08b4a7ecc7e7998b8
+  data.tar.gz: 30ef34a8ea5fac05318ee0a426595425af05d7a68ae647339efe5be2f76954906426cc680f80ae3555c285be9d1f767cb8ad26210f4440a6519e9a0518606c5a

data/lib/revision/cli.rb

@@ -97,8 +97,12 @@ module Revision
 
     private
 
+    def id_options
+      @releasables.keys.map { |id| "'-id #{id}'"}.join(', ')
+    end
+
     def select_one
-      raise "Please specify one of #{@releasables.keys}" if options[:id].nil? && @releasables.keys.length > 1
+      raise "Please specify one of #{id_options}" if options[:id].nil? && @releasables.keys.length > 1
       @releasables[@id]
     end
 

data/lib/revision/releasable.rb

@@ -17,7 +17,7 @@ module Revision
 
     REVISION_PLACEHOLDER = /<REV>|<VER>/
 
-    attr_reader :root, :id, :revision, :build_steps, :artefacts
+    attr_reader :root, :id, :revision, :build_steps, :artefacts, :git_tag_prefix
 
     # Load a file in yaml format containing one or more releasable definitions
     # @param root [String] An optional root directory argument
@@ -59,10 +59,11 @@ module Revision
       @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])
+      @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]}
-      @artefacts = config[:artefacts]
-
-      @artefacts.each { |a| a[:dest] ||= a[:src] } unless @artefacts.empty?
+      @artefacts = config[:artefacts] || []
+      @artefacts.each { |a| a[:dest] ||= a[:src] } unless @artefacts.nil? || @artefacts.empty?
     end
 
     def to_s
@@ -73,10 +74,15 @@ module Revision
         #{@build_def[:environment]}
 
         Build pipeline:
-        - #{@build_def[:steps].join("\n  - ")}
+        - #{@build_def[:steps].nil? ? 'empty' : @build_def[:steps].join("\n  - ")}
 
         Build artefacts:
-        #{artefacts.map{ |a| "- #{a[:src]}\n    => #{a[:dest]}" }.join("\n")}
+        #{@artefacts.empty? ? '- None defined' : @artefacts.map{ |a| "- #{a[:src]}\n    => #{a[:dest]}" }.join("\n") }
+
+        Git commit details:
+        - log entry: #{commit_message}
+        Git tag id #{tag_id} / annotation:
+          #{tag_annotation.gsub("\n","\n    ")}
 
       EOT
     end
@@ -89,11 +95,9 @@ module Revision
               value.gsub!(':', ';')
               value.gsub!('/', '\\')
             else
-              value.gsub!(':', ';')
+              value.gsub!(';', ':')
               value.gsub!('\\', '/')
             end
-            # value.gsub!('/',Gem.win_platform? ? '\' : '/')
-            # value.gsub!('\',Gem.win_platform? ? '\' : '/')
             value.gsub!('~', Dir.home)
           end
           puts "Setting environment variable '#{key}' to '#{value}'"
@@ -112,22 +116,32 @@ module Revision
       end
     end
 
+    def tag_id
+      "#{@git_tag_prefix}#{revision}"
+    end
+
+    def tag_annotation
+      @revision.last_changelog_entry.join("\n")
+    end
+
+    def commit_message
+      changelog_entry = @revision.last_changelog_entry
+      #Insert a blank line between the revision header and release notes, as per git commit best practice
+      commit_lines = ["#{tag_id} #{changelog_entry[1]}", '']
+      if changelog_entry.length > 2
+        commit_lines << "Also..."
+        commit_lines += changelog_entry[2..-1]
+      end
+      commit_lines.join("\n")
+    end
+
     def tag
       Dir.chdir(@root) do
-        tag_id = "v#{revision}"
-        changelog_entry = @revision.last_changelog_entry
-        #Insert a blank line between the revision header and release notes, as per git commit best practice
-        commit_lines = ["#{tag_id} #{changelog_entry[1]}", '']
-        if changelog_entry.length > 2
-          commit_lines << "Also..."
-          commit_lines += changelog_entry[2..-1]
-        end
-        commit_message = commit_lines.join("\n")
         puts "Committing..."
         puts commit_message
         system("git commit -a -m \"#{commit_message}\"")
         puts "Tagging as #{tag_id}"
-        system("git tag -a #{tag_id} -m \"#{changelog_entry.join("\n")}\"")
+        system("git tag -a #{tag_id} -m \"#{tag_annotation}\"")
       end
     end
 

data/lib/revision/version.rb

@@ -1,10 +1,17 @@
 # Defines the revision ID for the revision gem
 module Revision
-  VERSION = "1.2.2"
+  VERSION = "1.2.4"
 end
 
 # <BEGIN CHANGELOG>
 # 
+# Version 1.2.4 (05 Sep 2018)
+# - Added commit message and tag details to `revision info`
+# - Minor refactoring
+# 
+# Version 1.2.3 (03 Sep 2018)
+# - Tidied up `revision info` output formatting
+# 
 # Version 1.2.2 (03 Sep 2018)
 # - Updated CLI to provide version info
 # 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revision
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Cormac Cannon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor