overcommit 0.57.0 → 0.59.1

data/template-dir/hooks/pre-push

@@ -29,15 +29,22 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +87,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end

data/template-dir/hooks/pre-rebase

@@ -29,15 +29,22 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +87,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end

data/template-dir/hooks/prepare-commit-msg

@@ -29,15 +29,22 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +87,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.59.1
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: Utility to install, configure, and extend Git hooks
 email:
 - shane@dasilva.io
@@ -129,6 +143,7 @@ files:
 - lib/overcommit/hook/pre_commit/cook_style.rb
 - lib/overcommit/hook/pre_commit/credo.rb
 - lib/overcommit/hook/pre_commit/css_lint.rb
+- lib/overcommit/hook/pre_commit/dart_analyzer.rb
 - lib/overcommit/hook/pre_commit/dogma.rb
 - lib/overcommit/hook/pre_commit/erb_lint.rb
 - lib/overcommit/hook/pre_commit/es_lint.rb
@@ -213,12 +228,14 @@ files:
 - lib/overcommit/hook/pre_push/base.rb
 - lib/overcommit/hook/pre_push/brakeman.rb
 - lib/overcommit/hook/pre_push/cargo_test.rb
+- lib/overcommit/hook/pre_push/flutter_test.rb
 - lib/overcommit/hook/pre_push/go_test.rb
 - lib/overcommit/hook/pre_push/golangci_lint.rb
 - lib/overcommit/hook/pre_push/minitest.rb
 - lib/overcommit/hook/pre_push/php_unit.rb
 - lib/overcommit/hook/pre_push/pronto.rb
 - lib/overcommit/hook/pre_push/protected_branches.rb
+- lib/overcommit/hook/pre_push/pub_test.rb
 - lib/overcommit/hook/pre_push/pytest.rb
 - lib/overcommit/hook/pre_push/python_nose.rb
 - lib/overcommit/hook/pre_push/r_spec.rb
@@ -299,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Git hook manager