git-story-workflow 1.1.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db0a45891bcce9a80051da5c583b30218ef6ad2881006440c6995e6ba95ad40
-  data.tar.gz: abcb5921d4d65d818c39ff0ee8af5c77e8b3fd517506db141e0c25e8cd1ca8ac
+  metadata.gz: 1ef8d1e191f13d4e77de20b5fc538031c49bbc464c3ee345636f440552d944ac
+  data.tar.gz: 748a64331b6287988c2361052148ff60d0399dc74db0f09de01f8d180d38f99a
 SHA512:
-  metadata.gz: e69e2cfd05235940649f29100fa36acfb3edfec918c673e7a79f5468b1ee529db3a54c9d00cd0eca3e0cec12df0578b6b185cef6e45fe0af747664eac897a7f9
-  data.tar.gz: 13f82228787833511601d676f2a648d3e0cc00f31b6462794a8f99c062309cbfd66e362d4647e24c8d70154a0f0e651c3c463881e726f8f2f22c61aa9de432f0
+  metadata.gz: 88608ce799a9ac2ac6ea5b2f13353bb159319838f3bf6f8201efc4ffdbf151904c3afee2040824f326104173895837bb791834eea4459db0c05e950b393228cc
+  data.tar.gz: 557b78253cd6e7fcb48886ab607d914dfa5199ea884a066774a5ddfb270fe70e6a5ddaca31741d2839bb048a4845976d0b74db78201a6b7a9d792645adee2a7c

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.4.1

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 1.1.0 ruby lib
+# stub: git-story-workflow 1.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "1.1.0"
+  s.version = "1.4.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 = "2020-11-27"
+  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]
@@ -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.1.4".freeze
+  s.rubygems_version = "3.2.15".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

@@ -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,11 +295,31 @@ 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
+    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
+
   private
 
   def determine_command
@@ -388,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

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.1.0'
+  VERSION         = '1.4.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.1.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Gem abstracting a git workflow