rabbitt-githooks 1.3.0 → 1.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmVlMTFhYmNmYjA2YmM3NWJiMTA1YWNhMjk2MmE5ODhmZjQwZjZlYQ==
-  data.tar.gz: !binary |-
-    ZDQ3ZGMwYTI1MGY3NDc3ZmM2NTk0NGJkMjg1NjBlYWU5NTgyN2MwOQ==
+SHA1:
+  metadata.gz: d8a2ed779870b84aa9cc8d2a61a1cec2b9ce00bb
+  data.tar.gz: 74d1c181b0fb1f3ead9de7fba24cf55485d5e5fc
 SHA512:
-  metadata.gz: !binary |-
-    NDQ0YzkzNWQ4Yjc3NjQwYWYzNWQ5ZjIwZmM1MGZlOTQxYTJhNDFiODhjMTNl
-    ZWVkOGNmOTJhZmNhZGI1NjQ2ZDYxMTNiYzU5ZTA0MTFhMTUwODhkMmQ4MWZk
-    NzExZTY3MDQyNzAxMzNhMzA4MzU2YTdmOGE5YmUwOWQ1Y2E5YTI=
-  data.tar.gz: !binary |-
-    NDZiMTMyZDllMDZjZmE3Yjg2ZTcyODJiMWJkNDAzYjAxNDRjYjViYWY2ZjBm
-    YWRkNmY5MTc2ZGEyMGRlNDRiZmRiMjAzOGMyOGE0MTk5NDFhMmFlNDliODdj
-    N2I0MzI4NDY5MTkxNGFmMDhiMWIzZDFmMDA5MWE5NWVlYmFiY2I=
+  metadata.gz: 8b5aa0a35e390045e234980f8a132eb4cbf112444df25811e1d7becb50f3a79e85c25810445585743a2a79dcb324c1a50cee34c4202ccd8976fe0f4760b8e759
+  data.tar.gz: 3408b935632cb28b2c1ff13f6aacd2b83fdc407b4b3acc881ae29ed76f7d0e6b60ce8edd187fe95fc8b0b53d91b64085066451425d9a554ab0ea2b266b01959a

data/Gemfile.lock

@@ -1,43 +1,51 @@
 PATH
   remote: .
   specs:
-    rabbitt-githooks (1.3.0)
-      colorize (~> 0.5.8)
+    rabbitt-githooks (1.3.2)
+      colorize (~> 0.7.0)
       thor (~> 0.18)
 
 GEM
   remote: http://rubygems.org/
   specs:
     ast (2.0.0)
-    colorize (0.5.8)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    colorize (0.7.5)
     diff-lcs (1.2.5)
-    json (1.8.1)
-    parser (2.1.9)
+    docile (1.1.5)
+    multi_json (1.10.1)
+    parser (2.2.0.2)
       ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
