overcommit 0.39.1 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 688cc14559f6df12a77e50f70f478be5b3118d07
-  data.tar.gz: 787514eb5c006ffb8b9a5c48bf32b74c59c8f994
+  metadata.gz: ae52de060fc3a851e75bd8933c88d554ef099b2c
+  data.tar.gz: d8c64f104d539cb9feff13df03aea820b61ede3b
 SHA512:
-  metadata.gz: 9cf7cfc7aba8ad00f45da2eaa571256ef2c3d9ebd2115c098f41d2ce816cf70dfcc2ba6a0f351d60f02cc34f23ee0fa5792b8b0d0d714d7d4a9ca832db6078f6
-  data.tar.gz: 8bdd432dd5e873efd021f26128517d592ae94e7ebc6ff3241a50c23e3dbe1305c4da67aaf35fad338db108dcfdb625ea0574d50df9f7eeee64c55430f6a348f5
+  metadata.gz: 601925f353e7745b2461637f4a3d78483593e64e4c227601f0f1df5ff249ac903019fa47c90ec34521b0e416a7108d6bd7446b5aa56a48a1ab35e39359756aad
+  data.tar.gz: 8b6d27df807ce37e4eb94fddb105d22aa39f3b4cc9a233732f005792c8207ce914ddf40ddae87f5394eafda3aab97ff2d39b3951c69c8775147af58766c8cb57

data/bin/overcommit

@@ -2,7 +2,6 @@
 
 # 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
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
@@ -22,9 +21,14 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
     puts "Problem loading '#{gemfile}': #{ex.message}"
     puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
+  rescue Gem::LoadError => ex
+    # Handle case where user is executing overcommit without `bundle exec` and
+    # whose local Gemfile has a gem requirement that does not match a gem
+    # requirement of the installed version of Overcommit.
+    raise unless ex.message =~ /already activated/i
+    exec('bundle', 'exec', $0, *ARGV)
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit/cli'

data/config/default.yml

@@ -283,6 +283,13 @@ PreCommit:
     install_command: 'go get golang.org/x/tools/cmd/vet'
     include: '**/*.go'
 
+  Hadolint:
+    enabled: false
+    description: 'Analyze with hadolint'
+    required_executable: 'hadolint'
+    include:
+      - '**/Dockerfile*'
+
   HamlLint:
     enabled: false
     description: 'Analyze with haml-lint'
@@ -297,6 +304,9 @@ PreCommit:
     quiet: true
     required_executable: 'grep'
     flags: ['-IHn', "\t"]
+    exclude:
+      - '**/Makefile'
+      - '**/*.go'
 
   Hlint:
     enabled: false
@@ -376,6 +386,21 @@ PreCommit:
     install_command: 'gem install json'
     include: '**/*.json'
 
+  LicenseFinder:
+    enabled: false
+    description: 'Analyze with LicenseFinder'
+    required_executable: 'license_finder'
+    install_command: 'gem install license_finder'
+    include:
+      - 'Gemfile'
+      - 'requirements.txt'
+      - 'package.json'
+      - 'pom.xml'
+      - 'build.gradle'
+      - 'bower.json'
+      - 'Podfile'
+      - 'rebar.config'
+
   LicenseHeader:
     enabled: false
     license_file: 'LICENSE.txt'
@@ -409,20 +434,27 @@ PreCommit:
     flags: ['-t']
     include: '**/nginx.conf'
 
-  Pep257:
+  Pep257:  # Deprecated – use Pydocstyle instead.
     enabled: false
     description: 'Analyze docstrings with pep257'
     required_executable: 'pep257'
     install_command: 'pip install pep257'
     include: '**/*.py'
 
-  Pep8:
+  Pep8:  # Deprecated – use Pycodestyle instead.
     enabled: false
     description: 'Analyze with pep8'
     required_executable: 'pep8'
     install_command: 'pip install pep8'
     include: '**/*.py'
 
+  Pronto:
+    enabled: false
+    description: 'Analyzing with pronto'
+    required_executable: 'pronto'
+    install_command: 'gem install pronto'
+    flags: ['run', '--staged', '--exit-code']
+
   PuppetLint:
     enabled: false
     description: 'Analyze with puppet-lint'
