From a572e78201e1a4f5a44b6e354dc7b91f5f6d9c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 3 Jun 2020 20:46:54 +0200 Subject: [PATCH] [rubygems/rubygems] s/gem_command!/gem_command https://github.com/rubygems/rubygems/commit/f52733f6a4 --- spec/bundler/bundler/gem_helper_spec.rb | 2 +- spec/bundler/commands/clean_spec.rb | 8 ++++---- spec/bundler/install/gems/compact_index_spec.rb | 2 +- spec/bundler/support/builders.rb | 4 ++-- spec/bundler/support/helpers.rb | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spec/bundler/bundler/gem_helper_spec.rb b/spec/bundler/bundler/gem_helper_spec.rb index 5b87c692b2..6cb4c33f5a 100644 --- a/spec/bundler/bundler/gem_helper_spec.rb +++ b/spec/bundler/bundler/gem_helper_spec.rb @@ -167,7 +167,7 @@ RSpec.describe Bundler::GemHelper do mock_confirm_message "#{app_name} (#{app_version}) installed." subject.install_gem(nil, :local) expect(app_gem_path).to exist - gem_command! :list + gem_command :list expect(out).to include("#{app_name} (#{app_version})") end end diff --git a/spec/bundler/commands/clean_spec.rb b/spec/bundler/commands/clean_spec.rb index 3a4b638278..f0c506aa04 100644 --- a/spec/bundler/commands/clean_spec.rb +++ b/spec/bundler/commands/clean_spec.rb @@ -379,7 +379,7 @@ RSpec.describe "bundle clean" do gem "rack" G - gem_command! :list + gem_command :list expect(out).to include("rack (1.0.0)").and include("thin (1.0)") end @@ -507,7 +507,7 @@ RSpec.describe "bundle clean" do end bundle :update, :all => true - gem_command! :list + gem_command :list expect(out).to include("foo (1.0.1, 1.0)") end @@ -531,7 +531,7 @@ RSpec.describe "bundle clean" do bundle "clean --force" expect(out).to include("Removing foo (1.0)") - gem_command! :list + gem_command :list expect(out).not_to include("foo (1.0)") expect(out).to include("rack (1.0.0)") end @@ -565,7 +565,7 @@ RSpec.describe "bundle clean" do expect(err).to include(system_gem_path.to_s) expect(err).to include("grant write permissions") - gem_command! :list + gem_command :list expect(out).to include("foo (1.0)") expect(out).to include("rack (1.0.0)") end diff --git a/spec/bundler/install/gems/compact_index_spec.rb b/spec/bundler/install/gems/compact_index_spec.rb index 17cfcd2710..3f86629230 100644 --- a/spec/bundler/install/gems/compact_index_spec.rb +++ b/spec/bundler/install/gems/compact_index_spec.rb @@ -936,7 +936,7 @@ Either installing with `--full-index` or running `bundle update rails` should fi gem "activemerchant" end G - gem_command! "uninstall activemerchant" + gem_command "uninstall activemerchant" bundle "update rails", :artifice => "compact_index" expect(lockfile.scan(/activemerchant \(/).size).to eq(1) end diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb index ba1a6b5733..65f30d1f38 100644 --- a/spec/bundler/support/builders.rb +++ b/spec/bundler/support/builders.rb @@ -406,7 +406,7 @@ module Spec @_build_repo = File.basename(path) yield with_gem_path_as Path.base_system_gems do - gem_command! :generate_index, :dir => path + gem_command :generate_index, :dir => path end ensure @_build_path = nil @@ -753,7 +753,7 @@ module Spec elsif opts[:skip_validation] @context.gem_command "build --force #{@spec.name}", :dir => lib_path else - @context.gem_command! "build #{@spec.name}", :dir => lib_path + @context.gem_command "build #{@spec.name}", :dir => lib_path end gem_path = File.expand_path("#{@spec.full_name}.gem", lib_path) diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index 627367b555..c1ad1b24f6 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -295,7 +295,7 @@ module Spec def install_gem(path) raise "OMG `#{path}` does not exist!" unless File.exist?(path) - gem_command! "install --no-document --ignore-dependencies '#{path}'" + gem_command "install --no-document --ignore-dependencies '#{path}'" end def with_built_bundler(version = nil) @@ -323,7 +323,7 @@ module Spec replace_build_metadata(build_metadata, dir: build_path) # rubocop:disable Style/HashSyntax - gem_command! "build #{relative_gemspec}", :dir => build_path + gem_command "build #{relative_gemspec}", :dir => build_path yield(bundler_path) ensure @@ -411,7 +411,7 @@ module Spec with_gem_path_as(system_gem_path) do gems.each do |gem| - gem_command! "install --no-document #{gem}" + gem_command "install --no-document #{gem}" end end end