diff --git a/lib/suspenders/generators/advisories_generator.rb b/lib/suspenders/generators/advisories_generator.rb index 8dd3d5e6c..102e1b868 100644 --- a/lib/suspenders/generators/advisories_generator.rb +++ b/lib/suspenders/generators/advisories_generator.rb @@ -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 diff --git a/lib/suspenders/generators/ci_generator.rb b/lib/suspenders/generators/ci_generator.rb index 2ae758356..ab08c59a3 100644 --- a/lib/suspenders/generators/ci_generator.rb +++ b/lib/suspenders/generators/ci_generator.rb @@ -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 diff --git a/lib/suspenders/generators/db_optimizations_generator.rb b/lib/suspenders/generators/db_optimizations_generator.rb index 9eb74c42f..16e4e7b75 100644 --- a/lib/suspenders/generators/db_optimizations_generator.rb +++ b/lib/suspenders/generators/db_optimizations_generator.rb @@ -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 diff --git a/lib/suspenders/generators/factories_generator.rb b/lib/suspenders/generators/factories_generator.rb index 1d0cd4ef9..318dd9be9 100644 --- a/lib/suspenders/generators/factories_generator.rb +++ b/lib/suspenders/generators/factories_generator.rb @@ -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 diff --git a/lib/suspenders/generators/forms_generator.rb b/lib/suspenders/generators/forms_generator.rb index 53521dac2..6ea2aca80 100644 --- a/lib/suspenders/generators/forms_generator.rb +++ b/lib/suspenders/generators/forms_generator.rb @@ -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 diff --git a/lib/suspenders/generators/inline_svg_generator.rb b/lib/suspenders/generators/inline_svg_generator.rb index ca4fbac56..1ff39c16c 100644 --- a/lib/suspenders/generators/inline_svg_generator.rb +++ b/lib/suspenders/generators/inline_svg_generator.rb @@ -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 diff --git a/lib/suspenders/generators/jobs_generator.rb b/lib/suspenders/generators/jobs_generator.rb index a32be2914..9d83d8dcc 100644 --- a/lib/suspenders/generators/jobs_generator.rb +++ b/lib/suspenders/generators/jobs_generator.rb @@ -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 diff --git a/lib/suspenders/generators/js_driver_generator.rb b/lib/suspenders/generators/js_driver_generator.rb index 0171c6959..4d7f88842 100644 --- a/lib/suspenders/generators/js_driver_generator.rb +++ b/lib/suspenders/generators/js_driver_generator.rb @@ -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 diff --git a/lib/suspenders/generators/json_generator.rb b/lib/suspenders/generators/json_generator.rb index fd0c8b2aa..7e48eea11 100644 --- a/lib/suspenders/generators/json_generator.rb +++ b/lib/suspenders/generators/json_generator.rb @@ -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 diff --git a/lib/suspenders/generators/preloader_generator.rb b/lib/suspenders/generators/preloader_generator.rb index a077a5d51..dd767eda6 100644 --- a/lib/suspenders/generators/preloader_generator.rb +++ b/lib/suspenders/generators/preloader_generator.rb @@ -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 @@ -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 diff --git a/lib/suspenders/generators/production/timeout_generator.rb b/lib/suspenders/generators/production/timeout_generator.rb index d6718fe2f..21c71d939 100644 --- a/lib/suspenders/generators/production/timeout_generator.rb +++ b/lib/suspenders/generators/production/timeout_generator.rb @@ -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 diff --git a/lib/suspenders/generators/profiler_generator.rb b/lib/suspenders/generators/profiler_generator.rb index 4f2a8e7bf..2a380ef48 100644 --- a/lib/suspenders/generators/profiler_generator.rb +++ b/lib/suspenders/generators/profiler_generator.rb @@ -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 diff --git a/lib/suspenders/generators/static_generator.rb b/lib/suspenders/generators/static_generator.rb index 24b6f783b..215ee325d 100644 --- a/lib/suspenders/generators/static_generator.rb +++ b/lib/suspenders/generators/static_generator.rb @@ -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 diff --git a/lib/suspenders/generators/stylesheet_base_generator.rb b/lib/suspenders/generators/stylesheet_base_generator.rb index 8ff641ccc..a342fbadd 100644 --- a/lib/suspenders/generators/stylesheet_base_generator.rb +++ b/lib/suspenders/generators/stylesheet_base_generator.rb @@ -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 diff --git a/lib/suspenders/generators/testing_generator.rb b/lib/suspenders/generators/testing_generator.rb index c50975847..813138047 100644 --- a/lib/suspenders/generators/testing_generator.rb +++ b/lib/suspenders/generators/testing_generator.rb @@ -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 diff --git a/spec/features/api_spec.rb b/spec/features/api_spec.rb index d3e210ff1..8b10e4e46 100644 --- a/spec/features/api_spec.rb +++ b/spec/features/api_spec.rb @@ -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 diff --git a/spec/features/new_project_spec.rb b/spec/features/new_project_spec.rb index 42c309fb8..13e96b9fb 100644 --- a/spec/features/new_project_spec.rb +++ b/spec/features/new_project_spec.rb @@ -23,7 +23,7 @@ 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 @@ -31,7 +31,7 @@ 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 diff --git a/spec/support/suspenders.rb b/spec/support/suspenders.rb index a636bfadf..48b238f33 100644 --- a/spec/support/suspenders.rb +++ b/spec/support/suspenders.rb @@ -161,7 +161,7 @@ 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 @@ -169,7 +169,7 @@ def run_in_tmp def run_in_project Dir.chdir(project_path) do - Bundler.with_clean_env do + Bundler.with_unbundled_env do yield end end