cucumber-ci-environment 7.0.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08f1292f1769293e6a36074f11d1561867548ea7ab0b022a79a2fb8b498fb216'
-  data.tar.gz: 62e9581ab78df2ce86fa985e8707f2ab917b6bbe749ea5f37d30c39584dae175
+  metadata.gz: e953601361857424a8c088e9d46d318b885bea345f7513582079e2656eb9488a
+  data.tar.gz: 90d645ec2692732c3db88dbb69d88a6161295bfa2786e102b32979df74124732
 SHA512:
-  metadata.gz: 4431d3d58c2765b18dedd19a923da52a8ddc14cc357c88b6d0aae02bda31fbd78bdf868144cd04fd12f0ccc47766ca3a75e8957aed45d8ef352ba27a1beae613
-  data.tar.gz: '09d0faa39b92ebe95301e16c30b3bce2a03ed11cc94458b789a4be2e087d060bfa963428f2990472cfda27fc6ac9c6dbc5585c7906e5638537236e93f0346b60'
+  metadata.gz: 70e3661abfbc7c13dde7c43d9b15b7be8daf92165263d95b3ab04ff16be6c9ccbab29245c10040a59e26f8e4963b7bc016cd6701086e2805609c75e1ef5bc6ca
+  data.tar.gz: bb0c563b51adff06ab7707f7613de586e893585d270af4ab5050be20ddc2e8d84877b3c7798465e4f91372c106e95c83ad12613f20a33609d79349476085590d

data/lib/cucumber/ci_environment.rb

@@ -23,19 +23,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 +61,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-ci-environment
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-15 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-8.0.0
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/ci_environment/ci_environment_spec.rb