@@ -434,6 +466,20 @@ PreCommit:
       - '--error-level=all'
     include: '**/*.pp'
 
+  Pycodestyle:
+    enabled: false
+    description: 'Analyze with pycodestyle'
+    required_executable: 'pycodestyle'
+    install_command: 'pip install pycodestyle'
+    include: '**/*.py'
+
+  Pydocstyle:
+    enabled: false
+    description: 'Analyze docstrings with pydocstyle'
+    required_executable: 'pydocstyle'
+    install_command: 'pip install pydocstyle'
+    include: '**/*.py'
+
   Pyflakes:
     enabled: false
     description: 'Analyze with pyflakes'

data/lib/overcommit/configuration.rb

@@ -41,7 +41,7 @@ module Overcommit
       @concurrency ||=
         begin
           cores = Overcommit::Utils.processor_count
-          content = @hash.fetch('concurrency', '%{processors}')
+          content = @hash.fetch('concurrency', '%<processors>d')
           if content.is_a?(String)
             concurrency_expr = content % { processors: cores }
 

data/lib/overcommit/git_config.rb

@@ -1,3 +1,5 @@
+require 'overcommit/utils'
+
 module Overcommit
   # Get configuration options from git
   module GitConfig
@@ -8,5 +10,11 @@ module Overcommit
       char = '#' if char == ''
       char
     end
+
+    def hooks_path
+      path = `git config --get core.hooksPath`.chomp
+      return File.join(Overcommit::Utils.repo_root, '.git', 'hooks') if path.empty?
+      File.absolute_path(path)
+    end
   end
 end

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

@@ -0,0 +1,25 @@
+module Overcommit::Hook::PreCommit
+  # Runs `hadolint` against any modified Dockefile files.
+  #
+  # @see http://hadolint.lukasmartinelli.ch/
+  class Hadolint < Base
+    def run
+      output = ''
+      success = true
+
+      # hadolint doesn't accept multiple arguments
+      applicable_files.each do |dockerfile|
+        result = execute(command, args: Array(dockerfile))
+        output += result.stdout
+        success &&= result.success?
+      end
+
+      return :pass if success
+
+      extract_messages(
+        output.split("\n"),
+        /^(?<file>[^:]+):(?<line>\d+)/,
+      )
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Overcommit::Hook::PreCommit
+  # Runs LicenseFinder if any of your package manager declaration files have changed
+  # See more about LicenseFinder at https://github.com/pivotal/LicenseFinde
+  class LicenseFinder < 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/pre_commit/line_endings.rb

@@ -8,18 +8,16 @@ module Overcommit::Hook::PreCommit
 
       offending_files.map do |file_name|
         file = File.open(file_name)
