rabbitt-githooks 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f5a527f752152557546b7e9b09af917a80d2ac5
-  data.tar.gz: 83fde6252879d9215bab34d6d35f8269b471c43c
+  metadata.gz: c2910eaac5a0a17a57550adbda1fb32c5663d511
+  data.tar.gz: beacd673a92ee04af1e4a876fc05ff83282a3115
 SHA512:
-  metadata.gz: cb9e232c8acb6960027b60d9802e77b4242755440cec278a24f137dff0b9f77508aabf003ca222da849600fb05db8bf80408b3e4f820f7bc9a9de20445213521
-  data.tar.gz: 4fbbcb4f21183799a1daddbed62c1a2b63bafd1d3fff591d18a168b5e8bba71d83852aedadf4d57685a236bade4569566d09db146a672a717b7e157709671aa3
+  metadata.gz: bdb2a859e74d8ce90bf8644f20a0409b056a35599bacb1d87b7dbab3cfd0fbe3ca793dc17023f61c6059a0d0897dfb29223ec96c57221868e84c027e72d3f973
+  data.tar.gz: 8e756225570a161cab9eabe5a22fbf3ed001d0d008c3e5a7058d850b905bf22c19f932f59b6b39fd36c7a183128b10cd8c7170a2e13d05ac65801ff1f26c5e44

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbitt-githooks (1.4.1)
+    rabbitt-githooks (1.5.0)
       rainbow (~> 2.0.0)
       thor (~> 0.18)
 

data/TODO

@@ -0,0 +1,19 @@
+* General
+  - allow attaching scripts (not hooks-path) to specific hook phases
+  - add `githooks fix-links` command to reset hook symlinks to those defined in config
+
+* Config
+  - only store githooks configuration in local repository config
+    (means no need to store the repo path - it's implicit in the repo)
+
+  - store sub-config for each hook phase, for example:
+    [githooks pre-commit]
+      hooks-path = ...
+      script = ...
+      etc...
+    [githooks pre-push]
+      hooks-path = ...
+      ...
+
+* DSL
+  - encapsulate it into it's own class to isolate what's exposed

data/bin/githooks-runner

@@ -19,4 +19,5 @@ rescue GitHooks::Error => e
   puts e.message
   exit 1
 end
+
 exit result.to_i

data/lib/githooks/action.rb

@@ -34,7 +34,7 @@ module GitHooks
       @title     = title
       @section   = section
       @on        = nil
-      @limiters  = section.limiters
+      @limiters  = {}
       @success   = true
       @errors    = []
       @warnings  = []
@@ -46,11 +46,12 @@ module GitHooks
     end
 
     def manifest
-      @manifest ||= section.hook.manifest.filter(@limiters)
+      @manifest ||= section.hook.manifest.filter(section.limiters.merge(@limiters))
     end
 
     def colored_title
-      status_colorize title
+      return title.color_unknown! unless finished?
+      success? ? title.color_success! : title.color_failure!
     end
 
     def status_symbol
@@ -63,11 +64,6 @@ module GitHooks
       define_method(:"#{method}!") { @status = method.to_sym }
     end
 
-    def status_colorize(text)
-      return text.unknown! unless finished?
-      success? ? text.success! : text.failure!
-    end
-
     def run # rubocop:disable MethodLength, AbcSize
       running!
       with_benchmark do
@@ -151,20 +147,20 @@ module GitHooks
       @limiters[type]
     end
 
-    def on_each_file(&block)
-      @on = -> { manifest.collect { |file| block.call(file) }.all? }
+    def on_each_file
+      @on = -> { manifest.collect { |file| yield file }.all? }
     end
 
-    def on_all_files(&block)
-      @on = -> { block.call manifest }
+    def on_all_files
+      @on = -> { yield manifest }
     end
 
-    def on_argv(&block)
-      @on = -> { block.call section.hook.args }
+    def on_argv
+      @on = -> { yield section.hook.args }
     end
 
-    def on(*args, &block)
-      @on = -> { block.call(*args) }
+    def on(*args)
+      @on = -> { yield(*args) }
     end
 
   private
@@ -176,8 +172,8 @@ module GitHooks
       }
 
       result = command.execute(*args, &block)
-      result.output_lines(prefix).each { |line| puts line }
-      result.error_lines(prefix).each { |line| puts line }
+      result.output_lines(prefix).each { |line| $stdout.puts line }
+      result.error_lines(prefix).each { |line| $stderr.puts line }
       result.status.success?
     end
   end

data/lib/githooks/cli/config.rb

@@ -4,7 +4,7 @@ require 'githooks/repository'
 module GitHooks
   module CLI
     class Config < Thor
-      VALID_CONFIG_OPTIONS = %w( path script pre-run-execute post-run-execute )
+      VALID_CONFIG_OPTIONS = Repository::Config::OPTIONS.keys.freeze
 
       # class_option :verbose, type: :boolean, desc: 'verbose output', default: false
       # class_option :debug, type: :boolean, desc: 'debug output', default: false
@@ -22,30 +22,22 @@ module GitHooks
       }
 
       desc :get, 'display the value for a configuration option'
-      def get(option_name) # rubocop:disable MethodLength, AbcSize
-        unless VALID_CONFIG_OPTIONS.include? option_name
-          puts "Invalid option '#{option_name}': expected one of #{VALID_CONFIG_OPTIONS.join(', ')}"
+      def get(option) # rubocop:disable MethodLength, AbcSize
+        unless VALID_CONFIG_OPTIONS.include? option
+          puts "Invalid option '#{option}': expected one of #{VALID_CONFIG_OPTIONS.join(', ')}"
           return 1
         end
 
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug   = !!options['debug']
-        options['repo'] ||= GitHooks::Repository.path
 
-        repo_data = GitHooks::Repository::Config.new.get(
-          option_name,
-          repo_path: options['repo'],
-          global: options['global']
-        )
-
-        if repo_data.nil?
-          puts "Repository [#{options['repo']}] option '#{option_name}' is currently not set."
-          return
-        end
+        repository  = Repository.new(options['repo'])
+        config_data = repository.config.get(option, global: options['global'])
+        config_data ||= 'not set'
 
-        Array(repo_data).flatten.each do |value|
-          value ||= 'not set'
-          puts "#{option_name}: #{value}"
+        puts "Repository [#{repository.path.basename}]"
+        Array(config_data).flatten.each do |value|
+          puts "  #{option} = #{value}"
         end
       end
 
@@ -56,16 +48,13 @@ module GitHooks
         desc: 'overwrite all existing values.',
         default: false
       }
-      def set(option_name, option_value) # rubocop:disable AbcSize
+      def set(option, value) # rubocop:disable AbcSize
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug   = !!options['debug']
-        options['repo'] ||= GitHooks::Repository.path
 