+    powerpack (0.1.0)
     rainbow (2.0.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
-    rubocop (0.23.0)
-      json (>= 1.7.7, < 2)
-      parser (~> 2.1.9)
-      powerpack (~> 0.0.6)
+    rspec-mocks (2.99.3)
+    rubocop (0.29.0)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.1, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-lint (2.0.1)
+    ruby-lint (2.0.3)
       parser (~> 2.1, >= 2.1.1)
       slop (~> 3.4, >= 3.4.7)
-    ruby-progressbar (1.5.1)
-    slop (3.5.0)
+    ruby-progressbar (1.7.1)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
     thor (0.19.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
@@ -48,4 +56,6 @@ DEPENDENCIES
   rake (~> 10.1)
   rspec (~> 2.14)
   rubocop (~> 0.18)
-  ruby-lint (~> 2.0.1)
+  ruby-lint (~> 2.0)
+  simplecov (~> 0.9)
+  yard (~> 0.7)

data/Rakefile

@@ -17,3 +17,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 =end
 
 require 'bundler/gem_tasks'
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+desc 'Code coverage detail'
+task :simplecov do
+  ENV['COVERAGE'] = 'true'
+  Rake::Task['test'].execute
+end
+
+task default: :test
+
+require 'yard'
+YARD::Rake::YardocTask.new
+
+Dir['lib/tasks/*.task'].each { |t| load t }

data/bin/githooks

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 if ENV['GITHOOKS_DEV']
-  $:.unshift(File.expand_path(File.join(File.expand_path(__FILE__), '/../../lib')))
+  require 'pathname'
+  $:.unshift Pathname.new(__FILE__).dirname.parent.join('lib').realpath.to_s
 end
 require 'githooks'
 

data/bin/githooks-runner

@@ -1,8 +1,16 @@
 #!/usr/bin/env ruby
-# rubocop:disable Style/FileName
+# rubocop:disable FileName
 
 if ENV['GITHOOKS_DEV']
-  $:.unshift(File.expand_path(File.join(File.expand_path(__FILE__), '/../../lib')))
+  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
+  )
 end
 require 'githooks'
 

data/lib/githooks.rb

@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 require 'pathname'
 require 'githooks/error'
 require 'githooks/core_ext'
+require 'githooks/core_ext/colorize'
 require 'githooks/version'
 
 module GitHooks
@@ -35,7 +36,6 @@ module GitHooks
   autoload :Repository,     'githooks/repository'
   autoload :Runner,         'githooks/runner'
   autoload :SystemUtils,    'githooks/system_utils'
-  autoload :TerminalColors, 'githooks/terminal_colors'
 
   class << self
     attr_reader :debug, :verbose, :ignore_script
@@ -74,13 +74,17 @@ module GitHooks
     end
   end
 
-  LIB_PATH = Pathname.new(__FILE__).dirname.realpath
-  GEM_PATH = LIB_PATH.parent
-  BIN_PATH = GEM_PATH + 'bin'
+  SUCCESS_SYMBOL = '✓'.success! unless defined? SUCCESS_SYMBOL
+  FAILURE_SYMBOL = 'X'.failure! unless defined? FAILURE_SYMBOL
+  UNKNOWN_SYMBOL = '?'.unknown! unless defined? UNKNOWN_SYMBOL
 
-  SCRIPT_PATH = Pathname.new($0)
-  SCRIPT_NAME = SCRIPT_PATH.basename.to_s
-  HOOK_NAME   = SCRIPT_NAME.to_s
+  LIB_PATH = Pathname.new(__FILE__).dirname.realpath unless defined? LIB_PATH
+  GEM_PATH = LIB_PATH.parent                         unless defined? GEM_PATH
+  BIN_PATH = GEM_PATH.join('bin')                    unless defined? BIN_PATH
+
+  SCRIPT_PATH = Pathname.new($0)          unless defined? SCRIPT_PATH
+  SCRIPT_NAME = SCRIPT_PATH.basename.to_s unless defined? SCRIPT_NAME
+  HOOK_NAME   = SCRIPT_NAME.to_s          unless defined? HOOK_NAME
 
   if ARGV.include? '--ignore-script'
     ARGV.delete('--ignore-script')

data/lib/githooks/action.rb

@@ -17,14 +17,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 =end
 
-require 'stringio'
-require 'open3'
 require 'set'
+require 'stringio'
+require 'colorize'
+require_relative 'repository'
 
 module GitHooks
-  class Action # rubocop:disable Style/ClassLength
-    include TerminalColors
-
+  class Action # rubocop:disable Metrics/ClassLength
     attr_reader :title, :section, :on, :limiters
     attr_reader :success, :errors, :warnings, :benchmark
     private :section, :on
@@ -55,9 +54,9 @@ module GitHooks
       status_colorize title
     end
 
-    def state_symbol
-      return status_colorize('?') unless finished?
-      status_colorize success? ? '✓' : 'X'
+    def status_symbol
+      return GitHooks::UNKNOWN_SYMBOL unless finished?
+      success? ? GitHooks::SUCCESS_SYMBOL : GitHooks::FAILURE_SYMBOL
     end
 
     %w(finished running waiting).each do |method|
@@ -66,42 +65,61 @@ module GitHooks
     end
 
     def status_colorize(text)
-      return color_dark_cyan(text) unless finished?
-      success? ? color_bright_green(text) : color_bright_red(text)
+      return text.unknown! unless finished?
+      success? ? text.success! : text.failure!
+    end
+
+    def run # rubocop:disable MethodLength, AbcSize
+      running!
+      with_benchmark do
+        with_captured_output {
+          begin
+            @success &= @on.call
+          rescue StandardError => e
+            $stderr.puts "Exception thrown during action call: #{e.class.name}: #{e.message}"
+            if GitHooks.debug?
+              $stderr.puts "#{e.class}: #{e.message}:\n\t#{e.backtrace.join("\n\t")}"
+            else
+              hooks_files = e.backtrace.select! { |line| line =~ %r{/hooks/} }
+              hooks_files.collect! { |line| line.split(':')[0..1].join(':') }
+              $stderr.puts "  -> in hook file:line, #{hooks_files.join("\n\t")}" unless hooks_files.empty?
+            end
+            @success = false
+          ensure
+            finished!
+          end
+        }
+      end
     end
 
-    def run # rubocop:disable MethodLength
-      warnings, errors = StringIO.new, StringIO.new
+    def with_captured_output(&_block)
+      fail ArgumentError, 'expected block, none given' unless block_given?
 
       begin
-        running!
-        $stdout, $stderr = warnings, errors
-        time_start = Time.now
-        @success &= @on.call
-      rescue => error
-        errors.puts "Exception thrown during action call: #{error.class.name}: #{error.message}"
-
-        if !GitHooks.debug?
-          hooks_files = error.backtrace.select! { |line| line =~ %r{/hooks/} }
-          hooks_files.collect! { |line| line.split(':')[0..1].join(':') }
-          errors.puts "  -> in hook file:line, #{hooks_files.join("\n\t")}" unless hooks_files.empty?
-        else
-          errors.puts "\t#{error.backtrace.join("\n\t")}"
-        end
-
-        @success = false
+        $stdout = warnings = StringIO.new
+        $stderr = errors   = StringIO.new
+        yield
       ensure
-        @benchmark = Time.now - time_start
-        @errors, @warnings = [errors, warnings].collect do |io|
-          io.rewind
-          io.read.split(/\n/)
-        end
-
-        $stdout, $stderr = STDOUT, STDERR
-        finished!
+        @errors   = errors.rewind && errors.read.split(/\n/)
+        @warnings = warnings.rewind && warnings.read.split(/\n/)
+        $stdout   = STDOUT
+        $stderr   = STDERR
       end
+    end
+
+    def with_benchmark(&_block)
+      fail ArgumentError, 'expected block, none given' unless block_given?
+      begin
+        start_time = Time.now
+        yield
+      ensure
+        @benchmark = Time.now - start_time
+      end
+    end
 
-      @success
+    def respond_to_missing?(method, include_private = false)
+      return super unless section.hook.find_command(method)
+      true
     end
 
     def method_missing(method, *args, &block)
@@ -123,15 +141,15 @@ module GitHooks
     end
 
     def on_all_files(&block)
-      @on = ->() { block.call manifest }
+      @on = -> { block.call manifest }
     end
 
     def on_argv(&block)
-      @on = ->() { block.call section.hook.args }
+      @on = -> { block.call section.hook.args }
     end
 
     def on(*args, &block)
-      @on = ->() { block.call(*args) }
+      @on = -> { block.call(*args) }
     end
 
   private
@@ -141,19 +159,15 @@ module GitHooks
     end
 
     def run_command(command, *args, &block)
-      options = args.extract_options
-      prefix  = options.delete(:prefix_output)
-      args << options
-
-      command.execute(*args, &block).tap do |res|
-        res.output.split(/\n/).each do |line|
-          $stdout.puts prefix ? "#{prefix}: #{line}" : line
-        end
-
-        res.error.split(/\n/).each do |line|
-          $stderr.puts prefix ? "#{prefix}: #{line}" : line
-        end
-      end.status.success?
+      prefix = nil
+      args.extract_options.tap { |options|
+        prefix = options.delete(:prefix_output)
+      }
+
+      result = command.execute(*args, &block)
+      result.output_lines(prefix).each { |line| puts line }
+      result.error_lines(prefix).each { |line| puts line }
+      result.status.success?
     end
   end
 end

data/lib/githooks/cli.rb

@@ -1,9 +1,12 @@
 require 'thor'
+require_relative 'hook'
+require_relative 'runner'
 
 module GitHooks
   module CLI
     autoload :Config, 'githooks/commands/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
@@ -18,7 +21,7 @@ module GitHooks
       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,
-        desc: 'Path to repo to run tests on',
+        desc: 'hooks to attach',
         enum: Hook::VALID_PHASES,
         default: Hook::VALID_PHASES
       }
