rabbitt-githooks 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fc9f2e2715c624c84800b1e4acce192ec17d659
-  data.tar.gz: 82068a8270deeb4810e2c4f32b3f5748e9352423
+  metadata.gz: 0c6ee6c892f449e7194836f8c009b2fcdb1f1a54
+  data.tar.gz: b5fd9f630b3915b742da75af5d4d089ecb2081f9
 SHA512:
-  metadata.gz: 665c5935ad4362aafd8ec3800dd04a0d0aeda3c030e12679a93067355c1009a5980b088ffe5593012c631094204fb22cb4d74012e5e0f71d4cc33e6a861bd31b
-  data.tar.gz: bc720d2df0b87b5ec92b3e5478a952bb3aa7b10f498f8607ddd987ee79642cad45c92707119d70bf1211797df5ae6025c0941097b410ed063890ff03ef9ea44e
+  metadata.gz: db9796de78bc0e72c8d4de6065330198fb059cd382ecfd8e293b2257450fa4e77a3e5458eef82643be711d119d306d6ba6dea2c3c3863b598b20407f8978cc1f
+  data.tar.gz: 242e272466bf37fff2edffb96e185d08b4da9be3d5c0cd6f955a58bb86596961336d5ccf2b049c41805eef02324ab013919c107364444fae6b4e255a01f37c3f

data/Gemfile

@@ -19,3 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 source "http://rubygems.org"
 
 gemspec
+
+if RUBY_ENGINE == 'ruby'
+  gem 'parser', "~> #{RUBY_VERSION}.0"
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbitt-githooks (1.6.0)
+    rabbitt-githooks (1.6.1)
       rainbow (~> 2.0.0)
       thor (~> 0.19.1)
 
@@ -14,7 +14,6 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     json (1.8.3)
-    json (1.8.3-java)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
@@ -48,11 +47,11 @@ GEM
     yard (0.8.7.6)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
+  parser (~> 2.2.2.0)
   rabbitt-githooks!
   rake (~> 10.1)
   rspec (~> 2.14)

data/lib/githooks/action.rb

@@ -23,7 +23,7 @@ require_relative 'repository'
 
 module GitHooks
   class Action
-    attr_reader :title, :section, :on, :limiters
+    attr_reader :title, :section, :on
     attr_reader :success, :errors, :warnings, :benchmark
     private :section, :on
     alias_method :success?, :success
@@ -45,8 +45,12 @@ module GitHooks
       waiting!
     end
 
+    def limiters
+      section.limiters.merge(@limiters)
+    end
+
     def manifest
-      @manifest ||= section.hook.manifest.filter(section.limiters.merge(@limiters))
+      @manifest ||= section.hook.manifest.filter(limiters)
     end
 
     def colored_title

data/lib/githooks/repository/limiter.rb

@@ -47,7 +47,7 @@ module GitHooks
 
       def limit(files)
         files.select! do |file|
-          match_file(file, @only).tap do |result|
+          match_file(file).tap do |result|
             if GitHooks.debug?
               result = (result ? 'success' : 'failure')
               STDERR.puts "  #{file.path} (#{file.attribute_value(@type).inspect}) was a #{result}"
@@ -62,11 +62,11 @@ module GitHooks
         @inverted = true
       end
 
-      def match_file(file, match_value)
+      def match_file(file)
         if @inverted
-          [*match_value].none? { |value| file.match(@type, value) }
+          Array(@only).none? { |value| file.match(@type, value) }
         else
-          [*match_value].any? { |value| file.match(@type, value) }
+          Array(@only).any? { |value| file.match(@type, value) }
         end
       end
     end

data/lib/githooks/runner.rb

@@ -151,14 +151,23 @@ module GitHooks
           next unless Hook.phases[phase]
 
           puts "  Phase #{phase.camelize}:"
+
+          Hook.phases[phase].limiters.each_with_index do |(type, limiter), limiter_index|
+            selector = limiter.only.size > 1 ? limiter.only : limiter.only.first
+            printf "    Hook Limiter %d: %s -> %s\n", limiter_index + 1, type, selector.inspect
+          end
+
           Hook.phases[phase].sections.each_with_index do |section, section_index|
-            printf "    %3d: %s\n", section_index + 1, section.title
+            printf "    %d: %s\n", section_index + 1, section.title
             section.actions.each_with_index do |action, action_index|
-              printf "      %3d: %s\n", action_index + 1, action.title
-              action.limiters.each_with_index do |limiter, limiter_index|
-                type, value = limiter.type.inspect, limiter.only
-                value = value.first if value.size == 1
-                printf "          Limiter %d: %s -> %s\n", limiter_index + 1, type, value.inspect
+              section.limiters.each_with_index do |(type, limiter), limiter_index|
+                selector = limiter.only.size > 1 ? limiter.only : limiter.only.first
+                printf "      Section Limiter %d: %s -> %s\n", limiter_index + 1, type, selector.inspect
+              end
+              printf "      %d: %s\n", action_index + 1, action.title
+              action.limiters.each_with_index do |(type, limiter), limiter_index|
+                selector = limiter.only.size > 1 ? limiter.only : limiter.only.first
+                printf "        Action Limiter %d: %s -> %s\n", limiter_index + 1, type, selector.inspect
               end
             end
           end

data/lib/githooks/section.rb

@@ -21,7 +21,7 @@ require 'delegate'
 
 module GitHooks
   class Section < DelegateClass(Array)
-    attr_reader :name, :hook, :success, :benchmark, :limiters
+    attr_reader :name, :hook, :success, :benchmark
 
     alias_method :title, :name
     alias_method :success?, :success
@@ -36,7 +36,7 @@ module GitHooks
       @name      = name.to_s.titleize
       @success   = true
       @actions   = []
-      @limiters  = hook.limiters
+      @limiters  = {}
       @hook      = hook
       @benchmark = 0
 
@@ -45,6 +45,10 @@ module GitHooks
       waiting!
     end
 
+    def limiters
+      hook.limiters.merge(@limiters)
+    end
+
     # overrides previous action method to only return
     # actions that have a non-empty manifest
     def actions

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.6.0' unless defined? VERSION
+  VERSION = '1.6.1' unless defined? VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitt-githooks
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Carl P. Corliss