cucumber-ci-environment 9.0.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1292449161604186dd58873a044886eed7427da563b3f2172dd3a1107007ed69
-  data.tar.gz: 6214b6ab20c1c91ffc7585a3fb9ea207144f304021ec170cf1cfe5c1488fd524
+  metadata.gz: 8b113a16cc3df5fa4c163edac4bed8dc9cc479b03d7bc873d0e35e551b17e133
+  data.tar.gz: b350572faa0a9f959d12dfbda6b3b323cf3d18e9a46635d813af29a808f6dd27
 SHA512:
-  metadata.gz: 79bd805cd33679777a0779248d8c295586fb2768f6609122174141a48bdaf028c809dc9b92a163c75f104f8a328a3aac372e0d273e05631ec8db31a72120faae
-  data.tar.gz: cc73d17d21639bab099d2d7efd4419c87c4e3c186c01777a4e373f3032b9fc9e791e652a4dd55460cca455def86e15c5557718fe471ce0e56c74454e0b1aba07
+  metadata.gz: b094712321f9251fab4120c75ed7fd261e187cced6aea4ed0e5fffaf8703b9dc679f5b0a7eb9979c6ff66fe7d40427fface9b156940d2f6c120b9d2785948475
+  data.tar.gz: 71a3c6542c46d9064cc4f276378ca4c9296cbff2be31a7a6073bf78d36f74c88ef23affc4f941eedcd35ca25cc4bb1e155f27c83b87f86dd5e344010a9e8873c

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)
-      ci_environments = JSON.parse(IO.read(CI_ENVIRONMENTS_PATH))
+    def detect_ci_environment(env, file_reader = IO.method(:read))
+      ci_environments = JSON.parse(file_reader.call(CI_ENVIRONMENTS_PATH))
       ci_environments.each do |ci_environment|
-        detected = detect(ci_environment, env)
+        detected = detect(ci_environment, env, file_reader)
         return detected unless detected.nil?
       end
 
       nil
     end
 
-    def detect(ci_environment, env)
+    def detect(ci_environment, env, file_reader)
       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)
+      detected_git = detect_git(ci_environment, env, file_reader)
       result[:git] = detected_git if detected_git
       result
     end
 
-    def detect_git(ci_environment, env)
-      revision = evaluate(ci_environment['git']['revision'], env)
+    def detect_git(ci_environment, env, file_reader)
+      revision = detect_revision(ci_environment, env, file_reader)
       return nil if revision.nil?
 
       remote = evaluate(ci_environment['git']['remote'], env)
@@ -51,6 +51,17 @@ module Cucumber
       git_info
     end
 
+    def detect_revision(ci_environment, env, file_reader)
+      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']
+      end
+
+      return evaluate(ci_environment['git']['revision'], env)
+    end
+
     def remove_userinfo_from_url(value)
       return nil if value.nil?
 
@@ -63,6 +74,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/ci_environment_spec.rb

@@ -8,7 +8,12 @@ describe 'detect_ci_environment' do
     context "with #{File.basename(test_data_file, '.txt')}" do
       subject { JSON.parse(ci_environment.to_json) }
 
-      let(:ci_environment) { Cucumber::CiEnvironment.detect_ci_environment(env) }
+      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(:env) { Hash[entries] }
       let(:entries) { env_data.split(/\n/).map { |line| line.split(/=/) } }
       let(:env_data) { IO.read(test_data_file) }

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.1
 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: []
@@ -92,7 +92,7 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
-summary: cucumber-ci-environment-9.0.0
+summary: cucumber-ci-environment-9.0.1
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/ci_environment/ci_environment_spec.rb