overcommit 0.59.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c2ae9a910dd7a508c79a08564313b751646bb5bcdfdd1776b8eb5d58836f98
-  data.tar.gz: c3c3d555ee1919b68a5fba95f7e0b8a614c97459e71be94501fd822f94cc75e0
+  metadata.gz: f9628c356de69c116c7a315732abfe802f91578cbcf2665c450ec7bfeddfd297
+  data.tar.gz: b0f5f78774b47295f7200ea994a1dfa9d05eb9155d57f31a2f95ee7a60ed6d1f
 SHA512:
-  metadata.gz: 3558b41b1158d11ee7d152119bfbd76cb3b205f4221f379d009e9e823c343cd56ceb109d04af2a464e4f4713d577fd1223572fdb8ddacd8641014f99cfa1dfa0
-  data.tar.gz: 110d94b41040610061815119882b0ec4ddf67ebe218a410de3d91c3bf6a47a2f5f689828b5a1d477f5b4b2cd3f70f2057c49f6674afaf6c2d0cbedf6bae4bdc1
+  metadata.gz: 9b6a07c9a752bb5ce51f432b51c43f4f225ba2891806ca1deb1ac8e77134ad4ebfa26dbb5050393f9d4529fc1a9df18fee84f4c59dc418a534002dd817bae90e
+  data.tar.gz: 24b3f6be4e83a9e7167d7f66d5d2179be00777aa5209bfce778fc33b297a57ad045164421a9d46f8c66ffb6c2274af556dcbd87d0b2fecfe3000024c23eeb673

data/config/default.yml

@@ -536,6 +536,16 @@ PreCommit:
     required_executable: 'grep'
     flags: ['-IHn', "^<<<<<<<[ \t]"]
 
+  MixFormat:
+    enabled: false
+    description: 'Check formatting with mix format'
+    required_executable: 'mix'
+    flags: ['format', '--check-formatted']
+    include:
+      - '**/*.ex'
+      - '**/*.heex'
+      - '**/*.exs'
+
   PuppetMetadataJsonLint:
     enabled: false
     description: 'Checking module metadata'
@@ -703,7 +713,7 @@ PreCommit:
     enabled: false
     description: 'Analyze with RuboCop'
     required_executable: 'rubocop'
-    flags: ['--format=emacs', '--force-exclusion', '--display-cop-names', '--disable-pending-cops']
+    flags: ['--format=emacs', '--force-exclusion', '--display-cop-names']
     install_command: 'gem install rubocop'
     include:
       - '**/*.gemspec'
@@ -1316,6 +1326,12 @@ PrePush:
     command: ['ruby', '-Ilib:test', '-rminitest', "-e 'exit! Minitest.run'"]
     include: 'test/**/*_test.rb'
 
+  MixTest:
+    enabled: false
+    description: 'Run mix test suite'
+    required_executable: 'mix'
+    flags: ['test']
+
   PhpUnit:
     enabled: false
     description: 'Run PhpUnit test suite'

data/lib/overcommit/configuration_loader.rb

@@ -53,10 +53,14 @@ module Overcommit
     #
     # @return [Overcommit::Configuration]
     def load_repo_config
+      overcommit_local_yml = File.join(Overcommit::Utils.repo_root,
+                                       Overcommit::LOCAL_CONFIG_FILE_NAME)
       overcommit_yml = File.join(Overcommit::Utils.repo_root,
                                  Overcommit::CONFIG_FILE_NAME)
 
-      if File.exist?(overcommit_yml)
+      if File.exist?(overcommit_local_yml) && File.exist?(overcommit_yml)
+        load_file(overcommit_yml, overcommit_local_yml)
+      elsif File.exist?(overcommit_yml)
         load_file(overcommit_yml)
       else
         self.class.default_configuration
@@ -64,9 +68,13 @@ module Overcommit
     end
 
     # Loads a configuration, ensuring it extends the default configuration.
-    def load_file(file)
-      config = self.class.load_from_file(file, default: false, logger: @log)
-      config = self.class.default_configuration.merge(config)
+    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
+      config = self.class.default_configuration.merge(overcommit_config)
+      config = self.class.default_configuration.merge(local_config) if local_config
 
       if @options.fetch(:verify) { config.verify_signatures? }
         verify_signatures(config)

data/lib/overcommit/constants.rb

@@ -4,6 +4,7 @@
 module Overcommit
   HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
   CONFIG_FILE_NAME = '.overcommit.yml'
+  LOCAL_CONFIG_FILE_NAME = '.local-overcommit.yml'
 
   HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook').freeze
 

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

@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://bundler.io/
   class BundleCheck < Base
