git-story-workflow 1.6.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71a678629ab94d345b9362db3a9632978eecccf4a0b42074b8926a8caa8e7793
-  data.tar.gz: c709d15f03f8a751ec2c61626210ec240fbd5ab1e89b4cd314d9548499ab3284
+  metadata.gz: 9281d7ee0268375c1962f2e770d845eb3cbf8ebb26f0655b5362d52174698558
+  data.tar.gz: 8c0dfe010aaee441b7548f877492cfa68b394f2896862fa0e184991004302703
 SHA512:
-  metadata.gz: c1b06bbac8125456cb8095081affae06ee3105f3d157ae2b5f24f970d92072cac0b5aa129d6abde397fdf8d91e7040232673dbb43c55e46aebf30b8cddf66fc4
-  data.tar.gz: 03b2db927c695b5c16b1c0503ff26dbd570e4fe1e12317cf4dd69e3332c2329b2c8fe6c75709b8c4738bd6a4eec68b8dc71bf60c15728e9a163837f09457c734
+  metadata.gz: 6fd7c0939eb952e7f3e92d2ba3366fe469e829f70a238b5f54ed53cd101e05132651c62097ea0069a9761b3e95c148b726ff2c30112321d1f80bd829859e8ce7
+  data.tar.gz: 781376972c269ebd38e1ac0993d07daafd97365c6a4b6d4d41ba7280c02f9967794247df69c1104ed81db47357e232acebb644540faefc57cae723a7793a8496

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.1

data/config/story.yml

@@ -5,4 +5,3 @@ pivotal_reference_prefix: pivotal
 deploy_tag_prefix: production_deploy_
 semaphore_auth_token: <%= ENV['SEMAPHORE_AUTH_TOKEN'] %>
 semaphore_project_url: https://betterplace.semaphoreci.com/projects/betterplace
-todo_nudging: <%= ENV['TODO_NUDGING'].to_i == 1 %>

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 1.6.0 ruby lib
+# stub: git-story-workflow 1.7.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "1.6.0"
+  s.version = "1.7.1"
 
   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-11-15"
+  s.date = "2022-01-17"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://flori.github.com/git-story-workflow".freeze
   s.licenses = ["Apache-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "Git-story-workflow".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.2.15".freeze
+  s.rubygems_version = "3.2.22".freeze
   s.summary = "Gem abstracting a git workflow".freeze
   s.test_files = ["spec/git/story/app_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 

data/lib/git/story/app.rb

@@ -205,7 +205,8 @@ class Git::Story::App
     fetch_tags
     opts = ([
       '--color=never',
-      '--pretty=%B'
+      '--pretty=%B',
+      '--reverse',
     ] | rest) * ' '
     output = capture("git log #{opts} #{ref}")
     pivotal_ids = SortedSet[]
@@ -229,6 +230,10 @@ class Git::Story::App
     attendees = Set[]
     fetch_stories(pivotal_ids) do |pid|
       story = fetch_story(pid, with_owner: true)
+      if !story
+        stories << "• ** Story with id #{pid} could not be found **"
+        next
+      end
       attendees.merge story.owners
       stories << <<~end
       • [##{story.id}] #{story.name}
@@ -493,8 +498,9 @@ class Git::Story::App
   end
 
   def fetch_story(story_id, with_owner: false)
-    story = pivotal_get("projects/#{pivotal_project}/stories/#{story_id}").full?
-    story.owners = Array((fetch_story_owners(story_id) if with_owner))
+    if story = pivotal_get("projects/#{pivotal_project}/stories/#{story_id}").full?
+      story.owners = Array((fetch_story_owners(story_id) if with_owner))
+    end
     story
   end
 
@@ -613,15 +619,22 @@ class Git::Story::App
 
   def fetch_stories(pivotal_ids, &block)
     block or raise ArgumentError, '&block parameter is required'
-    tg = ThreadGroup.new
+    threads = []
     pivotal_ids.each do |pid|
-      tg.add Thread.new { Thread.current[:result] = block.(pid) }
+      order = 0
+      threads.push(
+        Thread.new do
+          Thread.current[:order] = order
+          Thread.current[:result] = block.(pid)
+        rescue
+        end
+      )
     end
-    tg.list.with_infobar(label: 'Story').map do |t|
+    threads.with_infobar(label: 'Story').map do |t|
       t.join
       +infobar
-      t[:result]
-    end
+      [ t[:order], t[:result] ]
+    end.sort_by(&:first).transpose[1].to_a
   end
 
   def fetch_statuses(pivotal_ids)

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

@@ -26,12 +26,8 @@ class CommitMesssageParser
   def parse(template)
     @message_data = template.readlines
     @message_data.each do |line|
-      if /^\s*\[.*(?:#\d+|TODO|(?<done>DONE)).*\]/i =~ line
+      if /^\s*\[.*(?:#\d{7,}).*\]/i =~ line
         @story_number_found = true
-        if @story_number_done  = !!done
-          @message_data.slice!(@line_index)
-          next
-        end
       end
       if line =~ /^\s*#/
         break
@@ -58,7 +54,7 @@ class CommitMesssageParser
 end
 
 story_numbers =
-  `git branch --no-color`.sub!(/^\* .*?(?:_(\d+(?:_\d+)*))$/) {
+  `git branch --no-color`.sub!(/^\* .*?(?:_(\d{7,}(?:_\d{7,})*))$/) {
     break $1.split(/_/)
   } || []
 story_numbers.map!(&:chomp)
@@ -67,8 +63,9 @@ Tempfile.open('commit') do |output|
     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
+    elsif story_numbers.empty?
+      template.rewind
+      output.puts template.read
     else
       full_message = [  message_parsed.data, "", ]
       if prefix = complex_config.story.pivotal_reference_prefix?

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '1.6.0'
+  VERSION         = '1.7.1'
   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.6.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Gem abstracting a git workflow