diff options
Diffstat (limited to 'spec/bundler/install')
22 files changed, 204 insertions, 204 deletions
diff --git a/spec/bundler/install/allow_offline_install_spec.rb b/spec/bundler/install/allow_offline_install_spec.rb index da71f09ab8..ec74cc7abf 100644 --- a/spec/bundler/install/allow_offline_install_spec.rb +++ b/spec/bundler/install/allow_offline_install_spec.rb @@ -28,7 +28,7 @@ RSpec.describe "bundle install with :allow_offline_install" do it "will install from the compact index" do system_gems ["rack-1.0.0"], :path => default_bundle_path - bundle! "config set clean false" + bundle "config set clean false" install_gemfile! <<-G, :artifice => "compact_index" source "http://testgemserver.local" gem "rack-obama" @@ -42,7 +42,7 @@ RSpec.describe "bundle install with :allow_offline_install" do gem "rack-obama" G - bundle! :update, :artifice => "fail", :all => true + bundle :update, :artifice => "fail", :all => true expect(last_command.stdboth).to include "Using the cached data for the new index because of a network error" expect(the_bundle).to include_gems("rack-obama 1.0", "rack 1.0.0") @@ -78,7 +78,7 @@ RSpec.describe "bundle install with :allow_offline_install" do gem "a", :git => #{git.path.to_s.dump} G - break_git_remote_ops! { bundle! :update, :all => true } + break_git_remote_ops! { bundle :update, :all => true } expect(err).to include("Using cached git data because of network errors") expect(the_bundle).to be_locked diff --git a/spec/bundler/install/binstubs_spec.rb b/spec/bundler/install/binstubs_spec.rb index 78ee893b81..6961171f4f 100644 --- a/spec/bundler/install/binstubs_spec.rb +++ b/spec/bundler/install/binstubs_spec.rb @@ -35,7 +35,7 @@ RSpec.describe "bundle install" do end it "warns about the situation" do - bundle! "exec rackup" + bundle "exec rackup" expect(last_command.stderr).to include( "The `rackup` executable in the `fake` gem is being loaded, but it's also present in other gems (rack).\n" \ diff --git a/spec/bundler/install/bundler_spec.rb b/spec/bundler/install/bundler_spec.rb index f4e9ffb786..7b5ae109f9 100644 --- a/spec/bundler/install/bundler_spec.rb +++ b/spec/bundler/install/bundler_spec.rb @@ -147,7 +147,7 @@ RSpec.describe "bundle install" do end it "can install dependencies with newer bundler version with system gems" do - bundle! "config set path.system true" + bundle "config set path.system true" system_gems "bundler-99999999.99.1" @@ -156,12 +156,12 @@ RSpec.describe "bundle install" do gem "rails", "3.0" G - bundle! "check" + bundle "check" expect(out).to include("The Gemfile's dependencies are satisfied") end it "can install dependencies with newer bundler version with a local path" do - bundle! "config set path .bundle" + bundle "config set path .bundle" system_gems "bundler-99999999.99.1" @@ -170,12 +170,12 @@ RSpec.describe "bundle install" do gem "rails", "3.0" G - bundle! "check" + bundle "check" expect(out).to include("The Gemfile's dependencies are satisfied") end context "with allow_bundler_dependency_conflicts set" do - before { bundle! "config set allow_bundler_dependency_conflicts true" } + before { bundle "config set allow_bundler_dependency_conflicts true" } it "are forced to the current bundler version with warnings when no compatible version is found" do build_repo4 do diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb index ffb021c798..8c23548acd 100644 --- a/spec/bundler/install/deploy_spec.rb +++ b/spec/bundler/install/deploy_spec.rb @@ -36,17 +36,17 @@ RSpec.describe "install in deployment or frozen mode" do it "doesn't mess up a subsequent `bundle install` after you try to deploy without a lock" do bundle "install --deployment", :raise_on_error => false - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0" end end it "still works if you are not in the app directory and specify --gemfile" do - bundle! "install" + bundle "install" simulate_new_machine bundle "config --local deployment true" bundle "config --local path vendor/bundle" - bundle! "install --gemfile #{tmp}/bundled_app/Gemfile", :dir => tmp + bundle "install --gemfile #{tmp}/bundled_app/Gemfile", :dir => tmp expect(the_bundle).to include_gems "rack 1.0" end @@ -57,19 +57,19 @@ RSpec.describe "install in deployment or frozen mode" do gem "foo", :git => "#{lib_path("foo-1.0")}" end G - bundle! :install + bundle :install bundle "config --local deployment true" bundle "config --local without test" - bundle! :install + bundle :install end it "works when you bundle exec bundle" do skip "doesn't find bundle" if Gem.win_platform? - bundle! :install + bundle :install bundle "config --local deployment true" bundle :install - bundle! "exec bundle check", :env => { "PATH" => path } + bundle "exec bundle check", :env => { "PATH" => path } end it "works when using path gems from the same path and the version is specified" do @@ -80,9 +80,9 @@ RSpec.describe "install in deployment or frozen mode" do gem "bar", :path => "#{lib_path("nested")}" G - bundle! :install + bundle :install bundle "config --local deployment true" - bundle! :install + bundle :install end it "works when there are credentials in the source URL" do @@ -93,7 +93,7 @@ RSpec.describe "install in deployment or frozen mode" do G bundle "config --local deployment true" - bundle! :install, :artifice => "endpoint_strict_basic_authentication" + bundle :install, :artifice => "endpoint_strict_basic_authentication" end it "works with sources given by a block" do @@ -104,7 +104,7 @@ RSpec.describe "install in deployment or frozen mode" do G bundle "config --local deployment true" - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0" end @@ -112,7 +112,7 @@ RSpec.describe "install in deployment or frozen mode" do context "when replacing a host with the same host with credentials" do before do bundle "config --local path vendor/bundle" - bundle! "install" + bundle "install" gemfile <<-G source "http://user_name:password@localgemserver.test/" gem "rack" @@ -131,7 +131,7 @@ RSpec.describe "install in deployment or frozen mode" do rack G - bundle! "config set --local deployment true" + bundle "config set --local deployment true" end it "prevents the replace by default" do @@ -141,17 +141,17 @@ RSpec.describe "install in deployment or frozen mode" do end context "when allow_deployment_source_credential_changes is true" do - before { bundle! "config set allow_deployment_source_credential_changes true" } + before { bundle "config set allow_deployment_source_credential_changes true" } it "allows the replace" do - bundle! :install + bundle :install expect(out).to match(/Bundle complete!/) end end context "when allow_deployment_source_credential_changes is false" do - before { bundle! "config set allow_deployment_source_credential_changes false" } + before { bundle "config set allow_deployment_source_credential_changes false" } it "prevents the replace" do bundle :install, :raise_on_error => false @@ -183,29 +183,29 @@ RSpec.describe "install in deployment or frozen mode" do describe "with an existing lockfile" do before do - bundle! "install" + bundle "install" end it "installs gems by default to vendor/bundle", :bundler => "< 3" do - bundle! "install --deployment" + bundle "install --deployment" expect(out).to include("vendor/bundle") end it "installs gems to custom path if specified", :bundler => "< 3" do - bundle! "install --path vendor/bundle2 --deployment" + bundle "install --path vendor/bundle2 --deployment" expect(out).to include("vendor/bundle2") end it "works with the --deployment flag if you didn't change anything", :bundler => "< 3" do - bundle! "install --deployment" + bundle "install --deployment" end it "works with the --frozen flag if you didn't change anything", :bundler => "< 3" do - bundle! "install --frozen" + bundle "install --frozen" end it "works with BUNDLE_FROZEN if you didn't change anything" do - bundle! :install, :env => { "BUNDLE_FROZEN" => "true" } + bundle :install, :env => { "BUNDLE_FROZEN" => "true" } end it "explodes with the --deployment flag if you make a change and don't check in the lockfile" do @@ -237,7 +237,7 @@ RSpec.describe "install in deployment or frozen mode" do bundle "config --local path .bundle" bundle "config --local without development" bundle "config --local deployment true" - bundle! :install, :env => { "DEBUG" => "1" } + bundle :install, :env => { "DEBUG" => "1" } run! "puts :WIN" expect(out).to eq("WIN") end @@ -391,9 +391,9 @@ RSpec.describe "install in deployment or frozen mode" do end it "remembers that the bundle is frozen at runtime" do - bundle! :lock + bundle :lock - bundle! "config set --local deployment true" + bundle "config set --local deployment true" gemfile <<-G source "#{file_uri_for(gem_repo1)}" @@ -422,19 +422,19 @@ You have deleted from the Gemfile: gem "foo", :path => "#{lib_path("foo")}" G - bundle! :install + bundle :install expect(the_bundle).to include_gems "foo 1.0" bundle "config set cache_all true" - bundle! :cache + bundle :cache expect(bundled_app("vendor/cache/foo")).to be_directory - bundle! "install --local" + bundle "install --local" expect(out).to include("Updating files in vendor/cache") simulate_new_machine - bundle! "config set --local deployment true" - bundle! "install --verbose" + bundle "config set --local deployment true" + bundle "install --verbose" expect(out).not_to include("You are trying to install in deployment mode after changing your Gemfile") expect(out).not_to include("You have added to the Gemfile") expect(out).not_to include("You have deleted from the Gemfile") diff --git a/spec/bundler/install/gemfile/eval_gemfile_spec.rb b/spec/bundler/install/gemfile/eval_gemfile_spec.rb index 59b2932fff..405837c686 100644 --- a/spec/bundler/install/gemfile/eval_gemfile_spec.rb +++ b/spec/bundler/install/gemfile/eval_gemfile_spec.rb @@ -39,16 +39,16 @@ RSpec.describe "bundle install with gemfile that uses eval_gemfile" do end it "installs the path gem" do - bundle! :install + bundle :install expect(the_bundle).to include_gem("a 1.0") end # Make sure that we are properly comparing path based gems between the # parsed lockfile and the evaluated gemfile. it "bundles with deployment mode configured" do - bundle! :install + bundle :install bundle "config --local deployment true" - bundle! :install + bundle :install end end diff --git a/spec/bundler/install/gemfile/gemspec_spec.rb b/spec/bundler/install/gemfile/gemspec_spec.rb index 4b0df954c9..bb56d5d0d4 100644 --- a/spec/bundler/install/gemfile/gemspec_spec.rb +++ b/spec/bundler/install/gemfile/gemspec_spec.rb @@ -143,7 +143,7 @@ RSpec.describe "bundle install from an existing gemspec" do gemspec :path => '#{tmp.join("foo")}' G - bundle! "install", :verbose => true + bundle "install", :verbose => true message = "Found no changes, using resolution from the lockfile" expect(out.scan(message).size).to eq(1) @@ -162,7 +162,7 @@ RSpec.describe "bundle install from an existing gemspec" do gemspec :path => '#{tmp.join("foo")}' G - bundle! "install", :verbose => true + bundle "install", :verbose => true message = "Found no changes, using resolution from the lockfile" expect(out.scan(message).size).to eq(1) @@ -179,7 +179,7 @@ RSpec.describe "bundle install from an existing gemspec" do gemspec :path => '#{tmp.join("foo")}' G - bundle! "update --bundler", :verbose => true + bundle "update --bundler", :verbose => true expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 JAVA" end @@ -268,7 +268,7 @@ RSpec.describe "bundle install from an existing gemspec" do build_lib "omg", "1.0", :path => lib_path("omg") - bundle! :install, :env => { "BUNDLE_BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS" => "true" } + bundle :install, :env => { "BUNDLE_BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS" => "true" } expect(the_bundle).to include_gems "omg 1.0" end diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb index 560d2a4495..e1ab8b7d93 100644 --- a/spec/bundler/install/gemfile/git_spec.rb +++ b/spec/bundler/install/gemfile/git_spec.rb @@ -32,8 +32,8 @@ RSpec.describe "bundle install with git sources" do it "caches the git repo globally" do simulate_new_machine - bundle! "config set global_gem_cache true" - bundle! :install + bundle "config set global_gem_cache true" + bundle :install expect(Dir["#{home}/.bundle/cache/git/foo-1.0-*"]).to have_attributes :size => 1 end @@ -277,7 +277,7 @@ RSpec.describe "bundle install with git sources" do it "does not download random non-head refs" do sys_exec("git update-ref -m \"Bundler Spec!\" refs/bundler/1 master~1", :dir => lib_path("foo-1.0")) - bundle! "config set global_gem_cache true" + bundle "config set global_gem_cache true" install_gemfile! <<-G git "#{lib_path("foo-1.0")}" do @@ -286,7 +286,7 @@ RSpec.describe "bundle install with git sources" do G # ensure we also git fetch after cloning - bundle! :update, :all => true + bundle :update, :all => true sys_exec("git ls-remote .", :dir => Dir[home(".bundle/cache/git/foo-*")].first) @@ -410,8 +410,8 @@ RSpec.describe "bundle install with git sources" do gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master" G - bundle! %(config set local.rack #{lib_path("local-rack")}) - bundle! :install + bundle %(config set local.rack #{lib_path("local-rack")}) + bundle :install run "require 'rack'" expect(out).to eq("LOCAL") @@ -451,8 +451,8 @@ RSpec.describe "bundle install with git sources" do gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master" G - bundle! %(config set local.rack #{lib_path("local-rack")}) - bundle! :install + bundle %(config set local.rack #{lib_path("local-rack")}) + bundle :install run! "require 'rack'" expect(out).to eq("LOCAL") end @@ -1046,7 +1046,7 @@ RSpec.describe "bundle install with git sources" do simulate_new_machine bundle "config --local deployment true" - bundle! :install + bundle :install end end @@ -1332,7 +1332,7 @@ In Gemfile: installed_time = out update_git("foo") - bundle! "update foo" + bundle "update foo" run! <<-R require 'foo' @@ -1393,14 +1393,14 @@ In Gemfile: bundle :cache simulate_new_machine - bundle! "install", :env => { "PATH" => "" } + bundle "install", :env => { "PATH" => "" } expect(out).to_not include("You need to install git to be able to use gems from git repositories.") end end describe "when the git source is overridden with a local git repo" do before do - bundle! "config set --global local.foo #{lib_path("foo")}" + bundle "config set --global local.foo #{lib_path("foo")}" end describe "and git output is colorized" do diff --git a/spec/bundler/install/gemfile/groups_spec.rb b/spec/bundler/install/gemfile/groups_spec.rb index 8d3ca4b117..e4b937fe3a 100644 --- a/spec/bundler/install/gemfile/groups_spec.rb +++ b/spec/bundler/install/gemfile/groups_spec.rb @@ -87,13 +87,13 @@ RSpec.describe "bundle install with groups" do it "installs gems in the default group" do bundle "config --local without emo" - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default] end it "respects global `without` configuration, but does not save it locally" do bundle "config without emo" - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default] bundle "config list" expect(out).not_to include("Set for your local app (#{bundled_app(".bundle/config")}): [:emo]") @@ -115,7 +115,7 @@ RSpec.describe "bundle install with groups" do it "does not say it installed gems from the excluded group" do bundle "config --local without emo" - bundle! :install + bundle :install expect(out).not_to include("activesupport") end @@ -218,13 +218,13 @@ RSpec.describe "bundle install with groups" do it "allows the BUNDLE_WITH setting to override BUNDLE_WITHOUT" do ENV["BUNDLE_WITH"] = "debugging" - bundle! :install + bundle :install expect(the_bundle).to include_gem "thin 1.0" ENV["BUNDLE_WITHOUT"] = "debugging" expect(the_bundle).to include_gem "thin 1.0" - bundle! :install + bundle :install expect(the_bundle).to include_gem "thin 1.0" end @@ -260,13 +260,13 @@ RSpec.describe "bundle install with groups" do it "installs gems in the default group" do bundle "config --local without emo lolercoaster" - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0.0" end it "installs the gem if any of its groups are installed" do bundle "config --local without emo" - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5" end @@ -321,13 +321,13 @@ RSpec.describe "bundle install with groups" do it "installs gems in the default group" do bundle "config --local without emo lolercoaster" - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0.0" end it "installs the gem if any of its groups are installed" do bundle "config --local without emo" - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5" end end @@ -389,7 +389,7 @@ RSpec.describe "bundle install with groups" do it "does not hit the remote a second time" do FileUtils.rm_rf gem_repo2 bundle "config --local without rack" - bundle! :install, :verbose => true + bundle :install, :verbose => true expect(last_command.stdboth).not_to match(/fetching/i) end end diff --git a/spec/bundler/install/gemfile/lockfile_spec.rb b/spec/bundler/install/gemfile/lockfile_spec.rb index 42233c4282..313e99d0b8 100644 --- a/spec/bundler/install/gemfile/lockfile_spec.rb +++ b/spec/bundler/install/gemfile/lockfile_spec.rb @@ -16,12 +16,12 @@ RSpec.describe "bundle install with a lockfile present" do context "with plugins disabled" do before do - bundle! "config set plugins false" + bundle "config set plugins false" subject end it "does not evaluate the gemfile twice" do - bundle! :install + bundle :install with_env_vars("BUNDLER_SPEC_NO_APPEND" => "1") { expect(the_bundle).to include_gem "rack 1.0.0" } @@ -34,7 +34,7 @@ RSpec.describe "bundle install with a lockfile present" do before { FileUtils.rm_rf bundled_app(".bundle") } it "does not evaluate the gemfile twice" do - bundle! :install + bundle :install with_env_vars("BUNDLER_SPEC_NO_APPEND" => "1") { expect(the_bundle).to include_gem "rack 1.0.0" } diff --git a/spec/bundler/install/gemfile/path_spec.rb b/spec/bundler/install/gemfile/path_spec.rb index bd38643430..3e6ee219ac 100644 --- a/spec/bundler/install/gemfile/path_spec.rb +++ b/spec/bundler/install/gemfile/path_spec.rb @@ -132,7 +132,7 @@ RSpec.describe "bundle install with explicit source paths" do G bundle "config --local frozen true" - bundle! :install + bundle :install expect(exitstatus).to eq(0) if exitstatus end @@ -185,7 +185,7 @@ RSpec.describe "bundle install with explicit source paths" do build_lib "omg", "1.0", :path => lib_path("omg") - bundle! :install, :env => { "BUNDLE_BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS" => "true" } + bundle :install, :env => { "BUNDLE_BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS" => "true" } expect(the_bundle).to include_gems "omg 1.0" end diff --git a/spec/bundler/install/gemfile/platform_spec.rb b/spec/bundler/install/gemfile/platform_spec.rb index 65ea2bee07..a38ad4fd91 100644 --- a/spec/bundler/install/gemfile/platform_spec.rb +++ b/spec/bundler/install/gemfile/platform_spec.rb @@ -128,7 +128,7 @@ RSpec.describe "bundle install across platforms" do #{Bundler::VERSION} L - bundle! "lock --add-platform ruby" + bundle "lock --add-platform ruby" good_lockfile = strip_whitespace(<<-L) GEM @@ -195,23 +195,23 @@ RSpec.describe "bundle install across platforms" do aggregate_failures do lockfile bad_lockfile - bundle! :install + bundle :install lockfile_should_be good_lockfile lockfile bad_lockfile - bundle! :update, :all => true + bundle :update, :all => true lockfile_should_be good_lockfile lockfile bad_lockfile - bundle! "update ffi" + bundle "update ffi" lockfile_should_be good_lockfile lockfile bad_lockfile - bundle! "update empyrean" + bundle "update empyrean" lockfile_should_be good_lockfile lockfile bad_lockfile - bundle! :lock + bundle :lock lockfile_should_be good_lockfile end end @@ -264,11 +264,11 @@ RSpec.describe "bundle install across platforms" do G bundle "config --local path vendor/bundle" - bundle! :install + bundle :install FileUtils.mv(vendored_gems, bundled_app("vendor/bundle", Gem.ruby_engine, "1.8")) - bundle! :install + bundle :install expect(vendored_gems("gems/rack-1.0.0")).to exist end end @@ -386,7 +386,7 @@ RSpec.describe "bundle install with platform conditionals" do gem "rack", :platform => [:mingw, :mswin, :x64_mingw, :jruby] G - bundle! "install" + bundle "install" expect(err).to be_empty diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb index 2b43b57519..db8724fb1a 100644 --- a/spec/bundler/install/gemfile/sources_spec.rb +++ b/spec/bundler/install/gemfile/sources_spec.rb @@ -95,20 +95,20 @@ RSpec.describe "bundle install with gems on multiple sources" do end it "installs the gems without any warning" do - bundle! :install + bundle :install expect(out).not_to include("Warning") expect(the_bundle).to include_gems("rack-obama 1.0.0") expect(the_bundle).to include_gems("rack 1.0.0", :source => "remote1") end it "can cache and deploy" do - bundle! :cache + bundle :cache expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist expect(bundled_app("vendor/cache/rack-obama-1.0.gem")).to exist bundle "config --local deployment true" - bundle! :install + bundle :install expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0") end @@ -190,11 +190,11 @@ RSpec.describe "bundle install with gems on multiple sources" do context "when disable_multisource is set" do before do - bundle! "config set disable_multisource true" + bundle "config set disable_multisource true" end it "installs from the same source without any warning" do - bundle! :install + bundle :install expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.") expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.") @@ -202,7 +202,7 @@ RSpec.describe "bundle install with gems on multiple sources" do # when there is already a lock file, and the gems are missing, so try again system_gems [] - bundle! :install + bundle :install expect(out).not_to include("Warning: the gem 'rack' was found in multiple sources.") expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.") @@ -307,7 +307,7 @@ RSpec.describe "bundle install with gems on multiple sources" do context "when a top-level gem has an indirect dependency" do context "when disable_multisource is set" do before do - bundle! "config set disable_multisource true" + bundle "config set disable_multisource true" end before do @@ -444,9 +444,9 @@ RSpec.describe "bundle install with gems on multiple sources" do end it "does not unlock the non-path gem after install" do - bundle! :install + bundle :install - bundle! %(exec ruby -e 'puts "OK"') + bundle %(exec ruby -e 'puts "OK"') expect(out).to include("OK") end @@ -487,7 +487,7 @@ RSpec.describe "bundle install with gems on multiple sources" do G bundle "config --local path ../gems/system" - bundle! :install + bundle :install # And then we add some new versions... update_repo4 do @@ -535,7 +535,7 @@ RSpec.describe "bundle install with gems on multiple sources" do end it "does not re-resolve" do - bundle! :install, :verbose => true + bundle :install, :verbose => true expect(out).to include("using resolution from the lockfile") expect(out).not_to include("re-resolving dependencies") end @@ -583,7 +583,7 @@ RSpec.describe "bundle install with gems on multiple sources" do G # But we should still be able to find rack 2.0.1.1.forked and install it - bundle! :install + bundle :install end end end diff --git a/spec/bundler/install/gemfile/specific_platform_spec.rb b/spec/bundler/install/gemfile/specific_platform_spec.rb index a1cc6b3551..2fa7d10f9a 100644 --- a/spec/bundler/install/gemfile/specific_platform_spec.rb +++ b/spec/bundler/install/gemfile/specific_platform_spec.rb @@ -69,7 +69,7 @@ RSpec.describe "bundle install with specific_platform enabled" do it "caches both the universal-darwin and ruby gems when --all-platforms is passed" do gemfile(google_protobuf) - bundle! "package --all-platforms" + bundle "package --all-platforms" expect([cached_gem("google-protobuf-3.0.0.alpha.5.0.5.1"), cached_gem("google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin")]). to all(exist) end @@ -95,7 +95,7 @@ RSpec.describe "bundle install with specific_platform enabled" do it "adds the foreign platform" do install_gemfile!(google_protobuf) - bundle! "lock --add-platform=#{x64_mingw}" + bundle "lock --add-platform=#{x64_mingw}" expect(the_bundle.locked_gems.platforms).to eq([rb, x64_mingw, pl("x86_64-darwin-15")]) expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[ @@ -107,7 +107,7 @@ RSpec.describe "bundle install with specific_platform enabled" do it "falls back on plain ruby when that version doesnt have a platform-specific gem" do install_gemfile!(google_protobuf) - bundle! "lock --add-platform=#{java}" + bundle "lock --add-platform=#{java}" expect(the_bundle.locked_gems.platforms).to eq([java, rb, pl("x86_64-darwin-15")]) expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[ diff --git a/spec/bundler/install/gems/compact_index_spec.rb b/spec/bundler/install/gems/compact_index_spec.rb index aa81459924..1391319837 100644 --- a/spec/bundler/install/gems/compact_index_spec.rb +++ b/spec/bundler/install/gems/compact_index_spec.rb @@ -10,7 +10,7 @@ RSpec.describe "compact index api" do gem "rack" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -31,7 +31,7 @@ RSpec.describe "compact index api" do gem "rails" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems( "rails 2.3.2", @@ -69,7 +69,7 @@ RSpec.describe "compact index api" do gem "net-sftp" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(the_bundle).to include_gems "net-sftp 1.1.1" end @@ -78,11 +78,11 @@ RSpec.describe "compact index api" do source "#{source_uri}" gem "rack" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" bundle "config --local deployment true" bundle "config --local path vendor/bundle" - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -100,7 +100,7 @@ RSpec.describe "compact index api" do end G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(the_bundle).to include_gems("rails 2.3.2") end @@ -116,7 +116,7 @@ RSpec.describe "compact index api" do gem 'foo', :git => "#{file_uri_for(lib_path("foo-1.0"))}" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" bundle "config --local deployment true" bundle :install, :artifice => "compact_index" @@ -133,7 +133,7 @@ RSpec.describe "compact index api" do bundle "install", :artifice => "compact_index" bundle "config --local deployment true" - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(the_bundle).to include_gems("foo 1.0") end @@ -146,7 +146,7 @@ RSpec.describe "compact index api" do gem "rcov" G - bundle! :install, :artifice => "windows" + bundle :install, :artifice => "windows" expect(out).to include("Fetching source index from #{source_uri}") expect(the_bundle).to include_gems "rcov 1.0.0" end @@ -157,7 +157,7 @@ RSpec.describe "compact index api" do gem "rack" G - bundle! :install, :verbose => true, :artifice => "compact_index_forbidden" + bundle :install, :verbose => true, :artifice => "compact_index_forbidden" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -168,7 +168,7 @@ RSpec.describe "compact index api" do gem "rack" G - bundle! :install, :verbose => true, :artifice => "compact_index_checksum_mismatch" + bundle :install, :verbose => true, :artifice => "compact_index_checksum_mismatch" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(out).to include <<-'WARN' The checksum of /versions does not match the checksum provided by the server! Something is wrong (local checksum is "\"d41d8cd98f00b204e9800998ecf8427e\"", was expecting "\"123\""). @@ -184,7 +184,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -195,7 +195,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - bundle! :install, :artifice => "compact_index_host_redirect" + bundle :install, :artifice => "compact_index_host_redirect" expect(the_bundle).to include_gems "rack 1.0.0" end @@ -218,7 +218,7 @@ The checksum of /versions does not match the checksum provided by the server! So H end - bundle! :install, :artifice => "compact_index_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")] + bundle :install, :artifice => "compact_index_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")] expect(out).to_not match(/Too many redirects/) expect(the_bundle).to include_gems "rack 1.0.0" end @@ -251,7 +251,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - bundle! "update --full-index", :artifice => "compact_index", :all => true + bundle "update --full-index", :artifice => "compact_index", :all => true expect(out).to include("Fetching source index from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -259,7 +259,7 @@ The checksum of /versions does not match the checksum provided by the server! So it "does not double check for gems that are only installed locally" do system_gems %w[rack-1.0.0 thin-1.0 net_a-1.0] - bundle! "config set --local path.system true" + bundle "config set --local path.system true" ENV["BUNDLER_SPEC_ALL_REQUESTS"] = strip_whitespace(<<-EOS).strip #{source_uri}/versions #{source_uri}/info/rack @@ -287,7 +287,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "back_deps" G - bundle! :install, :artifice => "compact_index_extra" + bundle :install, :artifice => "compact_index_extra" expect(the_bundle).to include_gems "back_deps 1.0", "foo 1.0" end @@ -314,7 +314,7 @@ The checksum of /versions does not match the checksum provided by the server! So source "#{source_uri}" gem "rack", "1.0.0" G - bundle! :install, :artifice => "compact_index_extra_api" + bundle :install, :artifice => "compact_index_extra_api" expect(the_bundle).to include_gems "rack 1.0.0" build_repo4 do @@ -328,7 +328,7 @@ The checksum of /versions does not match the checksum provided by the server! So source "#{source_uri}/extra" gem "rack", "1.2" G - bundle! :install, :artifice => "compact_index_extra_api" + bundle :install, :artifice => "compact_index_extra_api" expect(the_bundle).to include_gems "rack 1.2" end @@ -350,7 +350,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem 'somegem', '1.0.0' G - bundle! :install, :artifice => "compact_index_extra_api" + bundle :install, :artifice => "compact_index_extra_api" expect(the_bundle).to include_gems "somegem 1.0.0" expect(the_bundle).to include_gems "activesupport 1.2.3" @@ -375,7 +375,7 @@ The checksum of /versions does not match the checksum provided by the server! So end G - bundle! :install, :artifice => "compact_index_extra_api" + bundle :install, :artifice => "compact_index_extra_api" expect(the_bundle).to include_gems "somegem 1.0.0" expect(the_bundle).to include_gems "activesupport 1.2.3" @@ -396,7 +396,7 @@ The checksum of /versions does not match the checksum provided by the server! So end G - bundle! :install, :artifice => "compact_index_extra" + bundle :install, :artifice => "compact_index_extra" expect(out).to include("Fetching gem metadata from http://localgemserver.test/") expect(out).to include("Fetching source index from http://localgemserver.test/extra") @@ -453,7 +453,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem 'foo' G - bundle! :install, :artifice => "compact_index_api_missing" + bundle :install, :artifice => "compact_index_api_missing" expect(the_bundle).to include_gems "foo 1.0" end @@ -471,7 +471,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "back_deps" G - bundle! :install, :artifice => "compact_index_extra" + bundle :install, :artifice => "compact_index_extra" bundle "install --deployment", :artifice => "compact_index_extra" expect(the_bundle).to include_gems "back_deps 1.0" @@ -492,9 +492,9 @@ The checksum of /versions does not match the checksum provided by the server! So end G - bundle! :install, :artifice => "compact_index_extra" + bundle :install, :artifice => "compact_index_extra" bundle "config --local deployment true" - bundle! :install, :artifice => "compact_index_extra" + bundle :install, :artifice => "compact_index_extra" expect(the_bundle).to include_gems "back_deps 1.0" end @@ -505,7 +505,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "bundler_dep" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(out).to include("Fetching gem metadata from #{source_uri}") end @@ -517,7 +517,7 @@ The checksum of /versions does not match the checksum provided by the server! So source "#{source_uri}" gem "rails" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(the_bundle).to include_gems "rails 2.3.2" end @@ -563,7 +563,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem 'rack-obama' G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(out).to include("Post-install message from rack:") end @@ -573,7 +573,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem 'rack_middleware' G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expect(out).to include("Post-install message from rack:") expect(out).to include("Rack's post install message") end @@ -595,7 +595,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - bundle! :install, :artifice => "compact_index_basic_authentication" + bundle :install, :artifice => "compact_index_basic_authentication" expect(out).not_to include("#{user}:#{password}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -606,7 +606,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - bundle! :install, :artifice => "endopint_marshal_fail_basic_authentication" + bundle :install, :artifice => "endopint_marshal_fail_basic_authentication" expect(out).not_to include("#{user}:#{password}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -628,7 +628,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - bundle! :install, :artifice => "compact_index_basic_authentication" + bundle :install, :artifice => "compact_index_basic_authentication" expect(err).to include("Warning: the gem 'rack' was found in multiple sources.") expect(err).not_to include("#{user}:#{password}") expect(the_bundle).to include_gems "rack 1.0.0" @@ -640,7 +640,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - bundle! :install, :artifice => "compact_index_creds_diff_host" + bundle :install, :artifice => "compact_index_creds_diff_host" expect(the_bundle).to include_gems "rack 1.0.0" end @@ -655,7 +655,7 @@ The checksum of /versions does not match the checksum provided by the server! So it "reads authentication details by host name from bundle config" do bundle "config set #{source_hostname} #{user}:#{password}" - bundle! :install, :artifice => "compact_index_strict_basic_authentication" + bundle :install, :artifice => "compact_index_strict_basic_authentication" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" @@ -665,7 +665,7 @@ The checksum of /versions does not match the checksum provided by the server! So # The trailing slash is necessary here; Fetcher canonicalizes the URI. bundle "config set #{source_uri}/ #{user}:#{password}" - bundle! :install, :artifice => "compact_index_strict_basic_authentication" + bundle :install, :artifice => "compact_index_strict_basic_authentication" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" @@ -673,7 +673,7 @@ The checksum of /versions does not match the checksum provided by the server! So it "should use the API" do bundle "config set #{source_hostname} #{user}:#{password}" - bundle! :install, :artifice => "compact_index_strict_basic_authentication" + bundle :install, :artifice => "compact_index_strict_basic_authentication" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -686,7 +686,7 @@ The checksum of /versions does not match the checksum provided by the server! So bundle "config set #{source_hostname} otheruser:wrong" - bundle! :install, :artifice => "compact_index_strict_basic_authentication" + bundle :install, :artifice => "compact_index_strict_basic_authentication" expect(the_bundle).to include_gems "rack 1.0.0" end @@ -712,7 +712,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - bundle! :install, :artifice => "compact_index_basic_authentication" + bundle :install, :artifice => "compact_index_basic_authentication" expect(the_bundle).to include_gems "rack 1.0.0" end end @@ -774,7 +774,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem 'rack' G - bundle! :install, :artifice => "compact_index_forbidden" + bundle :install, :artifice => "compact_index_forbidden" expect(exitstatus).to eq(0) if exitstatus ensure @@ -792,7 +792,7 @@ The checksum of /versions does not match the checksum provided by the server! So G # Initial install creates the cached versions file - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" # Update the Gemfile so we can check subsequent install was successful gemfile <<-G @@ -801,7 +801,7 @@ The checksum of /versions does not match the checksum provided by the server! So G # Second install should make only a partial request to /versions - bundle! :install, :artifice => "compact_index_partial_update" + bundle :install, :artifice => "compact_index_partial_update" expect(the_bundle).to include_gems "rack 1.0.0" end @@ -818,7 +818,7 @@ The checksum of /versions does not match the checksum provided by the server! So FileUtils.mkdir_p(File.dirname(versions)) FileUtils.touch(versions) - bundle! :install, :artifice => "compact_index_concurrent_download" + bundle :install, :artifice => "compact_index_concurrent_download" expect(File.read(versions)).to start_with("created_at") expect(the_bundle).to include_gems "rack 1.0.0" @@ -833,7 +833,7 @@ The checksum of /versions does not match the checksum provided by the server! So rake_info_path = File.join(Bundler.rubygems.user_home, ".bundle", "cache", "compact_index", "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "info", "rack") - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" expected_rack_info_content = File.read(rake_info_path) @@ -848,7 +848,7 @@ The checksum of /versions does not match the checksum provided by the server! So # The cache files now being longer means the requested range is going to be not satisfiable # Bundler must end up requesting the whole file to fix things up. - bundle! :install, :artifice => "compact_index_range_not_satisfiable" + bundle :install, :artifice => "compact_index_range_not_satisfiable" resulting_rack_info_content = File.read(rake_info_path) @@ -897,7 +897,7 @@ The checksum of /versions does not match the checksum provided by the server! So end it "does not raise when disable_checksum_validation is set" do - bundle! "config set disable_checksum_validation true" + bundle "config set disable_checksum_validation true" install_gemfile! <<-G, :artifice => "compact_index_wrong_gem_checksum" source "#{source_uri}" gem "rack" @@ -937,7 +937,7 @@ Either installing with `--full-index` or running `bundle update rails` should fi end G gem_command! "uninstall activemerchant" - bundle! "update rails", :artifice => "compact_index" + bundle "update rails", :artifice => "compact_index" expect(lockfile.scan(/activemerchant \(/).size).to eq(1) end end diff --git a/spec/bundler/install/gems/dependency_api_spec.rb b/spec/bundler/install/gems/dependency_api_spec.rb index 7fe2bec721..cd02bff3f1 100644 --- a/spec/bundler/install/gems/dependency_api_spec.rb +++ b/spec/bundler/install/gems/dependency_api_spec.rb @@ -62,7 +62,7 @@ RSpec.describe "gemcutter's dependency API" do bundle "config --local deployment true" bundle "config --local path vendor/bundle" - bundle! :install, :artifice => "endpoint" + bundle :install, :artifice => "endpoint" expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -113,7 +113,7 @@ RSpec.describe "gemcutter's dependency API" do bundle "install", :artifice => "endpoint" bundle "config --local deployment true" - bundle! :install, :artifice => "endpoint" + bundle :install, :artifice => "endpoint" expect(the_bundle).to include_gems("foo 1.0") end @@ -241,7 +241,7 @@ RSpec.describe "gemcutter's dependency API" do gem "rack" G - bundle! "update --full-index", :artifice => "endpoint", :all => true + bundle "update --full-index", :artifice => "endpoint", :all => true expect(out).to include("Fetching source index from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -324,7 +324,7 @@ RSpec.describe "gemcutter's dependency API" do gem 'somegem', '1.0.0' G - bundle! :install, :artifice => "endpoint_extra_api" + bundle :install, :artifice => "endpoint_extra_api" expect(the_bundle).to include_gems "somegem 1.0.0" expect(the_bundle).to include_gems "activesupport 1.2.3" @@ -468,7 +468,7 @@ RSpec.describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_extra" bundle "config --local deployment true" - bundle! "install", :artifice => "endpoint_extra" + bundle "install", :artifice => "endpoint_extra" expect(the_bundle).to include_gems "back_deps 1.0" end diff --git a/spec/bundler/install/gems/native_extensions_spec.rb b/spec/bundler/install/gems/native_extensions_spec.rb index a057d0d152..8801a3c289 100644 --- a/spec/bundler/install/gems/native_extensions_spec.rb +++ b/spec/bundler/install/gems/native_extensions_spec.rb @@ -38,7 +38,7 @@ RSpec.describe "installing a gem with native extensions", :ruby_repo do G bundle "config set build.c_extension --with-c_extension=hello" - bundle! "install" + bundle "install" expect(out).to include("Installing c_extension 1.0 with native extensions") @@ -75,7 +75,7 @@ RSpec.describe "installing a gem with native extensions", :ruby_repo do C end - bundle! "config set build.c_extension --with-c_extension=hello" + bundle "config set build.c_extension --with-c_extension=hello" install_gemfile! <<-G gem "c_extension", :git => #{lib_path("c_extension-1.0").to_s.dump} @@ -121,8 +121,8 @@ RSpec.describe "installing a gem with native extensions", :ruby_repo do build_git "gems", :path => lib_path("gems"), :gemspec => false end - bundle! "config set build.c_extension_one --with-c_extension_one=one" - bundle! "config set build.c_extension_two --with-c_extension_two=two" + bundle "config set build.c_extension_one --with-c_extension_one=one" + bundle "config set build.c_extension_two --with-c_extension_two=two" # 1st time, require only one gem -- only one of the extensions gets built. install_gemfile! <<-G @@ -168,7 +168,7 @@ RSpec.describe "installing a gem with native extensions", :ruby_repo do C end - bundle! "config set build.c_extension --with-c_extension=hello --with-c_extension_bundle-dir=hola" + bundle "config set build.c_extension --with-c_extension=hello --with-c_extension_bundle-dir=hola" install_gemfile! <<-G gem "c_extension", :git => #{lib_path("c_extension-1.0").to_s.dump} diff --git a/spec/bundler/install/gems/standalone_spec.rb b/spec/bundler/install/gems/standalone_spec.rb index 6d7828a416..4b31a2f976 100644 --- a/spec/bundler/install/gems/standalone_spec.rb +++ b/spec/bundler/install/gems/standalone_spec.rb @@ -56,7 +56,7 @@ RSpec.shared_examples "bundle install --standalone" do gem "rails" G bundle "config --local path #{bundled_app("bundle")}" - bundle! :install, :standalone => true, :dir => cwd + bundle :install, :standalone => true, :dir => cwd end let(:expected_gems) do @@ -127,7 +127,7 @@ RSpec.shared_examples "bundle install --standalone" do gem "devise", :git => "#{lib_path("devise-1.0")}" G bundle "config --local path #{bundled_app("bundle")}" - bundle! :install, :standalone => true, :dir => cwd + bundle :install, :standalone => true, :dir => cwd end let(:expected_gems) do @@ -155,7 +155,7 @@ RSpec.shared_examples "bundle install --standalone" do end G bundle "config --local path #{bundled_app("bundle")}" - bundle! :install, :standalone => true, :dir => cwd + bundle :install, :standalone => true, :dir => cwd end let(:expected_gems) do @@ -169,7 +169,7 @@ RSpec.shared_examples "bundle install --standalone" do it "allows creating a standalone file with limited groups" do bundle "config --local path #{bundled_app("bundle")}" - bundle! :install, :standalone => "default", :dir => cwd + bundle :install, :standalone => "default", :dir => cwd load_error_ruby <<-RUBY, "spec" $:.unshift File.expand_path("bundle") @@ -187,7 +187,7 @@ RSpec.shared_examples "bundle install --standalone" do it "allows `without` configuration to limit the groups used in a standalone" do bundle "config --local path #{bundled_app("bundle")}" bundle "config --local without test" - bundle! :install, :standalone => true, :dir => cwd + bundle :install, :standalone => true, :dir => cwd load_error_ruby <<-RUBY, "spec" $:.unshift File.expand_path("bundle") @@ -204,7 +204,7 @@ RSpec.shared_examples "bundle install --standalone" do it "allows `path` configuration to change the location of the standalone bundle" do bundle "config --local path path/to/bundle" - bundle! "install", :standalone => true, :dir => cwd + bundle "install", :standalone => true, :dir => cwd ruby <<-RUBY $:.unshift File.expand_path("path/to/bundle") @@ -219,9 +219,9 @@ RSpec.shared_examples "bundle install --standalone" do it "allows `without` to limit the groups used in a standalone" do bundle "config --local without test" - bundle! :install, :dir => cwd + bundle :install, :dir => cwd bundle "config --local path #{bundled_app("bundle")}" - bundle! :install, :standalone => true, :dir => cwd + bundle :install, :standalone => true, :dir => cwd load_error_ruby <<-RUBY, "spec" $:.unshift File.expand_path("bundle") @@ -247,7 +247,7 @@ RSpec.shared_examples "bundle install --standalone" do gem "rails" G bundle "config --local path #{bundled_app("bundle")}" - bundle! :install, :standalone => true, :artifice => "endpoint", :dir => cwd + bundle :install, :standalone => true, :artifice => "endpoint", :dir => cwd end let(:expected_gems) do @@ -268,7 +268,7 @@ RSpec.shared_examples "bundle install --standalone" do gem "rails" G bundle "config --local path #{bundled_app("bundle")}" - bundle! :install, :standalone => true, :binstubs => true, :dir => cwd + bundle :install, :standalone => true, :binstubs => true, :dir => cwd end let(:expected_gems) do diff --git a/spec/bundler/install/gems/sudo_spec.rb b/spec/bundler/install/gems/sudo_spec.rb index a70e90552c..ff73b4a1fa 100644 --- a/spec/bundler/install/gems/sudo_spec.rb +++ b/spec/bundler/install/gems/sudo_spec.rb @@ -8,7 +8,7 @@ RSpec.describe "when using sudo", :sudo => true do end before do - bundle! "config set path.system true" + bundle "config set path.system true" subdir.mkpath sudo "chmod u-w #{subdir}" end @@ -32,7 +32,7 @@ RSpec.describe "when using sudo", :sudo => true do describe "and GEM_HOME is owned by root" do before :each do - bundle! "config set path.system true" + bundle "config set path.system true" chown_system_gems_to_root end @@ -141,7 +141,7 @@ RSpec.describe "when using sudo", :sudo => true do describe "and GEM_HOME is not writable" do it "installs" do - bundle! "config set path.system true" + bundle "config set path.system true" gem_home = tmp("sudo_gem_home") sudo "mkdir -p #{gem_home}" sudo "chmod ugo-w #{gem_home}" diff --git a/spec/bundler/install/git_spec.rb b/spec/bundler/install/git_spec.rb index fe3d600ec6..14f9874b70 100644 --- a/spec/bundler/install/git_spec.rb +++ b/spec/bundler/install/git_spec.rb @@ -31,7 +31,7 @@ RSpec.describe "bundle install" do update_git "foo", "4.0", :path => lib_path("foo"), :gemspec => true - bundle! :update, :all => true + bundle :update, :all => true expect(out).to include("Using foo 2.0 (was 1.0) from #{file_uri_for(lib_path("foo"))} (at master~2@#{rev2})") expect(the_bundle).to include_gems "foo 2.0", :source => "git@#{lib_path("foo")}" end @@ -59,7 +59,7 @@ RSpec.describe "bundle install" do bundle "config --local path vendor/bundle" bundle "config --local without development" - bundle! :install + bundle :install expect(out).to include("Bundle complete!") end diff --git a/spec/bundler/install/global_cache_spec.rb b/spec/bundler/install/global_cache_spec.rb index 51fb6d7a36..1d897983c3 100644 --- a/spec/bundler/install/global_cache_spec.rb +++ b/spec/bundler/install/global_cache_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true RSpec.describe "global gem caching" do - before { bundle! "config set global_gem_cache true" } + before { bundle "config set global_gem_cache true" } describe "using the cross-application user cache" do let(:source) { "http://localgemserver.test" } @@ -64,7 +64,7 @@ RSpec.describe "global gem caching" do gem "rack", "1.0.0" G - bundle! :install, :artifice => "compact_index_no_gem" + bundle :install, :artifice => "compact_index_no_gem" # rack 1.0.0 is installed and rack 0.9.1 is not expect(the_bundle).to include_gems "rack 1.0.0" expect(the_bundle).not_to include_gems "rack 0.9.1" @@ -75,7 +75,7 @@ RSpec.describe "global gem caching" do gem "rack", "0.9.1" G - bundle! :install, :artifice => "compact_index_no_gem" + bundle :install, :artifice => "compact_index_no_gem" # rack 0.9.1 is installed and rack 1.0.0 is not expect(the_bundle).to include_gems "rack 0.9.1" expect(the_bundle).not_to include_gems "rack 1.0.0" @@ -87,7 +87,7 @@ RSpec.describe "global gem caching" do gem "rack" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" simulate_new_machine expect(the_bundle).not_to include_gems "rack 1.0.0" expect(source_global_cache("rack-1.0.0.gem")).to exist @@ -98,7 +98,7 @@ RSpec.describe "global gem caching" do gem "rack", "0.9.1" G - bundle! :install, :artifice => "compact_index" + bundle :install, :artifice => "compact_index" simulate_new_machine expect(the_bundle).not_to include_gems "rack 0.9.1" expect(source2_global_cache("rack-0.9.1.gem")).to exist @@ -174,7 +174,7 @@ RSpec.describe "global gem caching" do # Install using the global cache instead of by downloading the .gem # from the server - bundle! :install, :artifice => "compact_index_no_gem", :dir => bundled_app2 + bundle :install, :artifice => "compact_index_no_gem", :dir => bundled_app2 # activesupport is installed and both are in the global cache expect(the_bundle).not_to include_gems "rack 1.0.0", :dir => bundled_app2 @@ -220,8 +220,8 @@ RSpec.describe "global gem caching" do gem_binary_cache.join("very_simple_binary_c.rb").open("w") {|f| f << "puts File.basename(__FILE__)" } git_binary_cache.join("very_simple_git_binary_c.rb").open("w") {|f| f << "puts File.basename(__FILE__)" } - bundle! "config set --local path different_path" - bundle! :install + bundle "config set --local path different_path" + bundle :install expect(Dir[home(".bundle", "cache", "extensions", "**", "*binary_c*")]).to all(end_with(".rb")) diff --git a/spec/bundler/install/path_spec.rb b/spec/bundler/install/path_spec.rb index 45e2b46055..22eedad388 100644 --- a/spec/bundler/install/path_spec.rb +++ b/spec/bundler/install/path_spec.rb @@ -15,7 +15,7 @@ RSpec.describe "bundle install" do it "does not use available system gems with bundle --path vendor/bundle", :bundler => "< 3" do bundle "config --local path vendor/bundle" - bundle! :install + bundle :install expect(the_bundle).to include_gems "rack 1.0.0" end @@ -24,7 +24,7 @@ RSpec.describe "bundle install" do dir.mkpath bundle "config --local path #{dir.join("vendor/bundle")}" - bundle! :install, :dir => dir + bundle :install, :dir => dir expect(out).to include("installed into `./vendor/bundle`") dir.rmtree @@ -32,7 +32,7 @@ RSpec.describe "bundle install" do it "prints a warning to let the user know what has happened with bundle --path vendor/bundle" do bundle "config --local path vendor/bundle" - bundle! :install + bundle :install expect(out).to include("gems are installed into `./vendor/bundle`") end @@ -52,24 +52,24 @@ RSpec.describe "bundle install" do end context "with path_relative_to_cwd set to true" do - before { bundle! "config set path_relative_to_cwd true" } + before { bundle "config set path_relative_to_cwd true" } it "installs the bundle relatively to current working directory", :bundler => "< 3" do - bundle! "install --gemfile='#{bundled_app}/Gemfile' --path vendor/bundle", :dir => bundled_app.parent + bundle "install --gemfile='#{bundled_app}/Gemfile' --path vendor/bundle", :dir => bundled_app.parent expect(out).to include("installed into `./vendor/bundle`") expect(bundled_app("../vendor/bundle")).to be_directory expect(the_bundle).to include_gems "rack 1.0.0" end it "installs the standalone bundle relative to the cwd" do - bundle! :install, :gemfile => bundled_app_gemfile, :standalone => true, :dir => bundled_app.parent + bundle :install, :gemfile => bundled_app_gemfile, :standalone => true, :dir => bundled_app.parent expect(out).to include("installed into `./bundled_app/bundle`") expect(bundled_app("bundle")).to be_directory expect(bundled_app("bundle/ruby")).to be_directory - bundle! "config unset path" + bundle "config unset path" - bundle! :install, :gemfile => bundled_app_gemfile, :standalone => true, :dir => bundled_app("subdir").tap(&:mkpath) + bundle :install, :gemfile => bundled_app_gemfile, :standalone => true, :dir => bundled_app("subdir").tap(&:mkpath) expect(out).to include("installed into `../bundle`") expect(bundled_app("bundle")).to be_directory expect(bundled_app("bundle/ruby")).to be_directory @@ -93,7 +93,7 @@ RSpec.describe "bundle install" do if type == :env ENV["BUNDLE_PATH"] = location elsif type == :global - bundle! "config set path #{location}", "no-color" => nil + bundle "config set path #{location}", "no-color" => nil end end @@ -102,7 +102,7 @@ RSpec.describe "bundle install" do it "installs gems to a path if one is specified" do set_bundle_path(type, bundled_app("vendor2").to_s) bundle "config --local path vendor/bundle" - bundle! :install + bundle :install expect(vendored_gems("gems/rack-1.0.0")).to be_directory expect(bundled_app("vendor2")).not_to be_directory @@ -111,9 +111,9 @@ RSpec.describe "bundle install" do it "installs gems to ." do set_bundle_path(type, ".") - bundle! "config set --global disable_shared_gems true" + bundle "config set --global disable_shared_gems true" - bundle! :install + bundle :install paths_to_exist = %w[cache/rack-1.0.0.gem gems/rack-1.0.0 specifications/rack-1.0.0.gemspec].map {|path| bundled_app(Bundler.ruby_scope, path) } expect(paths_to_exist).to all exist @@ -123,7 +123,7 @@ RSpec.describe "bundle install" do it "installs gems to the path" do set_bundle_path(type, bundled_app("vendor").to_s) - bundle! :install + bundle :install expect(bundled_app("vendor", Bundler.ruby_scope, "gems/rack-1.0.0")).to be_directory expect(the_bundle).to include_gems "rack 1.0.0" @@ -133,7 +133,7 @@ RSpec.describe "bundle install" do set_bundle_path(type, "vendor") FileUtils.mkdir_p bundled_app("lol") - bundle! :install, :dir => bundled_app("lol") + bundle :install, :dir => bundled_app("lol") expect(bundled_app("vendor", Bundler.ruby_scope, "gems/rack-1.0.0")).to be_directory expect(the_bundle).to include_gems "rack 1.0.0" @@ -152,7 +152,7 @@ RSpec.describe "bundle install" do it "sets BUNDLE_PATH as the first argument to bundle install" do bundle "config --local path ./vendor/bundle" - bundle! :install + bundle :install expect(vendored_gems("gems/rack-1.0.0")).to be_directory expect(the_bundle).to include_gems "rack 1.0.0" @@ -162,7 +162,7 @@ RSpec.describe "bundle install" do # This is so that vendored gems can be distributed to others build_gem "rack", "1.1.0", :to_system => true bundle "config --local path ./vendor/bundle" - bundle! :install + bundle :install expect(vendored_gems("gems/rack-1.0.0")).to be_directory expect(the_bundle).to include_gems "rack 1.0.0" @@ -179,7 +179,7 @@ RSpec.describe "bundle install" do G bundle "config --local path ./vendor/bundle" - bundle! :install + bundle :install expect(vendored_gems("gems/very_simple_binary-1.0")).to be_directory expect(vendored_gems("extensions")).to be_directory diff --git a/spec/bundler/install/redownload_spec.rb b/spec/bundler/install/redownload_spec.rb index 818c33bd61..0eae615c59 100644 --- a/spec/bundler/install/redownload_spec.rb +++ b/spec/bundler/install/redownload_spec.rb @@ -12,9 +12,9 @@ RSpec.describe "bundle install" do it "re-installs installed gems" do rack_lib = default_bundle_path("gems/rack-1.0.0/lib/rack.rb") - bundle! :install + bundle :install rack_lib.open("w") {|f| f.write("blah blah blah") } - bundle! :install, flag => true + bundle :install, flag => true expect(out).to include "Installing rack 1.0.0" expect(rack_lib.open(&:read)).to eq("RACK = '1.0.0'\n") @@ -22,7 +22,7 @@ RSpec.describe "bundle install" do end it "works on first bundle install" do - bundle! :install, flag => true + bundle :install, flag => true expect(out).to include "Installing rack 1.0.0" expect(the_bundle).to include_gems "rack 1.0.0" @@ -40,16 +40,16 @@ RSpec.describe "bundle install" do it "re-installs installed gems" do foo_lib = default_bundle_path("bundler/gems/foo-1.0-#{ref}/lib/foo.rb") - bundle! :install + bundle :install foo_lib.open("w") {|f| f.write("blah blah blah") } - bundle! :install, flag => true + bundle :install, flag => true expect(foo_lib.open(&:read)).to eq("FOO = '1.0'\n") expect(the_bundle).to include_gems "foo 1.0" end it "works on first bundle install" do - bundle! :install, flag => true + bundle :install, flag => true expect(the_bundle).to include_gems "foo 1.0" end @@ -62,12 +62,12 @@ RSpec.describe "bundle install" do end it "shows a deprecation when single flag passed" do - bundle! "install --force" + bundle "install --force" expect(err).to include "[DEPRECATED] The `--force` option has been renamed to `--redownload`" end it "shows a deprecation when multiple flags passed" do - bundle! "install --no-color --force" + bundle "install --no-color --force" expect(err).to include "[DEPRECATED] The `--force` option has been renamed to `--redownload`" end end @@ -78,12 +78,12 @@ RSpec.describe "bundle install" do end it "does not show a deprecation when single flag passed" do - bundle! "install --redownload" + bundle "install --redownload" expect(err).not_to include "[DEPRECATED] The `--force` option has been renamed to `--redownload`" end it "does not show a deprecation when single multiple flags passed" do - bundle! "install --no-color --redownload" + bundle "install --no-color --redownload" expect(err).not_to include "[DEPRECATED] The `--force` option has been renamed to `--redownload`" end end |