Skip to content
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

Load bundled gems on expected version #859

Merged
merged 6 commits into from
Jan 27, 2025
Merged

Load bundled gems on expected version #859

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ecec4a
Load bundled gems on expected version
xjunior Jan 23, 2025
f4a402a
Do not activate psych
xjunior Jan 24, 2025
84e44ed
Revert "Load bundled gems on expected version"
xjunior Jan 24, 2025
4401942
Switch to Regexp.last_match
xjunior Jan 24, 2025
79bd2ed
Set gemfile for error
xjunior Jan 24, 2025
90386d9
Support single quotes
xjunior Jan 24, 2025
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
10 changes: 2 additions & 8 deletions template-dir/hooks/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/overcommit-hook
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/post-checkout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/post-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/post-merge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/post-rewrite
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/pre-push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/pre-rebase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
10 changes: 2 additions & 8 deletions template-dir/hooks/prepare-commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
end

# Check if Overcommit should invoke a Bundler context for loading gems
require 'yaml'
# rubocop:disable Style/RescueModifier
gemfile =
begin
YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
rescue ArgumentError
YAML.load_file('.overcommit.yml')['gemfile']
end rescue nil
config = File.read('.overcommit.yml') =~ /gemfile: "?(.*)"?/
gemfile = Regexp.last_match(1)

if gemfile
ENV['BUNDLE_GEMFILE'] = gemfile
Expand Down
Loading