-    LOCK_FILE = 'Gemfile.lock'
+    LOCK_FILE = File.basename(ENV['BUNDLE_GEMFILE'] || 'Gemfile') + '.lock'
 
     def run
       # Ignore if Gemfile.lock is not tracked by git

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `mix format --check-formatted` against any modified ex/heex/exs files.
+  #
+  # @see https://hexdocs.pm/mix/main/Mix.Tasks.Format.html
+  class MixFormat < Base
+    # example message:
+    # ** (Mix) mix format failed due to --check-formatted.
+    # The following files are not formatted:
+    #
+    #   * lib/file1.ex
+    #   * lib/file2.ex
+    FILES_REGEX = /^\s+\*\s+(?<file>.+)$/.freeze
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      result.stderr.scan(FILES_REGEX).flatten.
+        map { |file| message(file) }
+    end
+
+    private
+
+    def message(file)
+      Overcommit::Hook::Message.new(:error, file, nil, file)
+    end
+  end
+end

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

@@ -34,6 +34,12 @@ module Overcommit::Hook::PreCommit
 
     private
 
+    def encoding
+      return unless @config.key?('encoding')
+
+      { encoding: @config['encoding'] }.compact
+    end
+
     def migration_files
       @migration_files ||= applicable_files.select do |file|
         file.match %r{db/migrate/.*\.rb}
@@ -47,7 +53,7 @@ module Overcommit::Hook::PreCommit
     end
 
     def schema
-      @schema ||= schema_files.map { |file| File.read(file) }.join
+      @schema ||= schema_files.map { |file| File.read(file, encoding) }.join
       @schema.tr('_', '')
     end
 

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

@@ -15,10 +15,19 @@ module Overcommit::Hook::PreCommit
           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
       end
 
       messages
     end
+
+    private
+
+    def error_message(file, error)
+      text = "#{file}: #{error.message}"
+      Overcommit::Hook::Message.new(:error, file, nil, text)
+    end
   end
 end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs `mix test` test suite before push
+  #
+  # @see https://hexdocs.pm/mix/Mix.Tasks.Test.html
+  class MixTest < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end

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

@@ -11,9 +11,9 @@ module Overcommit::Hook::PrepareCommitMsg
   # For instance, if your current branch is `123-topic` then this config
   #
   #    branch_pattern: '(\d+)-(\w+)'
-  #    replacement_text: '[#\1]'
+  #    replacement_text: '[#\1] '
   #
-  # would make this hook prepend commit messages with `[#123]`.
+  # would make this hook prepend commit messages with `[#123] `.
   #
   # Similarly, a replacement text of `[\1][\2]` would result in `[123][topic]`.
   #
@@ -53,7 +53,7 @@ module Overcommit::Hook::PrepareCommitMsg
       @new_template ||=
         begin
           curr_branch = Overcommit::GitRepo.current_branch
-          curr_branch.gsub(branch_pattern, replacement_text).strip
+          curr_branch.gsub(branch_pattern, replacement_text)
         end
     end
 
@@ -69,7 +69,7 @@ module Overcommit::Hook::PrepareCommitMsg
       @replacement_text ||=
         begin
           if File.exist?(replacement_text_config)
-            File.read(replacement_text_config)
+            File.read(replacement_text_config).chomp
           else
             replacement_text_config
           end

data/lib/overcommit/subprocess.rb

@@ -52,7 +52,7 @@ module Overcommit
         err.rewind
         out.rewind
 
-        Result.new(process.exit_code, to_utf8(out.read), to_utf8(err.read))
+        Result.new(process.exit_code, out.read, err.read)
       end
 
       # Spawns a new process in the background using the given array of
@@ -84,27 +84,6 @@ module Overcommit
         %w[cmd.exe /c] + [args.join(' ')]
       end
 
-      # Convert string from current locale to utf-8
-      #
-      # When running commands under windows the command output is using
-      # current system locale (depends on system lanuage) not UTF-8
-      #
-      # @param process [String]
-      # @return [String]
-      def to_utf8(string)
-        # Our encoding code doesn't work on the GitHub Actions Windows
-        # environment for unknown reasons, so just skip it in CI.
-        return string if OS.windows? && ENV['GITHUB_ACTIONS']
-
-        if Encoding.locale_charmap == 'UTF-8'
-          return string
-        end
-
-        ec = Encoding::Converter.new(Encoding.locale_charmap, 'UTF-8')
-        # Convert encoding, alternatively simple: string.scrub will suffice
-        ec.convert(string)
-      end
-
       # @param process [ChildProcess]
       # @return [Array<IO>]
       def assign_output_streams(process)

data/lib/overcommit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -179,6 +179,7 @@ files:
 - lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb
 - lib/overcommit/hook/pre_commit/mdl.rb
 - lib/overcommit/hook/pre_commit/merge_conflicts.rb
+- lib/overcommit/hook/pre_commit/mix_format.rb
 - lib/overcommit/hook/pre_commit/nginx_test.rb
 - lib/overcommit/hook/pre_commit/pep257.rb
 - lib/overcommit/hook/pre_commit/pep8.rb
@@ -232,6 +233,7 @@ files:
 - 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/mix_test.rb
 - lib/overcommit/hook/pre_push/php_unit.rb
 - lib/overcommit/hook/pre_push/pronto.rb
 - lib/overcommit/hook/pre_push/protected_branches.rb