ruby_git_hooks 0.0.44 → 0.0.45

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWIzZWY4YWFhMDQ3OWYyMGJlOWQ1ZjExZTA2NjY0ZDBjMGFiOWVlZA==
+    OWU2N2FmNTkyNGM1NzcwYWZkNmM4NmNmZWY0NGMyM2NkNjEyMDVmMg==
   data.tar.gz: !binary |-
-    ZGJiMTIwZDk4YmY5YWYwMTc3MGJiYTcyNWZlOTg5Y2VlOGM2MWIzNA==
+    NjM5YTJiNTRjZmFlY2U4Y2MxNGU0ZTkzYjZmMTc5MmU2MGU4ZjNiOQ==
 SHA512:
   metadata.gz: !binary |-
-    MTJlOTk4MDliOTA0ZWNkYjQ2Y2FkZmMwZGJlOWQwOTUyOWU3YmUzNGJiN2Fi
-    NTk1NTJjMDM4Nzk1YTRkNzhjNWM3ZWZmYjJlZTAyYjAxYjZjZGFjZDIyNzQy
-    N2M0NzVlZTY5YjZiMjcwMGQzMDBhNTUwNWNiYWNlYmM0NTU3OWE=
+    N2VjNWMzODQyMzJlMzU0YWQ4MjIzZjRiYzNjNzhhOWY0MmNkZjNkNmFmYTU0
+    ZWM4MzU4MWJjN2FmZWQ0M2Q0MDBlYmE0MjRjMDNkMTE2NDkxY2IxZDMwMzc5
+    OGI2MzJkNTgwMDRkMDZhMTRiNGI0OTQzOTE2MjliZGY4NmRjNDk=
   data.tar.gz: !binary |-
-    MjNlNzQzZDVlOWZjYTI0Y2NkMTVlYmMzZjczNjlhM2I5ZGE2NjBjZjVjMTQ3
-    NTVlNDRmMGFkYzRkODhjODBjYjk5MTJhYmQ2MjIwYTYyMzJjNzMzYWIxY2Ri
-    YWFmMjFhYmE3ODdmYjM5MmUzMDViNWIzYTE0N2MxMjc4YmM4ODk=
+    ODcyNzMzMTljOTgyZThkYTk0OTMxODZkYjBhY2RiNGE2ZWQyMzdmYmJmNzUx
+    YmQ1MmViZGZkY2ZlZmE2Y2IxOWVlNDg5Mjg2NjI0Zjc2MmNjZWE5ZmY5MWFj
+    Y2YwYTMzMzIxZjJhNWFmY2FlYzE2NTFkYTg5ZDkzYjUzNzMxMDY=

data/lib/ruby_git_hooks/git_ops.rb

@@ -58,6 +58,16 @@ module RubyGitHooks::GitOps
     @single_file_counter += 1
   end
 
+  def new_multi_file_commit(num_files = 3, repo_name = "child_repo", commit_message = "multi-file commit", base_filename = "test", contents="Contents")
+    (1..num_files).each do |num|
+      File.open(File.join(repo_name, base_filename + num.to_s), "w") do |f|
+        f.write(contents)
+      end
+    end
+    Hook.shell! "cd #{repo_name} && git add . && git commit -m \"#{commit_message}\""
+
+  end
+
   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
     Hook.shell! "cd #{repo_name} && git rm #{filename}"
@@ -68,7 +78,6 @@ module RubyGitHooks::GitOps
     Hook.shell! "cd #{repo_name} && git mv #{filename} #{new_filename}"
   end
 
-
   def last_commit_sha(repo_name = "child_repo")
     Hook.shell!("cd #{repo_name} && git log -n 1 --format=%H").chomp
   end

data/lib/ruby_git_hooks/jira_add_comment.rb

@@ -121,9 +121,8 @@ class JiraCommentAddHook < RubyGitHooks::Hook
       # 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}
+      files_with_status = files_with_status.map{|filename| "A\t" + filename}.join("\n")
     else
-
       files_with_status = Hook.shell!("git diff --name-status #{base}..#{current}")
     end
     files_with_status

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.44"
+  VERSION = "0.0.45"
 end

data/test/jira_add_comment_test.rb

@@ -159,7 +159,6 @@ JSON
 { "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
 
@@ -223,6 +222,43 @@ JSON
   end
 
 
+  def test_first_commit
+    # if we had a way to check the actual message generated for the content, which we don't right now
+    # we should check that the first commit shows the changes with "A" in front of them and with the correct
+    # formatting (we missed a bug where it leaves them in an array instead of a list).  BUT we can at least
+    # do a new commit with multiple files and then look at the output to be sure it's right.
+
+    puts "TEST FIRST COMMIT"
+    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")
+
+    # we want to test the very first commit, pushed with multiple files,
+    # so have to do it specifically instead of what's already set up
+    # (can still use @hook)
+
+    new_bare_repo("parent_repo2.git")
+    clone_repo("parent_repo2.git", "child_repo2")
+    new_multi_file_commit(3, "child_repo2", "Message with GOOD-234 reference to Jira" )
+    stub(@hook).commit_message { msg }
+    sha = last_commit_sha("child_repo2")   # one commit sha, multiple files changed
+    hook_refs = {sha => ["refs/heads/master"]}   # it's always the master branch
+    stub(@hook).commit_ref_map{ hook_refs  }
+    stub(@hook).commits{hook_refs.keys}
+    Dir.chdir("child_repo2") do
+      @hook.check
+    end
+
+    # and look and see if it looks right...
+
+  end
+
+
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_git_hooks
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.45
 platform: ruby
 authors:
 - Noah Gibbs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony