overcommit 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b041ebaa80bcfe3013027b461fd01453c6b9206
-  data.tar.gz: aa64ece4843d4d6153850d9e8e2a3bc14399257c
+  metadata.gz: 8f165cfdcb2a7a4293e715b273489473ed22d4a3
+  data.tar.gz: 3aac84eccfbc7f7096cb7a7216118eac072996b7
 SHA512:
-  metadata.gz: c2c6d61a99022f38a43bcaa286bb5907fda839325d0334112450e45226b52b51b3b52841121ef767dbabaed8bec3d595a8129c9fabbee2691eff8f994fea9a68
-  data.tar.gz: c36a4c528cb64b8387caeeedee2dda72207da0d42fc4c92b849fd9d9c0e7ee5bfa2a3a998165fdea66a4d7c91632dcc5521b2e7d47cffc3550910480e99ad446
+  metadata.gz: 39205b47a623e3ed2377af1305290c138e35c1926f12b98c2be2e18533ad808b138c666f40b4ab59393b0ca5ef16ecca971279d65f3b51b8a56209ba791e2669
+  data.tar.gz: e129c516f6953be502dc60737c263487a38ab1ecc0a8866a28e8edf980026c45aec3c340675e8508f9ce59981f72893af946b13491882990e1746b325e3ab898

data/config/default.yml

@@ -324,6 +324,13 @@ PreCommit:
     flags: ['-IHnE', "^[^#]*((\\bpath:)|(:path[ \t]*=>))"]
     include: '**/Gemfile'
 
+  Mdl:
+    enabled: false
+    description: 'Analyzing with mdl'
+    required_executable: 'mdl'
+    install_command: 'gem install mdl'
+    include: '**/*.md'
+
   MergeConflicts:
     enabled: true
     description: 'Checking for merge conflicts'
@@ -392,6 +399,7 @@ PreCommit:
     enabled: false
     description: 'Analyzing with RailsBestPractices'
     required_executable: 'rails_best_practices'
+    flags: ['--without-color']
     install_command: 'gem install rails_best_practices'
 
   RailsSchemaUpToDate:

data/lib/overcommit/configuration.rb

@@ -19,7 +19,6 @@ module Overcommit
     def ==(other)
       super || @hash == other.hash
     end
-    alias_method :eql?, :==
 
     # Access the configuration as if it were a hash.
     #

data/lib/overcommit/constants.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # Global application constants.
 module Overcommit
-  HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-  CONFIG_FILE_NAME = '.overcommit.yml'
+  HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
+  CONFIG_FILE_NAME = '.overcommit.yml'.freeze
 
-  HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook')
+  HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook').freeze
 
-  REPO_URL = 'https://github.com/brigade/overcommit'
-  BUG_REPORT_URL = "#{REPO_URL}/issues"
+  REPO_URL = 'https://github.com/brigade/overcommit'.freeze
+  BUG_REPORT_URL = "#{REPO_URL}/issues".freeze
 end

data/lib/overcommit/exceptions.rb

@@ -11,6 +11,9 @@ module Overcommit::Exceptions
   # Raised when there was a problem reading submodule information for a repo.
   class GitSubmoduleError < StandardError; end
 
+  # Raised when there was a problem reading git revision information with `rev-list`.
+  class GitRevListError < StandardError; end
+
   # Raised when a {HookContext} is unable to setup the environment before a run.
   class HookSetupFailed < StandardError; end
 

data/lib/overcommit/hook/base.rb

@@ -11,7 +11,7 @@ module Overcommit::Hook
   end
 
   # Possible types of messages.
-  MESSAGE_TYPES = [:error, :warning]
+  MESSAGE_TYPES = [:error, :warning].freeze
 
   # Functionality common to all hooks.
   class Base # rubocop:disable Metrics/ClassLength

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

@@ -5,7 +5,7 @@ module Overcommit::Hook::CommitMsg
       return :pass if empty_message?
 
       first_letter = commit_message_lines[0].to_s.match(/^[[:punct:]]*(.)/)[1]
-      unless first_letter.match(/[[:upper:]]/)
+      unless first_letter =~ /[[:upper:]]/
         return :warn, 'Subject should start with a capital letter'
       end
 

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

@@ -40,7 +40,9 @@ module Overcommit::Hook::PreCommit
     end
 
     def extract_file(match, message)
-      if match[:file].nil? || match[:file].empty?
+      return unless match.names.include?('file')
+
+      if match[:file].to_s.empty?
         raise "Unexpected output: no file found in '#{message}'"
       end
 
@@ -48,6 +50,7 @@ module Overcommit::Hook::PreCommit
     end
 
     def extract_line(match, message)
+      return unless match.names.include?('line')
       Integer(match[:line])
     rescue ArgumentError, TypeError
       raise "Unexpected output: invalid line number found in '#{message}'"

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Check if local Berksfile.lock matches Berksfile when either changes, unless
   # Berksfile.lock is ignored by git.
   #
   # @see http://berkshelf.com/
   class BerksfileCheck < Base
-    LOCK_FILE = 'Berksfile.lock'
+    LOCK_FILE = 'Berksfile.lock'.freeze
 
     def run
       # Ignore if Berksfile.lock is not tracked by git

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Check if local Gemfile.lock matches Gemfile when either changes, unless
   # Gemfile.lock is ignored by git.
   #
   # @see http://bundler.io/
   class BundleCheck < Base
-    LOCK_FILE = 'Gemfile.lock'
+    LOCK_FILE = 'Gemfile.lock'.freeze
 
     def run
       # Ignore if Gemfile.lock is not tracked by git

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

@@ -0,0 +1,23 @@
+module Overcommit::Hook::PreCommit
+  # Runs `mdl` against any modified Markdown files
+  #
+  # @see https://github.com/mivok/markdownlint
+  class Mdl < Base
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+
+    def run
+      result = execute(command, args: applicable_files)
+      output = result.stdout.chomp
+
+      return :pass if result.success?
+      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
+      )
+    end
+  end
+end

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

@@ -3,20 +3,31 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://batsov.com/rubocop/
   class RuboCop < Base
-    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+    GENERIC_MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type =~ /^warn/ ? :warning : :error
+    end
+
+    COP_MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('W') ? :warning : :error
     end
 
     def run
       result = execute(command, args: applicable_files)
       return :pass if result.success?
-      return [:fail, result.stderr] unless result.stderr.empty?
 
-      extract_messages(
+      generic_messages = extract_messages(
+        result.stderr.split("\n"),
+        /^(?<type>[a-z]+)/i,
+        GENERIC_MESSAGE_TYPE_CATEGORIZER,
+      )
+
+      cop_messages = extract_messages(
         result.stdout.split("\n"),
         /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):[^ ]+ (?<type>[^ ]+)/,
-        MESSAGE_TYPE_CATEGORIZER,
+        COP_MESSAGE_TYPE_CATEGORIZER,
       )
+
+      generic_messages + cop_messages
     end
   end
 end

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

@@ -13,15 +13,22 @@ module Overcommit::Hook::PrePush
 
     private
 
-    def branches
-      @branches ||= config['branches']
-    end
-
     def illegal_pushes
       @illegal_pushes ||= pushed_refs.select do |pushed_ref|
-        (pushed_ref.deleted? || pushed_ref.forced?) &&
-          branches.any? { |branch| pushed_ref.remote_ref == "refs/heads/#{branch}" }
+        protected?(pushed_ref.remote_ref) && pushed_ref.destructive?
       end
     end
+
+    def protected?(remote_ref)
+      ref_name = remote_ref[%r{refs/heads/(.*)}, 1]
+      protected_branch_patterns.any? do |pattern|
+        File.fnmatch(pattern, ref_name)
+      end
+    end
+
+    def protected_branch_patterns
+      @protected_branch_patterns ||= Array(config['branches']).
+        concat(Array(config['branch_patterns']))
+    end
   end
 end

data/lib/overcommit/hook_context/pre_push.rb

@@ -30,6 +30,10 @@ module Overcommit::HookContext
         local_sha1 == '0' * 40
       end
 
+      def destructive?
+        deleted? || forced?
+      end
+
       def to_s
         "#{local_ref} #{local_sha1} #{remote_ref} #{remote_sha1}"
       end
@@ -37,7 +41,14 @@ module Overcommit::HookContext
       private
 
       def overwritten_commits
