overcommit 0.60.0 → 0.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9628c356de69c116c7a315732abfe802f91578cbcf2665c450ec7bfeddfd297
-  data.tar.gz: b0f5f78774b47295f7200ea994a1dfa9d05eb9155d57f31a2f95ee7a60ed6d1f
+  metadata.gz: 5e9a2e23f1b830d2d9e8e500024cd01a1d368678b1f24039367ae88c90dc154a
+  data.tar.gz: 9c3fada758490c58d2341125315a988fe73fb9d4dc31c5167a400eddbff28846
 SHA512:
-  metadata.gz: 9b6a07c9a752bb5ce51f432b51c43f4f225ba2891806ca1deb1ac8e77134ad4ebfa26dbb5050393f9d4529fc1a9df18fee84f4c59dc418a534002dd817bae90e
-  data.tar.gz: 24b3f6be4e83a9e7167d7f66d5d2179be00777aa5209bfce778fc33b297a57ad045164421a9d46f8c66ffb6c2274af556dcbd87d0b2fecfe3000024c23eeb673
+  metadata.gz: 2773a91d43bf69aa97c9f65fab59934502c2b948ad5264a7dd0def628d6d9bb21b78ebfd868b3a5e0c9457f609ede41fa11fdd1e92708dc27bb87fc433361b91
+  data.tar.gz: 79e8e222951cbaea5875fbd2bab3268d47ead4dde32fad029e76b46bd4823546d8beee1473b42df1575879c64a7ae7bdc7e8da2e970f4ec6766b5b85163409dc

data/config/default.yml

@@ -709,6 +709,11 @@ PreCommit:
     install_command: 'pip install restructuredtext_lint'
     include: '**/*.rst'
 
+  RSpec:
+    enabled: false
+    description: 'Run tests with Rspec'
+    required_executable: 'rspec'
+
   RuboCop:
     enabled: false
     description: 'Analyze with RuboCop'
@@ -790,6 +795,14 @@ PreCommit:
     install_command: 'gem install slim_lint'
     include: '**/*.slim'
 
+  Sorbet:
+    enabled: false
+    description: 'Analyze with Sorbet'
+    required_executable: 'srb'
+    install_command: 'gem install sorbet'
+    command: ['srb', 'tc']
+    include: '**/*.rb'
+
   Sqlint:
     enabled: false
     description: 'Analyze with sqlint'

data/lib/overcommit/cli.rb

@@ -124,15 +124,13 @@ module Overcommit
       end
 
       @options[:targets].each do |target|
-        begin
-          Installer.new(log).run(target, @options)
-        rescue Overcommit::Exceptions::InvalidGitRepo => e
-          log.warning "Invalid repo #{target}: #{e}"
-          halt 69 # EX_UNAVAILABLE
-        rescue Overcommit::Exceptions::PreExistingHooks => e
-          log.warning "Unable to install into #{target}: #{e}"
-          halt 73 # EX_CANTCREAT
-        end
+        Installer.new(log).run(target, @options)
+      rescue Overcommit::Exceptions::InvalidGitRepo => e
+        log.warning "Invalid repo #{target}: #{e}"
+        halt 69 # EX_UNAVAILABLE
+      rescue Overcommit::Exceptions::PreExistingHooks => e
+        log.warning "Unable to install into #{target}: #{e}"
+        halt 73 # EX_CANTCREAT
       end
     end
 

data/lib/overcommit/configuration_loader.rb

@@ -70,11 +70,9 @@ module Overcommit
     # Loads a configuration, ensuring it extends the default configuration.
     def load_file(file, local_file = nil)
       overcommit_config = self.class.load_from_file(file, default: false, logger: @log)
-      if local_file
-        local_config = self.class.load_from_file(local_file, default: false, logger: @log)
-      end
+      l_config = self.class.load_from_file(local_file, default: false, logger: @log) if local_file
       config = self.class.default_configuration.merge(overcommit_config)
-      config = self.class.default_configuration.merge(local_config) if local_config
+      config = config.merge(l_config) if l_config
 
       if @options.fetch(:verify) { config.verify_signatures? }
         verify_signatures(config)

data/lib/overcommit/hook/base.rb

@@ -228,14 +228,12 @@ module Overcommit::Hook
       output = []
 
       required_libraries.each do |library|
-        begin
-          require library
-        rescue LoadError
-          install_command = @config['install_command']
-          install_command = " -- install via #{install_command}" if install_command
-
-          output << "Unable to load '#{library}'#{install_command}"
-        end
+        require library
+      rescue LoadError
+        install_command = @config['install_command']
+        install_command = " -- install via #{install_command}" if install_command
+
+        output << "Unable to load '#{library}'#{install_command}"
       end
 
       return if output.empty?

data/lib/overcommit/hook/commit_msg/text_width.rb

@@ -41,7 +41,7 @@ module Overcommit::Hook::CommitMsg
 
       max_body_width = config['max_body_width']
 
-      lines[2..-1].each_with_index do |line, index|
+      lines[2..].each_with_index do |line, index|
         if line.chomp.size > max_body_width
           @errors << "Line #{index + 3} of commit message has > " \
                     "#{max_body_width} characters"

data/lib/overcommit/hook/pre_commit/erb_lint.rb

@@ -12,7 +12,7 @@ module Overcommit::Hook::PreCommit
       return :pass if result.success?
 
       extract_messages(
-        result.stdout.split("\n\n")[1..-1],
+        result.stdout.split("\n\n")[1..],
         MESSAGE_REGEX
       )
     end

data/lib/overcommit/hook/pre_commit/html_hint.rb

@@ -14,7 +14,7 @@ module Overcommit::Hook::PreCommit
         lines = group.split("\n").map(&:strip)
         file = lines[0][/(.+):/, 1]
         extract_messages(
-          lines[1..-1].map { |msg| "#{file}: #{msg}" },
+          lines[1..].map { |msg| "#{file}: #{msg}" },
           /^(?<file>(?:\w:)?[^:]+): line (?<line>\d+)/
         )
       end.flatten

data/lib/overcommit/hook/pre_commit/json_syntax.rb

@@ -7,12 +7,10 @@ module Overcommit::Hook::PreCommit
       messages = []
 
       applicable_files.each do |file|
-        begin
-          JSON.parse(IO.read(file))
-        rescue JSON::ParserError => e
-          error = "#{e.message} parsing #{file}"
-          messages << Overcommit::Hook::Message.new(:error, file, nil, error)
-        end
+        JSON.parse(IO.read(file))
+      rescue JSON::ParserError => e
+        error = "#{e.message} parsing #{file}"
+        messages << Overcommit::Hook::Message.new(:error, file, nil, error)
       end
 
       messages

data/lib/overcommit/hook/pre_commit/r_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'overcommit/hook/shared/r_spec'
+
+module Overcommit::Hook::PreCommit
+  # Runs `rspec` test suite
+  #
+  # @see http://rspec.info/
+  class RSpec < Base
+    include Overcommit::Hook::Shared::RSpec
+  end
+end

data/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb

@@ -53,7 +53,7 @@ module Overcommit::Hook::PreCommit
     end
 
     def schema
-      @schema ||= schema_files.map { |file| File.read(file, encoding) }.join
+      @schema ||= schema_files.map { |file| File.read(file, **(encoding || {})) }.join
       @schema.tr('_', '')
     end
 

data/lib/overcommit/hook/pre_commit/sorbet.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs 'srb tc' against any modified files.
+  #
+  # @see https://github.com/sorbet/sorbet
+  class Sorbet < Base
+    # example of output:
+    # sorbet.rb:1: Method `foo` does not exist on `T.class_of(Bar)` https://srb.help/7003
+    MESSAGE_REGEX = /^(?<file>[^:]+):(?<line>\d+): (?<message>.*)$/.freeze
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      output = result.stderr.split("\n").grep(MESSAGE_REGEX)
+
+      extract_messages(
+        output,
+        MESSAGE_REGEX
+      )
+    end
+  end
+end

data/lib/overcommit/hook/pre_commit/xml_syntax.rb

@@ -7,12 +7,10 @@ module Overcommit::Hook::PreCommit
       messages = []
 
       applicable_files.each do |file|
-        begin
-          REXML::Document.new(IO.read(file))
-        rescue REXML::ParseException => e
-          error = "Error parsing #{file}: #{e.message}"
-          messages << Overcommit::Hook::Message.new(:error, file, nil, error)
-        end
+        REXML::Document.new(IO.read(file))
+      rescue REXML::ParseException => e
+        error = "Error parsing #{file}: #{e.message}"
+        messages << Overcommit::Hook::Message.new(:error, file, nil, error)
       end
 
       messages

data/lib/overcommit/hook/pre_commit/yaml_syntax.rb

@@ -7,17 +7,15 @@ module Overcommit::Hook::PreCommit
       messages = []
 
       applicable_files.each do |file|
+        YAML.load_file(file, aliases: true)
+      rescue ArgumentError
         begin
-          YAML.load_file(file, aliases: true)
-        rescue ArgumentError
-          begin
-            YAML.load_file(file)
-          rescue ArgumentError, Psych::SyntaxError => e
-            messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
-          end
-        rescue Psych::DisallowedClass => e
-          messages << error_message(file, e)
+          YAML.load_file(file)
+        rescue ArgumentError, Psych::SyntaxError => e
+          messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
         end
+      rescue Psych::DisallowedClass => e
+        messages << error_message(file, e)
       end
 
       messages

data/lib/overcommit/hook/pre_push/r_spec.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
+require 'overcommit/hook/shared/r_spec'
+
 module Overcommit::Hook::PrePush
-  # Runs `rspec` test suite before push
+  # Runs `rspec` test suite
   #
   # @see http://rspec.info/
   class RSpec < Base
-    def run
-      result = execute(command)
-      return :pass if result.success?
-
-      output = result.stdout + result.stderr
-      [:fail, output]
-    end
+    include Overcommit::Hook::Shared::RSpec
   end
 end

data/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb

@@ -85,7 +85,7 @@ module Overcommit::Hook::PrepareCommitMsg
     end
 
     def skip?
-      skipped_commit_types.include?(commit_message_source)
+      super || skipped_commit_types.include?(commit_message_source)
     end
   end
 end

data/lib/overcommit/hook/shared/r_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::Shared
+  # Runs `rspec` test suite before push
+  #
+  # @see http://rspec.info/
+  module RSpec
+    def run
+      result = if @config['include']
+                 execute(command, args: applicable_files)
+               else
+                 execute(command)
+               end
+
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end

data/lib/overcommit/utils/messages_utils.rb

@@ -26,7 +26,7 @@ module Overcommit::Utils
             raise Overcommit::Exceptions::MessageProcessingError,
                   'Unexpected output: unable to determine line number or type ' \
                   "of error/warning for output:\n" \
-                  "#{output_messages[index..-1].join("\n")}"
+                  "#{output_messages[index..].join("\n")}"
           end
 
           file = extract_file(match, message)

data/lib/overcommit/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.60.0'
+  VERSION = '0.63.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.63.0
 platform: ruby
 authors:
 - Shane da Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2024-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -19,7 +19,7 @@ dependencies:
         version: 0.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +195,7 @@ files:
 - lib/overcommit/hook/pre_commit/pyflakes.rb
 - lib/overcommit/hook/pre_commit/pylint.rb
 - lib/overcommit/hook/pre_commit/python_flake8.rb
+- lib/overcommit/hook/pre_commit/r_spec.rb
 - lib/overcommit/hook/pre_commit/rails_best_practices.rb
 - lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
 - lib/overcommit/hook/pre_commit/rake_target.rb
@@ -209,6 +210,7 @@ files:
 - lib/overcommit/hook/pre_commit/semi_standard.rb
 - lib/overcommit/hook/pre_commit/shell_check.rb
 - lib/overcommit/hook/pre_commit/slim_lint.rb
+- lib/overcommit/hook/pre_commit/sorbet.rb
 - lib/overcommit/hook/pre_commit/sqlint.rb
 - lib/overcommit/hook/pre_commit/standard.rb
 - lib/overcommit/hook/pre_commit/stylelint.rb
@@ -253,6 +255,7 @@ files:
 - lib/overcommit/hook/shared/index_tags.rb
 - lib/overcommit/hook/shared/npm_install.rb
 - lib/overcommit/hook/shared/pronto.rb
+- lib/overcommit/hook/shared/r_spec.rb
 - lib/overcommit/hook/shared/rake_target.rb
 - lib/overcommit/hook/shared/submodule_status.rb
 - lib/overcommit/hook/shared/yarn_install.rb
@@ -311,15 +314,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Git hook manager
 test_files: []