@@ -27,7 +30,7 @@ module GitHooks
         GitHooks.debug = !!options['debug']
 
         unless options['script'] || options['path']
-          fail ArgumentError, %q|Neither 'path' nor 'script' were specified - please provide at least one.|
+          fail ArgumentError, %q"Neither 'path' nor 'script' were specified - please provide at least one."
         end
 
         Runner.attach(options)
@@ -72,9 +75,9 @@ module GitHooks
       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 :'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(*args)
+      def execute
         GitHooks.verbose = !!options['verbose']
         GitHooks.debug = !!options['debug']
 
@@ -82,10 +85,10 @@ module GitHooks
 
         if opts['staged']
           if opts['tracked']
-            warn %q|--tracked conflicts with --staged. Dropping --tracked...|
+            warn '--tracked conflicts with --staged. Dropping --tracked...'
             opts['tracked'] = false
           elsif opts['untracked']
-            warn %q|--untracked conflicts with --staged. Dropping --untracked...|
+            warn '--untracked conflicts with --staged. Dropping --untracked...'
             opts['untracked'] = false
           end
         end

data/lib/githooks/commands/config.rb

@@ -1,3 +1,6 @@
+require 'thor'
+require 'githooks/repository'
+
 module GitHooks
   module CLI
     class Config < Thor
@@ -19,26 +22,30 @@ module GitHooks
       }
 
       desc :get, 'display the value for a configuration option'
-      def get(option_name) # rubocop:disable MethodLength
+      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(', ')}"
           return 1
         end
 
-        GitHooks.verbose = true if options['verbose']
-        GitHooks.debug = true if options['debug']
+        GitHooks.verbose = !!options['verbose']
+        GitHooks.debug   = !!options['debug']
         options['repo'] ||= GitHooks::Repository.root_path
 
         repo_data = GitHooks::Repository::Config.new.get(
           option_name,
-          repo_path: options['repo'], global: options['global']
+          repo_path: options['repo'],
+          global: options['global']
         )
+
         if repo_data.nil?
           puts "Repository [#{options['repo']}] option '#{option_name}' is currently not set."
           return
         end
-        [repo_data].flatten.each do |value|
-          puts "#{option_name}: #{value || 'not set'}"
+
+        Array(repo_data).flatten.each do |value|
+          value ||= 'not set'
+          puts "#{option_name}: #{value}"
         end
       end
 
@@ -49,9 +56,9 @@ module GitHooks
         desc: 'overwrite all existing values.',
         default: false
       }
-      def set(option_name, option_value)
-        GitHooks.verbose = true if options['verbose']
-        GitHooks.debug = true if options['debug']
+      def set(option_name, option_value) # rubocop:disable AbcSize
+        GitHooks.verbose = !!options['verbose']
+        GitHooks.debug   = !!options['debug']
         options['repo'] ||= GitHooks::Repository.root_path
 
         GitHooks::Repository::Config.new.set(
@@ -66,9 +73,9 @@ module GitHooks
       end
 
       desc :unset, 'Unsets a configuration value'
-      def unset(option_name, option_value = nil)
-        GitHooks.verbose = true if options['verbose']
-        GitHooks.debug = true if options['debug']
+      def unset(option_name, option_value = nil) # rubocop:disable AbcSize
+        GitHooks.verbose = !!options['verbose']
+        GitHooks.debug   = !!options['debug']
         options['repo'] ||= GitHooks::Repository.root_path
 
         GitHooks::Repository::Config.new.unset(
@@ -82,25 +89,25 @@ module GitHooks
       end
 
       desc :list, 'Lists all githooks configuration values'
-      def list
-        puts options.inspect
-
-        GitHooks.verbose = true if options['verbose']
-        GitHooks.debug = true if options['debug']
+      def list # rubocop:disable AbcSize
+        GitHooks.verbose = !!options['verbose']
+        GitHooks.debug   = !!options['debug']
 
         options['repo'] ||= GitHooks::Repository.root_path
         config = GitHooks::Repository::Config.new
 
         githooks = config.list(global: options['global'], repo_path: options['repo'])['githooks']
+        return unless githooks
+
         githooks.each do |path, data|
           puts "Repository #{path}:"
-          key_size, value_size = data.keys.collect(&:size).max, data.values.collect(&:size).max
+          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
             end
           end
-        end if githooks
+        end
       end
     end
   end