cucumber-ci-environment 9.0.0 → 9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1292449161604186dd58873a044886eed7427da563b3f2172dd3a1107007ed69
-  data.tar.gz: 6214b6ab20c1c91ffc7585a3fb9ea207144f304021ec170cf1cfe5c1488fd524
+  metadata.gz: ddb3770efbf64c848ff0784bc16b46bd1aac7310bb3543af9354eefaf934d590
+  data.tar.gz: 963b15c15a33c7b706b43bc3d7e83ca96b4dbe6d8562b3afc3a8909fceb0d4e4
 SHA512:
-  metadata.gz: 79bd805cd33679777a0779248d8c295586fb2768f6609122174141a48bdaf028c809dc9b92a163c75f104f8a328a3aac372e0d273e05631ec8db31a72120faae
-  data.tar.gz: cc73d17d21639bab099d2d7efd4419c87c4e3c186c01777a4e373f3032b9fc9e791e652a4dd55460cca455def86e15c5557718fe471ce0e56c74454e0b1aba07
+  metadata.gz: 7a6a3f4a3091dba40f37fe3f4831e9eaab18230750536770c891d657d14886ce651e440b136f9a731b2e20f7fb6d0878c92ce8fa6e98ccc2f2569e6e9b88e3b9
+  data.tar.gz: dafdfbf95a1e2a2283844256ddcbabde2c32edd8923c80e515d966e7e8f330f9e0e3a2ee9ef9ccd81cfc433fbc38dfd9c85653b78903dd09fca60238e6080863

data/lib/cucumber/ci_environment/CiEnvironments.json

@@ -80,7 +80,7 @@
     "git": {
       "remote": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git",
       "revision": "${GITHUB_SHA}",
-      "branch": "${GITHUB_REF/refs\/heads\/(.*)/\\1}",
+      "branch": "${GITHUB_HEAD_REF}",
       "tag": "${GITHUB_REF/refs\/tags\/(.*)/\\1}"
     }
   },

data/lib/cucumber/ci_environment.rb

@@ -33,7 +33,7 @@ module Cucumber
     end
 
     def detect_git(ci_environment, env)
-      revision = evaluate(ci_environment['git']['revision'], env)
+      revision = detect_revision(ci_environment, env)
       return nil if revision.nil?
 
       remote = evaluate(ci_environment['git']['remote'], env)
@@ -51,6 +51,18 @@ module Cucumber
       git_info
     end
 
+    def detect_revision(ci_environment, env)
+      if env['GITHUB_EVENT_NAME'] == 'pull_request'
+        raise StandardError('GITHUB_EVENT_PATH not set') unless env['GITHUB_EVENT_PATH']
+        event = JSON.parse(IO.read(env['GITHUB_EVENT_PATH']))
+        revision = event['pull_request']['head']['sha'] rescue nil
+        raise StandardError("Could not find .pull_request.head.sha in #{env['GITHUB_EVENT_PATH']}:\n#{JSON.pretty_generate(event)}") if revision.nil?
+        return revision
+      end
+
+      return evaluate(ci_environment['git']['revision'], env)
+    end
+
     def remove_userinfo_from_url(value)
       return nil if value.nil?
 
@@ -63,6 +75,6 @@ module Cucumber
       end
     end
 
-    module_function :detect_ci_environment, :detect, :detect_git, :remove_userinfo_from_url
+    module_function :detect_ci_environment, :detect, :detect_git, :detect_revision, :remove_userinfo_from_url
   end
 end

data/spec/cucumber/ci_environment/github_pull_request_integration_spec.rb

@@ -0,0 +1,10 @@
+describe 'GitHub' do
+  if (ENV['GITHUB_EVENT_NAME'] == 'pull_request')
+    it 'detects the correct revision for pull requests' do
+      ci_environment = Cucumber::CiEnvironment.detect_ci_environment(ENV)
+      expect(ci_environment).to be_truthy
+      puts ("Manually verify that the revision is correct");
+      p ci_environment
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-ci-environment
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.0.3
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 description: Detect CI Environment from environment variables
 email: cukes@googlegroups.com
 executables: []
@@ -63,6 +63,7 @@ files:
 - spec/capture_warnings.rb
 - spec/cucumber/ci_environment/ci_environment_spec.rb
 - spec/cucumber/ci_environment/evaluate_variable_expression_spec.rb
+- spec/cucumber/ci_environment/github_pull_request_integration_spec.rb
 - spec/cucumber/ci_environment/remove_userinfo_from_url_spec.rb
 homepage: https://github.com/cucumber/ci-environment
 licenses:
@@ -92,9 +93,10 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
-summary: cucumber-ci-environment-9.0.0
+summary: cucumber-ci-environment-9.0.3
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/ci_environment/ci_environment_spec.rb
 - spec/cucumber/ci_environment/evaluate_variable_expression_spec.rb
+- spec/cucumber/ci_environment/github_pull_request_integration_spec.rb
 - spec/cucumber/ci_environment/remove_userinfo_from_url_spec.rb