ruby_git_hooks 0.0.40 → 0.0.44

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWIzZWY4YWFhMDQ3OWYyMGJlOWQ1ZjExZTA2NjY0ZDBjMGFiOWVlZA==
+  data.tar.gz: !binary |-
+    ZGJiMTIwZDk4YmY5YWYwMTc3MGJiYTcyNWZlOTg5Y2VlOGM2MWIzNA==
+SHA512:
+  metadata.gz: !binary |-
+    MTJlOTk4MDliOTA0ZWNkYjQ2Y2FkZmMwZGJlOWQwOTUyOWU3YmUzNGJiN2Fi
+    NTk1NTJjMDM4Nzk1YTRkNzhjNWM3ZWZmYjJlZTAyYjAxYjZjZGFjZDIyNzQy
+    N2M0NzVlZTY5YjZiMjcwMGQzMDBhNTUwNWNiYWNlYmM0NTU3OWE=
+  data.tar.gz: !binary |-
+    MjNlNzQzZDVlOWZjYTI0Y2NkMTVlYmMzZjczNjlhM2I5ZGE2NjBjZjVjMTQ3
+    NTVlNDRmMGFkYzRkODhjODBjYjk5MTJhYmQ2MjIwYTYyMzJjNzMzYWIxY2Ri
+    YWFmMjFhYmE3ODdmYjM5MmUzMDViNWIzYTE0N2MxMjc4YmM4ODk=

data/lib/ruby_git_hooks.rb

@@ -59,11 +59,14 @@ module RubyGitHooks
 
       # refs associated with each commit
       attr_accessor :commit_ref_map
+
+      # branches included in this push
+      attr_accessor :branches_changed
     end
 
     # Instances of Hook delegate these methods to the class methods.
     HOOK_INFO = [ :files_changed, :file_contents, :file_diffs, :ls_files,
-                  :commits, :commit_message, :commit_message_file, :commit_ref_map ]
+                  :commits, :commit_message, :commit_message_file, :commit_ref_map, :branches_changed ]
     HOOK_INFO.each do |info_method|
       define_method(info_method) do |*args, &block|
         Hook.send(info_method, *args, &block)
@@ -84,32 +87,38 @@ module RubyGitHooks
           base, commit, ref = line.strip.split
           changes.push [base, commit, ref]
         end
-        self.commit_ref_map = {}  #
-        # commit_ref_map is a list of which new commits are in this push, and which branches they are associated with
+
+        self.branches_changed = {}  # {ref => [base, commit], ref2 => [base, commit]}
+
+        self.commit_ref_map = {}  # commit_ref_map is a list of which new commits are in this push,
+        # and which branches they are associated with
         # as {commit1 => [ref1, ref2], commit2 => [ref1]}
-        # For existing branches, this information is sent in directly "base commit ref"
-        # BUT for branch new branches, the pre/post-receive hook gets "0 commit ref"
-        # ref is of the form refs/heads/branch_name
-
-        new_branches = changes.select{|base, _, _ | base =~  /\A0+\z/ }.collect{|_,_, ref| ref[/refs\/heads\/(\S+)/,1] }
-
-        if !new_branches.empty?
-          # For new branches, we will calculate which commits are new by specifically not including commits which are
-          # present in any other branch (and therefore will have been processed with that branch)
-          all_branches = Hook.shell!("git branch").split(/[* \n]+/).select{|b| !b.empty?}  # remove spaces and the *
-          # ref is like refs/heads/<branch_name>
-          existing_branches = all_branches - new_branches
-          exclude_branches = existing_branches.inject("") {|str, b| str + " ^" + b} # "^B1 ^B2"
+
+        # figure out which commits have already been processed (everything we have seen before)
+        exclude_refs = []  # we know we have seen under these refs already
+            # includes all branches not referenced in this push
+            # and all commits before the base of referenced branches
+        all_branches = Hook.shell!("git for-each-ref --format='%(refname)' refs/heads/").split
+        changes.each do |base, _ , ref|
+          # ref is of the form refs/heads/branch_name
+          all_branches.delete(ref)  # we don't want to use the new ref for this branch
+          exclude_refs << "^#{base}" unless base =~  /\A0+\z/ # add the old ref for this branch to the exclude list
+                # (don't add if it's 0, this is a new branch with no old ref)
         end
 
+        # add the branches which aren't included in this push if any
+        all_branches.each { |ref|  exclude_refs << "^#{ref}" }
 
         self.files_changed = []
         self.file_contents = {}
         self.file_diffs = {}
 
         changes.each do |base, commit, ref|
-          new_branch = base =~  /\A0+\z/
-          if new_branch
+          self.branches_changed[ref] = [base, commit]
+
+          # TODO : calculate file_diffs and file_contents PER COMMIT for pre and post receive hooks
+          # for now it just does the overall diffs
+          if base =~  /\A0+\z/
             # if base is 000 then this is a new branch and we have no easy way know what files were added
             # so for now just don't include files changed in a new branch
             # because really this should be done per commit or at least per branch anyway
@@ -134,19 +143,11 @@ module RubyGitHooks
               file_contents[file_changed] = ""
             end
           end
-
-          # now calculate which commits are new
-          if new_branch
-            # new branch, but we don't want to include all commits from beginning of time
-            # so exclude any commits that are on any other branches
-            # e.g. git rev-list <commit for B3> ^master ^B2
-            # NOTE: have to use commit, not ref, because if this is called in pre-receive the branch name of ref won't
-            # actually have been set up yet!
-            new_commits = Hook.shell!("git rev-list #{commit} #{exclude_branches}").split("\n")
-          else
-            # existing branch, base..commit is right
-            new_commits = Hook.shell!("git rev-list #{base}..#{commit}").split("\n")
-          end
+          
+          # calculate which commits are new - exclude any commits that are on any other branches
+          # e.g. git rev-list <commit for B3> ^old_B3 ^master ^B2 --
+          # (the "--" at the end tells git these are refs NOT file references)
+          new_commits = Hook.shell!("git rev-list #{commit} #{exclude_refs.join(' ')} --").split("\n")
 
           new_commits.each do |one_commit|
             self.commit_ref_map[one_commit] ||= [];

data/lib/ruby_git_hooks/git_ops.rb

@@ -109,4 +109,14 @@ module RubyGitHooks::GitOps
     Hook.shell!("cd #{repo_name} && git rev-list --all").split("\n")
   end
 
+  def git_merge(repo_name = "child_repo", branch = "B1", msg = "Merge branch #{branch}")
+    # better be sure there's not going to be a conflict
+    Hook.shell!("cd #{repo_name} && git merge #{branch} --no-ff -m '#{msg}'")
+  end
+
+  def git_ff_merge(repo_name = "child_repo", branch = "B1", msg = "Merge branch #{branch}")
+    # better be sure there's not going to be a conflict
+    Hook.shell!("cd #{repo_name} && git merge #{branch} --ff")
+  end
+
 end

data/lib/ruby_git_hooks/jira_add_comment.rb

@@ -64,9 +64,6 @@ class JiraCommentAddHook < RubyGitHooks::Hook
 
 
   def check
-    if commits.empty?
-      STDERR.puts "JiraCommentAddHook - need list of commits to process"
-    end
     # called with a list of commits to check, as post-receive.
     # consider it a success for now only if all commit checks are successful
     # may cause us to redo some of the checks.
@@ -114,6 +111,24 @@ class JiraCommentAddHook < RubyGitHooks::Hook
     uri = "#{repo_remote_path}/commit/#{commit}"
   end
 
+  def get_change_list(commit)
+    # we want changes from the previous commit, if any
+    # ideally this list should be available from the ruby_git_hooks directly
+    # since they go through this same process.
+    # use --first-parent so it lists the correct files after a merge
+    current, base = Hook.shell!("git log #{commit} --first-parent -2 --pretty=%H").split
+    if !base
+      # This is the initial commit so all files were added, but have to add the A ourselves
+      files_with_status = Hook.shell!("git ls-tree --name-status -r #{commit}").split("\n")
+      # put the A at the front
+      files_with_status.map!{|filename| "A\t" + filename}
+    else
+
+      files_with_status = Hook.shell!("git diff --name-status #{base}..#{current}")
+    end
+    files_with_status
+  end
+
   def get_commit_branch(commit)
     # get the branch (list) for this commit
     # will usually be a single ref ([refs/heads/branch_name]). but could
@@ -138,21 +153,19 @@ class JiraCommentAddHook < RubyGitHooks::Hook
     # M	test.txt
 
     github_link = build_commit_uri(commit)      # have to do this separately
-    branch = "Branch: #{get_commit_branch(commit)}"
-    begin
-      content = "Revision: %h committed by %cn%nCommit date: %cd%n#{branch}%n#{github_link}%n%n#{commit_message}%n{noformat}"
-      text = Hook.shell!("git log #{commit} -1 --name-status --pretty='#{content}'")
-      text += "{noformat}" # git log puts changes at the bottom, we need to close the noformat tag for Jira
-    rescue
-      text = "No commit details available for #{commit}\n#{commit_message}"
-    end
-    text
+    changes = get_change_list(commit)
+    revision_and_date = Hook.shell!("git log #{commit} -1 --pretty='Revision: %h committed by %cn%nCommit date: %cd'") rescue ""
+    branch = "Branch: #{get_commit_branch(commit)}\n"
+
+    text = "#{revision_and_date}#{branch}#{github_link}\n\n#{commit_message}\n{noformat}\n#{changes}{noformat}"
+
+
   end
 
   def check_one_commit(commit, commit_message)
     STDERR.puts "Checking #{commit[0..6]} #{commit_message.lines.first}"
 
-    jira_tickets = commit_message.scan(JiraReferenceCheckHook::JIRA_TICKET_REGEXP).map(&:strip)
+    jira_tickets = commit_message.scan(JiraReferenceCheckHook::JIRA_TICKET_REGEXP).map(&:strip).uniq
     if jira_tickets.length == 0
       STDERR.puts ">>Commit message must refer to a jira ticket"
       add_error_to_report(commit, commit_message, "no_jira")

data/lib/ruby_git_hooks/version.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 module RubyGitHooks
-  VERSION = "0.0.40"
+  VERSION = "0.0.44"
 end

data/test/basic_hook_test.rb

@@ -51,6 +51,7 @@ class TestHook < RubyGitHooks::Hook
   def check
     File.open("#{TEST_PATH}", "w") do |f|
       f.puts commit_ref_map.inspect
+      f.puts branches_changed.keys
     end
 
     puts "Test hook runs!"
@@ -216,6 +217,67 @@ HOOK
 
   end
 
+  def test_pre_receive_with_merge_commit
+    @hook_name ||= "pre-receive"
+
+    add_hook("parent_repo.git", @hook_name, TEST_HOOK_MULTI)
+
+    # set up master and 2 branches with commits
+    # make changes to different files so no merge conflicts
+    new_commit("child_repo", "file1.txt","Contents",  "master commit")
+    git_create_and_checkout_branch("child_repo", "B1")
+    new_commit("child_repo", "file2.txt","Contents",  "B1 commit")
+    git_create_and_checkout_branch("child_repo", "B2")
+    new_commit("child_repo", "file3.txt","Contents",  "B2 commit")
+    git_checkout("child_repo", "master")
+    new_commit("child_repo", "file4.txt","Contents",  "master commit")
+
+    git_push_all("child_repo")
+    before_commits =  git_revlist_all("child_repo")  # commits already in the repo
+
+    # now do a merge commit
+    git_checkout("child_repo", "master")
+    git_merge("child_repo", "B1")
+    git_push_all("child_repo")
+
+    # make sure none of the before_commits are in the output
+    contents = File.read(TEST_PATH)
+    before_commits.each do |c|
+      refute contents.include?(c), "#{c} shouldn't be processed!"
+    end
+  end
+
+  def test_pre_receive_ff_merge
+    @hook_name ||= "pre-receive"
+
+    add_hook("parent_repo.git", @hook_name, TEST_HOOK_MULTI)
+
+    git_create_and_checkout_branch("child_repo", "B1")
+    new_commit("child_repo", "file22.txt","Contents",  "B1 commit")
+    new_commit("child_repo", "file23.txt","Contents",  "B1 commit 2")
+    git_push_all("child_repo")
+    before_commits =  git_revlist_all("child_repo")  # commits already in the repo
+
+    # now a merge ff commit
+    # shouldn't be any new commits
+    git_checkout("child_repo", "master")
+    git_ff_merge("child_repo", "B1")
+    after_commits =  git_revlist_all("child_repo")  # commits already in the repo
+
+    git_push_all("child_repo")
+
+    assert_empty(before_commits-after_commits)  # there are no new commits
+    contents = File.read(TEST_PATH)
+    before_commits.each do |c|
+      refute contents.include?(c), "#{c} shouldn't be processed!"
+    end
+
+    # should check that branches_changed is accurate
+    assert contents.include?("master")
+
+
+  end
+
 
   def test_pre_receive_with_delete
     @hook_name ||= "pre-receive"