-        GitHooks::Repository::Config.new.set(
-          option_name,
-          option_value,
-          repo_path: options['repo'],
-          global: options['global'],
+        Repository.new(options['repo']).config.set(
+          option, value,
+          global:    options['global'],
           overwrite: options['overwrite-all']
         ).status.success?
       rescue ArgumentError => e
@@ -73,16 +62,12 @@ module GitHooks
       end
 
       desc :unset, 'Unsets a configuration value'
-      def unset(option_name, option_value = nil) # rubocop:disable AbcSize
+      def unset(option, value = nil) # rubocop:disable AbcSize
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug   = !!options['debug']
-        options['repo'] ||= GitHooks::Repository.path
 
-        GitHooks::Repository::Config.new.unset(
-          option_name,
-          option_value,
-          repo_path: options['repo'],
-          global: options['global']
+        Repository.new(options['repo']).config.unset(
+          option, value, global: options['global']
         )
       rescue ArgumentError => e
         puts e.message
@@ -93,20 +78,22 @@ module GitHooks
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug   = !!options['debug']
 
-        options['repo'] ||= GitHooks::Repository.path
-        config = GitHooks::Repository::Config.new
-
-        githooks = config.list(global: options['global'], repo_path: options['repo'])['githooks']
+        repository = Repository.new(options['repo'])
+        githooks   = repository.config.list(global: options['global'])['githooks']
         return unless githooks
 
         githooks.each do |path, data|
-          puts "Repository #{path}:"
           key_size, value_size = data.keys.collect(&:size).maximum, data.values.collect(&:size).maximum
-          data.each do |key, value|
-            [value].flatten.each do |v|
-              printf "    %-#{key_size}s : %-#{value_size}s\n", key, v
+          display_format = "    %-#{key_size}s = %-#{value_size}s\n"
+
+          puts "Repository [#{File.basename(path)}]"
+          printf display_format, 'Repo Path', path
+
+          data.each { |key, value|
+            Array(value).flatten.each do |v|
+              printf display_format, key.tr('-', ' ').titleize, v
             end
-          end
+          }
         end
       end
     end

data/lib/githooks/cli.rb

@@ -25,7 +25,7 @@ module GitHooks
       desc :attach, 'attach githooks to repository hooks'
       method_option :bootstrap, type: :string, desc: 'Path to bootstrap script', default: nil
       method_option :script, aliases: '-s', type: :string, desc: 'Path to script to run', default: nil
-      method_option :path, aliases: '-p', type: :string, desc: 'Path to library of tests', default: nil
+      method_option :'hooks-path', aliases: '-p', type: :string, desc: 'Path to library of tests', default: nil
       method_option :repo, aliases: '-r', type: :string, desc: 'Path to repo to run tests on', default: Dir.getwd
       method_option :hooks, { # rubocop:disable BracesAroundHashParameters
         type: :array,
@@ -37,7 +37,7 @@ module GitHooks
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug = !!options['debug']
 
-        unless options['script'] || options['path']
+        unless options['script'] || options['hooks-path']
           fail ArgumentError, %q"Neither 'path' nor 'script' were specified - please provide at least one."
         end
 
@@ -79,11 +79,12 @@ module GitHooks
       method_option :tracked, aliases: '-A', type: :boolean, desc: 'test all tracked files', default: false
       method_option :untracked, aliases: '-T', type: :boolean, desc: 'test untracked files', default: false
       method_option :script, aliases: '-s', type: :string, desc: 'Path to script to run', default: nil
-      method_option :path, aliases: '-p', type: :string, desc: 'Path to library of tests', default: nil
+      method_option :'hooks-path', aliases: '-p', type: :string, desc: 'Path to library of tests', default: nil
       method_option :repo, aliases: '-r', type: :string, desc: 'Path to repo to run tests on', default: Dir.getwd
       method_option :'skip-pre', type: :boolean, desc: 'Skip PreRun Scripts', default: false
       method_option :'skip-post', type: :boolean, desc: 'Skip PostRun Scripts', default: false
       method_option :'skip-bundler', type: :boolean, desc: %q"Don't load bundler gemfile", default: false
+      method_option :'hook', type: :string, enum: Hook::VALID_PHASES, desc: 'Hook to run', default: 'pre-commit'
       method_option :args, type: :array, desc: 'Args to pass to pre/post scripts and main testing script', default: []
       def execute
         GitHooks.verbose = options['verbose']

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

@@ -26,6 +26,7 @@ class Array
       min
     end
   end
+  alias_method :min, :minimum
 
   def maximum(&_block)
     collection = block_given? ? collect { |obj| yield obj } : self
@@ -34,4 +35,5 @@ class Array
       max
     end
   end
+  alias_method :max, :maximum
 end

data/lib/githooks/core_ext/rainbow.rb

@@ -22,18 +22,18 @@ module Rainbow
   module Ext
     module String
       module InstanceMethods
-        def success!
+        def color_success!
           color(:green).bright
         end
 
-        def failure!
+        def color_failure!
           color(:red).bright
         end
 
-        def unknown!
+        def color_unknown!
           color(:yellow).bright
         end
-        alias_method :warning!, :unknown!
+        alias_method :color_warning!, :color_unknown!
       end
     end
   end

data/lib/githooks/hook.rb

@@ -22,7 +22,7 @@ require_relative 'system_utils'
 
 module GitHooks
   class Hook
-    VALID_PHASES = %w{ pre-commit commit-msg }.freeze unless defined? VALID_PHASES
+    VALID_PHASES = %w{ pre-commit commit-msg pre-push }.freeze unless defined? VALID_PHASES
 
     @__phases__ = {}
     @__mutex__  = Mutex.new

data/lib/githooks/repository/config.rb

@@ -21,15 +21,11 @@ module GitHooks
   class Repository
     class Config # rubocop:disable ClassLength
       OPTIONS = {
-        'path'             => { type: :path, multiple: false },
+        'hooks-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)
-        @repository = Repository.instance(path)
-      end
+      }.freeze unless defined? OPTIONS
 
       OPTIONS.keys.each do |name|
         method_name = name.gsub(/-/, '_')
@@ -41,33 +37,29 @@ module GitHooks
         EOS
       end
 
+      def initialize(repository)
+        @repository = repository
+      end
+
       def [](option)
-        send(option.gsub('-', '_'))
+        send(option.to_s.gsub('-', '_'))
       end
 
       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
-
-        repo      = options.delete(:repo_path) || repo_path
-        global    = (opt = options.delete(:global)).nil? ? false : opt
+        option    = normalize_option(option)
+        repo      = options.delete(:repo_path) || @repository.path
         var_type  = "--#{OPTIONS[option][:type]}"
         add_type  = OPTIONS[option][:multiple] ? '--add' : '--replace-all'
         overwrite = !!options.delete(:overwrite)
 
-        if option == 'path'
-          new_path = Pathname.new(value)
-          errors = []
-          errors << 'path must be a real location' unless new_path.exist?
-          errors << 'path must be a directory' unless new_path.directory?
-          unless (new_path + 'hooks').exist? || (new_path + '.hooks').exist?
-            errors << 'path must have a hooks or .hooks directory in it'
-          end
+        global    = (opt = options.delete(:global)).nil? ? false : opt
+        global    = global ? '--global' : '--local'
 
-          if errors.size > 0
-            puts "Unable to change githooks path for [#{repo}]:"
-            errors.each { |error| puts "  #{error}" }
+        if OPTIONS[option][:type] == :path
+          new_path = Pathname.new(value)
+          unless new_path.exist?
+            puts "Unable to set option option #{option} for [#{repo}]:"
+            puts "  Path does not exist: #{new_path}"
             fail ArgumentError
           end
         else
@@ -78,81 +70,84 @@ module GitHooks
 
         if overwrite && !self[option].nil? && !self[option].empty?
           puts "Overwrite requested for option '#{option}'" if GitHooks.verbose
-          unset(option, repo_chdir: repo, global: global)
+          unset(option, chdir: repo, global: global)
         end
 
         option = "githooks.#{repo}.#{option}"
-        git(global ? '--global' : '--local', var_type, add_type, option, value, chdir: repo).tap do |result|
+        git(global, var_type, add_type, option, value, chdir: repo).tap do |result|
           puts "Added option #{option} with value #{value}" if result.status.success?
         end
       end
 
       def remove_section(options = {})
-        repo   = options.delete(:repo_path) || repo_path
+        repo   = options.delete(:repo_path) || @repository.path
         global = (opt = options.delete(:global)).nil? ? false : opt
-        option = "githooks.#{repo}"
-        git(global ? '--global' : '--local', '--remove-section', option, chdir: repo)
+        global = global ? '--global' : '--local'
+        git(global, '--remove-section', "githooks.#{repo}", chdir: repo)
       end
 
-      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
-
-        options = args.extract_options
-        repo    = options.delete(:repo_path) || repo_path
+      def unset(option, *args) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity
+        options = args.extract_options!
         global  = (opt = options.delete(:global)).nil? ? false : opt
-        option  = "githooks.#{repo}.#{option}"
+        global  = global ? '--global' : '--local'
+        option  = "githooks.#{repo}.#{normalize_option(option)}"
 
         value_regex = args.first
 
         if options.delete(:all) || value_regex.nil?
-          git(global ? '--global' : '--local', '--unset-all', option, chdir: repo)
+          git(global, '--unset-all', option, options)
         else
-          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?
+          git(global, '--unset', option, value_regex, options)
         end
+
+        result.status.success?
       end
 
       def get(option, options = {})
-        unless OPTIONS.keys.include? option
-          fail ArgumentError, "Unexpected option '#{option}': expected one of: #{OPTIONS.keys.join(', ')}"
+        option = normalize_option(option)
+
+        begin
+          repo = options[:repo_path] || @repository.path
+          return unless (value = list(options)['githooks'][repo.to_s][option])
+          OPTIONS[option][:type] == :path ? Pathname.new(value) : value
+        rescue NoMethodError
+          nil
         end
-
-        repo     = options[:repo_path] || repo_path
-        githooks = list(options)['githooks']
-
-        githooks[repo][option] if githooks && githooks[repo] && githooks[repo][option]
       end
 
       def list(options = {})
-        config(options.delete(:repo_path) || repo_path)
+        config(chdir: options.delete(:repo_path) || options.delete(:chdir))
+      end
+
+      def inspect
+        opts = OPTIONS.keys.collect { |k| ":'#{k}'=>#{get(k).inspect}" }.join(' ')
+        format '<%s:0x%0x014 %s>', self.class.name, (__id__ * 2), opts
       end
 
     private
 
-      def repo_path
-        @repository.path
+      def normalize_option(option)
+        unless OPTIONS.keys.include? option
+          fail ArgumentError, "Unexpected option '#{option}': expected one of: #{OPTIONS.keys.join(', ')}"
+        end
+
+        option.to_s
       end
 
       def git(*args)
-        args = ['config', *args].flatten
-        @repository.git(*args)
+        options = args.extract_options!
+        args.push(options.merge(chdir: options[:repo_path] || options[:chdir] || @repository.path))
+        @repository.git(:config, *args)
       end
 
-      def config(path = nil) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity, AbcSize
-        path ||= repo_path
-
-        raw_config = git('--list', chdir: path).output.split("\n")
-        raw_config.sort.uniq.each_with_object({}) do |line, hash|
+      def config(*args) # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity, AbcSize
+        raw_config = git('--list', *args).output.split("\n").sort.uniq
+        raw_config.each_with_object({}) do |line, hash|
           key, value = line.split(/\s*=\s*/)
           key_parts = key.git_option_path_split
 
           ptr = hash[key_parts.shift] ||= {} # rubocop:disable IndentationWidth
-          while key_parts.size > 1 && (part = key_parts.shift)
-            ptr = ptr[part] ||= {} # rubocop:disable IndentationWidth
-          end
+          ptr = ptr[key_parts.shift]  ||= {} until key_parts.size == 1
 
           key = key_parts.shift
           case ptr[key]

data/lib/githooks/repository/diff_index_entry.rb

@@ -16,14 +16,16 @@ module GitHooks
         (?<rename_path>\S+)?
       }xi unless defined? DIFF_STRUCTURE_REGEXP
 
-      def self.from_file_path(path, tracked = false)
-        path = Pathname.new(path)
+      def self.from_file_path(repo, path, tracked = false)
+        relative_path = Pathname.new(path)
+        full_path = repo.path + relative_path
         entry_line = format(":%06o %06o %040x %040x %s\t%s",
-                            0, path.stat.mode, 0, 0, (tracked ? '^' : '?'), path.to_s)
-        new(entry_line)
+                            0, full_path.stat.mode, 0, 0, (tracked ? '^' : '?'), relative_path.to_s)
+        new(repo, entry_line)
       end
 
-      def initialize(entry)
+      def initialize(repo, entry)
+        @repo = repo
         unless entry =~ DIFF_STRUCTURE_REGEXP
           fail ArgumentError, "Unable to parse incoming diff entry data: #{entry}"
         end
@@ -56,7 +58,7 @@ module GitHooks
       # rubocop:enable MultilineOperationIndentation
 
       def to_repo_file
-        Repository::File.new(self)
+        Repository::File.new(@repo, self)
       end
 
       class FileState

data/lib/githooks/repository/file.rb

@@ -27,15 +27,16 @@ module GitHooks
     end
 
     class File < DiffIndexEntryDelegateClass
-      def initialize(entry)
-        unless entry.is_a? Repository::DiffIndexEntry
-          fail ArgumentError, "Expected a Repository::DiffIndexEntry but got a '#{entry.class.name}'"
-        end
-        @file = entry
-      end
+      attr_reader :repo, :file
+
+      private :repo
+      protected :file
 
-      def __getobj__ # rubocop:disable TrivialAccessors
-        @file
+      alias_method :__getobj__, :file
+
+      def initialize(repo, entry)
+        @repo = repo
+        @file = entry
       end
 
       def inspect
@@ -49,6 +50,10 @@ module GitHooks
         to.path || from.path
       end
 
+      def full_path
+        repo.path.join(path)
+      end
+
       def name
         path.basename.to_s
       end
@@ -85,7 +90,7 @@ module GitHooks
       def fd
         case type
           when :deleted, :deletion then nil
-          else path.open
+          else full_path.open
         end
       end
 
@@ -122,6 +127,14 @@ module GitHooks
         strip_newlines ? fd.readlines.collect(&:chomp!) : fd.readlines
       end
 
+      def eql?(other)
+        path.to_s == other.path.to_s
+      end
+
+      def hash
+        path.to_s.hash
+      end
+
       def <=>(other)
         path.to_s <=> other.path.to_s
       end

data/lib/githooks/repository.rb

@@ -17,6 +17,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 'set'
+require 'singleton'
+
 module GitHooks
   class Repository # rubocop:disable ClassLength
     extend SystemUtils
@@ -40,36 +43,20 @@ module GitHooks
     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
-      return @__instance__[strpath] if @__instance__[strpath]
+    attr_reader :path, :hooks, :config
 
-      @__mutex__.synchronize do
-        return @__instance__[strpath] if @__instance__[strpath]
-        @__instance__[strpath] = new(path)
-      end
+    def initialize(path = nil)
+      @path   = Pathname.new(get_root_path(path || Dir.getwd))
+      @hooks  = Pathname.new(@path).join('.git', 'hooks')
+      @config = Repository::Config.new(self)
     end
 
-    def self.method_missing(method, *args, &block)
-      return super unless instance.public_methods.include? method
-      instance.public_send(method, *args, &block)
+    def hooks_script
+      config['script']
     end
 
-    attr_reader :path, :hooks
-    alias_method :path, :path
-
-    def initialize(path = Dir.getwd)
-      @path  = get_root_path(path)
-      @hooks = Pathname.new(@path).join('.git', 'hooks')
-    end
-    protected :initialize
-
-    def config
-      @config ||= Repository::Config.new(path)
+    def hooks_path
+      config['hooks-path']
     end
 
     def get_root_path(path)
@@ -81,7 +68,7 @@ module GitHooks
     end
 
     def stash
-      git(*%w( stash -q --keep-index -a)).status.success?
+      git(*%w(stash -q --keep-index -a)).status.success?
     end
 
     def unstash
@@ -96,18 +83,17 @@ module GitHooks
 
       if options.delete(:tracked)
         tracked_manifest(ref: ref).each_with_object(manifest_list) do |file, list|
-          list << file unless list.include?(file)
+          list << file
         end
       end
 
       if options.delete(:untracked)
         untracked_manifest(ref: ref).each_with_object(manifest_list) do |file, list|
-          list << file unless list.include?(file)
+          list << file
         end
       end
 
-      manifest_list.sort!
-      manifest_list.uniq { |f| f.path.to_s }
+      manifest_list.sort
     end
 
     def staged_manifest(options = {})
@@ -121,12 +107,18 @@ module GitHooks
 
     def tracked_manifest(*)
       files = git('ls-files', '--exclude-standard').output.strip.split(/\s*\n\s*/)
-      files.collect { |path| DiffIndexEntry.from_file_path(path, true).to_repo_file }
+      files.collect { |path|
+        next unless self.path.join(path).file?
+        DiffIndexEntry.from_file_path(self, path, true).to_repo_file
+      }.compact
     end
 
     def untracked_manifest(*)
       files = git('ls-files', '--others', '--exclude-standard').output.strip.split(/\s*\n\s*/)
-      files.collect { |path| DiffIndexEntry.from_file_path(path).to_repo_file }
+      files.collect { |path|
+        next unless self.path.join(path).file?
+        DiffIndexEntry.from_file_path(self, path).to_repo_file
+      }.compact
     end
 
   private
@@ -142,9 +134,11 @@ module GitHooks
         cmd << (options.delete(:ref) || 'HEAD')
       end
 
-      git(*cmd.flatten.compact).output_lines.collect do |diff_data|
-        DiffIndexEntry.new(diff_data).to_repo_file
-      end
+      Set.new(
+        git(*cmd.flatten.compact).output_lines.collect { |diff_data|
+          DiffIndexEntry.new(self, diff_data).to_repo_file
+        }.compact
+      )
     rescue StandardError => e
       puts 'Error Encountered while acquiring manifest'
       puts "Command: git #{cmd.flatten.compact.join(' ')}"

data/lib/githooks/runner.rb

@@ -32,10 +32,10 @@ module GitHooks
     private :repository, :script, :hook_path, :repo_path, :options
 
     def initialize(options = {}) # rubocop:disable Metrics/AbcSize
-      @repo_path  = Pathname.new(options.delete('repo') || Repository.path)
-      @repository = Repository.instance(@repo_path)
-      @hook_path  = acquire_hooks_path(options.delete('path') || @repository.config.path || @repository.path)
-      @script     = options.delete('script') || @repository.config.script
+      @repo_path  = Pathname.new(options.delete('repo') || Dir.getwd)
+      @repository = Repository.new(@repo_path)
+      @hook_path  = acquire_hooks_path(options.delete('hooks-path') || @repository.config.hooks_path || @repository.path)
+      @script     = options.delete('script') || @repository.hooks_script
       @options    = IndifferentAccessOpenStruct.new(options)
 
       GitHooks.verbose = !!ENV['GITHOOKS_VERBOSE']
@@ -57,8 +57,7 @@ module GitHooks
         puts "Kernel#exec(#{command.inspect})" if GitHooks.verbose
         exec(command)
       elsif hook_path
-        load_tests(hook_path, options.skip_bundler)
-        start
+        load_tests && start
       else
         puts %q"I can't figure out what to run! Specify either path or script to give me a hint..."
       end
@@ -68,25 +67,27 @@ module GitHooks
       else
         run_externals('post-run-execute')
       end
+    rescue SystemStackError => e
+      puts "#{e.class.name}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
     rescue GitHooks::Error::NotAGitRepo => e
-      puts "Unable to find a valid git repo in #{repo}."
-      puts 'Please specify path to repo via --repo <path>' if GitHooks::SCRIPT_NAME == 'githooks'
+      puts "Unable to find a valid git repo in #{repository}."
+      puts 'Please specify path to repository via --repo <path>' if GitHooks::SCRIPT_NAME == 'githooks'
       raise e
     end
 
     def attach
-      entry_path   = Pathname.new(options.script || options.path).realdirpath
+      entry_path   = Pathname.new(script || hook_path).realdirpath
       hook_phases  = options.hooks || Hook::VALID_PHASES
       bootstrapper = Pathname.new(options.bootstrap).realpath if options.bootstrap
 
       if entry_path.directory?
-        if path = repository.config['path'] # rubocop:disable AssignmentInCondition
-          fail Error::AlreadyAttached, "Repository [#{repo_path}] already attached to path #{path} - Detach to continue."
+        if repository.hooks_path # rubocop:disable AssignmentInCondition
+          fail Error::AlreadyAttached, "Repository [#{repo_path}] already attached to hook path #{repository.hooks_path} - Detach to continue."
         end
-        repository.config.set('path', entry_path)
+        repository.config.set('hooks-path', entry_path)
       elsif entry_path.executable?
-        if path = repository.config['script'] # rubocop:disable AssignmentInCondition
-          fail Error::AlreadyAttached, "Repository [#{repo_path}] already attached to script #{path}. Detach to continue."
+        if repository.hooks_script # rubocop:disable AssignmentInCondition
+          fail Error::AlreadyAttached, "Repository [#{repo_path}] already attached to script #{repository.hooks_script}. Detach to continue."
         end
         repository.config.set('script', entry_path)
       else
@@ -115,7 +116,7 @@ module GitHooks
 
       if active_hooks.empty?
         puts 'All hooks detached. Removing configuration section.'
-        repo.config.remove_section(repo_path: repository.path)
+        repository.config.remove_section(repo_path: repository.path)
       else
         puts "Keeping configuration for active hooks: #{active_hooks.join(', ')}"
       end
@@ -144,7 +145,7 @@ module GitHooks
         puts "    #{hook_path}"
         puts
 
-        SystemUtils.quiet { load_tests(hook_path, true) }
+        SystemUtils.quiet { load_tests(true) }
 
         %w{ pre-commit commit-msg }.each do |phase|
           next unless Hook.phases[phase]
@@ -183,12 +184,7 @@ module GitHooks
 
     def acquire_hooks_path(path)
       path = Pathname.new(path) unless path.is_a? Pathname
-      path.tap do # return input path by default
-        return path if path.include? 'hooks'
-        return path if path.include? '.hooks'
-        return p if (p = path.join('hooks')).exist? # rubocop:disable Lint/UselessAssignment
-        return p if (p = path.join('.hooks')).exist? # rubocop:disable Lint/UselessAssignment
-      end
+      path
     end
 
     def run_externals(which)
@@ -220,7 +216,8 @@ module GitHooks
         active_hook.tracked         = options.tracked
         active_hook.repository_path = repository.path
       else
-        fail Error::InvalidPhase, "Hook '#{phase}' is not defined - have you registered any tests for this hook yet?"
+        $stderr.puts "Hook '#{phase}' not defined - skipping..." if GitHooks.verbose? || GitHooks.debug?
+        exit!(0) # exit quickly - no need to hold things up
       end
 
       success        = active_hook.run
@@ -235,10 +232,14 @@ module GitHooks
           printf "  %d. [ %s ] %s (%ds)\n", (index + 1), action.status_symbol, action.colored_title, action.benchmark
 
           action.errors.each do |error|
-            printf "    %s %s\n", GitHooks::FAILURE_SYMBOL, error
+            if action.success?
+              printf "    %s %s\n", GitHooks::WARNING_SYMBOL, error.color_warning!
+            else
+              printf "    %s %s\n", GitHooks::FAILURE_SYMBOL, error
+            end
           end
 
-          state_string = action.success? ? GitHooks::SUCCESS_SYMBOL : GitHooks::UNKNOWN_SYMBOL
+          state_string = action.success? ? GitHooks::SUCCESS_SYMBOL : GitHooks::WARNING_SYMBOL
 
           action.warnings.each do |warning|
             printf "    %s %s\n", state_string, warning
@@ -257,22 +258,15 @@ module GitHooks
       exit(success ? 0 : 1)
     end
 
-    def load_tests(hooks_path, skip_bundler = false)
-      # hooks stored locally in the repo_root should have their libs, init and
-      # gemfile stored in the hooks directory itself, whereas hooks stored
-      # in a separate repository should have have them all stored relative
-      # to the separate hooks directory.
-      if hook_path.to_s.start_with? repository.path
-        hook_data_path = acquire_hooks_path(repository.path)
-      else
-        hook_data_path = acquire_hooks_path(hook_path)
-      end
+    def load_tests(skip_bundler = nil)
+      skip_bundler = skip_bundler.nil? ? options.skip_bundler : skip_bundler
 
-      hooks_libs = hook_data_path.join('lib')
-      hooks_init = hook_data_path.join('hooks_init.rb')
-      gemfile    = hook_data_path.join('Gemfile')
+      hooks_path = repository.hooks_path
+      hooks_libs = hooks_path.join('lib')
+      hooks_init = (p = hooks_path.join('hooks_init.rb')).exist? ? p : hooks_path.join('githooks_init.rb')
+      gemfile    = hooks_path.join('Gemfile')
 
-      GitHooks.hooks_root = hook_data_path
+      GitHooks.hooks_root = hooks_path
 
       if gemfile.exist? && !(skip_bundler.nil? ? ENV.include?('GITHOOKS_SKIP_BUNDLER') : skip_bundler)
         puts "loading Gemfile from: #{gemfile}" if GitHooks.verbose
@@ -288,7 +282,9 @@ module GitHooks
             end
             # bundler tests for @settings using defined? - which means we need
             # to forcibly remove it.
-            Bundler.send(:remove_instance_variable, :@settings)
+            if Bundler.instance_variables.include? :@settings
+              Bundler.send(:remove_instance_variable, :@settings)
+            end
           else
             require 'bundler'
           end
@@ -305,6 +301,8 @@ module GitHooks
 
       $LOAD_PATH.unshift hooks_libs.to_s
 
+      Dir.chdir repo_path
+
       if hooks_init.exist?
         puts "Loading hooks from #{hooks_init} ..." if GitHooks.verbose?
         require hooks_init.sub_ext('').to_s
@@ -316,6 +314,8 @@ module GitHooks
           require lib
         end
       end
+
+      true
     end
 
     # rubocop:enable CyclomaticComplexity, MethodLength, AbcSize, PerceivedComplexity

data/lib/githooks/section.rb

@@ -21,14 +21,14 @@ require 'delegate'
 
 module GitHooks
   class Section < DelegateClass(Array)
-    attr_reader :name, :hook, :success, :actions, :benchmark, :limiters
+    attr_reader :name, :hook, :success, :benchmark, :limiters
 
     alias_method :title, :name
     alias_method :success?, :success
 
     class << self
       def key_from_name(name)
-        name.to_s.downcase.gsub(/[\W\s]+/, '_').to_sym
+        name.to_s.underscore.to_sym
       end
     end
 
@@ -74,18 +74,15 @@ module GitHooks
     end
 
     def colored_name(phase = GitHooks::HOOK_NAME)
-      status_colorize name(phase)
+      title = name(phase)
+      return title.color_unknown! unless finished? && completed?
+      success? ? title.color_success! : title.color_failure!
     end
 
     def key_name
       self.class.key_from_name(@name)
     end
 
-    def status_colorize(text)
-      return text.unknown! unless finished? && completed?
-      success? ? text.success! : text.failure!
-    end
-
     def run
       running!
       begin

data/lib/githooks/version.rb

@@ -18,5 +18,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 =end
 
 module GitHooks
-  VERSION = '1.4.1' unless defined? VERSION
+  VERSION = '1.5.0' unless defined? VERSION
 end

data/lib/githooks.rb

@@ -73,9 +73,10 @@ module GitHooks
     end
   end
 
-  SUCCESS_SYMBOL = '✓'.success! unless defined? SUCCESS_SYMBOL
-  FAILURE_SYMBOL = 'X'.failure! unless defined? FAILURE_SYMBOL
-  UNKNOWN_SYMBOL = '?'.unknown! unless defined? UNKNOWN_SYMBOL
+  SUCCESS_SYMBOL = '✓'.color_success! unless defined? SUCCESS_SYMBOL
+  FAILURE_SYMBOL = 'X'.color_failure! unless defined? FAILURE_SYMBOL
+  UNKNOWN_SYMBOL = '?'.color_unknown! unless defined? UNKNOWN_SYMBOL
+  WARNING_SYMBOL = '!'.color_warning! unless defined? WARNING_SYMBOL
 
   LIB_PATH = Pathname.new(__FILE__).dirname.realpath unless defined? LIB_PATH
   GEM_PATH = LIB_PATH.parent                         unless defined? GEM_PATH

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitt-githooks
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Carl P. Corliss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -154,6 +154,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO
 - bin/githooks
 - bin/githooks-runner
 - lib/githooks.rb
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: framework for building git hooks tests