rabbitt-githooks 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc92115463443ffe80792a5f569a4242e905d21b
-  data.tar.gz: 466abff7748a7204939a894cc8adfda9ec927b50
+  metadata.gz: fb31ed1dec8235280845f3b79a0903d99a6aa83a
+  data.tar.gz: 8476c63b4dddc57ca1715d235c4b4be3b2581366
 SHA512:
-  metadata.gz: 9390cef0e16c4574f9908f47ca1de0e4ceb842fa0dafaeed923e57568be96b09e73db566ed292df66a439b057a9ad5107ad3ccb5d4b8e86c342679262bfa6d62
-  data.tar.gz: 601aa784254ca0c9b1c3831c724ef90cfaa9a000e80fdc022d76c16e157aefe58d08323c97fbfdd84304dcf60e9d369914f8223be40ae5360dbdba27d8ae2d4b
+  metadata.gz: 053d3879bd2ba1a74b78b268e05c7b234bab3cd683e3ee34009409b8bf2ff7bf8d0151ef88e5bd250f2f162dd8c018be493ee4867a4ec5471a585cb8a765de2f
+  data.tar.gz: ae10de10f024a5023dba124539d642640f5c67cefefd462efb4577931091f622a5da761892a971116ed143eed51741ca3793b56188236d97c9d51c64400485c7

data/Gemfile.lock

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

data/lib/githooks/action.rb

@@ -73,7 +73,11 @@ module GitHooks
           begin
             was_skipped = catch(:skip) do
               @success &= @on.call
+              # was_skipped gets set to the return value of the block
+              # which we want to be false unless `throw :skip` is called
+              false
             end
+            return @success
           rescue StandardError => e
             $stderr.puts "Exception thrown during action call: #{e.class.name}: #{e.message}"
             if GitHooks.debug?
@@ -85,6 +89,7 @@ module GitHooks
             end
             @success = false
           ensure
+            STDERR.puts "WAS_SKIPPED? -> #{was_skipped.inspect} (#{@status.inspect})" if GitHooks.debug?
             was_skipped ? skipped! : finished!
           end
         }

data/lib/githooks/runner.rb

@@ -81,12 +81,12 @@ module GitHooks
       bootstrapper = Pathname.new(options.bootstrap).realpath if options.bootstrap
 
       if entry_path.directory?
-        if repository.hooks_path # rubocop:disable AssignmentInCondition
+        if repository.hooks_path
           fail Error::AlreadyAttached, "Repository [#{repo_path}] already attached to hook path #{repository.hooks_path} - Detach to continue."
         end
         repository.config.set('hooks-path', entry_path)
       elsif entry_path.executable?
-        if repository.hooks_script # rubocop:disable AssignmentInCondition
+        if repository.hooks_script
           fail Error::AlreadyAttached, "Repository [#{repo_path}] already attached to script #{repository.hooks_script}. Detach to continue."
         end
         repository.config.set('script', entry_path)
@@ -251,8 +251,13 @@ module GitHooks
       success = false if ENV['GITHOOKS_FORCE_FAIL']
 
       unless success
-        $stderr.puts 'Commit failed due to errors listed above.'
-        $stderr.puts 'Please fix and attempt your commit again.'
+        command = case phase
+          when /commit/i then 'commit'
+          when /push/i then 'push'
+          else phase
+        end
+        $stderr.puts "#{command.capitalize} failed due to errors listed above."
+        $stderr.puts "Please fix and attempt your #{command} again."
       end
 
       exit(success ? 0 : 1)
@@ -291,11 +296,11 @@ module GitHooks
           ::Bundler.require(:default)
         rescue LoadError
           puts %q"Unable to load bundler - please make sure it's installed."
-          raise # rubocop:disable SignalException
+          raise
         rescue ::Bundler::GemNotFound => e
           puts "Error: #{e.message}"
           puts 'Did you bundle install your Gemfile?'
-          raise # rubocop:disable SignalException
+          raise
         end
       end
 

data/lib/githooks/section.rb

@@ -62,7 +62,7 @@ module GitHooks
     end
 
     def completed?
-      @actions.all?(&:finished?)
+      finished? && @actions.all?(&:finished?)
     end
 
     def wait_count
@@ -76,8 +76,9 @@ 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!
+      return title.color_unknown! unless completed?
+      return title.color_failure! unless success?
+      title.color_success!
     end
 
     def key_name
@@ -89,10 +90,9 @@ module GitHooks
       begin
         time_start = Time.now
         actions.collect { |action|
-          catch(:skip) do
-            @success &= action.run
-          end
-          @success
+          @success &= action.run.tap { |r|
+            STDERR.puts "#{action.title} -> #{r.inspect}" if GitHooks.debug?
+          }
         }.all?
       ensure
         @benchmark = Time.now - time_start

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitt-githooks
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Carl P. Corliss
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: framework for building git hooks tests