data/test/jira_add_comment_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 require "test_helper"
@@ -32,12 +33,27 @@ class JiraCommentAddHookTest < HookTestCase
                                        "username" => "user", "password" => "password"
   end
 
-  def fake_hook_check(msg = "Commit message")
+  def fake_hook_check(msg = "Commit message", with_branch_merge = false)
     new_commit("child_repo", "file.txt","Contents",  msg)
     stub(@hook).commit_message { msg }
     sha = last_commit_sha("child_repo")
-    stub(@hook).commits{[sha]}
-    stub(@hook).commit_ref_map{  {sha => ["refs/heads/master"]} }  # it's always the master branch
+    hook_refs = {sha => ["refs/heads/master"]}   # it's always the master branch
+    if with_branch_merge
+      git_create_and_checkout_branch("child_repo", "B1")
+      new_commit("child_repo", "file2.txt","Contents",  "B1 commit\n(#{msg})")
+      sha2 = last_commit_sha("child_repo")
+
+      git_checkout("child_repo", "master")
+      git_merge("child_repo", "B1", "Merge Branch B1\n(#{msg})")
+      merge_sha = last_commit_sha("child_repo")
+
+      hook_refs[sha2] = ["refs/heads/master","refs/heads/B1"]
+      hook_refs[merge_sha] = ["refs/heads/master"]
+    end
+
+    stub(@hook).commit_ref_map{ hook_refs  }
+    stub(@hook).commits{hook_refs.keys}
+
     Dir.chdir("child_repo") do
       @hook.check
     end
@@ -91,6 +107,22 @@ JSON
     # but at least we'll make sure it doesn't fail.
   end
 
+  def test_same_good_reference_twice
+    mock(RestClient).get("https://user:password@jira.example.com/rest/api/latest/issue/GOOD-234") { <<JSON }
+{ "fields": { "status": { "name": "Open" } } }
+JSON
+
+    mock(RestClient).post.with_any_args {<<JSON }      # more complicated to check the args, just be sure it's called.
+{ "fields": { "status": { "name": "Open" } } }
+JSON
+    git_tag("child_repo", "0.1")
+    fake_hook_check("Message with GOOD-234 reference to Jira and another GOOD-234" )
+
+    # as long as the mocked RestClient calls happen, we succeeded
+    # would be better if we had a way to check if the tag is in the message
+    # but at least we'll make sure it doesn't fail.
+  end
+
   def test_good_reference_with_description
 
     mock(RestClient).get("https://user:password@jira.example.com/rest/api/latest/issue/GOOD-234") { <<JSON }
@@ -103,8 +135,32 @@ JSON
     # add a tag so describe works
 
     fake_hook_check("Message with GOOD-234 reference to Jira" )
+  end
+
+  def test_good_reference_with_long_message
 
+    mock(RestClient).get("https://user:password@jira.example.com/rest/api/latest/issue/GOOD-234") { <<JSON }
+{ "fields": { "status": { "name": "Open" } } }
+JSON
+
+    mock(RestClient).post.with_any_args {<<JSON }      # more complicated to check the args, just be sure it's called.
+{ "fields": { "status": { "name": "Open" } } }
+JSON
 
+    fake_hook_check("Message with GOOD-234 reference to Jira\n\nWhat if it can't handle unicode like ©?\n(Good, it can!)" )
+  end
+
+  def test_good_ref_with_merge
+    stub(RestClient).get("https://user:password@jira.example.com/rest/api/latest/issue/GOOD-234") { <<JSON }
+{ "fields": { "status": { "name": "Open" } } }
+JSON
+
+    stub(RestClient).post.with_any_args {<<JSON }      # more complicated to check the args, just be sure it's called.
+{ "fields": { "status": { "name": "Open" } } }
+JSON
+    #  look at output to see what gets generated for message
+    puts "***** STARTING MERGE REF CHECK *****"
+    fake_hook_check("Message with GOOD-234 reference to Jira" , true)
   end
 
 
@@ -169,4 +225,5 @@ JSON
 
 
 
+
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_git_hooks
 version: !ruby/object:Gem::Version
-  version: 0.0.40
-  prerelease: 
+  version: 0.0.44
 platform: ruby
 authors:
 - Noah Gibbs
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -96,7 +85,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,7 +99,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -120,7 +106,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -187,27 +172,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DSL and manager for git hooks in Ruby.
 test_files:
 - test/basic_hook_test.rb