git-story-workflow 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ca228230e6df3b78a7666b097cdfb126a3c304f58e437ea5f65cac3341eb1b
-  data.tar.gz: 24ec3369789ef343dfd3040ba834ca7726605eab327cb9a0f7d4bad7d772d5fe
+  metadata.gz: 596a9130689707c63f88c05175e839d2fd6618452096191d9f943ab7b0cf5273
+  data.tar.gz: e2917683df0992dc786210a6d666aa287f615501ab2334916d6a49c828579ddf
 SHA512:
-  metadata.gz: 5081071d98fd353fd9a9a6b6c14339b398d367eafb55509deaf9569871c58892c7d942ecef6eb7a8b989c58909e8dbf9c7c91c09a83bbe137845b52bfd135438
-  data.tar.gz: b3358fddfce2f7233972397e9bc72091f99d5adb08f6a07bd519cca613103995d06a0fe9099939b9a584c60063c6a9659d0eb94a09701e8d7e3714358983ce99
+  metadata.gz: 58477df77c6ab0ffcfda37cd1089dca528bb19b412f5e5359271d5b9956537c001f283e798881deedcae90f6ffd4254f76e37c95d7872e04caf3af9f1122b034
+  data.tar.gz: ce696203a7f9955074fa7829d5c2afd31adb884154c9eca38820bd9f91a38b5f97c6ba01c99523c1155316652503289f7bd7030ff4b3f442ddecdddab0823278

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.7.0

data/config/story.yml

@@ -1,6 +1,6 @@
 ---
 pivotal_token:   <%= ENV['PIVOTAL_TOKEN'] %>
-pivotal_project: 123456789
+pivotal_project: 1254912
 pivotal_reference_prefix: pivotal
 deploy_tag_prefix: production_deploy_
 semaphore_auth_token: <%= ENV['SEMAPHORE_AUTH_TOKEN'] %>

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 1.5.0 ruby lib
+# stub: git-story-workflow 1.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "1.5.0"
+  s.version = "1.7.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-10-21"
+  s.date = "2022-01-12"
   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

@@ -100,31 +100,9 @@ class Git::Story::App
     end
   end
 
-  def provide_name(story_id = nil)
-    until story_id.present?
-      story_id = ask(prompt: 'Story id? ').strip
-    end
-    story_id = story_id.gsub(/[^0-9]+/, '')
-    @story_id = Integer(story_id)
-    if stories.any? { |s| s.story_id == @story_id }
-      @reason = "story for ##@story_id already created"
-      return
-    end
-    if name = fetch_story_name(@story_id)
-      name = normalize_name(
-        name,
-        max_size: 128 - 'story'.size - @story_id.to_s.size - 2 * ?_.size
-      ).full? || name
-      [ 'story', name, @story_id ] * ?_
-    else
-      @reason = "name for ##@story_id could not be fetched from tracker"
-      return
-    end
-  end
-
   command doc: '[STORY_ID] fetch status of current story, -n SECONDS refreshes'
   def status(story_id = current(check: true)&.[](/_(\d+)\z/, 1)&.to_i)
-    if story = fetch_story(story_id)
+    if story = fetch_story(story_id, with_owner: true)
       color_state =
         case cs = story.current_state
         when 'unscheduled', 'planned', 'unstarted'
@@ -147,20 +125,21 @@ class Git::Story::App
         else
           t
         end
-      owners = Array(fetch_story_owners(story_id)).map { |o| "#{o.name} <#{o.email}>" }
       result = <<~end
         Id: #{(?# + story.id.to_s).green}
         Name: #{story.name.inspect.bold}
         Type: #{color_type}
         Estimate: #{story.estimate.to_s.full? { |e| e.yellow.bold } || 'n/a'}
         State: #{color_state}
-        Branch: #{current_branch_checked?&.color('#ff5f00')}
         Labels: #{story.labels.map { |l| l.name.on_color(91) }.join(' ')}
-        Owners: #{owners.join(', ').yellow}
+        Owners: #{story.owners.map { |o| "%s <%s>" % [ o.name, o.email ] }.join(', ').yellow}
         Pivotal: #{story.url.color(33)}
       end
-      if url = github_url(current_branch_checked?)
-        result << "Github: #{url.color(33)}\n"
+      if branch = current_branch_checked? and url = github_url(current_branch_checked?)
+        result << <<~end
+          Github: #{url.color(33)}
+          Branch: #{branch.color('#ff5f00')}
+        end
       end
       result
     end
@@ -226,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[]
@@ -234,18 +214,48 @@ class Git::Story::App
     fetch_statuses(pivotal_ids) * (?┄ * Tins::Terminal.cols << ?\n)
   end
 
-  def fetch_statuses(pivotal_ids)
-    tg = ThreadGroup.new
-    pivotal_ids.each do |pid|
-      tg.add Thread.new { Thread.current[:status] = status(pid) }
+  command doc: '[REF] Create some parts of deploy document'
+  def deploy_document(ref = default_ref, rest: [])
+    ref = build_ref_range(ref)
+    fetch_commits
+    fetch_tags
+    opts = ([
+      '--color=never',
+      '--pretty=%B'
+    ] | rest) * ' '
+    output = capture("git log #{opts} #{ref}")
+    pivotal_ids = SortedSet[]
+    output.scan(/\[\s*#\s*(\d+)\s*\]/) { pivotal_ids << $1.to_i }
+    stories   = ''
+    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}
+        ○ Pivotal: https://www.pivotaltracker.com/story/show/#{pid}
+        ○ Type: #{story.story_type}
+        ○ Status: #{story.current_state}
+        ○ Owners: #{story.owners.map { |o| "%s <%s>" % [ o.name, o.email ] }.join(', ')}
+        ○ Tasks to be done before deployment:
+          ☐ …
+        ○ Tasks to be done after deployment:
+         ☐ …
+      end
     end
-    tg.list.with_infobar(label: 'Story').map do |t|
-      +infobar
-      t.join
-      t[:status]
+    attendees.map! { |a| "• @#{a.email}" }
+    <<~end
+      #{attendees.join(?\n)}
+
+      #{stories}
     end
   end
 
+
   command doc: '[REF] output diff since last production deploy tag'
   def deploy_diff(ref = default_ref, rest: [])
     ref = build_ref_range(ref)
@@ -276,8 +286,8 @@ class Git::Story::App
     "Story #{name} created.".green
   end
 
-  command doc: '[PATTERN] switch to story matching PATTERN'
-  def switch(pattern = nil)
+  command doc: 'switch to selected story branch'
+  def switch
     fetch_commits
     if branch = pick_branch(prompt: 'Switch to story? %s')
       sh "git checkout #{branch}"
@@ -285,7 +295,7 @@ class Git::Story::App
     end
   end
 
-  command doc: '[PATTERN] delete story branch matching PATTERN'
+  command doc: 'delete selected story branch'
   def delete(pattern = nil)
     fetch_commits
     if branch = pick_branch(prompt: 'Delete story branch? %s', symbol: ?⌦)
@@ -337,6 +347,28 @@ class Git::Story::App
 
   private
 
+  def provide_name(story_id = nil)
+    until story_id.present?
+      story_id = ask(prompt: 'Story id? ').strip
+    end
+    story_id = story_id.gsub(/[^0-9]+/, '')
+    @story_id = Integer(story_id)
+    if stories.any? { |s| s.story_id == @story_id }
+      @reason = "story for ##@story_id already created"
+      return
+    end
+    if name = fetch_story_name(@story_id)
+      name = normalize_name(
+        name,
+        max_size: 128 - 'story'.size - @story_id.to_s.size - 2 * ?_.size
+      ).full? || name
+      [ 'story', name, @story_id ] * ?_
+    else
+      @reason = "name for ##@story_id could not be fetched from tracker"
+      return
+    end
+  end
+
   def determine_command
     c, command = [], nil
     possible_commands = []
@@ -448,11 +480,6 @@ class Git::Story::App
     name
   end
 
-  def apply_pattern(pattern, stories)
-    pattern = pattern.gsub(?#, '')
-    stories.grep(/#{Regexp.quote(pattern)}/)
-  end
-
   def error(msg)
     puts msg.red
     exit 1
@@ -470,8 +497,11 @@ class Git::Story::App
     fetch_story(story_id)&.name
   end
 
-  def fetch_story(story_id)
-    pivotal_get("projects/#{pivotal_project}/stories/#{story_id}").full?
+  def fetch_story(story_id, with_owner: false)
+    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
 
   def fetch_story_owners(story_id)
@@ -586,4 +616,30 @@ class Git::Story::App
     url = url.sub('git@github.com:', 'https://github.com/')
     url = url.sub(/(\.git)\z/, "/tree/#{branch}")
   end
+
+  def fetch_stories(pivotal_ids, &block)
+    block or raise ArgumentError, '&block parameter is required'
+    tg = ThreadGroup.new
+    pivotal_ids.each do |pid|
+      order = 0
+      tg.add(
+        Thread.new do
+          Thread.current[:order] = order
+          Thread.current[:result] = block.(pid)
+        rescue
+        end
+      )
+    end
+    tg.list.with_infobar(label: 'Story').map do |t|
+      t.join
+      +infobar
+      [ t[:order], t[:result] ]
+    end.sort_by(&:first).transpose[1]
+  end
+
+  def fetch_statuses(pivotal_ids)
+    fetch_stories(pivotal_ids) do |pid|
+      status(pid)
+    end
+  end
 end

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.5.0'
+  VERSION         = '1.7.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.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2022-01-12 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