pre-commit 0.12.0 → 0.13.0

data/lib/plugins/pre_commit/checks/whitespace.rb

@@ -1,11 +1,29 @@
+require 'pre-commit/checks/plugin'
+
 module PreCommit
   module Checks
-    class Whitespace
-      def self.supports(name)
-        name == :white_space
+    class Whitespace < Plugin
+
+      def self.aliases
+        [:white_space]
+      end
+
+      def files_filter(staged_files)
+        if
+          @list.map(&:name).include?("PreCommit::Checks::Rubocop")
+        then
+          staged_files.reject{|name| name =~ /\.rb$/ }
+        else
+          staged_files
+        end
       end
-      def self.call(_)
-        errors = `git diff-index --check --cached HEAD -- 2>&1`
+
+      def files_string(staged_files)
+        files_filter(staged_files).map{|file| "'#{file}'" }.join(" ")
+      end
+
+      def call(staged_files)
+        errors = `git diff-index --check --cached HEAD -- #{files_string(staged_files)} 2>&1`
         return if $?.success?
 
         # Initial commit: diff against the empty tree object
@@ -16,6 +34,11 @@ module PreCommit
 
         errors
       end
+
+      def self.description
+        "Finds white space."
+      end
+
     end
   end
 end

data/lib/plugins/pre_commit/configuration/providers/README.md

@@ -0,0 +1,10 @@
+# PreCommit::Configurations::Providers
+
+## Ordering
+
+Providers are ordered based on `priority`.
+
+## Adding new one
+
+You can add extra providers by creating gem with a new provider in
+`lib/plugins/pre_commit/configuration/providers`.

data/lib/plugins/pre_commit/configuration/providers/default.rb

@@ -0,0 +1,34 @@
+module PreCommit
+  class CanNotUpdateDefauls < StandardError
+  end
+
+  class Configuration
+    class Providers
+      class Default
+
+        DEFAULTS =
+        {
+          :warnings => [],
+          :checks   => [:common, :rails]
+        }
+
+        def self.priority
+          0
+        end
+
+        def initialize(defaults = nil)
+          @defaults = defaults || DEFAULTS
+        end
+
+        def [](name)
+          @defaults[name]
+        end
+
+        def update(name, value)
+          raise PreCommit::CanNotUpdateDefauls.new("Can not update default settings")
+        end
+
+      end
+    end
+  end
+end

data/lib/plugins/pre_commit/configuration/providers/git.rb

@@ -0,0 +1,26 @@
+require 'pre-commit/utils/git_conversions'
+
+module PreCommit
+  class Configuration
+    class Providers
+
+      class Git
+        include PreCommit::Utils::GitConversions
+
+        def self.priority
+          10
+        end
+
+        def [](name)
+          git_to_ruby(`git config pre-commit.#{name.to_s.gsub(/_/,".")} 2>/dev/null`)
+        end
+
+        def update(name, value)
+          `git config pre-commit.#{name.to_s.gsub(/_/,".")} "#{ruby_to_git(value)}" 2>/dev/null`
+        end
+
+      end
+
+    end
+  end
+end

data/lib/plugins/pre_commit/configuration/providers/git_old.rb

@@ -0,0 +1,28 @@
+require 'plugins/pre_commit/configuration/providers/git'
+
+module PreCommit
+  class Configuration
+    class Providers
+
+      class GitOld < Git
+
+        def self.priority
+          11
+        end
+
+        def [](name)
+          value = super(name)
+          if
+            name == :checks && value && ! value.kind_of?(Array)
+          then
+            value = value.chomp.split(/,\s*/).map(&:to_sym) || []
+            update(name, value) unless value.empty?
+          end
+          value
+        end
+
+      end
+
+    end
+  end
+end

data/lib/plugins/pre_commit/configuration/providers/yaml.rb

@@ -0,0 +1,67 @@
+require 'yaml'
+
+module PreCommit
+  class Configuration
+    class Providers
+
+      class Yaml
+        def self.priority
+          20
+        end
+
+        def [](name)
+          config[name]
+        end
+
+        def update(name, value)
+          content = read_config(local_file)
+          content[name] = value
+          save_config(local_file, content)
+        end
+
+      private
+
+        def config
+          return @config if @config
+          @config = {}
+          @config.merge!(read_config(system_file))
+          @config.merge!(read_config(global_file))
+          @config.merge!(read_config(local_file))
+          @config
+        end
+
+        def read_config(path)
+          content = YAML.load_file(path) if File.exist?(path)
+          content || {}
+        end
+
+        def save_config(path, content)
+          parent = File.expand_path('..', path)
+          Dir.mkdir(parent) unless Dir.exist?(parent)
+          File.open(path, "w") do |file|
+            file.write(YAML.dump(content))
+          end
+        end
+
+        def system_file
+          @system_file ||= '/etc/pre_commit.yml'
+        end
+
+        def global_file
+          @global_file ||= File.join(ENV['HOME'], '.pre_commit.yml')
+        end
+
+        def local_file
+          File.join(top_level, 'config', 'pre_commit.yml')
+        end
+
+        def top_level
+          top_level = `git rev-parse --show-toplevel`.chomp.strip
+          raise "no git repo!" if top_level == ""
+          top_level
+        end
+      end
+
+    end
+  end
+end

data/lib/pre-commit.rb

@@ -1 +1,28 @@
-require 'pre-commit/checks'
+require 'pre-commit/runner'
+
+module PreCommit
+
+  # Can not delete this method with out a deprecation strategy.
+  # It is refered to in the generated pre-commit hook in versions 0.0-0.1.1
+  #
+  # NOTE: The deprecation strategy *may* be just delete it since, we're still
+  # pre 1.0.
+  #
+  # Actually, on the deprecation note. This method isn't really the problem.
+  # The problem is the default generated pre-commit hook. It shouldn't have
+  # logic in it. The we have freedom to change the gem implementation however
+  # we want, and nobody is forced to update their pre-commit binary.
+  def self.checks_to_run
+    warn "WARNING: You are using old hook version, you can update it with: pre-commit install"
+    runner.list_to_run(:checks)
+  end
+
+  def self.run
+    runner.run or exit 1
+  end
+
+  def self.runner
+    @runner ||= PreCommit::Runner.new
+  end
+
+end

data/lib/pre-commit/checks.rb

@@ -1,98 +1 @@
-require 'pluginator'
-require 'pre-commit/utils'
-
-module PreCommit
-
-  DEFAULT_CHECKS = [
-    :white_space, :console_log, :debugger, :pry, :tabs, :jshint,
-    :migrations, :merge_conflict, :local, :nb_space
-  ]
-
-  DEFAULT_WARNINGS = []
-
-  # Can not delete this method with out a deprecation strategy.
-  # It is refered to in the generated pre-commit hook in versions 0.0-0.1.1
-  #
-  # NOTE: The deprecation strategy *may* be just delete it since, we're still
-  # pre 1.0.
-
-  #
-  # Actually, on the deprecation note. This method isn't really the problem.
-  # The problem is the default generated pre-commit hook. It shouldn't have
-  # logic in it. The we have freedom to change the gem implementation however
-  # we want, and nobody is forced to update their pre-commit binary.
-  def self.checks_to_run
-    @checks_to_run ||= find_plugins(configured_checks)
-  end
-
-  def self.warnings_to_run
-    @warnings_to_run ||= find_plugins(configured_warnings)
-  end
-
-  def self.configured_checks
-    @configured_checks   ||= get_git_config('checks',   DEFAULT_CHECKS)
-  end
-
-  def self.configured_warnings
-    @configured_warnings ||= get_git_config('warnings', DEFAULT_WARNINGS)
-  end
-
-  def self.get_git_config(name, default)
-    array_or_default(
-      `git config pre-commit.#{name}`.chomp.split(/,\s*/).map(&:to_sym),
-      default
-    )
-  end
-
-  def self.array_or_default(list, default)
-    list = default if list.nil? || list.empty?
-    list
-  end
-
-  def self.find_plugins(names)
-    names.map{|name| find_plugin(name) }.compact
-  end
-
-  def self.find_plugin(name)
-    pluginator.first_class('checks', name) ||
-    pluginator.first_ask('checks', 'supports', name) ||
-    begin
-      $stderr.puts "Could not find plugin supporting #{name}."
-      nil
-    end
-  end
-
-  def self.pluginator
-    @pluginator ||= Pluginator.find('pre_commit', :extends => [:first_ask, :first_class] )
-  end
-
-  def self.execute_list(list)
-    list.map { |cmd| cmd.call(@staged_files.dup) }.compact
-  end
-
-  def self.run
-    @staged_files = Utils.staged_files
-    show_warnings( execute_list(warnings_to_run) )
-    show_errors(   execute_list(checks_to_run  ) )
-  end
-
-  def self.show_warnings(warnings)
-    if warnings.any?
-       $stderr.puts "pre-commit: Some warnings were raised. These will not stop commit:"
-       $stderr.puts warnings.join("\n")
-    end
-  end
-
-  def self.show_errors(errors)
-    if errors.any?
-      $stderr.puts "pre-commit: Stopping commit because of errors."
-      $stderr.puts errors.join("\n")
-      $stderr.puts
-      $stderr.puts "pre-commit: You can bypass this check using `git commit -n`"
-      $stderr.puts
-      exit 1
-    else
-      exit 0
-    end
-  end
-end
+require 'pre-commit'

