cucumber-ci-environment 10.0.1 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dcc9cd3de17a82ace1e2cebe193a2a0591dacf3c1332f61d15fae86fa68f638
-  data.tar.gz: 6c356bef412b0c4c05e363fd144a0a3b96b58ac5ef9225165c0d98beed44ec8a
+  metadata.gz: baf6a11cd50dfb9ae5bdf63a33db62ef25473ccdf61b63b978a8259e3a051a3f
+  data.tar.gz: c2c84999d1a4b6c2699fcfdcb0d9c60ea4c4a4ce119cc02e4438482a4b6e28c9
 SHA512:
-  metadata.gz: 882d1dc8afcc9eb0fe94c06fa43c82bd283afa9c6dfbf870e81079624915b41efd3d4ff366fca5e3a62914ff4ea3fa53f3de6b9fe17a052e9ce23f5b1ad2dd8a
-  data.tar.gz: ed7ecd3c4677181fbe32963c006893adfca74437abf0d47fedf62a77cd92b71e9c54f995ec10a1a16137a82ddd5bb01ba73a4fd1e3c394b4816dde4fb05b73c3
+  metadata.gz: be572aab3b81f6dcfacfae5382daf2dcaf4341583f53a51a3c20216aaa696101b24ec80017d4881af0e47df2d1714fe0b9de581bdaa44870d853e92b3c348648
+  data.tar.gz: ad45b5d985598d9eb75e0074962274fbda1a034d352129abd59006eb39b878aac0ec9e065877e439b86432092af35c9d81ecfa1d617d9acffdef25ef77fce814

data/LICENSE

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) Cucumber Ltd
+Copyright (c) 2020 Cucumber Ltd and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/cucumber/ci_environment/variable_expression.rb

@@ -1,29 +1,34 @@
+# frozen_string_literal: true
+
 module Cucumber
   module CiEnvironment
     module VariableExpression
       def evaluate(expression, env)
         return nil if expression.nil?
+
         begin
           expression.gsub(/\${(.*?)(?:(?<!\\)\/(.*)\/(.*))?}/) do
-            variable = $1
-            pattern = $2
-            replacement = $3
+            variable = Regexp.last_match(1)
+            pattern = Regexp.last_match(2)
+            replacement = Regexp.last_match(3)
 
             value = get_value(variable, env)
             raise "Undefined variable #{variable}" if value.nil?
+
             if pattern.nil?
               value
             else
               regexp = Regexp.new(pattern.gsub('\/', '/'))
               match = value.match(regexp)
               raise "No match for variable #{variable}" if match.nil?
-              match[1..-1].each_with_index do |group, i|
-                replacement = replacement.gsub("\\#{i+1}", group)
+
+              match[1..].each_with_index do |group, i|
+                replacement = replacement.gsub("\\#{i + 1}", group)
               end
               replacement
             end
           end
-        rescue
+        rescue StandardError
           nil
         end
       end
@@ -31,7 +36,7 @@ module Cucumber
       def get_value(variable, env)
         if variable.index('*')
           env.each do |name, value|
-            return value if Regexp.new(variable.gsub('*', '.*')) =~ name
+            return value if Regexp.new(variable.gsub('*', '.*')).match?(name)
           end
         end
         env[variable]

data/lib/cucumber/ci_environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'json'
 require 'cucumber/ci_environment/variable_expression'
@@ -7,8 +9,10 @@ module Cucumber
     extend VariableExpression
     CI_ENVIRONMENTS_PATH = File.join(File.dirname(__FILE__), 'ci_environment/CiEnvironments.json')
 
+    module_function
+
     def detect_ci_environment(env)
-      ci_environments = JSON.parse(IO.read(CI_ENVIRONMENTS_PATH))
+      ci_environments = JSON.parse(File.read(CI_ENVIRONMENTS_PATH))
       ci_environments.each do |ci_environment|
         detected = detect(ci_environment, env)
         return detected unless detected.nil?
@@ -24,7 +28,7 @@ module Cucumber
       result = {
         name: ci_environment['name'],
         url: url,
-        buildNumber: evaluate(ci_environment['buildNumber'], env),
+        buildNumber: evaluate(ci_environment['buildNumber'], env)
       }
 
       detected_git = detect_git(ci_environment, env)
@@ -41,7 +45,7 @@ module Cucumber
 
       git_info = {
         remote: remove_userinfo_from_url(remote),
-        revision: revision,
+        revision: revision
       }
 
       tag = evaluate(ci_environment['git']['tag'], env)
@@ -52,15 +56,14 @@ module Cucumber
     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) unless env['GITHUB_EVENT_NAME'] == 'pull_request'
 
-      return evaluate(ci_environment['git']['revision'], env)
+      raise StandardError('GITHUB_EVENT_PATH not set') unless env['GITHUB_EVENT_PATH']
+
+      event = JSON.parse(File.read(env['GITHUB_EVENT_PATH']))
+      event.dig('pull_request', 'head', 'sha').tap do |revision|
+        raise StandardError("Could not find .pull_request.head.sha in GITHUB_EVENT_PATH:\n#{JSON.pretty_generate(event)}") if revision.nil?
+      end
     end
 
     def remove_userinfo_from_url(value)
@@ -74,7 +77,5 @@ module Cucumber
         value
       end
     end
-
-    module_function :detect_ci_environment, :detect, :detect_git, :detect_revision, :remove_userinfo_from_url
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-ci-environment
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 11.0.0
 platform: ruby
 authors:
 - Vincent Prêtre
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,56 +15,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '13.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.0
+        version: 1.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.0
+        version: 1.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 3.7.0
 description: Detect CI Environment from environment variables
 email: cukes@googlegroups.com
 executables: []
@@ -104,19 +103,13 @@ files:
 - lib/cucumber/ci_environment.rb
 - lib/cucumber/ci_environment/CiEnvironments.json
 - lib/cucumber/ci_environment/variable_expression.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:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/cucumber/ci-environment/issues
   changelog_uri: https://github.com/cucumber/ci-environment/blob/main/CHANGELOG.md
-  documentation_uri: https://cucumber.io/docs/gherkin/
   source_code_uri: https://github.com/cucumber/ci-environment/tree/main/ruby
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -125,19 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.3
+      version: 3.2.8
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
-summary: cucumber-ci-environment-10.0.1
-test_files:
-- 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
+summary: cucumber-ci-environment-11.0.0
+test_files: []

data/spec/cucumber/ci_environment/ci_environment_spec.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'cucumber/ci_environment'
-require 'json'
-
-describe 'detect_ci_environment' do
-  Dir.glob('../testdata/*.txt') do |test_data_file|
-    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) }
-      let(:env) { Hash[entries] }
-      let(:entries) { env_data.split(/\n/).map { |line| line.split(/=/) } }
-      let(:env_data) { IO.read(test_data_file) }
-
-      let(:expected_json) { File.read("#{test_data_file}.json") }
-
-      it { is_expected.to eq JSON.parse(expected_json) }
-    end
-  end
-
-  context 'with no CI environment' do
-    subject { JSON.parse(ci_environment.to_json) }
-    let(:ci_environment) { Cucumber::CiEnvironment.detect_ci_environment(env) }
-    let(:env) { {} }
-
-    it { is_expected.to be_nil }
-  end
-end

data/spec/cucumber/ci_environment/evaluate_variable_expression_spec.rb

@@ -1,38 +0,0 @@
-require 'cucumber/ci_environment'
-
-describe 'Cucumber::CiEnvironment::VariableExpression.evaluate' do
-  include Cucumber::CiEnvironment::VariableExpression
-
-  it 'returns nil when a variable is undefined' do
-    expression = "hello-${SOME_VAR}"
-    result = evaluate(expression, {})
-    expect(result).to eq(nil)
-  end
-
-  it 'gets a value without replacement' do
-    expression = "${SOME_VAR}"
-    result = evaluate(expression, { 'SOME_VAR' => 'some_value' })
-    expect(result).to eq('some_value')
-  end
-
-  it 'captures a group' do
-    expression = "${SOME_REF/refs\/heads\/(.*)/\\1}"
-    result = evaluate(expression, { 'SOME_REF' => 'refs/heads/main' })
-    expect(result).to eq('main')
-  end
-
-  it 'works with star wildcard in var' do
-    expression = "${GO_SCM_*_PR_BRANCH/.*:(.*)/\\1}"
-    result = evaluate(expression, { 'GO_SCM_MY_MATERIAL_PR_BRANCH' => 'ashwankthkumar:feature-1' })
-    expect(result).to eq('feature-1')
-  end
-
-  it 'evaluates a complex expression' do
-    expression = "hello-${VAR1}-${VAR2/(.*) (.*)/\\2-\\1}-world"
-    result = evaluate(expression, {
-      'VAR1' => 'amazing',
-      'VAR2' => 'gorgeous beautiful'
-    })
-    expect(result).to eq('hello-amazing-beautiful-gorgeous-world')
-  end
-end

data/spec/cucumber/ci_environment/github_pull_request_integration_spec.rb

@@ -1,10 +0,0 @@
-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

data/spec/cucumber/ci_environment/remove_userinfo_from_url_spec.rb

@@ -1,29 +0,0 @@
-require 'cucumber/ci_environment'
-
-describe 'remove_user_info_from_url' do
-  it 'returns nil for nil' do
-    expect(Cucumber::CiEnvironment.remove_userinfo_from_url(nil)).to be_nil
-  end
-
-  it 'returns empty string for empty string' do
-    expect(Cucumber::CiEnvironment.remove_userinfo_from_url('')).to eq('')
-  end
-
-  it 'leaves the data intact when no sensitive information is detected' do
-    expect(Cucumber::CiEnvironment.remove_userinfo_from_url('pretty safe')).to eq('pretty safe')
-  end
-
-  context 'with URLs' do
-    it 'leaves intact when no password is found' do
-      expect(Cucumber::CiEnvironment.remove_userinfo_from_url('https://example.com/git/repo.git')).to eq('https://example.com/git/repo.git')
-    end
-
-    it 'removes credentials when found' do
-      expect(Cucumber::CiEnvironment.remove_userinfo_from_url('http://login@example.com/git/repo.git')).to eq('http://example.com/git/repo.git')
-    end
-
-    it 'removes credentials and passwords when found' do
-      expect(Cucumber::CiEnvironment.remove_userinfo_from_url('ssh://login:password@example.com/git/repo.git')).to eq('ssh://example.com/git/repo.git')
-    end
-  end
-end