git-story-workflow 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7436139595b89b702416d8a9d0f792d2c4cf078a89d56ae462093e4a36c8b1f4
-  data.tar.gz: 3a2542c050b36b046b49130b356284825fa3fd6d2cfef9bffbdea7735298555f
+  metadata.gz: 7db0a45891bcce9a80051da5c583b30218ef6ad2881006440c6995e6ba95ad40
+  data.tar.gz: abcb5921d4d65d818c39ff0ee8af5c77e8b3fd517506db141e0c25e8cd1ca8ac
 SHA512:
-  metadata.gz: eb7071e5a13b018ed232b9ff0e15357037b417c24720ea420b0d1ed370e83ecd8b54b65f60f4f426c8a6c6c30db236894a6839504d389bf0343e6f2efac2771f
-  data.tar.gz: c1755fe341e1f171169627dfe4a9b40b20a9fe34fc565f5ae2ee2d2925aebbdb38949fd5b8a1e7285730bd25fffba1c7d7b750113a44b9af4acb4204de2725a9
+  metadata.gz: e69e2cfd05235940649f29100fa36acfb3edfec918c673e7a79f5468b1ee529db3a54c9d00cd0eca3e0cec12df0578b6b185cef6e45fe0af747664eac897a7f9
+  data.tar.gz: 13f82228787833511601d676f2a648d3e0cc00f31b6462794a8f99c062309cbfd66e362d4647e24c8d70154a0f0e651c3c463881e726f8f2f22c61aa9de432f0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/git-story-workflow.gemspec

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

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)

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/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.1.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.1.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-11-27 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