git-story-workflow 1.0.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7436139595b89b702416d8a9d0f792d2c4cf078a89d56ae462093e4a36c8b1f4
-  data.tar.gz: 3a2542c050b36b046b49130b356284825fa3fd6d2cfef9bffbdea7735298555f
+  metadata.gz: 04601b201fea90d5e5054d3e61881533d1d5c87b8fb9f4d0c23ab71b74fbda4d
+  data.tar.gz: 3991c64783f6d63815273b6475597a87731a7737cbfc41e2050919c18ec5c1af
 SHA512:
-  metadata.gz: eb7071e5a13b018ed232b9ff0e15357037b417c24720ea420b0d1ed370e83ecd8b54b65f60f4f426c8a6c6c30db236894a6839504d389bf0343e6f2efac2771f
-  data.tar.gz: c1755fe341e1f171169627dfe4a9b40b20a9fe34fc565f5ae2ee2d2925aebbdb38949fd5b8a1e7285730bd25fffba1c7d7b750113a44b9af4acb4204de2725a9
+  metadata.gz: 34536de7b1148214bd5fa6a09dfee1ac876ff16a0d4a9543eb34b08ae92aac111d264bc8b0aefb4bdde112b76c9867ebd7622e58f771ffce411e2a9aee3e2a9e
+  data.tar.gz: 9ecadc6812f41148ad7e79b0184b694a19ec593a041b93626972f9ad2100f6b6b7a6c51962a1e16ceb86222a0800794f2538086b8ad5d7666d406a1fb4e45cd6

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.4.0

data/git-story-workflow.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 1.0.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.0.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 = "2020-09-10"
+  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]
   s.extra_rdoc_files = ["README.md".freeze, "lib/git/story.rb".freeze, "lib/git/story/app.rb".freeze, "lib/git/story/setup.rb".freeze, "lib/git/story/utils.rb".freeze, "lib/git/story/version.rb".freeze]
-  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/git-story".freeze, "config/story.yml".freeze, "git-story-workflow.gemspec".freeze, "lib/git/story.rb".freeze, "lib/git/story/app.rb".freeze, "lib/git/story/prepare-commit-msg".freeze, "lib/git/story/setup.rb".freeze, "lib/git/story/utils.rb".freeze, "lib/git/story/version.rb".freeze, "spec/git/story/app_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/git-story".freeze, "config/story.yml".freeze, "git-story-workflow.gemspec".freeze, "lib/git/story.rb".freeze, "lib/git/story/app.rb".freeze, "lib/git/story/pre-push".freeze, "lib/git/story/prepare-commit-msg".freeze, "lib/git/story/setup.rb".freeze, "lib/git/story/utils.rb".freeze, "lib/git/story/version.rb".freeze, "spec/git/story/app_spec.rb".freeze, "spec/spec_helper.rb".freeze]
   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

@@ -39,10 +39,10 @@ class Git::Story::App
     @opts      = go 'n:', @argv
     @debug     = debug
     determine_command
+    Git::Story::Setup.perform
   end
 
   def run
-    Git::Story::Setup.perform
     if command_of(@command)
       if method(@command).parameters.include?(%i[key rest])
         puts __send__(@command, *@argv, rest: @rest_argv)
@@ -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,8 +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
+    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
 
@@ -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/pre-push

@@ -0,0 +1,35 @@
+#!/bin/sh
+# Installed by the git-story gem
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP or [TODO] commit
+		commit=`git rev-list -n 1 --pretty=%B "$range" | egrep -i 'WIP|\[TODO\]'`
+		if [ -n "$commit" -a "$FORCE" != "1" ]
+		then
+			echo >&2 "Found WIP / [TODO] commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

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/setup.rb

@@ -11,30 +11,38 @@ module Git::Story::Setup
   module_function
 
   def perform(force: false)
-    pcm = PREPARE_COMMIT_MESSAGE_DST
-    if File.exist?(pcm)
-      if force
-        install_prepare_commit_msg
-      elsif File.read(pcm).match?(MARKER)
-        ;
-      else
-        ask(
-          prompt: "File #{pcm.inspect} not created by git-story."\
-            " Overwrite? (y/n, default is %s)",
-          default: ?n,
-        ) do |response|
-          if response == ?y
-            install_prepare_commit_msg
+    for filename in %w[ prepare-commit-msg pre-push ]
+      if path = file_installed?(filename)
+        if force
+          install_file filename
+        elsif File.read(path).match?(MARKER)
+          ;
+        else
+          ask(
+            prompt: "File #{path.inspect} not created by git-story."\
+              " Overwrite? (y/n, default is %s) ",
+            default: ?n,
+          ) do |response|
+            if response == ?y
+              install_file filename
+            end
           end
         end
+      else
+        install_file filename
       end
-    else
-      install_prepare_commit_msg
     end
   end
 
-  def install_prepare_commit_msg
+  def file_installed?(filename)
+    path = File.join(HOOKS_DIR, filename)
+    if File.exist?(path)
+      path
+    end
+  end
+
+  def install_file(filename)
     File.exist?(HOOKS_DIR) or mkdir_p(HOOKS_DIR)
-    cp PREPARE_COMMIT_MESSAGE_SRC, PREPARE_COMMIT_MESSAGE_DST
+    cp File.join(__dir__, filename), File.join(HOOKS_DIR, filename)
   end
 end

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '1.0.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.0.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -174,6 +174,7 @@ files:
 - git-story-workflow.gemspec
 - lib/git/story.rb
 - lib/git/story/app.rb
+- lib/git/story/pre-push
 - lib/git/story/prepare-commit-msg
 - lib/git/story/setup.rb
 - lib/git/story/utils.rb
@@ -203,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