cucumber-create-meta 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb02c92607f075dd2131ad7f6e564e11d76cb35d895dc178d20853345a12e39f
-  data.tar.gz: db20d3ac9d17165204c687fe9cf733ce639510fc0360f57b0a870b9aee02cf47
+  metadata.gz: 4a4f36daf37f233cc900ef6e7e9b962dc8109d1054faecf1de72e532a59335ff
+  data.tar.gz: 0c1fe89598d1eedb5914ac7f8fea417a03c59f6a5b901ef503542fb7695ea675
 SHA512:
-  metadata.gz: 81f25445789ac4c100cdb7678080a08f2d4a2370632e3b864e4602e05d3aecebd963a74a9d8b4a4f18fdcce5f49bf6447b1cfb4845118294526ac0af237abc17
-  data.tar.gz: 52c0ce5a5d28b332376cf1eef36ed004f0408978f99d4609bb3e55f3ad6243c9ccfa6801023104d9cd2bcfea9f56d39dd4afd2d28182f4b65937678f20f45450
+  metadata.gz: 7141737ea7d22b1bc7e78f282c0e589eb4c12fc9bfc793b99f75efe69119e5392beb2660d3ce87839e553b917c5a47967777db5eb26cb3ab40740b9dd328cb91
+  data.tar.gz: 7aa043622a0c97318e8abe92941e41a82071e3fecae213962e7a99c437d4bd16dfb34bd4e7b7d71e98788bcbf66da11242002d5bff094682e936cc396a879a10

data/lib/cucumber/create_meta.rb

@@ -1,30 +1,31 @@
+require 'uri'
 require 'cucumber/messages'
 require 'sys/uname'
 require 'json'
 
 module Cucumber
   module CreateMeta
-    CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__),"ciDict.json")))
+    CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__), "ciDict.json")))
 
-    def create_meta(tool_name, tool_version, env=ENV)
+    def create_meta(tool_name, tool_version, env = ENV)
       Cucumber::Messages::Meta.new(
-        protocol_version: Cucumber::Messages::VERSION,
-        implementation: Cucumber::Messages::Meta::Product.new(
-          name: tool_name,
-          version: tool_version
-        ),
-        runtime: Cucumber::Messages::Meta::Product.new(
-          name: RUBY_ENGINE,
-          version: RUBY_VERSION
-        ),
-        os: Cucumber::Messages::Meta::Product.new(
-          name: RbConfig::CONFIG['target_os'],
-          version: Sys::Uname.uname.version
-        ),
-        cpu: Cucumber::Messages::Meta::Product.new(
-          name: RbConfig::CONFIG['target_cpu']
-        ),
-        ci: detect_ci(env)
+          protocol_version: Cucumber::Messages::VERSION,
+          implementation: Cucumber::Messages::Meta::Product.new(
+              name: tool_name,
+              version: tool_version
+          ),
+          runtime: Cucumber::Messages::Meta::Product.new(
+              name: RUBY_ENGINE,
+              version: RUBY_VERSION
+          ),
+          os: Cucumber::Messages::Meta::Product.new(
+              name: RbConfig::CONFIG['target_os'],
+              version: Sys::Uname.uname.version
+          ),
+          cpu: Cucumber::Messages::Meta::Product.new(
+              name: RbConfig::CONFIG['target_cpu']
+          ),
+          ci: detect_ci(env)
       )
     end
 
@@ -41,14 +42,14 @@ module Cucumber
       return nil if url.nil?
 
       Cucumber::Messages::Meta::CI.new(
-        url: url,
-        name: ci_name,
-        git: Cucumber::Messages::Meta::CI::Git.new(
-          remote: 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),
-        )
+          url: url,
+          name: ci_name,
+          git: Cucumber::Messages::Meta::CI::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
 
@@ -80,6 +81,17 @@ module Cucumber
       m[1]
     end
 
-    module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate
+    def remove_userinfo_from_url(value)
+      return nil if value.nil?
+      begin
+        uri = URI(value)
+        uri.userinfo = ''
+        uri.to_s
+      rescue
+        value
+      end
+    end
+
+    module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate, :remove_userinfo_from_url
   end
 end

data/spec/capture_warnings.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+# With thanks to @myronmarston
+# https://github.com/vcr/vcr/blob/master/spec/capture_warnings.rb
+
+module CaptureWarnings
+  def report_warnings(&block)
+    current_dir = Dir.pwd
+    warnings, errors = capture_error(&block).partition { |line| line.include?('warning') }
+    project_warnings, other_warnings = warnings.uniq.partition { |line| line.include?(current_dir) }
+
+    if errors.any?
+      puts errors.join("\n")
+    end
+
+    if other_warnings.any?
+      puts "#{ other_warnings.count } warnings detected, set VIEW_OTHER_WARNINGS=true to see them."
+      print_warnings('other', other_warnings) if ENV['VIEW_OTHER_WARNINGS']
+    end
+
+    # Until they fix https://bugs.ruby-lang.org/issues/10661
+    if RUBY_VERSION == "2.2.0"
+      project_warnings = project_warnings.reject { |w| w =~ /warning: possible reference to past scope/ }
+    end
+
+    if project_warnings.any?
+      puts "#{ project_warnings.count } warnings detected"
+      print_warnings('cucumber-expressions', project_warnings)
+      fail "Please remove all cucumber-expressions warnings."
+    end
+
+    ensure_system_exit_if_required
+  end
+
+  def capture_error(&block)
+    old_stderr = STDERR.clone
+    pipe_r, pipe_w = IO.pipe
+    pipe_r.sync    = true
+    error          = String.new
+    reader = Thread.new do
+      begin
+        loop do
+          error << pipe_r.readpartial(1024)
+        end
+      rescue EOFError
+      end
+    end
+    STDERR.reopen(pipe_w)
+    block.call
+  ensure
+    capture_system_exit
+    STDERR.reopen(old_stderr)
+    pipe_w.close
+    reader.join
+    return error.split("\n")
+  end
+
+  def print_warnings(type, warnings)
+    puts
+    puts "-" * 30 + " #{type} warnings: " + "-" * 30
+    puts
+    puts warnings.join("\n")
+    puts
+    puts "-" * 75
+    puts
+  end
+
+  def ensure_system_exit_if_required
+    raise @system_exit if @system_exit
+  end
+
+  def capture_system_exit
+    @system_exit = $!
+  end
+end

data/spec/cucumber/remove_userinfo_from_url_spec.rb

@@ -0,0 +1,29 @@
+require 'cucumber/create_meta'
+
+describe 'remove_user_info_from_url' do
+  it 'returns nil for nil' do
+    expect(Cucumber::CreateMeta.remove_userinfo_from_url(nil)).to be_nil
+  end
+
+  it 'returns empty string for empty string' do
+    expect(Cucumber::CreateMeta.remove_userinfo_from_url('')).to eq('')
+  end
+
+  it 'leaves the data intact when no sensitive information is detected' do
+    expect(Cucumber::CreateMeta.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::CreateMeta.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::CreateMeta.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::CreateMeta.remove_userinfo_from_url('ssh://login:password@example.com/git/repo.git')).to eq('ssh://example.com/git/repo.git')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-create-meta
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -99,7 +99,9 @@ files:
 - LICENSE
 - lib/cucumber/ciDict.json
 - lib/cucumber/create_meta.rb
+- spec/capture_warnings.rb
 - spec/cucumber/create_meta_spec.rb
+- spec/cucumber/remove_userinfo_from_url_spec.rb
 homepage: https://github.com/cucumber/create-meta-ruby
 licenses:
 - MIT
@@ -128,6 +130,8 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-create-meta-2.0.1
+summary: cucumber-create-meta-2.0.2
 test_files:
 - spec/cucumber/create_meta_spec.rb
+- spec/cucumber/remove_userinfo_from_url_spec.rb
+- spec/capture_warnings.rb