-        file.each_line do |line|
-          # remove configured line-ending
-          line.gsub!(/#{config['eol']}/, '')
-
-          # detect any left over line-ending characters
-          next unless line.end_with?("\n", "\r")
-
+        begin
+          messages += check_file(file, file_name)
+        rescue ArgumentError => ex
+          # File is likely a binary file which this check should ignore, but
+          # print a warning just in case
           messages << Overcommit::Hook::Message.new(
-            :error,
+            :warning,
             file_name,
             file.lineno,
-            "#{file_name}:#{file.lineno}:#{line.inspect}"
+            "#{file_name}:#{file.lineno}:#{ex.message}"
           )
         end
       end
@@ -29,6 +27,27 @@ module Overcommit::Hook::PreCommit
 
     private
 
+    def check_file(file, file_name)
+      messages_for_file = []
+
+      file.each_line do |line|
+        # Remove configured line-ending
+        line.gsub!(/#{config['eol']}/, '')
+
+        # Detect any left over line-ending characters
+        next unless line.end_with?("\n", "\r")
+
+        messages_for_file << Overcommit::Hook::Message.new(
+          :error,
+          file_name,
+          file.lineno,
+          "#{file_name}:#{file.lineno}:#{line.inspect}"
+        )
+      end
+
+      messages_for_file
+    end
+
     def offending_files
       result = execute(%w[git ls-files --eol -z --], args: applicable_files)
       raise 'Unable to access git tree' unless result.success?

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

@@ -0,0 +1,21 @@
+module Overcommit::Hook::PreCommit
+  # Runs `pronto`
+  #
+  # @see https://github.com/mmozuras/pronto
+  class Pronto < Base
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type.include?('E') ? :error : :warning
+    end
+
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/,
+        MESSAGE_TYPE_CATEGORIZER,
+      )
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Overcommit::Hook::PreCommit
+  # Runs `pycodestyle` against any modified Python files.
+  #
+  # @see https://pypi.python.org/pypi/pycodestyle
+  class Pycodestyle < Base
+    def run
+      result = execute(command, args: applicable_files)
+      output = result.stdout.chomp
+
+      return :pass if result.success? && output.empty?
+
+      # example message:
+      #   path/to/file.py:88:5: E301 expected 1 blank line, found 0
+      extract_messages(
+        output.split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):\d+:\s(?<type>E|W)/,
+        lambda { |type| type.include?('W') ? :warning : :error }
+      )
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Overcommit::Hook::PreCommit
+  # Runs `pydocstyle` against any modified Python files.
+  #
+  # @see https://pypi.python.org/pypi/pydocstyle
+  class Pydocstyle < Base
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      output = result.stderr.chomp
+
+      # example message:
+      #   path/to/file.py:1 in public method `foo`:
+      #           D102: Docstring missing
+      extract_messages(
+        output.gsub(/:\s+/, ': ').split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+      )
+    end
+  end
+end

data/lib/overcommit/installer.rb

@@ -65,8 +65,7 @@ module Overcommit
     end
 
     def hooks_path
-      absolute_target = File.expand_path(@target)
-      File.join(Overcommit::Utils.git_dir(absolute_target), 'hooks')
+      @hooks_path ||= Dir.chdir(@target) { GitConfig.hooks_path }
     end
 
     def old_hooks_path

data/lib/overcommit/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.39.1'.freeze
+  VERSION = '0.40.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.40.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,13 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-06-29 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
   type: :runtime
@@ -23,6 +26,9 @@ dependencies:
   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::Dependency
@@ -122,6 +128,7 @@ files:
 - lib/overcommit/hook/pre_commit/forbidden_branches.rb
 - lib/overcommit/hook/pre_commit/go_lint.rb
 - lib/overcommit/hook/pre_commit/go_vet.rb
+- lib/overcommit/hook/pre_commit/hadolint.rb
 - lib/overcommit/hook/pre_commit/haml_lint.rb
 - lib/overcommit/hook/pre_commit/hard_tabs.rb
 - lib/overcommit/hook/pre_commit/hlint.rb
@@ -134,6 +141,7 @@ files:
 - lib/overcommit/hook/pre_commit/jscs.rb
 - lib/overcommit/hook/pre_commit/jsl.rb
 - lib/overcommit/hook/pre_commit/json_syntax.rb
+- lib/overcommit/hook/pre_commit/license_finder.rb
 - lib/overcommit/hook/pre_commit/license_header.rb
 - lib/overcommit/hook/pre_commit/line_endings.rb
 - lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb
@@ -142,7 +150,10 @@ files:
 - lib/overcommit/hook/pre_commit/nginx_test.rb
 - lib/overcommit/hook/pre_commit/pep257.rb
 - lib/overcommit/hook/pre_commit/pep8.rb
+- lib/overcommit/hook/pre_commit/pronto.rb
 - lib/overcommit/hook/pre_commit/puppet_lint.rb
+- lib/overcommit/hook/pre_commit/pycodestyle.rb
+- lib/overcommit/hook/pre_commit/pydocstyle.rb
 - lib/overcommit/hook/pre_commit/pyflakes.rb
 - lib/overcommit/hook/pre_commit/pylint.rb
 - lib/overcommit/hook/pre_commit/python_flake8.rb
@@ -246,9 +257,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Git hook manager
 test_files: []
-has_rdoc: