rabbitt-githooks 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be7b07bbebbb66c3fc6cbc08f76c2759f4f24bc
-  data.tar.gz: 6521197f0aa99b077a74a4b7362541de2ee8f635
+  metadata.gz: cc92115463443ffe80792a5f569a4242e905d21b
+  data.tar.gz: 466abff7748a7204939a894cc8adfda9ec927b50
 SHA512:
-  metadata.gz: 6b6da3d8b71bff3f1bb1b3a705183aa67c06ba73cf210046d5cade7d2dcca6b277438b0b0a5902a0b22b67ade84a6a8b38c38902a70bcf0921d6b56c7a8a21f3
-  data.tar.gz: 680979f0543e112cf61a1ef9ecad384691c646659e7d5f47f674fc7122390680b477ed0e6c7fd669a8e3f3351490d64628add6015e288fd436caf1a9b6df2525
+  metadata.gz: 9390cef0e16c4574f9908f47ca1de0e4ceb842fa0dafaeed923e57568be96b09e73db566ed292df66a439b057a9ad5107ad3ccb5d4b8e86c342679262bfa6d62
+  data.tar.gz: 601aa784254ca0c9b1c3831c724ef90cfaa9a000e80fdc022d76c16e157aefe58d08323c97fbfdd84304dcf60e9d369914f8223be40ae5360dbdba27d8ae2d4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbitt-githooks (1.5.1)
+    rabbitt-githooks (1.5.2)
       rainbow (~> 2.0.0)
       thor (~> 0.18)
 
@@ -60,6 +60,3 @@ DEPENDENCIES
   ruby-lint (~> 2.0)
   simplecov (~> 0.9)
   yard (~> 0.7)
-
-BUNDLED WITH
-   1.10.6

data/lib/githooks.rb

@@ -76,7 +76,8 @@ module GitHooks
   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
+  WARNING_SYMBOL = 'W'.color_warning! unless defined? WARNING_SYMBOL
+  SKIPPED_SYMBOL = 'S'.color_skipped! unless defined? SKIPPED_SYMBOL
 
   LIB_PATH = Pathname.new(__FILE__).dirname.realpath unless defined? LIB_PATH
   GEM_PATH = LIB_PATH.parent                         unless defined? GEM_PATH

data/lib/githooks/action.rb

@@ -22,7 +22,7 @@ require 'stringio'
 require_relative 'repository'
 
 module GitHooks
-  class Action # rubocop:disable Metrics/ClassLength
+  class Action
     attr_reader :title, :section, :on, :limiters
     attr_reader :success, :errors, :warnings, :benchmark
     private :section, :on
@@ -50,26 +50,30 @@ module GitHooks
     end
 
     def colored_title
+      return title.color_skipped! if skipped?
       return title.color_unknown! unless finished?
       success? ? title.color_success! : title.color_failure!
     end
 
     def status_symbol
+      return GitHooks::SKIPPED_SYMBOL if skipped?
       return GitHooks::UNKNOWN_SYMBOL unless finished?
       success? ? GitHooks::SUCCESS_SYMBOL : GitHooks::FAILURE_SYMBOL
     end
 
-    %w(finished running waiting).each do |method|
+    %w[finished running waiting skipped].each do |method|
       define_method(:"#{method}?") { @status == method.to_sym }
       define_method(:"#{method}!") { @status = method.to_sym }
     end
 
-    def run # rubocop:disable MethodLength, AbcSize
+    def run # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       running!
       with_benchmark do
         with_captured_output {
           begin
-            @success &= @on.call
+            was_skipped = catch(:skip) do
+              @success &= @on.call
+            end
           rescue StandardError => e
             $stderr.puts "Exception thrown during action call: #{e.class.name}: #{e.message}"
             if GitHooks.debug?
@@ -81,7 +85,7 @@ module GitHooks
             end
             @success = false
           ensure
-            finished!
+            was_skipped ? skipped! : finished!
           end
         }
       end
@@ -124,6 +128,10 @@ module GitHooks
 
     # DSL Methods
 
+    def skip!
+      throw :skip, true
+    end
+
     def config_path
       GitHooks.hooks_root.join('configs')
     end

data/lib/githooks/core_ext/rainbow.rb

@@ -34,6 +34,10 @@ module Rainbow
           color(:yellow).bright
         end
         alias_method :color_warning!, :color_unknown!
+
+        def color_skipped!
+          color(:cyan)
+        end
       end
     end
   end

data/lib/githooks/error.rb

@@ -7,5 +7,9 @@ module GitHooks
     class AlreadyAttached < GitHooks::Error; end
     class NotAttached < GitHooks::Error; end
     class InvalidPhase < GitHooks::Error; end
+
+    class RemoteNotSet < GitHooks::Error
+      attr_accessor :branch
+    end
   end
 end

data/lib/githooks/hook.rb

@@ -108,7 +108,7 @@ module GitHooks
     private :setup_command
 
     def find_command(name)
-      @commands.select { |command| command.name == name.to_s }.first
+      @commands.find { |command| command.name == name.to_s }
     end
 
     def sections
@@ -169,22 +169,32 @@ module GitHooks
         @hook = hook
       end
 
-      def repo
+      def repository
         @hook.repository
       end
 
