rabbitt-githooks 1.3.0 → 1.3.2

data/lib/githooks/core_ext.rb

@@ -16,8 +16,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 =end
 
+require_relative 'core_ext/object'
 require_relative 'core_ext/array'
+require_relative 'core_ext/colorize'
 require_relative 'core_ext/numbers'
 require_relative 'core_ext/string'
 require_relative 'core_ext/pathname'
-require_relative 'core_ext/process'

data/lib/githooks/core_ext/array/extract_options.rb

@@ -1,5 +1,9 @@
 class Array
-  def extract_options
+  def extract_options!
     last.is_a?(Hash) ? pop : {}
   end
+
+  def extract_options
+    last.is_a?(Hash) ? last : {}
+  end
 end

data/lib/githooks/core_ext/array/min_max.rb

@@ -19,17 +19,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 require_relative '../numbers/infinity'
 
 class Array
-  def min(&block)
+  def minimum(&_block)
     collection = block_given? ? collect { |obj| yield obj } : self
-    collection.inject(Infinity) do |min, num|
+    collection.inject(Infinity) do |min, num| # rubocop:disable Style/EachWithObject
       min = num < min ? num : min
       min
     end
   end
 
-  def max(&block)
+  def maximum(&_block)
     collection = block_given? ? collect { |obj| yield obj } : self
-    collection.inject(0) do |max, num|
+    collection.inject(0) do |max, num| # rubocop:disable Style/EachWithObject
       max = num > max ? num : max
       max
     end

data/lib/githooks/core_ext/array/select_with_index.rb

@@ -5,7 +5,7 @@ class Array
         if regexp.is_a? Regexp
           collection << [index, node] if node =~ regexp
         elsif block_given?
-          collection << [index, node] if yield(node)
+          collection << [index, node] if block.call(node)
         end
       end
     end

data/lib/githooks/core_ext/colorize.rb

@@ -0,0 +1,30 @@
+require 'colorize'
+
+module Colorize
+  module ClassMethods
+    unless respond_to? :disable_colorization_without_tty_detection
+      alias_method :disable_colorization_without_tty_detection, :disable_colorization
+    end
+
+    def disable_colorization(value = nil)
+      # disable colorization when we don't have a tty on STDOUT
+      return true unless value || STDOUT.tty?
+      disable_colorization_without_tty_detection(value)
+    end
+  end
+
+  module InstanceMethods
+    def success!
+      light_green
+    end
+
+    def failure!
+      light_red
+    end
+
+    def unknown!
+      light_yellow
+    end
+    alias_method :warning!, :unknown!
+  end
+end

data/lib/githooks/core_ext/object.rb

@@ -0,0 +1,8 @@
+class Object
+  def deep_dup
+    Marshal.load(Marshal.dump(self))
+  rescue TypeError => e
+    raise e unless e.message.include? "can't dump"
+    dup
+  end
+end

data/lib/githooks/core_ext/pathname.rb

@@ -3,10 +3,9 @@ require 'pathname'
 if RUBY_ENGINE == 'jruby'
   class Pathname
     def realpath(basedir = nil)
-      unless (path = java_realpath(basedir)).exist?
-        fail Errno::ENOENT, path.to_s
+      java_realpath(basedir).tap do |path|
+        fail Errno::ENOENT, path.to_s unless path.exist?
       end
-      path
     end
 
     def realdirpath(basedir = nil)
@@ -14,11 +13,13 @@ if RUBY_ENGINE == 'jruby'
     end
 
     def java_realpath(basedir = nil)
-      if basedir && !@path.start_with?('/')
-        path = self.class.new(basedir).realpath + @path
+      # rubocop:disable ElseAlignment, EndAlignment
+      path = if basedir && @path[0] != '/'
+        Pathname.new(basedir).realpath.join(@path)
       else
-        path = @path.to_s
+        @path.to_s
       end
+      # rubocop:enable ElseAlignment, EndAlignment
 
       self.class.new java.io.File.new(path.to_s).canonical_path
     end

data/lib/githooks/core_ext/string.rb

@@ -1,3 +1,3 @@
 require_relative 'string/git_option_path_split'
 require_relative 'string/inflections'
-require_relative 'string/strip_empty_lines'
+require_relative 'string/sanitize'

data/lib/githooks/core_ext/string/sanitize.rb

