terraspace_ci_github 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d88b062ab17176d868d4f0b6f11a8a4b614c1e1396922186e4356264be0e069
-  data.tar.gz: 58b57b162da756f2e3aa63c055c8980ab58aa846489ac6378263fa72bfc1101c
+  metadata.gz: bd1bc2f04e34e6cb7e0cc58e2d87f4dd393b28043f383fffe6f7e6e842da38fb
+  data.tar.gz: f53bedc944ff116d042877f47e1f3768a1549a6ab0c97956c7ad38e40a13f996
 SHA512:
-  metadata.gz: ccae205902e9717ca80ee2335238052217e9e4e553ebbe2c1afec8274c7aeda317ed73a04eeb611f9406af4964af5f12074a6da69f77614add44697613d34134
-  data.tar.gz: 2f24c1dd359f4856e4f67b5681777417647dc6f60d514d4b82400d631d34611a9b30f505ccb2b65dbb319800121c58a1920a8336e0c56b680aea27a84c5be3e1
+  metadata.gz: 31ffa1b4da8351b72a49c6fc0f95afd6679f1a0b936538ce0509a1fe97bea21737ee09a51da821a8f8e232b73d279f8340de3b8237b5df30d9f77be0a5094b63
+  data.tar.gz: 4b693db74e2d5aa7dab995039cde20909e7ad3f8b35a49585f58fb49b1e8bb48cb894ee3245bde054b2077cb3f4898eea271f64554d4a0e2c919ee05869d4922

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.1.3] - 2022-06-15
+- [#2](https://github.com/boltops-tools/terraspace_ci_github/pull/2) get pr url from push commit message
+
+## [0.1.2] - 2022-06-15
+- [#1](https://github.com/boltops-tools/terraspace_ci_github/pull/1) add faraday-retry gem to get rid of warning
+
+## [0.1.1] - 2022-06-09
+
+- Fix branch name
+
 ## [0.1.0] - 2022-06-09
 
 - Initial release

data/lib/terraspace_ci_github/base.rb

@@ -1,3 +1,5 @@
+require "faraday"
+require "faraday/retry"
 require "octokit"
 
 module TerraspaceCiGithub

data/lib/terraspace_ci_github/pr.rb

@@ -1,11 +1,11 @@
 module TerraspaceCiGithub
   class Pr < Base
     def comment(url)
-      return unless ENV['GITHUB_EVENT_NAME'] == 'pull_request'
+      return unless pull_request_available?
       return unless github_token?
 
       repo = ENV['GITHUB_REPOSITORY'] # org/repo
-      number = ENV['GITHUB_REF_NAME'].split('/').first # IE: 2/merge
+      number = pr_number
       marker = "<!-- terraspace marker -->"
       body = marker + "\n"
       body << "Terraspace Cloud Url #{url}"
@@ -25,5 +25,17 @@ module TerraspaceCiGithub
     rescue Octokit::Unauthorized => e
       puts "WARN: #{e.message}. Unable to create pull request comment. Please double check your github token"
     end
+
+    def pull_request_available?
+      !!pr_number
+    end
+
+    def pr_number
+      if ENV['GITHUB_EVENT_NAME'] == 'pull_request'
+        ENV['GITHUB_REF_NAME'].split('/').first # IE: 2/merge
+      else
+        Vars.new.pr_number
+      end
+    end
   end
 end

data/lib/terraspace_ci_github/vars.rb

@@ -12,7 +12,7 @@ module TerraspaceCiGithub
         build_url: build_url,
         # additional properties
         build_type: build_type,   # required IE: pull_request or push
-        pr_number: pr['number'],  # set when build_type=pull_request
+        pr_number: pr_number,  # set when build_type=pull_request
         sha: sha,
         # additional properties
         commit_message: commit_message,
@@ -25,8 +25,27 @@ module TerraspaceCiGithub
       ENV['GITHUB_SERVER_URL'] || 'https://github.com'
     end
 
+    COMMIT_PATTERN = %r{Merge pull request #(\d) from (.*)}
     def pr_url
-      "#{host}/#{full_repo}/pull/#{pr['number']}" if pr['number']
+      if pr['number']
+        "#{host}/#{full_repo}/pull/#{pr['number']}"
+      elsif md = commit_message.match(COMMIT_PATTERN)
+        # git push commit has commit with PR info
+        # IE: Merge pull request #4 from tongueroo/feature
+        number = md[1]
+        org_branch = md[2]
+        org = org_branch.split('/').first
+        repo = ENV['GITHUB_REPOSITORY'].split('/').last # IE: tongueroo/infra-ci
+        "#{host}/#{org}/#{repo}/pull/#{number}"
+      end
+    end
+
+    def pr_number
+      if pr['number']
+        pr['number']
+      elsif md = commit_message.match(COMMIT_PATTERN)
+        md[1] # number
+      end
     end
 
     def build_url
@@ -46,6 +65,7 @@ module TerraspaceCiGithub
     rescue Octokit::Unauthorized => e
       puts "WARN: #{e.message}. Error getting commit message. Please double check your github token"
     end
+    memoize :commit_message
 
     def full_repo
       ENV['GITHUB_REPOSITORY']
@@ -67,7 +87,7 @@ module TerraspaceCiGithub
       if build_type == "pull_request"
         pr.dig('pull_request','head','ref')
       else # push
-        ENV['GITHUB_REF']
+        ENV['GITHUB_REF_NAME']
       end
     end
 

data/lib/terraspace_ci_github/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TerraspaceCiGithub
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

data/terraspace_ci_github.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "faraday-retry"
   spec.add_dependency "memoist"
   spec.add_dependency "octokit"
   spec.add_dependency "zeitwerk"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_ci_github
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement