cucumber-ci-environment 9.0.1 → 9.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b113a16cc3df5fa4c163edac4bed8dc9cc479b03d7bc873d0e35e551b17e133
-  data.tar.gz: b350572faa0a9f959d12dfbda6b3b323cf3d18e9a46635d813af29a808f6dd27
+  metadata.gz: c1cc542bd3cd0d027c8a6c7bcd3283540ad5422dffadef3e7dd45782ba1b210d
+  data.tar.gz: 76d7a0f4c685b44b0a4a4fcb63c9c372cb2e1675daa9459574cac6180d67418a
 SHA512:
-  metadata.gz: b094712321f9251fab4120c75ed7fd261e187cced6aea4ed0e5fffaf8703b9dc679f5b0a7eb9979c6ff66fe7d40427fface9b156940d2f6c120b9d2785948475
-  data.tar.gz: 71a3c6542c46d9064cc4f276378ca4c9296cbff2be31a7a6073bf78d36f74c88ef23affc4f941eedcd35ca25cc4bb1e155f27c83b87f86dd5e344010a9e8873c
+  metadata.gz: 3f4d2fa7fa571d1ea22a28e2104ad0c79bd638fa82bbfc7455d847aa7f6e55c9e72360166f5632d186babcbd6dca67c0fd983c4b9671abb37248f88876d55fa9
+  data.tar.gz: c8f5b94aec624580f1a1585139b8ca2bd4ff000498eea1e7f93445fb862ffa3ab1e5d1719b45edb734df3b3cfb660c05a2852be98606113bd884da72b84b92a1

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

@@ -7,17 +7,17 @@ module Cucumber
     extend VariableExpression
     CI_ENVIRONMENTS_PATH = File.join(File.dirname(__FILE__), 'ci_environment/CiEnvironments.json')
 
-    def detect_ci_environment(env, file_reader = IO.method(:read))
-      ci_environments = JSON.parse(file_reader.call(CI_ENVIRONMENTS_PATH))
+    def detect_ci_environment(env)
+      ci_environments = JSON.parse(IO.read(CI_ENVIRONMENTS_PATH))
       ci_environments.each do |ci_environment|
-        detected = detect(ci_environment, env, file_reader)
+        detected = detect(ci_environment, env)
         return detected unless detected.nil?
       end
 
       nil
     end
 
-    def detect(ci_environment, env, file_reader)
+    def detect(ci_environment, env)
       url = evaluate(ci_environment['url'], env)
       return nil if url.nil?
 
@@ -27,13 +27,13 @@ module Cucumber
         buildNumber: evaluate(ci_environment['buildNumber'], env),
       }
 
-      detected_git = detect_git(ci_environment, env, file_reader)
+      detected_git = detect_git(ci_environment, env)
       result[:git] = detected_git if detected_git
       result
     end
 
-    def detect_git(ci_environment, env, file_reader)
-      revision = detect_revision(ci_environment, env, file_reader)
+    def detect_git(ci_environment, env)
+      revision = detect_revision(ci_environment, env)
       return nil if revision.nil?
 
       remote = evaluate(ci_environment['git']['remote'], env)
@@ -51,12 +51,13 @@ module Cucumber
       git_info
     end
 
-    def detect_revision(ci_environment, env, file_reader)
+    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(file_reader.call(env['GITHUB_EVENT_PATH']))
-        raise StandardError('GITHUB_EVENT_PATH not set') unless event['before']
-        return event['before']
+        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)

data/spec/cucumber/ci_environment/ci_environment_spec.rb

@@ -8,12 +8,7 @@ describe 'detect_ci_environment' do
     context "with #{File.basename(test_data_file, '.txt')}" do
       subject { JSON.parse(ci_environment.to_json) }
 
-      def mock_reader(path)
-        return '{"before": "2436f28fad432a895bfc595bce16e907144b0dc3"}' if path.end_with?('_github_workflow/event.json')
-        IO.read(path)
-      end
-
-      let(:ci_environment) { Cucumber::CiEnvironment.detect_ci_environment(env, method(:mock_reader)) }
+      let(:ci_environment) { Cucumber::CiEnvironment.detect_ci_environment(env) }
       let(:env) { Hash[entries] }
       let(:entries) { env_data.split(/\n/).map { |line| line.split(/=/) } }
       let(:env_data) { IO.read(test_data_file) }

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.1
+  version: 9.0.4
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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.1
+summary: cucumber-ci-environment-9.0.4
 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