cucumber-ci-environment 7.0.1 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08f1292f1769293e6a36074f11d1561867548ea7ab0b022a79a2fb8b498fb216'
-  data.tar.gz: 62e9581ab78df2ce86fa985e8707f2ab917b6bbe749ea5f37d30c39584dae175
+  metadata.gz: 1292449161604186dd58873a044886eed7427da563b3f2172dd3a1107007ed69
+  data.tar.gz: 6214b6ab20c1c91ffc7585a3fb9ea207144f304021ec170cf1cfe5c1488fd524
 SHA512:
-  metadata.gz: 4431d3d58c2765b18dedd19a923da52a8ddc14cc357c88b6d0aae02bda31fbd78bdf868144cd04fd12f0ccc47766ca3a75e8957aed45d8ef352ba27a1beae613
-  data.tar.gz: '09d0faa39b92ebe95301e16c30b3bce2a03ed11cc94458b789a4be2e087d060bfa963428f2990472cfda27fc6ac9c6dbc5585c7906e5638537236e93f0346b60'
+  metadata.gz: 79bd805cd33679777a0779248d8c295586fb2768f6609122174141a48bdaf028c809dc9b92a163c75f104f8a328a3aac372e0d273e05631ec8db31a72120faae
+  data.tar.gz: cc73d17d21639bab099d2d7efd4419c87c4e3c186c01777a4e373f3032b9fc9e791e652a4dd55460cca455def86e15c5557718fe471ce0e56c74454e0b1aba07

data/lib/cucumber/ci_environment/CiEnvironments.json

@@ -17,8 +17,7 @@
     "git": {
       "remote": "${bamboo_planRepository_repositoryUrl}",
       "revision": "${bamboo_planRepository_revision}",
-      "branch": "${bamboo_planRepository_branch}",
-      "tag": null
+      "branch": "${bamboo_planRepository_branch}"
     }
   },
   {
@@ -61,8 +60,7 @@
     "git": {
       "remote": "${CF_COMMIT_URL/(.*)\\/commit.+$/\\1}.git",
       "revision": "${CF_REVISION}",
-      "branch": "${CF_BRANCH}",
-      "tag": null
+      "branch": "${CF_BRANCH}"
     }
   },
   {
@@ -72,8 +70,7 @@
     "git": {
       "remote": "${CI_PULL_REQUEST/(.*)\\/pull\\/\\d+/\\1.git}",
       "revision": "${CI_COMMIT_ID}",
-      "branch": "${CI_BRANCH}",
-      "tag": null
+      "branch": "${CI_BRANCH}"
     }
   },
   {
@@ -105,8 +102,7 @@
     "git": {
       "remote": "${GO_SCM_*_PR_URL/(.*)\\/pull\\/\\d+/\\1.git}",
       "revision": "${GO_REVISION}",
-      "branch": "${GO_SCM_*_PR_BRANCH/.*:(.*)/\\1}",
-      "tag": null
+      "branch": "${GO_SCM_*_PR_BRANCH/.*:(.*)/\\1}"
     }
   },
   {
@@ -116,8 +112,7 @@
     "git": {
       "remote": "${GIT_URL}",
       "revision": "${GIT_COMMIT}",
-      "branch": "${GIT_LOCAL_BRANCH}",
-      "tag": null
+      "branch": "${GIT_LOCAL_BRANCH}"
     }
   },
   {
@@ -149,8 +144,7 @@
     "git": {
       "remote": "https://${WERCKER_GIT_DOMAIN}/${WERCKER_GIT_OWNER}/${WERCKER_GIT_REPOSITORY}.git",
       "revision": "${WERCKER_GIT_COMMIT}",
-      "branch": "${WERCKER_GIT_BRANCH}",
-      "tag": null
+      "branch": "${WERCKER_GIT_BRANCH}"
     }
   }
 ]

data/lib/cucumber/ci_environment.rb

@@ -13,6 +13,8 @@ module Cucumber
         detected = detect(ci_environment, env)
         return detected unless detected.nil?
       end
+
+      nil
     end
 
     def detect(ci_environment, env)
@@ -23,19 +25,32 @@ module Cucumber
         name: ci_environment['name'],
         url: url,
         buildNumber: evaluate(ci_environment['buildNumber'], env),
-        git: {
-          remote: remove_userinfo_from_url(evaluate(ci_environment['git']['remote'], env)),
-          revision: evaluate(ci_environment['git']['revision'], env),
-          branch: evaluate(ci_environment['git']['branch'], env),
-        }
       }
-      tag = evaluate(ci_environment['git']['tag'], env)
-      if tag
-        result[:git][:tag] = tag
-      end
+
+      detected_git = detect_git(ci_environment, env)
+      result[:git] = detected_git if detected_git
       result
     end
 
+    def detect_git(ci_environment, env)
+      revision = evaluate(ci_environment['git']['revision'], env)
+      return nil if revision.nil?
+
+      remote = evaluate(ci_environment['git']['remote'], env)
+      return nil if remote.nil?
+
+      git_info = {
+        remote: remove_userinfo_from_url(remote),
+        revision: revision,
+      }
+
+      tag = evaluate(ci_environment['git']['tag'], env)
+      branch = evaluate(ci_environment['git']['branch'], env)
+      git_info[:tag] = tag if tag
+      git_info[:branch] = branch if branch
+      git_info
+    end
+
     def remove_userinfo_from_url(value)
       return nil if value.nil?
 
@@ -48,6 +63,6 @@ module Cucumber
       end
     end
 
-    module_function :detect_ci_environment, :detect, :remove_userinfo_from_url
+    module_function :detect_ci_environment, :detect, :detect_git, :remove_userinfo_from_url
   end
 end

data/spec/cucumber/ci_environment/ci_environment_spec.rb

@@ -4,7 +4,7 @@ require 'cucumber/ci_environment'
 require 'json'
 
 describe 'detect_ci_environment' do
-  Dir.glob("../testdata/*.txt") do |test_data_file|
+  Dir.glob('../testdata/*.txt') do |test_data_file|
     context "with #{File.basename(test_data_file, '.txt')}" do
       subject { JSON.parse(ci_environment.to_json) }
 
@@ -18,4 +18,12 @@ describe 'detect_ci_environment' do
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-ci-environment
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 9.0.0
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,7 +92,7 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
-summary: cucumber-ci-environment-7.0.1
+summary: cucumber-ci-environment-9.0.0
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/ci_environment/ci_environment_spec.rb