-        `git rev-list #{remote_sha1} ^#{local_sha1}`.split("\n")
+        return @overwritten_commits if defined? @overwritten_commits
+        result = Overcommit::Subprocess.spawn(%W[git rev-list #{remote_sha1} ^#{local_sha1}])
+        if result.success?
+          result.stdout.split("\n")
+        else
+          raise Overcommit::Exceptions::GitRevListError,
+                "Unable to check if commits on the remote ref will be overwritten: #{result.stderr}"
+        end
       end
     end
   end

data/lib/overcommit/hook_signer.rb

@@ -5,7 +5,7 @@ module Overcommit
 
     # We don't want to include the skip setting as it is set by Overcommit
     # itself
-    IGNORED_CONFIG_KEYS = %w[skip]
+    IGNORED_CONFIG_KEYS = %w[skip].freeze
 
     # @param hook_name [String] name of the hook
     # @param config [Overcommit::Configuration]

data/lib/overcommit/message_processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   # Utility class that encapsulates the handling of hook messages and whether
   # they affect lines the user has modified or not.
@@ -6,10 +8,12 @@ module Overcommit
   # output tuple from an array of {Overcommit::Hook::Message}s, respecting the
   # configuration settings for the given hook.
   class MessageProcessor
-    ERRORS_MODIFIED_HEADER = 'Errors on modified lines:'
-    WARNINGS_MODIFIED_HEADER = 'Warnings on modified lines:'
-    ERRORS_UNMODIFIED_HEADER = "Errors on lines you didn't modify:"
-    WARNINGS_UNMODIFIED_HEADER = "Warnings on lines you didn't modify:"
+    ERRORS_MODIFIED_HEADER = 'Errors on modified lines:'.freeze
+    WARNINGS_MODIFIED_HEADER = 'Warnings on modified lines:'.freeze
+    ERRORS_UNMODIFIED_HEADER = "Errors on lines you didn't modify:".freeze
+    WARNINGS_UNMODIFIED_HEADER = "Warnings on lines you didn't modify:".freeze
+    ERRORS_GENERIC_HEADER = 'Errors:'.freeze
+    WARNINGS_GENERIC_HEADER = 'Warnings:'.freeze
 
     # @param hook [Overcommit::Hook::Base]
     # @param unmodified_lines_setting [String] how to treat messages on
@@ -40,10 +44,19 @@ module Overcommit
     def handle_modified_lines(messages, status)
       messages = remove_ignored_messages(messages)
 
-      messages_on_modified_lines, messages_on_unmodified_lines =
-        messages.partition { |message| message_on_modified_line?(message) }
+      messages_with_line, generic_messages = messages.partition(&:line)
 
+      # Always print generic messages first
       output = print_messages(
+        generic_messages,
+        ERRORS_GENERIC_HEADER,
+        WARNINGS_GENERIC_HEADER
+      )
+
+      messages_on_modified_lines, messages_on_unmodified_lines =
+        messages_with_line.partition { |message| message_on_modified_line?(message) }
+
+      output += print_messages(
         messages_on_modified_lines,
         ERRORS_MODIFIED_HEADER,
         WARNINGS_MODIFIED_HEADER
@@ -54,7 +67,7 @@ module Overcommit
         WARNINGS_UNMODIFIED_HEADER
       )
 
-      [transform_status(status, messages_on_modified_lines), output]
+      [transform_status(status, generic_messages + messages_on_modified_lines), output]
     end
 
     def transform_status(status, messages_on_modified_lines)

data/lib/overcommit/os.rb

@@ -27,10 +27,10 @@ module Overcommit
       private
 
       def host_os
-        @os ||= ::RbConfig::CONFIG['host_os']
+        @os ||= ::RbConfig::CONFIG['host_os'].freeze
       end
     end
 
-    SEPARATOR = self.windows? ? '\\' : File::SEPARATOR
+    SEPARATOR = (windows? ? '\\' : File::SEPARATOR).freeze
   end
 end

data/lib/overcommit/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.30.0'
+  VERSION = '0.31.0'.freeze
 end

data/template-dir/hooks/commit-msg

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

data/template-dir/hooks/overcommit-hook

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

data/template-dir/hooks/post-checkout

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

data/template-dir/hooks/post-commit

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

data/template-dir/hooks/post-merge

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

data/template-dir/hooks/post-rewrite

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

data/template-dir/hooks/pre-commit

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

data/template-dir/hooks/pre-push

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

data/template-dir/hooks/pre-rebase

@@ -30,7 +30,15 @@ require 'yaml'
 # rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler/setup'
+  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)
+    exit 78 # EX_CONFIG
+  end
 end
 # rubocop:enable Style/RescueModifier
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,7 @@ files:
 - lib/overcommit/hook/pre_commit/jsl.rb
 - lib/overcommit/hook/pre_commit/json_syntax.rb
 - 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/nginx_test.rb
 - lib/overcommit/hook/pre_commit/pep257.rb