pivo_flow 0.4.3 → 0.4.4

data/bin/pf-prepare-commit-msg

@@ -5,7 +5,7 @@ if File.exists?(story_path)
   if story_id =~ /(\d{7,})/
     puts IO.read(ARGV[0])
     commit_msg = IO.read(ARGV[0])
-    unless commit_msg.include?($1)
+    unless commit_msg.include?($1) or commit_msg =~ /Merge branch/
       File.open(ARGV[0], 'w') do |file|
         file.print commit_msg
         file.print "[##{$1}]"

data/lib/pivo_flow/base.rb

@@ -28,6 +28,7 @@ module PivoFlow
       @git_hook_path = File.join(@git_dir, 'hooks', 'prepare-commit-msg')
       @pf_git_hook_name = 'pf-prepare-commit-msg'
       @pf_git_hook_path = File.join(@git_dir, 'hooks', @pf_git_hook_name)
+      @pf_git_hook_local_path = File.join(File.dirname(__FILE__), '..', '..', 'bin', @pf_git_hook_name)
       @pf_git_hook_cmd = "#{@pf_git_hook_path} $1"
       @options[:repository] = Grit::Repo.new(@git_dir)
 
@@ -38,7 +39,11 @@ module PivoFlow
 
     # Check if git hook is already installed
     def git_hook_needed?
-      !File.executable?(@git_hook_path) || !File.read(@git_hook_path).match(/#{@pf_git_hook_name} \$1/)
+      !File.executable?(@git_hook_path) || !File.read(@git_hook_path).match(/#{@pf_git_hook_name} \$1/) || !pf_git_hook_valid?
+    end
+
+    def pf_git_hook_valid?
+      File.executable?(@pf_git_hook_path) && File.read(@pf_git_hook_path).match(File.read(@pf_git_hook_local_path))
     end
 
     def git_directory_present?
@@ -51,11 +56,10 @@ module PivoFlow
     # helpful if user has his custom hooks)
     def install_git_hook
       puts "Installing prepare-commit-msg hook..."
-      hook_path = File.join(File.dirname(__FILE__), '..', '..', 'bin', @pf_git_hook_name)
       FileUtils.mkdir_p(File.dirname(@pf_git_hook_path))
-      FileUtils.cp(hook_path, @pf_git_hook_path, preserve: true)
+      FileUtils.cp(@pf_git_hook_local_path, @pf_git_hook_path, preserve: true)
       puts "File copied..."
-      unless File.exists?(@git_hook_path) && File.read(@git_hook_path).match(@pf_git_hook_cmd)
+      unless File.exists?(@git_hook_path) && File.read(@git_hook_path).match(@pf_git_hook_name)
         File.open(@git_hook_path, "a") { |f| f.puts(@pf_git_hook_cmd) }
         puts "Reference to pf-prepare-commit-msg added to prepare-commit-msg..."
       end

data/lib/pivo_flow/version.rb

@@ -1,3 +1,3 @@
 module PivoFlow
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivo_flow
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors: