git-whence 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1b7eea59985e627d3b8ea1d736ed08b366ce2f4
-  data.tar.gz: ea63dbc55464e70ba50375ea89200e7bbb2c5d37
+  metadata.gz: 3d23b4ac84ee717b785cd7de075b1a2d035509e5
+  data.tar.gz: d7b37d818091f7abeaa0833f83d26a780c140b66
 SHA512:
-  metadata.gz: 0904f748ef078e0c8cf4e0e78f562a4d39b516b959abf7c4da3f95eaeb3f55d97055cd550a3036b37c195ed80c51ed1a6512efcabc5a2f351483ff09eb4c70f5
-  data.tar.gz: c960879a1edcfcaca0f11e80ea8e8644ef21ec7dcdc55db8e5560d158f8e326e43d0728322434ace15dc063058e50d6f750c25830f7c7dd720a771a1aa766364
+  metadata.gz: d357a86878294eaebddc58f3b21d7e53665260c744396325ee1ef056ce4b7b612c9a2bdd51d995fae61bb5fb620639f474b12e9b2c866ac300e9c5285b6d8c5a
+  data.tar.gz: c069e55bb44efa2c09aa52b48c9bcd74b2972421d6f477d709ab0ded902331b90db2ed97582b1d2473bd582ef6ddcb3d965870e7a89ce8dddb54bfcc8cc3e7c2

data/lib/git/whence.rb

@@ -7,28 +7,43 @@ module Git::Whence
       def run(argv)
         options = parse_options(argv)
         commit = argv[0]
-        unless system("git rev-parse --git-dir 1>&2>/dev/null")
+        unless system("git rev-parse --git-dir 2>&1 >/dev/null")
           puts "Not in a git directory"
           return 1
         end
 
-        merge = find_merge(commit)
-        if merge
-          if options[:open] && (pr = merge[/Merge pull request #(\d+) from /, 1]) && (url = origin)
-            repo = url[%r{(\w+/[-\w\.]+)}i, 1].to_s.sub(/\.git$/, "")
-            exec %Q{open "https://github.com/#{repo}/pull/#{pr}"}
+        if is_merge?(commit)
+          $stderr.puts "Commit is a merge"
+          finished_with_commit(commit, options)
+          1
+        else
+          merge = find_merge(commit)
+          if merge
+            finished_with_commit(merge, options)
+            0
           else
-            puts merge
+            $stderr.puts "Unable to find merge"
+            1
           end
-          0
-        else
-          $stderr.puts "Unable to find commit"
-          1
         end
       end
 
       private
 
+      def is_merge?(commit)
+        sh("git cat-file -p #{commit}").split("\n")[1..2].grep(/parent /).size > 1
+      end
+
+      def finished_with_commit(merge, options)
+        info = sh("git show -s --oneline #{merge}").strip
+        if options[:open] && (pr = info[/Merge pull request #(\d+) from /, 1]) && (url = origin)
+          repo = url[%r{(\w+/[-\w\.]+)}i, 1].to_s.sub(/\.git$/, "")
+          exec %Q{open "https://github.com/#{repo}/pull/#{pr}"}
+        else
+          puts info
+        end
+      end
+
       def origin
         remotes = sh("git remote -v").split("\n")
         remotes.detect { |l| l.start_with?("origin\t") }.split(" ")[1]
@@ -56,7 +71,7 @@ module Git::Whence
       end
 
       def find_merge_simple(commit, branch)
-        result = sh "git log #{commit}..#{branch} --ancestry-path --merges --oneline 2>/dev/null | tail -n 1"
+        result = sh "git log #{commit}..#{branch} --ancestry-path --merges --pretty='%h' 2>/dev/null | tail -n 1"
         result unless result.strip.empty?
       end
 

data/lib/git/whence/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Whence
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-whence
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it

metadata.gz.sig

@@ -1,2 +1 @@
-`7�*�	jJ#�&�,!��((
�_K��CN�e
-�Bvh0;�9LtK�ւ�{�Y^��W\G���(�h��4���I~?Cvfcg�Vd��)2���C��+.�Svu����g�1˸
+V3��QD�������9�'��=_nl���VD4��S9jr��O�h���\���������b}������x��)�������mR4��