Skip to content

Commit

Permalink
[rubygems/rubygems] s/run!/run
Browse files Browse the repository at this point in the history
  • Loading branch information
deivid-rodriguez authored and hsbt committed Jun 18, 2020
1 parent 596588c commit ea4824e
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion spec/bundler/cache/git_spec.rb
Expand Up @@ -93,7 +93,7 @@
expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist

FileUtils.rm_rf lib_path("foo-1.0")
run! "require 'foo'"
run "require 'foo'"
expect(out).to eq("CACHE")
end

Expand Down
2 changes: 1 addition & 1 deletion spec/bundler/commands/config_spec.rb
Expand Up @@ -92,7 +92,7 @@

it "can also be set explicitly" do
bundle "config set --global foo global"
run! "puts Bundler.settings[:foo]"
run "puts Bundler.settings[:foo]"
expect(out).to eq("global")
end

Expand Down
2 changes: 1 addition & 1 deletion spec/bundler/commands/exec_spec.rb
Expand Up @@ -921,7 +921,7 @@ def bin_path(a,b,c)
expect(bundle("exec #{file}", :artifice => nil, :env => env)).to eq(expected)
expect(bundle("exec bundle exec #{file}", :artifice => nil, :env => env)).to eq(expected)
expect(bundle("exec ruby #{file}", :artifice => nil, :env => env)).to eq(expected)
expect(run!(file.read, :artifice => nil, :env => env)).to eq(expected)
expect(run(file.read, :artifice => nil, :env => env)).to eq(expected)
end

skip "ruby_core has openssl and rubygems in the same folder, and this test needs rubygems require but default openssl not in a directly added entry in $LOAD_PATH" if ruby_core?
Expand Down
2 changes: 1 addition & 1 deletion spec/bundler/install/deploy_spec.rb
Expand Up @@ -238,7 +238,7 @@
bundle "config --local without development"
bundle "config --local deployment true"
bundle :install, :env => { "DEBUG" => "1" }
run! "puts :WIN"
run "puts :WIN"
expect(out).to eq("WIN")
end

Expand Down
2 changes: 1 addition & 1 deletion spec/bundler/install/gemfile/gemspec_spec.rb
Expand Up @@ -255,7 +255,7 @@

expect(the_bundle).to include_gems "foo 1.0.0"

run! "Gem.finish_resolve; puts 'WIN'"
run "Gem.finish_resolve; puts 'WIN'"
expect(out).to eq("WIN")
end

Expand Down
22 changes: 11 additions & 11 deletions spec/bundler/install/gemfile/git_spec.rb
Expand Up @@ -232,7 +232,7 @@
G
expect(err).to be_empty

run! <<-RUBY
run <<-RUBY
require 'foo'
puts "WIN" if defined?(FOO)
RUBY
Expand Down Expand Up @@ -266,7 +266,7 @@
G
expect(err).to be_empty

run! <<-RUBY
run <<-RUBY
require 'foo'
puts "WIN" if defined?(FOO)
RUBY
Expand Down Expand Up @@ -453,7 +453,7 @@

bundle %(config set local.rack #{lib_path("local-rack")})
bundle :install
run! "require 'rack'"
run "require 'rack'"
expect(out).to eq("LOCAL")
end

Expand Down Expand Up @@ -1135,7 +1135,7 @@
R
expect(out).to eq("YES")

run! <<-R
run <<-R
puts $:.grep(/ext/)
R
expect(out).to include(Pathname.glob(default_bundle_path("bundler/gems/extensions/**/foo-1.0-*")).first.to_s)
Expand Down Expand Up @@ -1223,7 +1223,7 @@
gem "foo", :git => "#{lib_path("foo-1.0")}"
G

run! <<-R
run <<-R
require 'foo'
puts FOO
R
Expand All @@ -1236,7 +1236,7 @@
gem "foo", :git => "#{lib_path("foo-1.0")}"
G

run! <<-R
run <<-R
require 'foo'
puts FOO
R
Expand Down Expand Up @@ -1265,7 +1265,7 @@
gem "foo", :git => "#{lib_path("foo-1.0")}"
G

run! <<-R
run <<-R
require 'foo'
puts FOO
R
Expand All @@ -1279,7 +1279,7 @@
gem "foo", :git => "#{lib_path("foo-1.0")}"
G

run! <<-R
run <<-R
require 'foo'
puts FOO
R
Expand Down Expand Up @@ -1307,7 +1307,7 @@
gem "foo", :git => "#{lib_path("foo-1.0")}"
G

run! <<-R
run <<-R
require 'foo'
puts FOO
R
Expand All @@ -1323,7 +1323,7 @@
gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "branch2"
G

run! <<-R
run <<-R
require 'foo'
puts FOO
R
Expand All @@ -1334,7 +1334,7 @@
update_git("foo")
bundle "update foo"

run! <<-R
run <<-R
require 'foo'
puts FOO
R
Expand Down
2 changes: 1 addition & 1 deletion spec/bundler/install/gemfile/groups_spec.rb
Expand Up @@ -122,7 +122,7 @@
it "allows Bundler.setup for specific groups" do
bundle "config --local without emo"
bundle :install
run!("require 'rack'; puts RACK", :default)
run("require 'rack'; puts RACK", :default)
expect(out).to eq("1.0.0")
end

Expand Down
2 changes: 1 addition & 1 deletion spec/bundler/install/gems/compact_index_spec.rb
Expand Up @@ -59,7 +59,7 @@

# can't use `include_gems` here since the `require` will conflict on a
# case-insensitive FS
run! "Bundler.require; puts Gem.loaded_specs.values_at('rack', 'Rack').map(&:full_name)"
run "Bundler.require; puts Gem.loaded_specs.values_at('rack', 'Rack').map(&:full_name)"
expect(out).to eq("rack-1.0\nRack-0.1")
end

Expand Down
6 changes: 3 additions & 3 deletions spec/bundler/install/gems/native_extensions_spec.rb
Expand Up @@ -83,7 +83,7 @@

expect(err).to_not include("warning: conflicting chdir during another chdir block")

run! "Bundler.require; puts CExtension.new.its_true"
run "Bundler.require; puts CExtension.new.its_true"
expect(out).to eq("true")
end

Expand Down Expand Up @@ -135,7 +135,7 @@
gem "c_extension_two", :git => #{lib_path("gems").to_s.dump}
G

run! "Bundler.require; puts CExtension_one.new.value; puts CExtension_two.new.value"
run "Bundler.require; puts CExtension_one.new.value; puts CExtension_two.new.value"
expect(out).to eq("one\ntwo")
end

Expand Down Expand Up @@ -174,7 +174,7 @@
gem "c_extension", :git => #{lib_path("c_extension-1.0").to_s.dump}
G

run! "Bundler.require; puts CExtension.new.its_true"
run "Bundler.require; puts CExtension.new.its_true"
expect(out).to eq("true")
end
end
4 changes: 2 additions & 2 deletions spec/bundler/install/global_cache_spec.rb
Expand Up @@ -209,7 +209,7 @@ def source2_global_cache(*segments)
cached_extensions = Pathname.glob(home(".bundle", "cache", "extensions", "*", "*", "*", "*", "*")).sort
expect(cached_extensions).to eq [gem_binary_cache, git_binary_cache].sort

run! <<-R
run <<-R
require 'very_simple_binary_c'; puts ::VERY_SIMPLE_BINARY_IN_C
require 'very_simple_git_binary_c'; puts ::VERY_SIMPLE_GIT_BINARY_IN_C
R
Expand All @@ -225,7 +225,7 @@ def source2_global_cache(*segments)

expect(Dir[home(".bundle", "cache", "extensions", "**", "*binary_c*")]).to all(end_with(".rb"))

run! <<-R
run <<-R
require 'very_simple_binary_c'
require 'very_simple_git_binary_c'
R
Expand Down
8 changes: 4 additions & 4 deletions spec/bundler/runtime/require_spec.rb
Expand Up @@ -375,7 +375,7 @@ def self.two
gem "rack"
G

run! <<-R
run <<-R
path = File.join(Gem.dir, "specifications", "rack-1.0.0.gemspec")
contents = File.read(path)
contents = contents.lines.to_a.insert(-2, "\n raise 'broken gemspec'\n").join
Expand All @@ -384,7 +384,7 @@ def self.two
end
R

run! <<-R
run <<-R
Bundler.require
puts "WIN"
R
Expand All @@ -399,7 +399,7 @@ def self.two
gem "foo", :git => "#{lib_path("foo-1.0")}"
G

run! <<-R
run <<-R
path = Gem.loaded_specs["foo"].loaded_from
contents = File.read(path)
contents = contents.lines.to_a.insert(-2, "\n raise 'broken gemspec'\n").join
Expand All @@ -408,7 +408,7 @@ def self.two
end
R

run! <<-R
run <<-R
Bundler.require
puts "WIN"
R
Expand Down
8 changes: 4 additions & 4 deletions spec/bundler/runtime/setup_spec.rb
Expand Up @@ -670,7 +670,7 @@ def clean_load_path(lp)
gem "rack"
G

run! <<-R
run <<-R
File.open(File.join(Gem.dir, "specifications", "broken.gemspec"), "w") do |f|
f.write <<-RUBY
# -*- encoding: utf-8 -*-
Expand All @@ -685,7 +685,7 @@ def clean_load_path(lp)
end
R

run! <<-R
run <<-R
puts "WIN"
R

Expand Down Expand Up @@ -722,7 +722,7 @@ def clean_load_path(lp)
gem "with_man"
G

run! "puts ENV['MANPATH']"
run "puts ENV['MANPATH']"
expect(out).to eq("#{default_bundle_path("gems/with_man-1.0/man")}#{File::PATH_SEPARATOR}/foo")
end
end
Expand All @@ -736,7 +736,7 @@ def clean_load_path(lp)
gem "with_man"
G

run! "puts ENV['MANPATH']"
run "puts ENV['MANPATH']"
expect(out).to eq(default_bundle_path("gems/with_man-1.0/man").to_s)
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/bundler/update/git_spec.rb
Expand Up @@ -165,7 +165,7 @@
end
G

run! "require 'submodule'"
run "require 'submodule'"
expect(out).to eq("GIT")

install_gemfile <<-G
Expand All @@ -175,7 +175,7 @@
end
G

run! "require 'submodule'"
run "require 'submodule'"
expect(out).to eq("GEM")
end
end
Expand Down

0 comments on commit ea4824e

Please sign in to comment.