git-whence 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7086aa5c3bbc94e5f5a842c43e88669ded5738b5
-  data.tar.gz: 0e22874dd8b2ec5d8e628ab18c72f453beb65044
+SHA256:
+  metadata.gz: bbf02d5c73586be8d70edcabecd451091376a8f4db383766fb6ed64768d97bfc
+  data.tar.gz: 3c521c44e7fa1ece8af4b213940b1e61b96d7b4282cf90cbb94d9d54a5072a0c
 SHA512:
-  metadata.gz: 2bcfce0b66afbac623de6721ab12b0025f1742bc0cafe6c23ce2cead5ef26ad6c912effdaff3d29ffd879bc63eba3321707b68ea9482dc5a22b2e82b30b03179
-  data.tar.gz: bdd79fe9fe66d32b94bebfce7e792635c12ff12db101397065a08bba1578b4b7cb8e36f42b5246871575bde9b7959f319bfee873acc590ebccd827ab6b760fe4
+  metadata.gz: 6273c8f80e7fe4c56dd145294ac5eaa0dd950e9e530498414b1f0b87e54bcb1bd345e0fbef1aa1b2a816b608b14bc354e27dd868581920ee0e9e704f77533fbc
+  data.tar.gz: 5291c1401f7a04428a0cdda6d26824d7f4547eeea3bc9a4268e92fbdf1f5e723b16d309d4d064851affe708f36faa004a4fb78de07d6f34eb3d867d018f6af3a

data/lib/git/whence/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Whence
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/lib/git/whence.rb

@@ -8,24 +8,22 @@ module Git::Whence
         options = parse_options(argv)
         commit = argv[0]
         unless system("git rev-parse --git-dir 2>&1 >/dev/null")
-          puts "Not in a git directory"
+          warn "Not in a git directory"
           return 1
         end
 
         commit = expand(commit)
 
         if is_merge?(commit)
-          $stderr.puts "Commit is a merge"
+          warn "Commit is a merge"
           finished_with_commit(commit, options)
-          1
         else
           merge = find_merge(commit)
           if merge
             finished_with_commit(merge, options)
-            0
           else
-            $stderr.puts "Unable to find merge"
-            1
+            warn "Unable to find merge"
+            options[:open] ? finished_with_commit(commit, options) : 1
           end
         end
       end
@@ -33,7 +31,7 @@ module Git::Whence
       private
 
       def expand(commit)
-        sh("git show #{commit} -s --format='%H'").strip
+        sh("git rev-parse #{commit}").strip
       end
 
       def is_merge?(commit)
@@ -42,23 +40,32 @@ module Git::Whence
 
       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}"}
