overcommit 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d7eb3f46bb777b61a7691c1eef669daf7993b5
-  data.tar.gz: cf0dc9b2c995254856a82ddf449d271a1d886d8c
+  metadata.gz: 1c7ae9be51eb3b0d57670dc28a29c359ec89c040
+  data.tar.gz: 6830fbb57c870026962e5ea7b98b74a2ae69ca78
 SHA512:
-  metadata.gz: f0fa19bb49c780b3d0a89d3488458339ed81bd20a2d26dc1e9a85f8f26dd3e6c315a75c3e9e1eafd627f09725062450b8a5da0b29ab07e6567b78bd1772a54aa
-  data.tar.gz: ffbbb87fadc8db06a91fbf052954a13e7d68063935225ff6480b834599ef3a70945f80903dbf6a5d7756170eb559db0c74d296b13c9502380b209dfdaade2add
+  metadata.gz: faa4abb76a1d4b681b29bcdf0bfa84d9d55498fd8e472bc654ffd4ce7dd3edbcd49da126f1299ca49efc519f7310b023afb7229c2d03a9ca0b2535eb92ee0f15
+  data.tar.gz: 817e12dcedd4b6a624fb9eb5203443fd81279d130f37a65613e30126e71d8337a51f65d6e85a3f930a4d5aa7c13d13c940053851da47793d4bfa536f84021558

data/lib/overcommit.rb

@@ -1,9 +1,9 @@
 require 'overcommit/configuration'
-require 'overcommit/console_methods'
 require 'overcommit/errors'
 require 'overcommit/git_hook'
 require 'overcommit/hook_specific_check'
 require 'overcommit/installer'
+require 'overcommit/logger'
 require 'overcommit/reporter'
 require 'overcommit/utils'
 require 'overcommit/version'

data/lib/overcommit/cli.rb

@@ -2,7 +2,6 @@ require 'optparse'
 
 module Overcommit
   class CLI
-    include ConsoleMethods
     attr_reader :options
 
     def initialize(arguments = [])
@@ -19,14 +18,14 @@ module Overcommit
         end
 
         opts.on_tail('-v', '--version', 'Show version') do
-          puts VERSION
+          log.log VERSION
           exit 0
         end
 
         opts.on('-l', '--list-templates', 'List built-in templates') do
           Overcommit.config.templates.each_pair do |name, configuration|
             bold name
-            puts YAML.dump(configuration), ''
+            log.log YAML.dump(configuration), ''
           end
           exit 0
         end
@@ -80,8 +79,8 @@ module Overcommit
 
     def run
       if @options[:targets].nil? || @options[:targets].empty?
-        warning 'You must supply at least one directory'
-        puts @parser.help
+        log.warning 'You must supply at least one directory'
+        log.log @parser.help
         exit 2
       end
 
@@ -89,11 +88,11 @@ module Overcommit
         begin
           Installer.new(@options, target).run
         rescue NotAGitRepoError => e
-          warning "Skipping #{target}: #{e}"
+          log.warning "Skipping #{target}: #{e}"
         end
       end
 
-      success "#{@options[:uninstall] ? 'Removal' : 'Installation'} complete"
+      log.success "#{@options[:uninstall] ? 'Removal' : 'Installation'} complete"
 
     rescue ArgumentError => ex
       error "Installation failed: #{ex}"
@@ -102,9 +101,13 @@ module Overcommit
 
   private
 
+    def log
+      Logger.instance
+    end
+
     def print_help(message, ex = nil)
-      error ex.to_s + "\n" if ex
-      puts message
+      log.error ex.to_s + "\n" if ex
+      log.log message
       exit 0
     end
   end

data/lib/overcommit/configuration.rb

@@ -22,7 +22,7 @@ module Overcommit
     # Given the current configuration, return a set of paths which should be
     # loaded as plugins (`require`d)
     def desired_plugins
