ruby_git_hooks 0.0.32 → 0.0.40

data/README.md

@@ -254,6 +254,14 @@ Ruby version managers like rbenv.
 
 ## Troubleshooting
 
+### Running our tests
+For now, to run the tests you need to be sure to have the latest code
+actually installed.
+
+* gem build ruby_git_hooks.gemspec
+* gem install ruby_git_hooks-0.0.34.gem (but use your real file name)
+* rake test
+
 ### It Says It's Not Installed
 
 Sometimes you can get an error saying that ruby_git_hooks isn't

data/TODO

@@ -64,4 +64,6 @@
 * In jira_add_comment_hook, rescue DNS errors for VPN setups.  Allow
   the commit, but print a message.
 
+* In jira_add_comment_hook, allow to specify which branches to process
+
 * In ruby_git_hooks.rb, have "shell!" capture both STDOUT and STDERR.

data/lib/ruby_git_hooks.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 require "ruby_git_hooks/version"
 
@@ -46,19 +46,24 @@ module RubyGitHooks
       # All filenames in repo
       attr_accessor :ls_files
 
-      # All current commits (sometimes empty)
-      attr_accessor :commits
-
       # Commit message for current commit
       attr_accessor :commit_message
 
       # Commit message file for current commit
       attr_accessor :commit_message_file
+
+      # the following are for hooks which involve multiple commits (pre-receive, post-receive):
+      # (may be empty in other hooks)
+      # All current commits
+      attr_accessor :commits
+
+      # refs associated with each commit
+      attr_accessor :commit_ref_map
     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 ]
+                  :commits, :commit_message, :commit_message_file, :commit_ref_map ]
     HOOK_INFO.each do |info_method|
       define_method(info_method) do |*args, &block|
         Hook.send(info_method, *args, &block)
@@ -69,25 +74,47 @@ module RubyGitHooks
 
       # Pre-receive gets no args, but STDIN with a list of changes.
       "pre-receive" => proc {
+        def commit_date(c)
+          date = Hook.shell!("git log #{c} --pretty=%ct -1").strip.to_i
+        end
+
         changes = []
         STDIN.each_line do |line|
+          # STDERR.puts line # for debugging
           base, commit, ref = line.strip.split
           changes.push [base, commit, ref]
         end
-        self.commits = []
+        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"
+        end
+
 
         self.files_changed = []
         self.file_contents = {}
         self.file_diffs = {}
 
         changes.each do |base, commit, ref|
-          no_base = false
-          if base =~  /\A0+\z/
-            # if base is 000... (initial commit), then all files were added, and git diff won't work
-            no_base = true
-            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}
+          new_branch = base =~  /\A0+\z/
+          if new_branch
+            # 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
+            # TODO: we could figure it out based on the branch commit calculations per branch (see below)
+            files_with_status = []
           else
             files_with_status = Hook.shell!("git diff --name-status #{base}..#{commit}").split("\n")
           end
@@ -107,19 +134,34 @@ module RubyGitHooks
               file_contents[file_changed] = ""
             end
           end
-          commit_range  = no_base ? commit : "#{base}..#{commit}"
-          new_commits = Hook.shell!("git log --pretty=format:%H #{commit_range}").split("\n")
-          self.commits = self.commits | new_commits
+
+          # 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
+
+          new_commits.each do |one_commit|
+            self.commit_ref_map[one_commit] ||= [];
+            self.commit_ref_map[one_commit] << ref  # name of the branch associated with this commit
+          end
         end
 
+        # we want the list of commits sorted by commit date
+        self.commits = self.commit_ref_map.keys.sort{|a,b|commit_date(b) <=> commit_date(a)}
+
         if !self.commits.empty?
             file_list_revision =  self.commits.first # can't just use HEAD - remote may be on branch with no HEAD
             self.ls_files = Hook.shell!("git ls-tree --full-tree --name-only -r #{file_list_revision}").split("\n")
-          # TODO should store ls_files per commit and ls_files with branch name (in case commits on multiple branches)?
+          # TODO should store ls_files per commit (with status)?
         end
-
-
-
       },
 
       "pre-commit" => proc {
@@ -286,7 +328,6 @@ ERR
           "any of: #{HOOK_NAMES.inspect}"
         exit 1
       end
-
       unless HOOK_TYPE_SETUP[@run_as_hook]
         STDERR.puts "No setup defined for hook type #{@run_as_hook.inspect}!"
         exit 1

data/lib/ruby_git_hooks/git_ops.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 # This is a set of Git operations, run via shell.  It permits much
 # cleaner unit tests.  Initially it was written in this way because it
@@ -57,7 +57,6 @@ module RubyGitHooks::GitOps
 
     @single_file_counter += 1
   end
-    system("git mv child_repo/file_to_rename child_repo/renamed_file")
 
   def git_delete(repo_name="child_repo", filename="file_to_delete")  
     # filename is a file that has already been added and commited to the repo
@@ -90,4 +89,24 @@ module RubyGitHooks::GitOps
     Hook.shell!("cd #{repo_name} && git log -1").chomp
   end
 
+  def git_tag(repo_name="child_repo", tagname="0.1")
+    Hook.shell! "cd #{repo_name} && git tag -a #{tagname} -m 'test'"
+  end
+
+  def git_checkout(repo_name="child_repo", branch_name="master")
+    Hook.shell! "cd #{repo_name} && git checkout #{branch_name}"
+  end
+
+  def git_create_and_checkout_branch(repo_name="child_repo", branch_name="B1")
+    Hook.shell! "cd #{repo_name} && git checkout -b #{branch_name}"
+  end
+
+  def git_push_all(repo_name = "child_repo")
+    Hook.shell! "cd #{repo_name} && git push --all"
+  end
+
+  def git_revlist_all(repo_name = "child_repo")
+    Hook.shell!("cd #{repo_name} && git rev-list --all").split("\n")
+  end
+
 end

data/lib/ruby_git_hooks/jira_add_comment.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 require "ruby_git_hooks"
 require "ruby_git_hooks/jira_ref_check"
@@ -114,21 +114,12 @@ 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.
-    current, base = Hook.shell!("git log #{commit} -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
+  def get_commit_branch(commit)
+    # get the branch (list) for this commit
+    # will usually be a single ref ([refs/heads/branch_name]). but could
+    # theoretically be multiple if single commit is on several branches processed at the same time.
+    refs = self.commit_ref_map[commit]
+    refs ? refs.join(" ") : ""
   end
 
   def get_comment_content(commit, commit_message)
@@ -146,12 +137,16 @@ class JiraCommentAddHook < RubyGitHooks::Hook
     #
     # M	test.txt
 
-     github_link = build_commit_uri(commit)      # have to do this separately
-     changes = get_change_list(commit)
-
-     revision_and_date = Hook.shell!("git log #{commit} -1 --pretty='Revision: %h committed by %cn%nCommit date: %cd'") rescue ""
-
-    text = "#{revision_and_date}#{github_link}\n\n#{commit_message}\n{noformat}#{changes}{noformat}"
+    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
   end
 
   def check_one_commit(commit, commit_message)
@@ -262,7 +257,7 @@ class JiraCommentAddHook < RubyGitHooks::Hook
     # (it looks scary when there's a lot)
     # when there's only one, just return the commit
     # when more than one return first_commit..last_commit
-    # use the shortened SHAH1 for readability
+    # use the shortened SHA-1 for readability
     return "" if !self.commits || self.commits.empty?
 
     if self.commits.size == 1

data/lib/ruby_git_hooks/version.rb

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

data/test/basic_hook_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 require "test_helper"
 
@@ -40,6 +40,24 @@ class TestHook < RubyGitHooks::Hook
   end
 end
 
+RubyGitHooks.run TestHook.new
+HOOK
+
+  TEST_HOOK_MULTI = <<HOOK
+#{RubyGitHooks.shebang}
+require "ruby_git_hooks"
+
+class TestHook < RubyGitHooks::Hook
+  def check
+    File.open("#{TEST_PATH}", "w") do |f|
+      f.puts commit_ref_map.inspect
+    end
+
+    puts "Test hook runs!"
+    true
+  end
+end
+
 RubyGitHooks.run TestHook.new
 HOOK
 
@@ -91,32 +109,128 @@ HOOK
   end
 
   def test_simple_pre_receive
-    add_hook("parent_repo.git", "pre-receive", TEST_HOOK_BODY)
+    @hook_name ||= "pre-receive"
+    add_hook("parent_repo.git", @hook_name, TEST_HOOK_BODY)
 
     new_single_file_commit "child_repo"
+
     git_push("child_repo")
 
+    assert File.exist?(TEST_PATH), "Test #{@hook_name} hook didn't run!"
+
+    # file contents not expected to reach pre-receive hook for first push of a branch
+   # assert File.read(TEST_PATH).include?("Single-file commit"),  "No file contents reached pre-receive hook!"
+  end
+
+
+  def test_multiple_pre_receive
+    @hook_name ||= "pre-receive"
+    add_hook("parent_repo.git", @hook_name, TEST_HOOK_MULTI)
+
+    before_commits =  git_revlist_all("child_repo")  # commits already in the repo
+
+    new_single_file_commit "child_repo"
+
+    git_create_and_checkout_branch("child_repo", "B1")
+    new_single_file_commit "child_repo"
+    git_push_all("child_repo")  # pushes multiple branches
+
     assert File.exist?(TEST_PATH), "Test pre-receive hook didn't run!"
-    assert File.read(TEST_PATH).include?("Single-file commit"),
-      "No file contents reached pre-receive hook!"
+
+    commits =  git_revlist_all("child_repo") - before_commits  # will give us all the commits we just made
+    contents = File.read(TEST_PATH)
+    commits.each do |c|
+      assert contents.include?(c), "Missing commit info for #{c} in #{@hook_name} hook!"
+    end
+    assert contents.include?("B1")
+    assert contents.include?("master")
+  end
+
+  def test_simple_post_receive
+    @hook_name = "post-receive"  # pre and post are the same, but want to test both
+    # default to pre but this lets us use the exact same tests.
+    test_simple_pre_receive
+  end
+
+  def test_multiple_post_receive
+    @hook_name = "post-receive"  # pre and post are the same, but want to test both
+    # default to pre but this lets us use the exact same tests.
+    test_multiple_branch_pre_receive
+  end
+
+  def test_delete_post_receive
+    @hook_name = "post-receive"  # pre and post are the same, but want to test both
+    # default to pre but this lets us use the exact same tests.
+    test_pre_receive_with_delete
+  end
+
+
+
+  def test_multiple_branch_pre_receive
+    @hook_name ||= "pre-receive"
+
+    add_hook("parent_repo.git", @hook_name, TEST_HOOK_MULTI)
+
+    before_commits =  git_revlist_all("child_repo")  # commits already in the repo
+
+    new_single_file_commit "child_repo" # commit to master
+    git_create_and_checkout_branch("child_repo", "B1")
+    new_single_file_commit "child_repo"
+    git_create_and_checkout_branch("child_repo", "B2")
+    new_single_file_commit "child_repo"
+    git_checkout("child_repo", "master")
+    new_single_file_commit "child_repo"
+
+    git_push_all("child_repo")  # pushes multiple branches
+
+    commits =  before_commits - git_revlist_all("child_repo")  # will give us all the commits we just made
+    contents = File.read(TEST_PATH)
+    commits.each do |c|
+      assert contents.include?(c), "Missing commit info for #{c} in #{@hook_name} hook!"
+    end
+    assert contents.include?("B1")
+    assert contents.include?("B2")
+    assert contents.include?("master")
+
+    # now push a commit to a single existing branch and a new branch
+    before_commits =  git_revlist_all("child_repo")  # commits already in the repo
+
+    git_create_and_checkout_branch("child_repo", "B4")  # no commits
+    git_checkout("child_repo", "B1")
+    new_single_file_commit "child_repo"
+    git_create_and_checkout_branch("child_repo", "B3")
+    new_single_file_commit "child_repo"
+
+    git_push_all("child_repo")  # pushes multiple branches
+
+    commits =  git_revlist_all("child_repo") - before_commits  # will give us all the commits we just made
+    contents = File.read(TEST_PATH)
+    commits.each do |c|
+      assert contents.include?(c), "Missing commit info for #{c} in pre-receive hook!"
+    end
+    assert contents.include?("B1")
+    assert contents.include?("B3")
+
+    refute contents.include?("B2")
+    refute contents.include?("master")
+
   end
 
 
   def test_pre_receive_with_delete
-    add_hook("parent_repo.git", "pre-receive", TEST_HOOK_BODY)
+    @hook_name ||= "pre-receive"
+    add_hook("parent_repo.git", @hook_name, TEST_HOOK_BODY)
 
     new_commit "child_repo", "file_to_delete"
     git_push "child_repo"
 
-    
     git_delete "child_repo", "file_to_delete"
     git_commit "child_repo", "Deleted file_to_delete"
     git_push "child_repo"
 
-
-    assert File.exist?(TEST_PATH), "Test pre-receive hook didn't run!"
+    assert File.exist?(TEST_PATH), "Test #{@hook_name} hook didn't run!"
     assert File.read(TEST_PATH).include?('"file_to_delete"=>""'),
-      "File deletion did not reach pre-receive hook!"
+      "File deletion did not reach #{@hook_name} hook!"
   end
 
   def test_commit_msg

data/test/copyright_check_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 require "test_helper"
 
@@ -9,6 +9,7 @@ class RealCopyrightCheckHookTest < HookTestCase
   REPOS_DIR = File.expand_path File.join(File.dirname(__FILE__), "repos")
   FAKE_MAILER = File.join(File.dirname(__FILE__), "fake_mailer")
   MAILER_FILE = File.join(File.dirname(__FILE__), "mail_params")
+  CURRENT_YEAR = Time.now.strftime("%Y")
   TEST_HOOK_BASIC = <<TEST
 #{RubyGitHooks.shebang}
 require "ruby_git_hooks/copyright_check"
@@ -115,7 +116,7 @@ FILE_CONTENTS
     add_hook("child_repo", "post-commit", TEST_HOOK_BASIC)
 
     new_commit("child_repo", "correct_file.rb", <<FILE_CONTENTS)
-# Copyright (C) 1941-2013 YoyoDyne, Inc.  All Rights Reserved.
+# Copyright (C) 1941-#{CURRENT_YEAR} YoyoDyne, Inc.  All Rights Reserved.
 FILE_CONTENTS
 
     assert !File.exist?(MAILER_FILE), "Copyright test must not send email!"
@@ -125,7 +126,7 @@ FILE_CONTENTS
     add_hook("child_repo", "post-commit", TEST_HOOK_COMPANY)
 
     new_commit("child_repo", "correct_file.rb", <<FILE_CONTENTS)
-# Copyright (C) 1941-2013 YoyoDyne Industries  All Rights Reserved.
+# Copyright (C) 1941-#{CURRENT_YEAR} YoyoDyne Industries  All Rights Reserved.
 FILE_CONTENTS
 
     assert !File.exist?(MAILER_FILE), "Copyright test must not send email!"
@@ -135,7 +136,7 @@ FILE_CONTENTS
     add_hook("child_repo", "post-commit", TEST_HOOK_COMPANY)
 
     new_commit("child_repo", "correct_file.rb", <<FILE_CONTENTS)
-# Copyright (C) 1941-2013 YoyoWrong  All Rights Reserved.
+# Copyright (C) 1941-#{CURRENT_YEAR} YoyoWrong  All Rights Reserved.
 FILE_CONTENTS
 
     assert File.exist?(MAILER_FILE), "Must email about wrong company name!"
@@ -145,12 +146,22 @@ FILE_CONTENTS
     add_hook("child_repo", "post-commit", TEST_HOOK_BASIC)
 
     new_commit("child_repo", "correct_file_single_year.rb", <<FILE_CONTENTS)
-# Copyright (C) 2013 YoyoDyne, Inc.  All Rights Reserved.
+# Copyright (C) #{CURRENT_YEAR} YoyoDyne, Inc.  All Rights Reserved.
 FILE_CONTENTS
 
     assert !File.exist?(MAILER_FILE), "Copyright test must not send email!"
   end
 
+  def test_copyright_wrong_year
+    add_hook("child_repo", "post-commit", TEST_HOOK_COMPANY)
+
+    new_commit("child_repo", "correct_file.rb", <<FILE_CONTENTS)
+# Copyright (C) 2012 YoyoDyne, Inc.  All Rights Reserved.
+FILE_CONTENTS
+
+    assert File.exist?(MAILER_FILE), "Must email about wrong date!"
+  end
+
   def test_copyright_exclude_files
     add_hook("child_repo", "post-commit", TEST_HOOK_EXCLUDE)
     new_commit("child_repo", "schema.rb", <<FILE_CONTENTS)

data/test/jira_add_comment_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 require "test_helper"
 require "ruby_git_hooks/jira_add_comment"
@@ -37,6 +37,7 @@ class JiraCommentAddHookTest < HookTestCase
     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
     Dir.chdir("child_repo") do
       @hook.check
     end
@@ -60,7 +61,7 @@ class JiraCommentAddHookTest < HookTestCase
 
   def test_bad_reference
     dont_allow(JiraCommentAddHook).add_comment   # check that no comments are added
-                                                         # because there are no valid tickets
+                                                 # because there are no valid tickets
     mock(RestClient).get("https://user:password@jira.example.com/rest/api/latest/issue/BAD-234") do
       exc = RestClient::Exception.new
       mock(exc).http_code.at_least(1) { 404 }
@@ -82,10 +83,28 @@ 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" )
 
     # 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 }
+{ "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
+    # add a tag so describe works
+
+    fake_hook_check("Message with GOOD-234 reference to Jira" )
+
+
   end
 
 
@@ -148,4 +167,6 @@ JSON
   end
 
 
+
+
 end

data/test/max_file_size_hook_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 require "test_helper"
 
@@ -11,7 +11,7 @@ class MaxFileSizeHookTest < HookTestCase
 #{RubyGitHooks.shebang}
 require "ruby_git_hooks/max_file_size"
 
-RubyGitHooks.run MaxFileSizeHook.new(MAX_SIZE)
+RubyGitHooks.run MaxFileSizeHook.new(#{MAX_SIZE})
 TEST
 
   def setup

data/test/multi_hook_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 require "test_helper"
 
@@ -6,6 +6,7 @@ require "minitest/autorun"
 
 class CopyrightCheckHookTest < HookTestCase
   REPOS_DIR = File.expand_path File.join(File.dirname(__FILE__), "repos")
+  CURRENT_YEAR = Time.now.strftime("%Y")
   TEST_HOOK_MULTI_REG = <<TEST
 #{RubyGitHooks.shebang}
 require "ruby_git_hooks/ruby_debug"
@@ -45,7 +46,7 @@ TEST
     last_sha = last_commit_sha
 
     new_commit("child_repo", "myfile.rb", <<FILE_CONTENTS)
-# Copyright (C) 2013 YoyoDyne, Inc.  All Rights Reserved.
+# Copyright (C) #{CURRENT_YEAR} YoyoDyne, Inc.  All Rights Reserved.
 # No copyright notice, no ruby-debug.  Should be fine.
 FILE_CONTENTS
 
@@ -65,7 +66,7 @@ FILE_CONTENTS
     assert_raises RuntimeError do
       new_commit("child_repo", "myfile.rb", <<FILE_CONTENTS)
 # Includes a copyright notice, but has ruby-debug
-# Copyright (C) 2013 YoyoDyne, Inc.  All Rights Reserved.
+# Copyright (C) #{CURRENT_YEAR} YoyoDyne, Inc.  All Rights Reserved.
 require 'ruby-debug'
 FILE_CONTENTS
     end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 OL2, Inc. See LICENSE.txt for details.
+# Copyright (C) 2013-2014 OL2, Inc. See LICENSE.txt for details.
 
 # Test local copy first
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
@@ -9,7 +9,7 @@ require "rr"
 require "ruby_git_hooks"
 require "ruby_git_hooks/git_ops"
 
-class HookTestCase < MiniTest::Unit::TestCase
+class HookTestCase < MiniTest::Test
   Hook = RubyGitHooks::Hook
   include RubyGitHooks::GitOps
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_git_hooks
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: DSL and manager for git hooks in Ruby.
@@ -223,4 +223,3 @@ test_files:
 - test/repos/.keep
 - test/test_helper.rb
 - test/watermark_test.rb
-has_rdoc: