diff --git a/template-dir/hooks/commit-msg b/template-dir/hooks/commit-msg index 7f8023de..377c892b 100755 --- a/template-dir/hooks/commit-msg +++ b/template-dir/hooks/commit-msg @@ -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 diff --git a/template-dir/hooks/overcommit-hook b/template-dir/hooks/overcommit-hook index 7f8023de..377c892b 100755 --- a/template-dir/hooks/overcommit-hook +++ b/template-dir/hooks/overcommit-hook @@ -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 diff --git a/template-dir/hooks/post-checkout b/template-dir/hooks/post-checkout index 7f8023de..377c892b 100755 --- a/template-dir/hooks/post-checkout +++ b/template-dir/hooks/post-checkout @@ -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 diff --git a/template-dir/hooks/post-commit b/template-dir/hooks/post-commit index 7f8023de..377c892b 100755 --- a/template-dir/hooks/post-commit +++ b/template-dir/hooks/post-commit @@ -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 diff --git a/template-dir/hooks/post-merge b/template-dir/hooks/post-merge index 7f8023de..377c892b 100755 --- a/template-dir/hooks/post-merge +++ b/template-dir/hooks/post-merge @@ -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 diff --git a/template-dir/hooks/post-rewrite b/template-dir/hooks/post-rewrite index 7f8023de..377c892b 100755 --- a/template-dir/hooks/post-rewrite +++ b/template-dir/hooks/post-rewrite @@ -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 diff --git a/template-dir/hooks/pre-commit b/template-dir/hooks/pre-commit index 7f8023de..377c892b 100755 --- a/template-dir/hooks/pre-commit +++ b/template-dir/hooks/pre-commit @@ -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 diff --git a/template-dir/hooks/pre-push b/template-dir/hooks/pre-push index 7f8023de..377c892b 100755 --- a/template-dir/hooks/pre-push +++ b/template-dir/hooks/pre-push @@ -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 diff --git a/template-dir/hooks/pre-rebase b/template-dir/hooks/pre-rebase index 7f8023de..377c892b 100755 --- a/template-dir/hooks/pre-rebase +++ b/template-dir/hooks/pre-rebase @@ -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 diff --git a/template-dir/hooks/prepare-commit-msg b/template-dir/hooks/prepare-commit-msg index 7f8023de..377c892b 100755 --- a/template-dir/hooks/prepare-commit-msg +++ b/template-dir/hooks/prepare-commit-msg @@ -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