@@ -0,0 +1,51 @@
+require_relative '../array/extract_options'
+
+class String
+  def strip_empty_lines!
+    replace(strip_empty_lines)
+  end
+
+  def strip_empty_lines
+    split(/\n/).reject { |s| s !~ /\S/ }.join("\n")
+  end
+
+  def strip_non_printable!
+    replace(strip_non_printable)
+  end
+
+  def strip_non_printable
+    gsub(/[^[:print:] \n\t\x1b]/, '')
+  end
+
+  def strip_colors!
+    replace(strip_colors)
+  end
+
+  def strip_colors
+    gsub(/\x1b\[\d+(?:;\d+)?m/, '')
+  end
+
+  def sanitize!(*methods)
+    options = methods.extract_options!
+
+    map = {
+      strip:         :strip!,
+      empty_lines:   :strip_empty_lines!,
+      non_printable: :strip_non_printable!,
+      colors:        :strip_colors!
+    }
+
+    methods = map.keys if methods.empty? || methods.include?(:all)
+    methods -= Array(options.delete(:except)) if options[:except]
+
+    methods.collect(&:to_sym).each do |method|
+      send(map[method]) if map[method]
+    end
+
+    self
+  end
+
+  def sanitize(*methods)
+    dup.sanitize!(*methods)
+  end
+end

data/lib/githooks/error.rb

@@ -1,5 +1,6 @@
 module GitHooks
   class Error < StandardError
+    class CommandExecutionFailure < GitHooks::Error; end
     class NotAGitRepo < GitHooks::Error; end
     class Registration < GitHooks::Error; end
     class TestsFailed < GitHooks::Error; end

data/lib/githooks/hook.rb

@@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 =end
 
+require_relative 'repository'
 require_relative 'system_utils'
 
 module GitHooks
@@ -27,24 +28,22 @@ module GitHooks
     @__mutex__  = Mutex.new
 
     class << self
-      def instances # rubocop:disable TrivialAccessors
-        @__phases__
-      end
-      alias_method :phases, :instances
+      attr_reader :__phases__
+      alias_method :phases, :__phases__
 
-      def instance(phase = 'pre-commit')
+      def instance(phase = 'pre-commit') # rubocop:disable AbcSize
         phase = phase.to_s
         unless VALID_PHASES.include? phase
-          valid_phases = VALID_PHASES.collect(&:inspect).join(', ')
-          fail ArgumentError, "Hook phase (#{phase.inspect}) must be one of #{valid_phases}"
+          fail ArgumentError, "Hook phase (#{phase}) must be one of #{VALID_PHASES.join(', ')}"
         end
 
-        return phases[phase] if phases[phase]
-
-        @__mutex__.synchronize do
-          return phases[phase] if phases[phase]
-          phases[phase] = new(phase)
+        unless phases[phase]
+          @__mutex__.synchronize {
+            return phases[phase] if phases[phase]
+            phases[phase] = new(phase)
+          }
         end
+        phases[phase]
       end
       private :instance
 
@@ -57,8 +56,8 @@ module GitHooks
       end
 
       def register(phase, &block)
-        fail ArgumentError, 'Missing required block to #register' unless block_given?
-        self[phase].instance_eval(&block)
+        fail ArgumentError, 'expected block, received none' unless block_given?
+        instance(phase).instance_eval(&block)
       end
     end
 
@@ -66,7 +65,7 @@ module GitHooks
     attr_accessor :args, :staged, :untracked, :tracked
 
     def initialize(phase)
-      @phase     = phase
+      @phase     = phase.to_s
       @sections  = {}
       @commands  = []
       @args      = []
@@ -85,35 +84,31 @@ module GitHooks
       @repository = Repository.new(path)
     end
 
-    def manifest(options = {})
+    def manifest
       @manifest ||= Manifest.new(self)
     end
 
     def run
       # only run sections that have actions matching files in the manifest
-      runable_sections = sections.select { |section| !section.actions.empty? }
-      runable_sections.collect { |section| section.run }.all?
+      sections.reject { |s| s.actions.empty? }.collect(&:run).all?
     end
 
     def method_missing(method, *args, &block)
-      command = find_command(method)
-      return super unless command
+      return super unless command = find_command(method) # rubocop:disable AssignmentInCondition
       command.execute(*args, &block)
     end
 
     def setup_command(name, options = {})
-      name    = name.to_s.to_sym
-
       @commands << SystemUtils::Command.new(
-        name,
-        path: options.delete(:path),
-        aliases: options.delete(:aliases) || options.delete(:alias)
+        name.to_sym,
+        chdir: options.delete(:chdir),
+        bin_path: options.delete(:bin_path)
       )
     end
     private :setup_command
 
     def find_command(name)
-      @commands.select { |command| command.aliases.include? name.to_s }.first
+      @commands.select { |command| command.name == name.to_s }.first
     end
 
     def sections

data/lib/githooks/repository.rb

@@ -17,12 +17,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 =end
 
-require 'ostruct'
-require 'singleton'
-require 'open3'
-
 module GitHooks
   class Repository # rubocop:disable ClassLength
+    extend SystemUtils
+
+    command :git
+
     autoload :Config,         'githooks/repository/config'
     autoload :File,           'githooks/repository/file'
     autoload :Limiter,        'githooks/repository/limiter'
@@ -38,11 +38,11 @@ module GitHooks
     }.freeze unless defined? CHANGE_TYPE_SYMBOLS
 
     CHANGE_TYPES = CHANGE_TYPE_SYMBOLS.invert.freeze unless defined? CHANGE_TYPES
-
     DEFAULT_DIFF_INDEX_OPTIONS = { staged: true } unless defined? DEFAULT_DIFF_INDEX_OPTIONS
 
     @__instance__ = {}
     @__mutex__    = Mutex.new
+
     def self.instance(path = Dir.getwd)
       path = Pathname.new(path).realpath
       strpath = path.to_s
@@ -70,12 +70,8 @@ module GitHooks
       @config ||= Repository::Config.new(root_path)
     end
 
-    def git_command(*args)
-      git.execute(*args.flatten)
-    end
-
     def get_root_path(path)
-      git_command('rev-parse', '--show-toplevel', path: path).tap do |result|
+      git('rev-parse', '--show-toplevel', chdir: path).tap do |result|
         unless result.status.success? && result.output !~ /not a git repository/i
           fail Error::NotAGitRepo, "Unable to find a valid git repo in #{path}"
         end
@@ -83,30 +79,33 @@ module GitHooks
     end
 
     def stash
-      git_command(%w( stash -q --keep-index -a)).status.success?
+      git(*%w( stash -q --keep-index -a)).status.success?
     end
 
     def unstash
-      git_command(%w(stash pop -q)).status.success?
+      git(*%w(stash pop -q)).status.success?
     end
 
-    def manifest(options = {})
+    def manifest(options = {}) # rubocop:disable AbcSize
       ref = options.delete(:ref)
-
       return staged_manifest(ref: ref) if options.delete(:staged)
 
-      files = unstaged_manifest(ref: ref)
+      manifest_list = unstaged_manifest(ref: ref)
 
-      tracked_manifest(ref: ref).each do |file|
-        files << file unless files.index { |f| f.path.to_s == file.path.to_s }
-      end if options.delete(:tracked)
+      if options.delete(:tracked)
+        tracked_manifest(ref: ref).each_with_object(manifest_list) do |file, list|
+          list << file unless list.include?(file)
+        end
+      end
 
-      untracked_manifest(ref: ref).each do |file|
-        files << file unless files.index { |f| f.path.to_s == file.path.to_s }
-      end if options.delete(:untracked)
+      if options.delete(:untracked)
+        untracked_manifest(ref: ref).each_with_object(manifest_list) do |file, list|
+          list << file unless list.include?(file)
+        end
+      end
 
-      files.sort_by! { |f| f.path.to_s }
-      files.uniq { |f| f.path.to_s }
+      manifest_list.sort!
+      manifest_list.uniq { |f| f.path.to_s }
     end
 
     def staged_manifest(options = {})
@@ -119,18 +118,18 @@ module GitHooks
     end
 
     def tracked_manifest(*)
-      files = git_command('ls-files', '--exclude-standard').output.strip.split(/\s*\n\s*/)
+      files = git('ls-files', '--exclude-standard').output.strip.split(/\s*\n\s*/)
       files.collect { |path| DiffIndexEntry.from_file_path(path, true).to_repo_file }
     end
 
     def untracked_manifest(*)
-      files = git_command('ls-files', '--others', '--exclude-standard').output.strip.split(/\s*\n\s*/)
+      files = git('ls-files', '--others', '--exclude-standard').output.strip.split(/\s*\n\s*/)
       files.collect { |path| DiffIndexEntry.from_file_path(path).to_repo_file }
     end
 
   private
 
-    def diff_index(options = {})
+    def diff_index(options = {}) # rubocop:disable AbcSize
       options = DEFAULT_DIFF_INDEX_OPTIONS.merge(options)
 
       if $stdout.tty? && !options[:staged]
@@ -141,21 +140,18 @@ module GitHooks
         cmd << (options.delete(:ref) || 'HEAD')
       end
 
