Skip to content

Simplify Bundler native helper runners #7785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deivid-rodriguez merged 2 commits into from
Aug 10, 2023
Merged

Simplify Bundler native helper runners #7785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9525cc
Remove unnecessary checks
deivid-rodriguez Aug 10, 2023
fbdb114
Enforce Bundler 2.4
deivid-rodriguez Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions bundler/helpers/v1/run.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,11 @@

require "functions"

MAX_BUNDLER_VERSION = "2.0.0"

def validate_bundler_version!
return true if correct_bundler_version?

raise StandardError, "Called with Bundler '#{Bundler::VERSION}', expected < '#{MAX_BUNDLER_VERSION}'"
end

def correct_bundler_version?
Gem::Version.new(Bundler::VERSION) < Gem::Version.new(MAX_BUNDLER_VERSION)
end

def output(obj)
print JSON.dump(obj)
end

begin
validate_bundler_version!

request = JSON.parse($stdin.read)

function = request["function"]
Expand Down
16 changes: 1 addition & 15 deletions bundler/helpers/v2/run.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

gem "bundler", "~> 2.3"
gem "bundler", "~> 2.4"
require "bundler"
require "json"

Expand All @@ -19,25 +19,11 @@

require "functions"

MIN_BUNDLER_VERSION = "2.1.0"

def validate_bundler_version!
return true if correct_bundler_version?

raise StandardError, "Called with Bundler '#{Bundler::VERSION}', expected >= '#{MIN_BUNDLER_VERSION}'"
end

def correct_bundler_version?
Gem::Version.new(Bundler::VERSION) >= Gem::Version.new(MIN_BUNDLER_VERSION)
end

def output(obj)
print JSON.dump(obj)
end

begin
validate_bundler_version!

request = JSON.parse($stdin.read)

function = request["function"]
Expand Down