git-whence 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff4eae5cbbb56bd17fdd8baa9a653bb45b68f70b1214358d6b595d1c5b8b829
-  data.tar.gz: de12ddbebc457c3e72c324b17242787c96c5c4243868042d3ba199706d4f19e1
+  metadata.gz: 8469e43011173ed18cdd8b1d51709b6436286037806fb88e923901ff2c6a7123
+  data.tar.gz: c5e5821f09e4019e5aa23c66a2b4c76160c5219e69cb3fb506119348caaaaf48
 SHA512:
-  metadata.gz: 5a3193767c1a1cb822946ae91b9e4956294349669f32664364f62ea99806ad0af882e3313998bb2f8c3c5505c4a2daced0087af63858e0162fdca48a2a88902f
-  data.tar.gz: 7c6c048d81234fdeae88b330d768d6485bb5a5dd18a3c3f923d49aa2ba99a5196a22a268203d76be7ffe4882fb08d1f14b54f43b579e9a301868bcab55ce9680
+  metadata.gz: 3b184b3804d3f0adc3c8c909dc62bd5a77d3d9565b25dd65bb397f3333ab4fec834e767caa0e3389c5c500a9f9bd7fe4872808d25db1efe833ae4ee06b0e5cd5
+  data.tar.gz: 73e1238e7a961cdad0e4558d5d2fd8579d5e54f0dc2c2b044b5d1db4b3e3a73493e7bfbd3afa27013b6ba3f77a0453fff1bf02b6c706a5629783c5a801940e73

data/lib/git/whence.rb

@@ -3,6 +3,8 @@ require "optparse"
 
 module Git::Whence
   module CLI
+    SQUASH_REGEX = /\(#(\d+)\)$/
+
     class << self
       def run(argv)
         options = parse_options(argv)
@@ -19,8 +21,7 @@ module Git::Whence
           show_commit(commit, options)
           1
         else
-          merge = find_merge(commit)
-          if merge
+          if merge = find_merge(commit)
             show_commit(merge, options)
             0
           else
@@ -44,7 +45,7 @@ module Git::Whence
       def show_commit(merge, options)
         info = sh("git show -s --oneline #{merge}").strip
         if options[:open]
-          if pr = info[/Merge pull request #(\d+) from /, 1]
+          if pr = info[/Merge pull request #(\d+) from /, 1] || info[SQUASH_REGEX, 1]
             exec "open", "https://github.com/#{origin}/pull/#{pr}"
           else
             warn "Unable to find PR number in #{info}"
@@ -57,19 +58,23 @@ module Git::Whence
 
       # https://github.com/foo/bar or git@github.com:foo/bar.git -> foo/bar
       def origin
-        repo = sh("git remote get-url origin").strip
+        repo = sh("git remote get-url origin").strip # TODO: read file instead
         repo.sub!(/\.git$/, "")
         repo.split(/[:\/]/).last(2).join("/")
       end
 
       def find_merge(commit)
-        commit, merge = (
+        merge_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)
+        if merge && merge_include_commit?(merge, merge_commit)
+          merge
+        else
+          find_squash_merge(commit) # not very exact, so do this last ... ideally ask github api
+        end
       end
 
       def merge_include_commit?(merge, commit)
@@ -83,6 +88,10 @@ module Git::Whence
         end
       end
 
+      def find_squash_merge(commit)
+        commit if sh("git show -s --format='%s' #{commit}") =~ SQUASH_REGEX
+      end
+
       def find_similar(commit, branch)
         month = 30 * 24 * 60 * 60
         time, search = sh("git show -s --format='%ct %an %s' #{commit}").strip.split(" ", 2)
@@ -93,8 +102,8 @@ module Git::Whence
       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.strip] unless result.strip.empty?
+        result = sh("git log #{commit}..#{branch} --ancestry-path --merges --pretty='%H' 2>/dev/null | tail -n 1").chomp
+        [commit, result] unless result.empty?
       end
 
       def sh(command)

data/lib/git/whence/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Whence
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-whence
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -40,8 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Find the merge and pull request a commit came from + find cherry-picks