-      def manifest
-        @files ||= repo.manifest(
-          staged:    hook.staged,
-          tracked:   hook.tracked,
-          untracked: hook.untracked
-        )
+      def files
+        @files ||= begin
+          options = {
+            staged:    hook.staged,
+            tracked:   hook.tracked,
+            untracked: hook.untracked
+          }
+
+          if %w[ commit-msg pre-push ].include? hook.phase
+            if (parent_sha = repository.last_unpushed_commit_parent)
+              options.merge!(ref: parent_sha)
+            end
+          end
+
+          repository.manifest(options)
+        end
       end
 
       def filter(limiters)
-        manifest.dup.tap do |files|
+        files.dup.tap do |files|
           limiters.each do |type, limiter|
-            puts "Limiter [#{type}] -> (#{limiter.only.inspect}) match against: " if GitHooks.debug?
+            STDERR.puts "Limiter [#{type}] -> (#{limiter.only.inspect}) match against: " if GitHooks.debug?
             limiter.limit(files)
           end
         end

data/lib/githooks/repository.rb

@@ -21,7 +21,7 @@ require 'set'
 require 'singleton'
 
 module GitHooks
-  class Repository # rubocop:disable ClassLength
+  class Repository
     extend SystemUtils
 
     command :git
@@ -75,23 +75,20 @@ module GitHooks
       git(*%w(stash pop -q)).status.success?
     end
 
-    def manifest(options = {}) # rubocop:disable AbcSize
+    def manifest(options = {})
       ref = options.delete(:ref)
+
       return staged_manifest(ref: ref) if options.delete(:staged)
 
       manifest_list = unstaged_manifest(ref: ref)
 
-      if options.delete(:tracked)
-        tracked_manifest(ref: ref).each_with_object(manifest_list) do |file, list|
-          list << file
-        end
-      end
+      tracked_manifest(ref: ref).each_with_object(manifest_list) do |file, list|
+        list << file
+      end if options.delete(:tracked)
 
-      if options.delete(:untracked)
-        untracked_manifest(ref: ref).each_with_object(manifest_list) do |file, list|
-          list << file
-        end
-      end
+      untracked_manifest(ref: ref).each_with_object(manifest_list) do |file, list|
+        list << file
+      end if options.delete(:untracked)
 
       manifest_list.sort
     end
@@ -121,6 +118,28 @@ module GitHooks
       }.compact
     end
 
+    def unpushed_commits
+      result = git('log', '--format=%H', '@{upstream}..')
+      if result.failure?
+        if result.error =~ /^fatal: no upstream configured for branch '([^']+)'/
+          fail Error::RemoteNotSet, "No upstream remote configured for '#{$1}'"
+        else
+          fail Error::CommandExecutionFailure, result.error
+        end
+      end
+      result.output.split(/\s*\n\s*/).collect(&:strip)
+    end
+
+    def revision_parent(revision)
+      return unless (result = git('rev-parse', "#{revision}~1")).status.success?
+      result.output.strip
+    end
+
+    def last_unpushed_commit_parent
+      oldest_sha = unpushed_commits.last
+      revision_parent(oldest_sha) unless oldest_sha.nil?
+    end
+
   private
 
     def diff_index(options = {}) # rubocop:disable AbcSize

data/lib/githooks/repository/limiter.rb

@@ -44,7 +44,7 @@ module GitHooks
           match_file(file, @only).tap do |result|
             if GitHooks.debug?
               result = (result ? 'success' : 'failure')
-              puts "  #{file.path} (#{file.attribute_value(@type).inspect}) was a #{result}"
+              STDERR.puts "  #{file.path} (#{file.attribute_value(@type).inspect}) was a #{result}"
             end
           end
         end

data/lib/githooks/section.rb

@@ -48,7 +48,6 @@ module GitHooks
     # overrides previous action method to only return
     # actions that have a non-empty manifest
     def actions
-      return @actions unless @hook.phase == 'pre-commit'
       @actions.reject { |action| action.manifest.empty? }
     end
     alias_method :__getobj__, :actions
@@ -57,7 +56,7 @@ module GitHooks
       @actions << action
     end
 
-    %w(finished running waiting).each do |method|
+    %w(finished running waiting skipped).each do |method|
       define_method(:"#{method}?") { @status == method.to_sym }
       define_method(:"#{method}!") { @status = method.to_sym }
     end
@@ -67,7 +66,7 @@ module GitHooks
     end
 
     def wait_count
-      @actions.select(&:waiting?).size
+      @actions.count(&:waiting?)
     end
 
     def name(phase = GitHooks::HOOK_NAME)
@@ -76,6 +75,7 @@ module GitHooks
 
     def colored_name(phase = GitHooks::HOOK_NAME)
       title = name(phase)
+      return title.color_skipped! if @actions.all?(&:skipped?)
       return title.color_unknown! unless finished? && completed?
       success? ? title.color_success! : title.color_failure!
     end
@@ -88,7 +88,12 @@ module GitHooks
       running!
       begin
         time_start = Time.now
-        actions.collect { |action| @success &= action.run }.all?
+        actions.collect { |action|
+          catch(:skip) do
+            @success &= action.run
+          end
+          @success
+        }.all?
       ensure
         @benchmark = Time.now - time_start
         finished!

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitt-githooks
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Carl P. Corliss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: framework for building git hooks tests