data/lib/pre-commit/checks/grep.rb

@@ -0,0 +1,57 @@
+require 'pre-commit/checks/plugin'
+
+module PreCommit
+  module Checks
+    class Grep < Plugin
+      class PaternNotSet < StandardError
+        def message
+          "Please define 'pattern' method."
+        end
+      end
+
+    # overwrite those:
+
+      def files_filter(staged_files)
+        staged_files
+      end
+
+      def extra_grep
+        @extra_grep or ""
+      end
+
+      def message
+        @message or ""
+      end
+
+      def pattern
+        @pattern or raise PaternNotSet.new
+      end
+
+    # general code:
+
+      def call(staged_files)
+        staged_files = files_filter(staged_files)
+        return if staged_files.empty?
+        errors = `#{grep} #{pattern} #{staged_files.join(" ")}#{extra_grep}`
+        return unless $?.success?
+        "#{message}#{errors}"
+      end
+
+    private
+
+      def grep(grep_version = nil)
+        grep_version ||= detect_grep_version
+        if grep_version =~ /FreeBSD/
+          "grep -EnIH"
+        else
+          "grep -PnIH"
+        end
+      end
+
+      def detect_grep_version
+        `grep --version | head -n 1 | sed -e 's/^[^0-9.]*\([0-9.]*\)$/\1/'`
+      end
+
+    end
+  end
+end

data/lib/{plugins/pre_commit → pre-commit}/checks/js.rb

@@ -1,14 +1,14 @@
-require 'pre-commit/utils'
+require 'pre-commit/checks/plugin'
 
 module PreCommit
   module Checks
-    class Js
-      def self.call(staged_files)
+    class Js < Plugin
+      def call(staged_files)
         require 'execjs'
       rescue RuntimeError, LoadError => e
         $stderr.puts "Could not load execjs: #{e}"
       else
-        staged_files = staged_files.select { |f| File.extname(f) == ".js" }
+        staged_files = files_filter(staged_files)
         return if staged_files.empty?
 
         errors = []
@@ -21,15 +21,23 @@ module PreCommit
         errors.join("\n")
       end
 
-      def self.linter_src
+      def linter_src
         raise "Must be defined by subclass"
       end
 
-      def self.display_error(error_object, file)
+      def files_filter(staged_files)
+        staged_files.grep(/\.js$/)
+      end
+
+      def error_selector
+        'reason'
+      end
+
+      def display_error(error_object, file)
         return "" unless error_object
 
         line = error_object['line'].to_i + 1
-        "#{error_object['reason']}\n#{file}:#{line} #{error_object['evidence']}"
+        "#{error_object[error_selector]}\n#{file}:#{line} #{error_object['evidence']}"
       end
     end
   end