git-story-workflow 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63e47013d8d5c62bf7f3b02c334ab8a6cfb6e200d54506042a8552005fabcd03
-  data.tar.gz: 23b3d417eb765ec8d842a06c927c14c3bc79c9e45a488bb1be395ed35ff856e3
+  metadata.gz: 04601b201fea90d5e5054d3e61881533d1d5c87b8fb9f4d0c23ab71b74fbda4d
+  data.tar.gz: 3991c64783f6d63815273b6475597a87731a7737cbfc41e2050919c18ec5c1af
 SHA512:
-  metadata.gz: fe79a45d3ba9663fa4b7240fc13e6379b4847282669333ee89c44012226fce6179064152b5c6b345ed57a89fc85e6d1c3fc55e6e561e5a81ef8543be1203bb47
-  data.tar.gz: f710599f822a1711c4fc5f7c7731db03b9fbed0e298e3f15fdf4304654c4f5ac20bbf955f51a5c2984eae49db6150f960a3fb43b479272253e5c36141b368ad3
+  metadata.gz: 34536de7b1148214bd5fa6a09dfee1ac876ff16a0d4a9543eb34b08ae92aac111d264bc8b0aefb4bdde112b76c9867ebd7622e58f771ffce411e2a9aee3e2a9e
+  data.tar.gz: 9ecadc6812f41148ad7e79b0184b694a19ec593a041b93626972f9ad2100f6b6b7a6c51962a1e16ceb86222a0800794f2538086b8ad5d7666d406a1fb4e45cd6

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 1.3.0 ruby lib
+# stub: git-story-workflow 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2021-05-21"
+  s.date = "2021-08-17"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]

data/lib/git/story/prepare-commit-msg

@@ -2,11 +2,14 @@
 # Installed by the git-story gem
 
 require 'tempfile'
+require 'complex_config/rude'
+include ComplexConfig::Provider::Shortcuts
 
 class CommitMesssageParser
   def initialize
     @line_index         = 0
     @story_number_found = false
+    @story_number_done  = false
     @message_data       = []
   end
 
@@ -16,10 +19,20 @@ class CommitMesssageParser
     @story_number_found
   end
 
+  def story_number_done?
+    @story_number_done
+  end
+
   def parse(template)
     @message_data = template.readlines
     @message_data.each do |line|
-      line =~ /\[.*#\d+.*\]/ and @story_number_found = true
+      if /^\s*\[.*(?:#\d+|TODO|(?<done>DONE)).*\]/i =~ line
+        @story_number_found = true
+        if @story_number_done  = !!done
+          @message_data.slice!(@line_index)
+          next
+        end
+      end
       if line =~ /^\s*#/
         break
       else
@@ -49,21 +62,31 @@ story_numbers =
     break $1.split(/_/)
   } || []
 story_numbers.map!(&:chomp)
-unless story_numbers.empty?
-  Tempfile.open('commit') do |output|
-    File.open(ARGV.first) do |template|
-      message_parsed = CommitMesssageParser.new.parse(template)
-      if message_parsed.story_number_found?
-        output.puts message_parsed.total
-      else
-        output.puts message_parsed.data, "",
-          "[#{story_numbers.map { |story_number| "##{story_number}" } * ' '}]",
-          "", message_parsed.footer
-      end
-      output.rewind
-      File.open(ARGV.first, 'w') do |message|
-        message.write output.read
+Tempfile.open('commit') do |output|
+  File.open(ARGV.first) do |template|
+    message_parsed = CommitMesssageParser.new.parse(template)
+    if message_parsed.story_number_found?
+      output.puts message_parsed.total
+    elsif complex_config.todo_nudging? && story_numbers.empty? && !message_parsed.story_number_done?
+      output.puts message_parsed.data, "", "[TODO]", "", message_parsed.footer
+    else
+      full_message = [  message_parsed.data, "", ]
+      if prefix = complex_config.story.pivotal_reference_prefix?
+        pivotal_reference = -> number { "%s-%u" % [ prefix, number ] }
+        full_message.concat(
+          story_numbers.each_with_index.map { |story_number, i| "#{i + 1}. " + pivotal_reference.(story_number) }
+        )
+        full_message << ""
       end
+      full_message <<
+        "[#{story_numbers.map { |story_number| "##{story_number}" } * ' '}]" <<
+        "" <<
+        message_parsed.footer
+      output.puts full_message
+    end
+    output.rewind
+    File.open(ARGV.first, 'w') do |message|
+      message.write output.read
     end
   end
 end

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '1.3.0'
+  VERSION         = '1.4.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-story-workflow
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar