pronto 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6eced888221992765e7822d10cc30c5bb425807
-  data.tar.gz: 3691ca0e624f99993eff02d044fc76dc8f13b633
+  metadata.gz: 745decf88e9fb240c3a33e5ac1d0969872f74ef4
+  data.tar.gz: 256b5eb2b0dcb08bf3322dd29f4499d8cdd47bef
 SHA512:
-  metadata.gz: 502260ec324f87bda046de5c75313abc8a48a2dc29c9c9f5339820ad40c683e1150e80013f9c5864b9f003a601759fcadfc99458fcb9424bf095aea02a0d4882
-  data.tar.gz: 640af0dbfe133fa024ccd924ccd9496011a32d5001bb076a692ac9e833a36b3bbeeb5caa857ef33600f9e1c0929e221899827a1f42d5c4ecd608446651cd84c9
+  metadata.gz: 0880f55cf76eb358fc5668ba9ef18ee1182d3d4d43ca5fce301c5862701a0524a95caedf2a90719f58bacd17ed23bbcddfd585d80200f5cb7543617281f94d8a
+  data.tar.gz: acbd3f8bedf6e2a5a830ba254307e59cab146993268d8e23375a6c6ee9a32386e9a77dd7ac23d9f61eecbe6b8a79d2141d808b557a24bd69da6573d6d7a7e939

data/CHANGELOG.md

@@ -6,6 +6,12 @@
 ### Changes
 ### Bugs fixed
 
+## 0.5.1
+
+### Changes
+
+* Try to retrieve commit sha for GitHub PR via GitHub API instead of trusting local sha.
+
 ## 0.5.0
 
 ### New features

data/lib/pronto/github.rb

@@ -31,7 +31,8 @@ module Pronto
 
     def create_pull_comment(comment)
       client.create_pull_comment(slug, pull_id, comment.body,
-                                 comment.sha, comment.path, comment.position)
+                                 pull_sha || comment.sha,
+                                 comment.path, comment.position)
     end
 
     private
@@ -54,20 +55,29 @@ module Pronto
                                       auto_paginate: true)
     end
 
-    def pull_requests
-      @pull_requests ||= client.pull_requests(slug)
+    def pull_id
+      pull ? pull[:number].to_i : env_pull_id.to_i
     end
 
-    def pull_id
-      @pull_id ||= begin
-        pull_id = ENV['PULL_REQUEST_ID']
-        if pull_id
-          pull_id.to_i
-        elsif @repo.branch
-          pull = pull_requests.find { |pr| pr[:head][:ref] == @repo.branch }
-          pull[:number].to_i if pull
-        end
-      end
+    def env_pull_id
+      ENV['PULL_REQUEST_ID']
+    end
+
+    def pull_sha
+      pull[:head][:sha] if pull
+    end
+
+    def pull
+      return unless @repo.branch
+      @pull ||= if env_pull_id
+                  pull_requests.find { |pr| pr[:number].to_i == env_pull_id.to_i }
+                else
+                  pull_requests.find { |pr| pr[:head][:ref] == @repo.branch }
+                end
+    end
+
+    def pull_requests
+      @pull_requests ||= client.pull_requests(slug)
     end
 
     Comment = Struct.new(:sha, :body, :path, :position) do

data/lib/pronto/version.rb

@@ -1,3 +1,3 @@
 module Pronto
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pronto
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mindaugas Mozūras