rabbitt-githooks 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8a2ed779870b84aa9cc8d2a61a1cec2b9ce00bb
-  data.tar.gz: 74d1c181b0fb1f3ead9de7fba24cf55485d5e5fc
+  metadata.gz: 4f5a527f752152557546b7e9b09af917a80d2ac5
+  data.tar.gz: 83fde6252879d9215bab34d6d35f8269b471c43c
 SHA512:
-  metadata.gz: 8b5aa0a35e390045e234980f8a132eb4cbf112444df25811e1d7becb50f3a79e85c25810445585743a2a79dcb324c1a50cee34c4202ccd8976fe0f4760b8e759
-  data.tar.gz: 3408b935632cb28b2c1ff13f6aacd2b83fdc407b4b3acc881ae29ed76f7d0e6b60ce8edd187fe95fc8b0b53d91b64085066451425d9a554ab0ea2b266b01959a
+  metadata.gz: cb9e232c8acb6960027b60d9802e77b4242755440cec278a24f137dff0b9f77508aabf003ca222da849600fb05db8bf80408b3e4f820f7bc9a9de20445213521
+  data.tar.gz: 4fbbcb4f21183799a1daddbed62c1a2b63bafd1d3fff591d18a168b5e8bba71d83852aedadf4d57685a236bade4569566d09db146a672a717b7e157709671aa3

data/CONTRIBUTORS.txt

@@ -0,0 +1,2 @@
+Miscellaneous Bugfixes:
+  - Robert Widmer (https://github.com/rdubya)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rabbitt-githooks (1.3.2)
-      colorize (~> 0.7.0)
+    rabbitt-githooks (1.4.1)
+      rainbow (~> 2.0.0)
       thor (~> 0.18)
 
 GEM
@@ -11,7 +11,6 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    colorize (0.7.5)
     diff-lcs (1.2.5)
     docile (1.1.5)
     multi_json (1.10.1)
@@ -48,6 +47,7 @@ GEM
     yard (0.8.7.6)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/bin/githooks

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-if ENV['GITHOOKS_DEV']
-  require 'pathname'
-  $:.unshift Pathname.new(__FILE__).dirname.parent.join('lib').realpath.to_s
+if ENV.include? 'GITHOOKS_DEV'
+  $:.unshift File.expand_path('../../lib', __FILE__)
 end
 require 'githooks'
 
@@ -12,5 +11,4 @@ rescue GitHooks::Error => e
   puts e.message
   exit 1
 end
-
 exit 0

data/bin/githooks-runner

@@ -1,26 +1,22 @@
 #!/usr/bin/env ruby
 # rubocop:disable FileName
 
-if ENV['GITHOOKS_DEV']
-  require 'pathname'
-  path = Pathname.new(__FILE__).dirname
-  $:.unshift(
-    if path.to_s.end_with? '.git/hooks'
-      path.parent.parent
-    else
-      path.parent
-    end.join('lib').realpath.to_s
-  )
+if ENV.include? 'GITHOOKS_DEV'
+  if __FILE__.include? '.git/hooks'
+    $:.unshift File.expand_path('../../../lib', __FILE__)
+  else
+    $:.unshift File.expand_path('../../lib', __FILE__)
+  end
 end
 require 'githooks'
 
 begin
-  GitHooks::Runner.run(
+  result = GitHooks::Runner.new(
     'args' => ARGV,
     'hook' => ENV['GITHOOKS_HOOK']
-  )
+  ).run
 rescue GitHooks::Error => e
   puts e.message
   exit 1
 end
-exit 0
+exit result.to_i

data/lib/githooks/action.rb

@@ -19,7 +19,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 require 'set'
 require 'stringio'
-require 'colorize'
 require_relative 'repository'
 
 module GitHooks
@@ -35,7 +34,7 @@ module GitHooks
       @title     = title
       @section   = section
       @on        = nil
-      @limiters  = Set.new
+      @limiters  = section.limiters
       @success   = true
       @errors    = []
       @warnings  = []
@@ -118,8 +117,7 @@ module GitHooks
     end
 
     def respond_to_missing?(method, include_private = false)
-      return super unless section.hook.find_command(method)
-      true
+      section.hook.find_command(method) || super
     end
 
     def method_missing(method, *args, &block)
@@ -130,10 +128,27 @@ module GitHooks
 
     # DSL Methods
 
+    def config_path
+      GitHooks.hooks_root.join('configs')
+    end
+
+    def config_file(*path_components)
+      config_path.join(*path_components)
+    end
+
+    def lib_path
+      GitHooks.hooks_root.join('lib')
+    end
+
+    def lib_file(*path_components)
+      lib_path.join(*path_components)
+    end
+
     def limit(type)
-      (find_limiter(type) || Repository::Limiter.new(type)).tap do |limiter|
-        @limiters << limiter
+      unless @limiters.include? type
+        @limiters[type] ||= Repository::Limiter.new(type)
       end
+      @limiters[type]
     end
 
     def on_each_file(&block)
@@ -154,10 +169,6 @@ module GitHooks
 
   private
 
-    def find_limiter(type)
-      @limiters.select { |l| l.type == type }.first
-    end
-
     def run_command(command, *args, &block)
       prefix = nil
       args.extract_options.tap { |options|

data/lib/githooks/{commands → cli}/config.rb

@@ -30,7 +30,7 @@ module GitHooks
 
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug   = !!options['debug']
-        options['repo'] ||= GitHooks::Repository.root_path
+        options['repo'] ||= GitHooks::Repository.path
 
         repo_data = GitHooks::Repository::Config.new.get(
           option_name,
@@ -59,7 +59,7 @@ module GitHooks
       def set(option_name, option_value) # rubocop:disable AbcSize
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug   = !!options['debug']
-        options['repo'] ||= GitHooks::Repository.root_path
+        options['repo'] ||= GitHooks::Repository.path
 
         GitHooks::Repository::Config.new.set(
           option_name,
@@ -76,7 +76,7 @@ module GitHooks
       def unset(option_name, option_value = nil) # rubocop:disable AbcSize
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug   = !!options['debug']
-        options['repo'] ||= GitHooks::Repository.root_path
+        options['repo'] ||= GitHooks::Repository.path
 
         GitHooks::Repository::Config.new.unset(
           option_name,
@@ -93,7 +93,7 @@ module GitHooks
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug   = !!options['debug']
 
-        options['repo'] ||= GitHooks::Repository.root_path
+        options['repo'] ||= GitHooks::Repository.path
         config = GitHooks::Repository::Config.new
 
         githooks = config.list(global: options['global'], repo_path: options['repo'])['githooks']

data/lib/githooks/cli.rb

@@ -4,13 +4,21 @@ require_relative 'runner'
 
 module GitHooks
   module CLI
-    autoload :Config, 'githooks/commands/config'
+    autoload :Config, 'githooks/cli/config'
 
     # rubocop:disable AbcSize
     class Base < Thor
       class_option :verbose, aliases: '-v', type: :boolean, desc: 'verbose output', default: false
       class_option :debug, aliases: '-d', type: :boolean, desc: 'debug output', default: false
 
+      desc :version, 'display version information'
+      def version
+        puts "GitHooks: #{GitHooks::VERSION}"
+        puts "Git     : #{%x{git --version | grep git}.split(/\s+/).last}"
+        puts "Bundler : #{Bundler::VERSION}"
+        puts "Ruby    : #{RUBY_ENGINE} #{RUBY_VERSION}p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})"
+      end
+
       # githook attach [--hook <hook1,hookN>] [--script <path> | --path <path>] [--bootstrap <path>]
       #   --  attaches the listed hooks (or all if none specified) to the githook runner
       #       optionally sets the script XOR path
@@ -33,7 +41,7 @@ module GitHooks
           fail ArgumentError, %q"Neither 'path' nor 'script' were specified - please provide at least one."
         end
 
-        Runner.attach(options)
+        Runner.new(options.dup).attach
       end
 
       # githook dettach [--hook <hook1,hookN>]
@@ -49,7 +57,7 @@ module GitHooks
       def detach
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug = !!options['debug']
-        Runner.detach(options['repo'], options['hooks'])
+        Runner.new(options.dup).detach(options['hooks'])
       end
 
       # githook list [--hook <hook1,hook2,hookN>]
@@ -59,7 +67,7 @@ module GitHooks
       def list
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug = !!options['debug']
-        Runner.list(options['repo'])
+        Runner.new(options.dup).list
       end
 
       # githooks execute [--[no-]staged] [--tracked] [--untracked] [--args -- one two three ...]
@@ -78,10 +86,11 @@ module GitHooks
       method_option :'skip-bundler', type: :boolean, desc: %q"Don't load bundler gemfile", default: false
       method_option :args, type: :array, desc: 'Args to pass to pre/post scripts and main testing script', default: []
       def execute
-        GitHooks.verbose = !!options['verbose']
-        GitHooks.debug = !!options['debug']
+        GitHooks.verbose = options['verbose']
+        GitHooks.debug = options['debug']
 
-        opts = (options).dup
+        opts = options.dup
+        opts['staged'] ||= !(opts['tracked'] || opts['untracked'])
 
         if opts['staged']
           if opts['tracked']
@@ -93,9 +102,9 @@ module GitHooks
           end
         end
 
-        opts['staged'] = !(opts['tracked'] || opts['untracked']) if opts['staged'].nil?
+        opts['skip-bundler'] ||= !!ENV['GITHOOKS_SKIP_BUNDLER']
 
-        GitHooks::Runner.run(opts)
+        Runner.new(opts).run
       end
 
       desc :config, 'manage githooks configuration'

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

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+=end
+
 class Array
   def extract_options!
     last.is_a?(Hash) ? pop : {}

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

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+=end
+
 class Array
   def select_with_index(regexp = nil, &block)
     [].tap do |collection|

data/lib/githooks/core_ext/array.rb

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+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 'array/min_max'
 require_relative 'array/select_with_index'
 require_relative 'array/extract_options'

data/lib/githooks/core_ext/numbers.rb

@@ -1 +1,19 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+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 'numbers/infinity'

data/lib/githooks/core_ext/object.rb

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+=end
+
 class Object
   def deep_dup
     Marshal.load(Marshal.dump(self))

data/lib/githooks/core_ext/ostruct.rb

@@ -0,0 +1,44 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+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 'thor/core_ext/hash_with_indifferent_access'
+
+class IndifferentAccessOpenStruct < OpenStruct
+  def new_ostruct_member(name)
+    return super unless name.to_s.include? '-'
+
+    original_name, sanitized_name = name, name.to_s.gsub('-', '_').to_sym
+    return if respond_to?(sanitized_name)
+
+    define_singleton_method(sanitized_name) { @table[original_name] }
+    define_singleton_method("#{sanitized_name}=") { |x| @table[original_name] = x }
+  end
+
+  def [](k)
+    public_send(k)
+  end
+
+  def []=(k, v)
+    public_send("#{k}=", v)
+  end
+
+  def to_h
+    Thor::CoreExt::HashWithIndifferentAccess.new(@table)
+  end
+end

data/lib/githooks/core_ext/pathname.rb

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+=end
+
 require 'pathname'
 
 if RUBY_ENGINE == 'jruby'
@@ -26,3 +44,13 @@ if RUBY_ENGINE == 'jruby'
     private :java_realpath
   end
 end
+
+class Pathname
+  def include?(component)
+    to_s.split(File::SEPARATOR).include?(component)
+  end
+
+  def exclude?(component)
+    !include?(component)
+  end
+end

data/lib/githooks/core_ext/rainbow.rb

@@ -0,0 +1,40 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+=end
+
+require 'rainbow/ext/string'
+
+module Rainbow
+  module Ext
+    module String
+      module InstanceMethods
+        def success!
+          color(:green).bright
+        end
+
+        def failure!
+          color(:red).bright
+        end
+
+        def unknown!
+          color(:yellow).bright
+        end
+        alias_method :warning!, :unknown!
+      end
+    end
+  end
+end

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

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+=end
+
 class String
   def git_option_path_split
     section, *subsection, option = split('.')

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

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+=end
+
 =begin
   Mostly borrowed from Rails' ActiveSupport::Inflections
 =end

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

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+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 '../array/extract_options'
 
 class String

data/lib/githooks/core_ext/string.rb

@@ -1,3 +1,21 @@
+=begin
+Copyright (C) 2013 Carl P. Corliss
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+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 'string/git_option_path_split'
 require_relative 'string/inflections'
 require_relative 'string/sanitize'

data/lib/githooks/core_ext.rb

@@ -18,7 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 require_relative 'core_ext/object'
 require_relative 'core_ext/array'
-require_relative 'core_ext/colorize'
+require_relative 'core_ext/rainbow'
 require_relative 'core_ext/numbers'
 require_relative 'core_ext/string'
 require_relative 'core_ext/pathname'
+require_relative 'core_ext/ostruct'