Skip to content

Commit 5cb0f36

Browse files
siutinsiutin
committed
upgrade bundler bins
1 parent 606d5a4 commit 5cb0f36

File tree

3 files changed

+8
-160
lines changed

3 files changed

+8
-160
lines changed

‎dummy_app/bin/bundle

Lines changed: 2 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,3 @@
11
#!/usr/bin/env ruby
2-
# frozen_string_literal: true
3-
4-
#
5-
# This file was generated by Bundler.
6-
#
7-
# The application 'bundle' is installed as part of a gem, and
8-
# this file is here to facilitate running it.
9-
#
10-
11-
require "rubygems"
12-
13-
m = Module.new do
14-
module_function
15-
16-
def invoked_as_script?
17-
File.expand_path($0) == File.expand_path(__FILE__)
18-
end
19-
20-
def env_var_version
21-
ENV["BUNDLER_VERSION"]
22-
end
23-
24-
def cli_arg_version
25-
return unless invoked_as_script? # don't want to hijack other binstubs
26-
return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
27-
bundler_version = nil
28-
update_index = nil
29-
ARGV.each_with_index do |a, i|
30-
if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
31-
bundler_version = a
32-
end
33-
next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
34-
bundler_version = $1 || ">= 0.a"
35-
update_index = i
36-
end
37-
bundler_version
38-
end
39-
40-
def gemfile
41-
gemfile = ENV["BUNDLE_GEMFILE"]
42-
return gemfile if gemfile && !gemfile.empty?
43-
44-
File.expand_path("../../Gemfile", __FILE__)
45-
end
46-
47-
def lockfile
48-
lockfile =
49-
case File.basename(gemfile)
50-
when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
51-
else "#{gemfile}.lock"
52-
end
53-
File.expand_path(lockfile)
54-
end
55-
56-
def lockfile_version
57-
return unless File.file?(lockfile)
58-
lockfile_contents = File.read(lockfile)
59-
return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
60-
Regexp.last_match(1)
61-
end
62-
63-
def bundler_version
64-
@bundler_version ||= begin
65-
env_var_version || cli_arg_version ||
66-
lockfile_version || "#{Gem::Requirement.default}.a"
67-
end
68-
end
69-
70-
def load_bundler!
71-
ENV["BUNDLE_GEMFILE"] ||= gemfile
72-
73-
# must dup string for RG < 1.8 compatibility
74-
activate_bundler(bundler_version.dup)
75-
end
76-
77-
def activate_bundler(bundler_version)
78-
if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
79-
bundler_version = "< 2"
80-
end
81-
gem_error = activation_error_handling do
82-
gem "bundler", bundler_version
83-
end
84-
return if gem_error.nil?
85-
require_error = activation_error_handling do
86-
require "bundler/version"
87-
end
88-
return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
89-
warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
90-
exit 42
91-
end
92-
93-
def activation_error_handling
94-
yield
95-
nil
96-
rescue StandardError, LoadError => e
97-
e
98-
end
99-
end
100-
101-
m.load_bundler!
102-
103-
if m.invoked_as_script?
104-
load Gem.bin_path("bundler", "bundle")
105-
end
2+
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
3+
load Gem.bin_path('bundler', 'bundle')

‎dummy_app/bin/rails

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
11
#!/usr/bin/env ruby
2-
# frozen_string_literal: true
3-
4-
#
5-
# This file was generated by Bundler.
6-
#
7-
# The application 'rails' is installed as part of a gem, and
8-
# this file is here to facilitate running it.
9-
#
10-
11-
require "pathname"
12-
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
13-
Pathname.new(__FILE__).realpath)
14-
15-
bundle_binstub = File.expand_path("../bundle", __FILE__)
16-
17-
if File.file?(bundle_binstub)
18-
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
19-
load(bundle_binstub)
20-
else
21-
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
22-
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
23-
end
24-
end
25-
26-
require "rubygems"
27-
require "bundler/setup"
28-
29-
load Gem.bin_path("railties", "rails")
2+
APP_PATH = File.expand_path('../config/application', __dir__)
3+
require_relative '../config/boot'
4+
require 'rails/commands'

‎dummy_app/bin/rake

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
11
#!/usr/bin/env ruby
2-
# frozen_string_literal: true
3-
4-
#
5-
# This file was generated by Bundler.
6-
#
7-
# The application 'rake' is installed as part of a gem, and
8-
# this file is here to facilitate running it.
9-
#
10-
11-
require "pathname"
12-
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
13-
Pathname.new(__FILE__).realpath)
14-
15-
bundle_binstub = File.expand_path("../bundle", __FILE__)
16-
17-
if File.file?(bundle_binstub)
18-
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
19-
load(bundle_binstub)
20-
else
21-
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
22-
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
23-
end
24-
end
25-
26-
require "rubygems"
27-
require "bundler/setup"
28-
29-
load Gem.bin_path("rake", "rake")
2+
require_relative '../config/boot'
3+
require 'rake'
4+
Rake.application.run

0 commit comments

Comments
 (0)