-      excludes = repo_settings['excludes']
+      excludes = repo_settings['excludes'] || {}
 
       plugin_directories.map do |dir|
         Dir[File.join(dir, Utils.hook_name, '*.rb')].map do |plugin|

data/lib/overcommit/git_hook.rb

@@ -1,14 +1,12 @@
 module Overcommit
   module GitHook
     class BaseHook
-      include ConsoleMethods
-
       def initialize
         Overcommit.config.desired_plugins.each do |plugin|
           require plugin
         end
-      rescue NameError => ex
-        error "Couldn't load plugin: #{ex}"
+      rescue LoadError, NameError => ex
+        log.error "Couldn't load plugin: #{ex}"
         exit 0
       end
 
@@ -39,8 +37,16 @@ module Overcommit
         reporter.print_result
       end
 
+      def skip_checks
+        @skip_checks ||= ENV.fetch('SKIP_CHECKS', '').split(/[:, ]/)
+      end
+
     private
 
+      def log
+        Logger.instance
+      end
+
       # Return all loaded plugins, skipping those that are skippable and have
       # been asked to be skipped by the environment variable SKIP_CHECKS.
       #
@@ -48,10 +54,9 @@ module Overcommit
       # `ENV['SKIP_CHECKS'] == 'all'`
       def registered_checks
         @registered_checks ||= begin
-          skip_checks = ENV.fetch('SKIP_CHECKS', '').split(/[:, ]/)
-          skip_all    = skip_checks.include? 'all'
+          skip_all = skip_checks.include? 'all'
           HookRegistry.checks.reject do |check|
-            hook_name = Utils.underscorize check.name
+            hook_name = Utils.underscorize(check.name).split('/').last
 
             check.skippable? && (skip_all || skip_checks.include?(hook_name))
           end

data/lib/overcommit/installer.rb

@@ -14,7 +14,7 @@ module Overcommit
     end
 
     def install
-      puts "Installing hooks into #{@target}"
+      log.log "Installing hooks into #{@target}"
 
       install_scripts
       install_hooks
@@ -22,7 +22,7 @@ module Overcommit
     end
 
     def uninstall
-      puts "Removing hooks from #{@target}"
+      log.log "Removing hooks from #{@target}"
 
       uninstall_scripts
       uninstall_hooks
@@ -31,6 +31,10 @@ module Overcommit
 
   private
 
+    def log
+      Logger.instance
+    end
+
     def hook_path
       absolute_target = File.expand_path @target
       File.join(absolute_target, '.git/hooks')

data/lib/overcommit/logger.rb

@@ -0,0 +1,36 @@
+require 'singleton'
+
+# This class centralizes all communication to STDOUT
+module Overcommit
+  class Logger
+    include Singleton
+
+    def partial(*args)
+      print *args
+    end
+
+    def log(*args)
+      puts *args
+    end
+
+    def bold(str)
+      log "\033[1;37m#{str}\033[0m"
+    end
+
+    def error(str)
+      log "\033[31m#{str}\033[0m"
+    end
+
+    def success(str)
+      log "\033[32m#{str}\033[0m"
+    end
+
+    def warning(str)
+      log "\033[33m#{str}\033[0m"
+    end
+
+    def notice(str)
+      log "\033[1;33m#{str}\033[0m"
+    end
+  end
+end

data/lib/overcommit/reporter.rb

@@ -1,7 +1,5 @@
 module Overcommit
   class Reporter
-    include ConsoleMethods
-
     def initialize(name, checks)
       @name    = name
       @checks  = checks
@@ -11,7 +9,7 @@ module Overcommit
 
     def with_status(check, &block)
       title = "  Checking #{check.name}..."
-      print title unless check.stealth?
+      log.partial title unless check.stealth?
 
       status, output = yield
 
@@ -20,48 +18,53 @@ module Overcommit
     end
 
     def print_header
-      puts "Running #{@name} checks"
+      log.log "Running #{@name} checks"
     end
 
     def print_result
