cucumber-create-meta 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ee53160861ac80fab521c7c68e65d3f67992a253096b1bc86eebf071e93084
-  data.tar.gz: b3a3a1a5272e75af443cb88f736924209563e92f40d8d37bac855a71ddcc9608
+  metadata.gz: cbeec9c9555758136e2dab0114910c1ee47bab5cd1ddd0c53bab5d36db42b3aa
+  data.tar.gz: 6a740a16b9ab323fc360579ab13259603caa77ee9fc3fb8a0fe2bed07f02fb85
 SHA512:
-  metadata.gz: 8a3d47bf29d4e21381473159abafa1262f179c3049eacfbad3725ac0a8c054ba061849d66c585b1f60167e0ca5ecab06615bfc7e73a8d9f19b8d547504cabeb6
-  data.tar.gz: 451316acb36b939dff9e89e772585bd1acac9d6c07e3d61847bff0b5bad97e7e18e02e8eed097f43b3b61caf4c716eb9f4e798fbc64f5ee6578cddbd3430677c
+  metadata.gz: a90d7404c481a3a0da38cad6f44a740982955d43651fb1ffbecec4270aa3e652695879dc8a70e6a6fbd2e05cea5959618788e8de0efe34f5a6975cbd61996a6b
+  data.tar.gz: fafdb21be0d5d8c6b76eed939954b858a60bcec4bc4c84d9e3e54bad6658f36565b30b5a7f11df40aa3c2996d0921c1ed06f2b4d3617a81c43d7f72043de474f

data/lib/cucumber/create_meta.rb

@@ -10,25 +10,25 @@ module Cucumber
     CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__), "ciDict.json")))
 
     def create_meta(tool_name, tool_version, env = ENV)
-      {
-          protocol_version: Cucumber::Messages::VERSION,
-          implementation: {
-              name: tool_name,
-              version: tool_version
-          },
-          runtime: {
-              name: RUBY_ENGINE,
-              version: RUBY_VERSION
-          },
-          os: {
-              name: RbConfig::CONFIG['target_os'],
-              version: Sys::Uname.uname.version
-          },
-          cpu: {
-              name: RbConfig::CONFIG['target_cpu']
-          },
-          ci: detect_ci(env)
-      }
+      Cucumber::Messages::Meta.new(
+        protocol_version: Cucumber::Messages::VERSION,
+        implementation: Cucumber::Messages::Product.new(
+            name: tool_name,
+            version: tool_version
+        ),
+        runtime: Cucumber::Messages::Product.new(
+            name: RUBY_ENGINE,
+            version: RUBY_VERSION
+        ),
+        os: Cucumber::Messages::Product.new(
+            name: RbConfig::CONFIG['target_os'],
+            version: Sys::Uname.uname.version
+        ),
+        cpu: Cucumber::Messages::Product.new(
+            name: RbConfig::CONFIG['target_cpu']
+        ),
+        ci: detect_ci(env)
+      )
     end
 
     def detect_ci(env)
@@ -43,17 +43,17 @@ module Cucumber
       url = evaluate(ci_system['url'], env)
       return nil if url.nil?
 
-      {
-          url: url,
-          name: ci_name,
-          buildNumber: evaluate(ci_system['buildNumber'], env),
-          git: {
-              remote: remove_userinfo_from_url(evaluate(ci_system['git']['remote'], env)),
-              revision: evaluate(ci_system['git']['revision'], env),
-              branch: evaluate(ci_system['git']['branch'], env),
-              tag: evaluate(ci_system['git']['tag'], env),
-          }.delete_if {|k,v| v.nil?}
-      }
+      Cucumber::Messages::Ci.new(
+        url: url,
+        name: ci_name,
+        build_number: evaluate(ci_system['buildNumber'], env),
+        git: Cucumber::Messages::Git.new(
+          remote: remove_userinfo_from_url(evaluate(ci_system['git']['remote'], env)),
+          revision: evaluate(ci_system['git']['revision'], env),
+          branch: evaluate(ci_system['git']['branch'], env),
+          tag: evaluate(ci_system['git']['tag'], env),
+        )
+      )
     end
 
     def remove_userinfo_from_url(value)

data/spec/cucumber/create_meta_spec.rb

@@ -2,15 +2,35 @@ require 'cucumber/create_meta'
 
 describe 'create_meta' do
   it 'generates a Meta message with platform information' do
-    meta = Cucumber::CreateMeta.create_meta('cucumba-ruby', 'X.Y.Z')
+    meta = Cucumber::CreateMeta.create_meta('cucumba-ruby', 'X.Y.Z', [])
 
-    expect(meta[:protocol_version]).to match(/\d+\.\d+\.\d+/)
-    expect(meta[:implementation][:name]).to eq('cucumba-ruby')
-    expect(meta[:implementation][:version]).to eq('X.Y.Z')
-    expect(meta[:runtime][:name]).to match(/(jruby|ruby)/)
-    expect(meta[:runtime][:version]).to eq(RUBY_VERSION)
-    expect(meta[:os][:name]).to match(/.+/)
-    expect(meta[:os][:version]).to match(/.+/)
-    expect(meta[:cpu][:name]).to match(/.+/)
+    expect(meta.protocol_version).to match(/\d+\.\d+\.\d+/)
+    expect(meta.implementation.name).to eq('cucumba-ruby')
+    expect(meta.implementation.version).to eq('X.Y.Z')
+    expect(meta.runtime.name).to match(/(jruby|ruby)/)
+    expect(meta.runtime.version).to eq(RUBY_VERSION)
+    expect(meta.os.name).to match(/.+/)
+    expect(meta.os.version).to match(/.+/)
+    expect(meta.cpu.name).to match(/.+/)
+    expect(meta.ci).to be_nil
+  end
+
+  it 'generates a Meta message with CI information' do
+    env = {
+      'BUILD_URL' => 'url of the build',
+      'BUILD_NUMBER' => '42',
+      'GIT_URL' => 'url of git',
+      'GIT_COMMIT' => 'git_sha1',
+      'GIT_LOCAL_BRANCH' => 'main'
+    }
+
+    meta = Cucumber::CreateMeta.create_meta('cucumba-ruby', 'X.Y.Z', env)
+
+    expect(meta.ci).not_to be_nil
+    expect(meta.ci.url).to eq env['BUILD_URL']
+    expect(meta.ci.build_number).to eq env['BUILD_NUMBER']
+    expect(meta.ci.git.remote).to eq env['GIT_URL']
+    expect(meta.ci.git.revision).to eq env['GIT_COMMIT']
+    expect(meta.ci.git.branch).to eq env['GIT_LOCAL_BRANCH']
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-create-meta
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '17.0'
+        version: '17.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 17.0.1
+        version: 17.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '17.0'
+        version: '17.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 17.0.1
+        version: 17.1.1
 - !ruby/object:Gem::Dependency
   name: sys-uname
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-create-meta-6.0.1
+summary: cucumber-create-meta-6.0.2
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/remove_userinfo_from_url_spec.rb