Skip to content

Commit

Permalink
Replace deprecated Bundler method
Browse files Browse the repository at this point in the history
`Bundler.with_clean_env` has been deprecated in favor of
`Bundler.with_unbundled_env`
  • Loading branch information
composerinteralia committed Jun 24, 2020
1 parent d6b0a3c commit ecd95f6
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion lib/suspenders/generators/advisories_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class AdvisoriesGenerator < Generators::Base
def bundler_audit_gem
gem "bundler-audit", ">= 0.7.0", require: false, group: %i[development test]
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def rake_task
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/ci_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class CiGenerator < Generators::Base
def simplecov_gem
gem "simplecov", require: false, group: [:test]
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def simplecov_test_integration
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/db_optimizations_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class DbOptimizationsGenerator < Generators::Base
def add_bullet
gem "bullet", group: %i(development test)
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def configure_bullet
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/factories_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class FactoriesGenerator < Generators::Base
def add_factory_bot
gem "factory_bot_rails", group: %i(development test)
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def set_up_factory_bot_for_rspec
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/forms_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class FormsGenerator < Generators::Base
def add_simple_form
gem "simple_form"
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def configure_simple_form
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/inline_svg_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class InlineSvgGenerator < Generators::Base
def add_inline_svg
gem "inline_svg"
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def configure_inline_svg
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/jobs_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class JobsGenerator < Generators::Base
def add_jobs_gem
gem "delayed_job_active_record"
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def configure_background_jobs_for_rspec
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/js_driver_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class JsDriverGenerator < Generators::Base
def add_gems
gem "webdrivers", group: :test
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def configure_capybara
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/json_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class JsonGenerator < Generators::Base
def add_oj
gem "oj"
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end
end
end
6 changes: 3 additions & 3 deletions lib/suspenders/generators/preloader_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def spring_gem
gem "spring-watcher-listen", "~> 2.0.0"
end

Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def cache_classes_test
Expand All @@ -31,13 +31,13 @@ def initialize(base)
end

def invoke!
Bundler.with_clean_env do
Bundler.with_unbundled_env do
@base.send(:always_run, "spring binstub --all")
end
end

def revoke!
Bundler.with_clean_env do
Bundler.with_unbundled_env do
@base.send(:always_run, "spring binstub --remove --all")
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/production/timeout_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Production
class TimeoutGenerator < Generators::Base
def add_gem
gem "rack-timeout", group: :production
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def configure_rack_timeout
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/profiler_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def augment_default_env

def add_gem
gem "rack-mini-profiler", require: false
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def configure_rack_mini_profiler
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/static_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class StaticGenerator < Generators::Base
def add_high_voltage
gem "high_voltage"
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def make_placeholder_directory
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/stylesheet_base_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Suspenders
class StylesheetBaseGenerator < Generators::Base
def add_stylesheet_gems
gem "bourbon", ">= 6.0.0"
Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def remove_prior_config
Expand Down
2 changes: 1 addition & 1 deletion lib/suspenders/generators/testing_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def add_testing_gems
gem "rspec-rails", "~> 3.6", group: %i(development test)
gem "shoulda-matchers", group: :test

Bundler.with_clean_env { run "bundle install" }
Bundler.with_unbundled_env { run "bundle install" }
end

def generate_rspec
Expand Down
2 changes: 1 addition & 1 deletion spec/features/api_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
run_suspenders("--api")

Dir.chdir(project_path) do
Bundler.with_clean_env do
Bundler.with_unbundled_env do
expect(`rake`).to include("0 failures")
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/features/new_project_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@

it "ensures project specs pass" do
Dir.chdir(project_path) do
Bundler.with_clean_env do
Bundler.with_unbundled_env do
expect(`rake`).to include('0 failures')
end
end
end

it "includes the bundle:audit task" do
Dir.chdir(project_path) do
Bundler.with_clean_env do
Bundler.with_unbundled_env do
expect(`rails -T`).to include("rails bundle:audit")
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/support/suspenders.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,15 @@ def with_revision_for_honeybadger

def run_in_tmp
Dir.chdir(tmp_path) do
Bundler.with_clean_env do
Bundler.with_unbundled_env do
yield
end
end
end

def run_in_project
Dir.chdir(project_path) do
Bundler.with_clean_env do
Bundler.with_unbundled_env do
yield
end
end
Expand Down

0 comments on commit ecd95f6

Please sign in to comment.