-      puts
+      log.log # Newline
+
       case final_result
       when :good
-        success "+++ All #{@name} checks passed"
+        log.success "+++ All #{@name} checks passed"
         exit 0
       when :bad
-        error "!!! One or more #{@name} checks failed"
+        log.error "!!! One or more #{@name} checks failed"
         exit 1
       when :stop
-        warning "*** One or more #{@name} checks needs attention"
-        warning "*** If you really want to commit, use SKIP_CHECKS"
-        warning "*** (takes a space-separated list of checks to skip, or 'all')"
+        log.warning "*** One or more #{@name} checks needs attention"
+        log.warning "*** If you really want to commit, use SKIP_CHECKS"
+        log.warning "*** (takes a space-separated list of checks to skip, or 'all')"
         exit 1
       end
     end
 
   private
 
+    def log
+      Overcommit::Logger.instance
+    end
+
     def print_incremental_result(title, status, output, stealth = false)
       if stealth
         return if status == :good
-        print title
+        log.partial title
       end
 
       print '.' * (@width - title.length)
       case status
       when :good
-        success 'OK'
+        log.success 'OK'
       when :bad
-        error 'FAILED'
+        log.error 'FAILED'
         print_report output
       when :warn
-        warning output
+        log.warning output
       when :stop
-        warning 'UH OH'
+        log.warning 'UH OH'
         print_report output
       else
-        error '???'
+        log.error '???'
         print_report "Check didn't return a status"
         exit 1
       end
@@ -74,7 +77,7 @@ module Overcommit
     end
 
     def print_report(*report)
-      puts report.flatten.map { |line| "    #{line}" }.join("\n")
+      log.log report.flatten.map { |line| "    #{line}" }.join("\n")
     end
   end
 end

data/lib/overcommit/utils.rb

@@ -1,8 +1,6 @@
 module Overcommit
   module Utils
     class << self
-      include ConsoleMethods
-
       @@hooks = []
 
       def register_hook(hook)
@@ -20,7 +18,7 @@ module Overcommit
       def load_hooks
         require File.expand_path("../hooks/#{hook_name}", __FILE__)
       rescue LoadError
-        error "No hook definition found for #{hook_name}"
+        log.error "No hook definition found for #{hook_name}"
         exit 1
       end
 
@@ -55,6 +53,12 @@ module Overcommit
         @modified_files ||=
           `git diff --cached --name-only --diff-filter=ACM`.split "\n"
       end
+
+    private
+
+      def log
+        Logger.instance
+      end
     end
   end
 end

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Causes Engineering
@@ -33,13 +33,13 @@ extra_rdoc_files: []
 files:
 - lib/overcommit/cli.rb
 - lib/overcommit/configuration.rb
-- lib/overcommit/console_methods.rb
 - lib/overcommit/errors.rb
 - lib/overcommit/git_hook.rb
 - lib/overcommit/hook_specific_check.rb
 - lib/overcommit/hooks/commit_msg.rb
 - lib/overcommit/hooks/pre_commit.rb
 - lib/overcommit/installer.rb
+- lib/overcommit/logger.rb
 - lib/overcommit/plugins/commit_msg/change_id.rb
 - lib/overcommit/plugins/commit_msg/release_note.rb
 - lib/overcommit/plugins/commit_msg/russian_novel.rb

data/lib/overcommit/console_methods.rb

@@ -1,23 +0,0 @@
-module Overcommit
-  module ConsoleMethods
-    def bold(str)
-      puts "\033[1;37m#{str}\033[0m"
-    end
-
-    def error(str)
-      puts "\033[31m#{str}\033[0m"
-    end
-
-    def success(str)
-      puts "\033[32m#{str}\033[0m"
-    end
-
-    def warning(str)
-      puts "\033[33m#{str}\033[0m"
-    end
-
-    def notice(str)
-      puts "\033[1;33m#{str}\033[0m"
-    end
-  end
-end