+        if options[:open]
+          if pr = info[/Merge pull request #(\d+) from /, 1]
+            exec "open", "https://github.com/#{origin}/pull/#{pr}"
+          else
+            warn "Unable to find PR number in #{info}"
+            exec "open", "https://github.com/#{origin}/commit/#{merge}"
+          end
         else
           puts info
+          0
         end
       end
 
+      # https://github.com/foo/bar or git@github.com:foo/bar.git -> foo/bar
       def origin
-        remotes = sh("git remote -v").split("\n")
-        remotes.detect { |l| l.start_with?("origin\t") }.split(" ")[1]
+        repo = sh("git remote get-url origin").strip
+        repo.sub!(/\.git$/, "")
+        repo.split(/[:\/]/).last(2).join("/")
       end
 
       def find_merge(commit)
-        commit, merge = find_merge_simple(commit, "HEAD") ||
+        commit, merge = (
+          find_merge_simple(commit, "HEAD") ||
           find_merge_simple(commit, "master") ||
           find_merge_fuzzy(commit, "master")
+        )
 
         merge if merge && merge_include_commit?(merge, commit)
       end
@@ -79,18 +86,18 @@ module Git::Whence
         time, search = sh("git show -s --format='%ct %an %s' #{commit}").strip.split(" ", 2)
         time = time.to_i
         same = sh("git log #{branch} --pretty=format:'%H %an %s' --before #{time + month} --after #{time - month}")
-        found = same.split("\n").map { |x| x.split(" ", 2) }.detect { |commit, message| message == search }
+        found = same.split("\n").map { |x| x.split(" ", 2) }.detect { |_, message| message == search }
         found && found.first
       end
 
       def find_merge_simple(commit, branch)
         result = sh "git log #{commit}..#{branch} --ancestry-path --merges --pretty='%H' 2>/dev/null | tail -n 1"
-        [commit, result] unless result.strip.empty?
+        [commit, result.strip] unless result.strip.empty?
       end
 
       def sh(command)
         result = `#{command}`
-        raise unless $?.success?
+        raise "Command failed\n#{command}\n#{result}" unless $?.success?
         result
       end
 

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-whence
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MRAwDgYDVQQDDAdtaWNo
-  YWVsMRcwFQYKCZImiZPyLGQBGRYHZ3Jvc3NlcjESMBAGCgmSJomT8ixkARkWAml0
-  MB4XDTE0MDIwNDIwMjk0MVoXDTE1MDIwNDIwMjk0MVowPzEQMA4GA1UEAwwHbWlj
-  aGFlbDEXMBUGCgmSJomT8ixkARkWB2dyb3NzZXIxEjAQBgoJkiaJk/IsZAEZFgJp
-  dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMorXo/hgbUq97+kII9H
-  MsQcLdC/7wQ1ZP2OshVHPkeP0qH8MBHGg6eYisOX2ubNagF9YTCZWnhrdKrwpLOO
-  cPLaZbjUjljJ3cQR3B8Yn1veV5IhG86QseTBjymzJWsLpqJ1UZGpfB9tXcsFtuxO
-  6vHvcIHdzvc/OUkICttLbH+1qb6rsHUceqh+JrH4GrsJ5H4hAfIdyS2XMK7YRKbh
-  h+IBu6dFWJJByzFsYmV1PDXln3UBmgAt65cmCu4qPfThioCGDzbSJrGDGLmw/pFX
-  FPpVCm1zgYSb1v6Qnf3cgXa2f2wYGm17+zAVyIDpwryFru9yF/jJxE38z/DRsd9R
-  /88CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFLIj
-  Z1x7SnjGGHK+MiVZkFjjS/iMMB0GA1UdEQQWMBSBEm1pY2hhZWxAZ3Jvc3Nlci5p
-  dDAdBgNVHRIEFjAUgRJtaWNoYWVsQGdyb3NzZXIuaXQwDQYJKoZIhvcNAQEFBQAD
-  ggEBAExBcUWfGuamYn+IddOA0Ws8jUKwB14RXoZRDrTiTAlMm3Bkg2OKyxS3uJXa
-  6Z+LwFiZwVYk62yHXqNzEJycQk4SEmY+xDWLj0p7X6qEeU4QZKwR1TwJ5z3PTrZ6
-  irJgM3q7NIBRvmTzRaAghWcQn+Eyr5YLOfMksjVBMUMnzh5/ZDgq53LphgJbGwvz
-  ScJAgfNclLHnjk9q1mT1s0e1FPWbiAL3siBIR5HpH8qtSEiivTf2ntciebOqS93f
-  F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
-  /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
-  -----END CERTIFICATE-----
-date: 2014-07-03 00:00:00.000000000 Z
+cert_chain: []
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -63,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Find the merge and pull request a commit came from + find cherry-picks

data.tar.gz.sig

@@ -1 +0,0 @@
-Ƃ����*�}���4E"�L3�i���͉�C����<��LE΃B*��S����J�ϓrT����J�7��~F-!�5�#��/m!��=��C��-��i���zX��2���g ����zѐ����ߑ1Y�
1{�H��LŝԻZ���)`�q+u:�FQ}G�1z�d�v��E�:�v��%4o�����N�Ƒ��s�(��b%��/7�t���])Y