-      cmd.compact!
-
-      raw_output = git_command(*cmd.compact).output.strip
-      raw_output.split(/\n/).collect { |data| DiffIndexEntry.new(data).to_repo_file }
-    end
-
-    def git
-      @git ||= SystemUtils::Command.new('git')
+      git(*cmd.compact.compact).output_lines.collect do |diff_data|
+        DiffIndexEntry.new(diff_data).to_repo_file
+      end
+    rescue
+      exit! 1
     end
 
     def while_stashed(&block)
       fail ArgumentError, 'Missing required block' unless block_given?
       begin
         stash
-        yield
+        block.call
       ensure
         unstash
       end

data/lib/githooks/repository/config.rb

@@ -17,18 +17,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 =end
 
-require 'ostruct'
-require 'singleton'
-require 'open3'
-
 module GitHooks
   class Repository
     class Config # rubocop:disable ClassLength
       OPTIONS = {
-        'path' => { type: :path, multiple: false },
-        'script' => { type: :path, multiple: false },
-        'pre-run-execute' => { type: :path, multiple: true },
-        'post-run-execute' => { type: :path, multiple: true }
+        'path'             => { type: :path, multiple: false },
+        'script'           => { type: :path, multiple: false },
+        'pre-run-execute'  => { type: :path, multiple: true },
+        'post-run-execute' => { type: :path, multiple: true },
       }
 
       def initialize(path = Dir.getwd)
@@ -49,7 +45,7 @@ module GitHooks
         send(option.gsub('-', '_'))
       end
 
-      def set(option, value, options = {}) # rubocop:disable CyclomaticComplexity, MethodLength
+      def set(option, value, options = {}) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity, AbcSize
         unless OPTIONS.keys.include? option
           fail ArgumentError, "Unexpected option '#{option}': expected one of: #{OPTIONS.keys.join(', ')}"
         end
@@ -82,11 +78,11 @@ module GitHooks
 
         if overwrite && !self[option].nil? && !self[option].empty?
           puts "Overwrite requested for option '#{option}'" if GitHooks.verbose
-          unset(option, repo_path: repo, global: global)
+          unset(option, repo_chdir: repo, global: global)
         end
 
         option = "githooks.#{repo}.#{option}"
-        git_command(global ? '--global' : '--local', var_type, add_type, option, value, path: repo).tap do |result|
+        git(global ? '--global' : '--local', var_type, add_type, option, value, chdir: repo).tap do |result|
           puts "Added option #{option} with value #{value}" if result.status.success?
         end
       end
@@ -95,10 +91,10 @@ module GitHooks
         repo   = options.delete(:repo_path) || repo_path
         global = (opt = options.delete(:global)).nil? ? false : opt
         option = "githooks.#{repo}"
-        git_command(global ? '--global' : '--local', '--remove-section', option, path: repo)
+        git(global ? '--global' : '--local', '--remove-section', option, chdir: repo)
       end
 
-      def unset(option, *args) # rubocop:disable Style/CyclomaticComplexity
+      def unset(option, *args) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity, AbcSize
         unless OPTIONS.keys.include? option
           fail ArgumentError, "Unexpected option '#{option}': expected one of: #{OPTIONS.keys.join(', ')}"
         end
@@ -111,9 +107,9 @@ module GitHooks
         value_regex = args.first
 
         if options.delete(:all) || value_regex.nil?
-          git_command(global ? '--global' : '--local', '--unset-all', option, path: repo)
+          git(global ? '--global' : '--local', '--unset-all', option, chdir: repo)
         else
-          git_command(global ? '--global' : '--local', '--unset', option, value_regex, path: repo)
+          git(global ? '--global' : '--local', '--unset', option, value_regex, chdir: repo)
         end.tap do |result|
           puts "Unset option #{option.git_option_path_split.last}" if result.status.success?
         end
@@ -140,16 +136,16 @@ module GitHooks
         @repository.root_path
       end
 
-      def git_command(*args)
+      def git(*args)
         args = ['config', *args].flatten
-        @repository.git_command(*args)
+        @repository.git(*args)
       end
 
-      def config(path = nil) # rubocop:disable MethodLength, CyclomaticComplexity
+      def config(path = nil) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity, AbcSize
         path ||= repo_path
 
-        raw_config = git_command('--list', path: path).output.split("\n")
-        raw_config.sort.uniq.inject({}) do |hash, line|
+        raw_config = git('--list', chdir: path).output.split("\n")
+        raw_config.sort.uniq.each_with_object({}) do |line, hash|
           key, value = line.split(/\s*=\s*/)
           key_parts = key.git_option_path_split
 
@@ -168,10 +164,6 @@ module GitHooks
           hash
         end
       end
-
-      def git
-        @repository.git
-      end
     end
   end
 end