Move files of bundler/tool to top of repository

rubygems · May 31, 2023 · 7b78821 · 7b78821
1 parent e996131
commit 7b78821
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 7 deletions.
diff --git a/Rakefile b/Rakefile
@@ -14,11 +14,11 @@ module RubyGems
 
     def bundle_dev_gemfile(*args)
       name = RUBY_VERSION.start_with?("2.6") ? "dev26_gems" : "dev_gems"
-      sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", *args, "--gemfile=bundler/tool/bundler/#{name}.rb"
+      sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", *args, "--gemfile=tool/bundler/#{name}.rb"
     end
 
     def bundle_support_gemfile(name, *args)
-      sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", *args, "--gemfile=bundler/tool/bundler/#{name}.rb"
+      sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", *args, "--gemfile=tool/bundler/#{name}.rb"
     end
   end
 end

diff --git a/bin/rubocop b/bin/rubocop
@@ -3,7 +3,7 @@
 
 $LOAD_PATH.unshift(File.expand_path("../bundler/lib", __dir__))
 
-ENV["BUNDLE_GEMFILE"] = File.expand_path("../bundler/tool/bundler/lint_gems.rb", __dir__)
+ENV["BUNDLE_GEMFILE"] = File.expand_path("../tool/bundler/lint_gems.rb", __dir__)
 require "bundler/setup"
 
 load Gem.bin_path("rubocop", "rubocop")
diff --git a/bundler/spec/support/path.rb b/bundler/spec/support/path.rb
@@ -292,15 +292,15 @@ def ruby_core_tarball?
     end
 
     def rubocop_gemfile_basename
-      source_root.join("tool/bundler/rubocop_gems.rb")
+      source_root.join("../tool/bundler/rubocop_gems.rb")
     end
 
     def standard_gemfile_basename
-      source_root.join("tool/bundler/standard_gems.rb")
+      source_root.join("../tool/bundler/standard_gems.rb")
     end
 
     def tool_dir
-      source_root.join("tool/bundler")
+      source_root.join("../tool/bundler")
     end
 
     def templates_dir

diff --git a/bundler/tool/bundler/dev26_gems.rb → tool/bundler/dev26_gems.rb b/bundler/tool/bundler/dev26_gems.rb → tool/bundler/dev26_gems.rb
diff --git a/bundler/tool/bundler/dev26_gems.rb.lock → tool/bundler/dev26_gems.rb.lock b/bundler/tool/bundler/dev26_gems.rb.lock → tool/bundler/dev26_gems.rb.lock
diff --git a/bundler/tool/bundler/dev_gems.rb → tool/bundler/dev_gems.rb b/bundler/tool/bundler/dev_gems.rb → tool/bundler/dev_gems.rb
diff --git a/bundler/tool/bundler/dev_gems.rb.lock → tool/bundler/dev_gems.rb.lock b/bundler/tool/bundler/dev_gems.rb.lock → tool/bundler/dev_gems.rb.lock
diff --git a/bundler/tool/bundler/lint_gems.rb → tool/bundler/lint_gems.rb b/bundler/tool/bundler/lint_gems.rb → tool/bundler/lint_gems.rb
diff --git a/bundler/tool/bundler/lint_gems.rb.lock → tool/bundler/lint_gems.rb.lock b/bundler/tool/bundler/lint_gems.rb.lock → tool/bundler/lint_gems.rb.lock
diff --git a/bundler/tool/bundler/release_gems.rb → tool/bundler/release_gems.rb b/bundler/tool/bundler/release_gems.rb → tool/bundler/release_gems.rb
diff --git a/bundler/tool/bundler/release_gems.rb.lock → tool/bundler/release_gems.rb.lock b/bundler/tool/bundler/release_gems.rb.lock → tool/bundler/release_gems.rb.lock
diff --git a/bundler/tool/bundler/rubocop_gems.rb → tool/bundler/rubocop_gems.rb b/bundler/tool/bundler/rubocop_gems.rb → tool/bundler/rubocop_gems.rb
diff --git a/bundler/tool/bundler/rubocop_gems.rb.lock → tool/bundler/rubocop_gems.rb.lock b/bundler/tool/bundler/rubocop_gems.rb.lock → tool/bundler/rubocop_gems.rb.lock
diff --git a/bundler/tool/bundler/standard_gems.rb → tool/bundler/standard_gems.rb b/bundler/tool/bundler/standard_gems.rb → tool/bundler/standard_gems.rb
diff --git a/bundler/tool/bundler/standard_gems.rb.lock → tool/bundler/standard_gems.rb.lock b/bundler/tool/bundler/standard_gems.rb.lock → tool/bundler/standard_gems.rb.lock
diff --git a/bundler/tool/bundler/test_gems.rb → tool/bundler/test_gems.rb b/bundler/tool/bundler/test_gems.rb → tool/bundler/test_gems.rb
diff --git a/bundler/tool/bundler/test_gems.rb.lock → tool/bundler/test_gems.rb.lock b/bundler/tool/bundler/test_gems.rb.lock → tool/bundler/test_gems.rb.lock
diff --git a/tool/release.rb b/tool/release.rb
@@ -116,7 +116,7 @@ def self.install_dependencies!
       File.expand_path("../lib", __dir__),
       File.expand_path("../bundler/spec/support/bundle.rb", __dir__),
       "install",
-      "--gemfile=#{File.expand_path("../bundler/tool/bundler/release_gems.rb", __dir__)}",
+      "--gemfile=#{File.expand_path("bundler/release_gems.rb", __dir__)}",
       exception: true
     )
   end