overcommit 0.48.1 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d560865c5f4d0d10103a9a76e8447e84d93890b768dbcaa689d896fd144c5e
-  data.tar.gz: 96bd78d4139356c2ef0ff89dd64750e8df602b6609bf01249c560c5c0a4c121a
+  metadata.gz: a28cd7dfaf56d9588e2f9f789f49f4da01e50ebaa835a18d3d2f00c76863901d
+  data.tar.gz: 3112089cea167f58128d085f5c02cd9ec3589f6b3ac1cbb934e6d6a9d8c7982d
 SHA512:
-  metadata.gz: 3b5dbeccbcaba03c4845367d45cc0ba72fee1af4f523bc315e35118ac7e35444308e5925a3d6c26cd7ecbc9da33ac36863a8b28b7185a770581b252c9248409b
-  data.tar.gz: 398c42bf237a8d7c7d1388dfab5814504a621dcf78fc8ed4557645bf330b71da05ef9d4ee7ef9825e15bf1abd7515a4aa4ca09c84a13c447a4c8ad06b339378d
+  metadata.gz: e282603906588c02990acb714d2b767599295b4fd66102a9a1a705fd57eca4ff4eee29772c03e33c2a632692167898837b469a909979e043cc3dce9c24dc0d67
+  data.tar.gz: 281d5bd19cdbd57a036bd9985764271b8616e673b12c796a9832150bb8fa7a779f7e59d332aa877b4eefdce0f2332923b2a4c7e6487ef4b7df259e8ad23c8d74

data/config/default.yml

@@ -222,6 +222,15 @@ PreCommit:
     install_command: 'gem install chamber'
     include: *chamber_settings_files
 
+  CodeSpellCheck:
+    enabled: false
+    description: 'Check if all your code is spell-checked correctly'
+    command: 'alfonsox'
+    install_command: 'gem install alfonsox'
+    include:
+      - '**/*.rb'
+      - '**/*.erb'
+
   CoffeeLint:
     enabled: false
     description: 'Analyze with coffeelint'
@@ -477,6 +486,7 @@ PreCommit:
     enabled: false
     description: 'Analyze markdown files with mdl'
     required_executable: 'mdl'
+    flags: ['--json']
     install_command: 'gem install mdl'
     include: '**/*.md'
 
@@ -674,6 +684,19 @@ PreCommit:
       - '**/*.gemspec'
       - '**/*.rb'
 
+  RubySyntax:
+    enabled: false
+    description: 'Check ruby syntax'
+    required_executable: 'ruby'
+    command: [
+      'ruby',
+      '-e',
+      'ARGV.each { |applicable_file| ruby_c_output = `ruby -c #{applicable_file}`; puts ruby_c_output unless $?.success? }'
+    ]
+    include:
+      - '**/*.gemspec'
+      - '**/*.rb'
+
   Scalariform:
     enabled: false
     description: 'Check formatting with Scalariform'
@@ -1192,6 +1215,7 @@ PrepareCommitMsg:
     description: 'Prepends the commit message with text based on the branch name'
     branch_pattern: '\A.*\w+[-_](\d+).*\z'
     replacement_text: '[#\1]'
+    skipped_commit_types: ['message', 'template', 'merge', 'squash']
     on_fail: warn
 
 # Hooks that run during `git push`, after remote refs have been updated but

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `alfonsox` spell-checking tool against any modified code file.
+  #
+  # @see https://github.com/diegojromerolopez/alfonsox
+  class CodeSpellCheck < Base
+    def run
+      # Create default file config if it does not exist
+
+      # Run spell-check
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      spellchecking_errors = result.stderr.split("\n")
+      spellchecking_errors.pop
+
+      error_messages(spellchecking_errors)
+    end
+
+    private
+
+    # Create the error messages
+    def error_messages(spellchecking_errors)
+      messages = []
+      spellchecking_errors.each do |spellchecking_error_i|
+        error_location, word = spellchecking_error_i.split(' ')
+        error_file_path, line = error_location.split(':')
+        messages << Overcommit::Hook::Message.new(
+          :error, error_file_path, line, "#{error_location}: #{word}"
+        )
+      end
+      messages
+    end
+  end
+end

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

@@ -5,8 +5,6 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/mivok/markdownlint
   class Mdl < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):\s(?<msg>.+)/
-
     def run
       result = execute(command, args: applicable_files)
       output = result.stdout.chomp
@@ -15,11 +13,17 @@ module Overcommit::Hook::PreCommit
       return [:fail, result.stderr] unless result.stderr.empty?
 
       # example message:
-      #   path/to/file.md:1: MD001 Error message
-      extract_messages(
-        output.split("\n"),
-        MESSAGE_REGEX
-      )
+      #   [{"filename":"file1.md","line":1,"rule":"MD013","aliases":["line-length"],
+      #   "description":"Line length"}]
+      json_messages = JSON.parse(output)
+      json_messages.map do |message|
+        Overcommit::Hook::Message.new(
+          :error,
+          message[:filename],
+          message[:line],
+          message[:description]
+        )
+      end
     end
   end
 end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `ruby -c` against all Ruby files.
+  #
+  class RubySyntax < Base
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type.match?(/^(syntax)?\s*error/) ? :error : :warning
+    end
+
+    def run
+      result = execute(command, args: applicable_files)
+
+      result_lines = result.stderr.split("\n")
+
+      return :pass if result_lines.length.zero?
+
+      # Example message:
+      #   path/to/file.rb:1: syntax error, unexpected '^'
+      extract_messages(
+        result_lines,
+        /^(?<file>[^:]+):(?<line>\d+):\s*(?<type>[^,]+),\s*(?<message>.+)/,
+        MESSAGE_TYPE_CATEGORIZER
+      )
+    end
+  end
+end

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

@@ -6,20 +6,21 @@ module Overcommit::Hook::PrepareCommitMsg
   # the `branch_pattern` regex.
   class ReplaceBranch < Base
     def run
-      return :pass unless !commit_message_source ||
-        commit_message_source == :commit # NOTE: avoid 'merge' and 'rebase'
+      return :pass if skipped_commit_types.include? commit_message_source
+
       Overcommit::Utils.log.debug(
         "Checking if '#{Overcommit::GitRepo.current_branch}' matches #{branch_pattern}"
       )
-      if branch_pattern.match?(Overcommit::GitRepo.current_branch)
-        Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
-        modify_commit_message do |old_contents|
-          "#{new_template}\n#{old_contents}"
-        end
-        :pass
-      else
-        :warn
+
+      return :warn unless branch_pattern.match?(Overcommit::GitRepo.current_branch)
+
+      Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
+
+      modify_commit_message do |old_contents|
+        "#{new_template}\n#{old_contents}"
       end
+
+      :pass
     end
 
     def new_template
@@ -48,5 +49,9 @@ module Overcommit::Hook::PrepareCommitMsg
     def replacement_text_config
       @replacement_text_config ||= config['replacement_text']
     end
+
+    def skipped_commit_types
+      @skipped_commit_types ||= config['skipped_commit_types'].map(&:to_sym)
+    end
   end
 end

data/lib/overcommit/hook_runner.rb

@@ -129,12 +129,9 @@ module Overcommit
         slots_released = processors_for_hook(hook)
         @slots_available += slots_released
 
-        if @hooks_left.any?
-          # Signal once. `wait_for_slot` will perform additional signals if
-          # there are still slots available. This prevents us from sending out
-          # useless signals
-          @resource.signal
-        end
+        # Signal every time in case there are threads that are already waiting for
+        # these slots to be released
+        @resource.signal
       end
     end
 

data/lib/overcommit/version.rb

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

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.48.1
+  version: 0.49.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +124,7 @@ files:
 - lib/overcommit/hook/pre_commit/chamber_compare.rb
 - lib/overcommit/hook/pre_commit/chamber_security.rb
 - lib/overcommit/hook/pre_commit/chamber_verification.rb
+- lib/overcommit/hook/pre_commit/code_spell_check.rb
 - lib/overcommit/hook/pre_commit/coffee_lint.rb
 - lib/overcommit/hook/pre_commit/cook_style.rb
 - lib/overcommit/hook/pre_commit/credo.rb
@@ -181,6 +182,7 @@ files:
 - lib/overcommit/hook/pre_commit/rst_lint.rb
 - lib/overcommit/hook/pre_commit/rubo_cop.rb
 - lib/overcommit/hook/pre_commit/ruby_lint.rb
+- lib/overcommit/hook/pre_commit/ruby_syntax.rb
 - lib/overcommit/hook/pre_commit/scalariform.rb
 - lib/overcommit/hook/pre_commit/scalastyle.rb
 - lib/overcommit/hook/pre_commit/scss_lint.rb