git-story-workflow 1.2.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b917809872cfe428b4919698d7c9fc4cfa5ae9fee374ae9c3b893b5061080c
-  data.tar.gz: a44657b9ce55dd5fec18f68abc04109e49ee17e44e76e490b6e4bcfe61585d7d
+  metadata.gz: 57fd6d4ff94ab8ef89840a6c7fd9af4ff8865a6aa15ab9c562cbe536c98675af
+  data.tar.gz: 4831ce63881313940343c5e0bf447cba8de302c122ffedb8682cd0ce6125a7f3
 SHA512:
-  metadata.gz: a043895d4a9e6057d243e5447eec1668e8c05a0190abd60cfe443e2f0c59784c9ed10d7865a1c04dbb8687889b7c480d0c0b08f6307d27776ccee623c577c0e0
-  data.tar.gz: 5a5020e9b44229ea153aeaa8f97eb83bf54a65567774eb2adb7ad1e01e12ed1df802c713412d5179029b2fb10ced2226a7b2752db040d005ccb668fd9dade5f6
+  metadata.gz: a873c02d9271925c6855017e64034d4a06dba3706c27c6e64d588e5a7aaec12097a3ea0dca44caa6a6202e4867e8ea1b4232cb4e6be9fea54633e1fdd06a4cbe
+  data.tar.gz: 0e9afef53d03a5f306ee92796d2066cf5ce62edc78c42442d8cdb84667fafe4d331a0f6a850b16baf6cb6d8cad8ceddcd76413baab81210fbe57520df1eec202

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.4.2

data/config/story.yml

@@ -2,3 +2,4 @@
 pivotal_token: <%= ENV['PIVOTAL_TOKEN'] %>
 pivotal_project: 123456789
 deploy_tag_prefix: production_deploy_
+semaphore_project_url: https://xxx.semaphoreci.com/projects/yyy

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 1.2.0 ruby lib
+# stub: git-story-workflow 1.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "1.2.0"
+  s.version = "1.4.2"
 
   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-04"
+  s.date = "2021-09-27"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]

data/lib/git/story/app.rb

@@ -286,7 +286,7 @@ class Git::Story::App
   command doc: '[BRANCH] open branch on github'
   def github(branch = current(check: false))
     if url = github_url(branch)
-      system "open #{url.inspect}"
+      sh "open #{url.inspect}"
     end
     nil
   end
@@ -295,14 +295,28 @@ class Git::Story::App
   def pivotal(branch = current(check: true))
     if story_id = branch&.[](/_(\d+)\z/, 1)&.to_i
       story_url = fetch_story(story_id)&.url
-      system "open #{story_url}"
+      sh "open #{story_url}"
     end
     nil
   end
 
   command doc: 'open project on semaphore'
   def semaphore
-    system "open #{complex_config.story.semaphore_project_url}"
+    sh "open #{complex_config.story.semaphore_project_url}"
+    nil
+  end
+
+  command doc: '[REF] create a hotfix branch from REF'
+  def hotfix(ref = nil)
+    if ref
+      start_point = ref
+    elsif tag = tags.last
+      start_point = tag_name(tag)
+    else
+      fail 'no last deployment tag found'
+    end
+    branch = "hotfix_#{start_point}"
+    sh "git checkout -b #{branch.inspect} #{start_point.inspect}"
     nil
   end
 
@@ -394,7 +408,7 @@ class Git::Story::App
       end
       loop do
         r = block.()
-        system('clear')
+        sh 'clear'
         start = Time.now
         puts r
         refresh_at = start + seconds
@@ -452,7 +466,12 @@ class Git::Story::App
   def pivotal_get(path)
     path = path.sub(/\A\/*/, '')
     url = "https://www.pivotaltracker.com/services/v5/#{path}"
-    @debug and STDERR.puts "Fetching #{url.inspect}"
+    if pivotal_token
+      @debug and STDERR.puts "Fetching #{url.inspect}"
+    else
+      STDERR.puts "Cannot fetch #{url.inspect} without PIVOTAL_TOKEN set as env var"
+      return
+    end
     URI.open(url,
          'X-TrackerToken' => pivotal_token,
          'Content-Type'   => 'application/xml',

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.story.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.2.0'
+  VERSION         = '1.4.2'
   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.2.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar