pre-commit 0.1.1 → 0.1.2

data/lib/pre-commit/checks.rb

@@ -1,6 +1,9 @@
 require 'support/all'
 require 'pre-commit/utils'
 require 'pre-commit/checks/merge_conflict'
+require 'pre-commit/checks/tabs'
+require 'pre-commit/checks/console_log'
+require 'pre-commit/checks/debugger_check'
 
 class PreCommit
 
@@ -8,47 +11,6 @@ class PreCommit
     WhiteSpaceChecker.check
   }
 
-  ConsoleLog = lambda {
-    
-    if File.exists?('public/javascripts') && (args = Utils.staged_files('public/javascripts')).size > 0
-      if system("git grep -n -q \"console\.log\" #{args}")
-        puts "\n[ERROR] console.log found:"
-        !system("git grep -n \"console\.log\" #{args}")
-      else
-        true
-      end
-    else
-      true
-    end
-  }
-
-  Debugger = lambda {
-    dirs = ['app/', 'lib/', 'script/', 'vendor/', 'test/'].reject {|d| !File.exists?(d)}
-    if dirs.size > 0 && (args = Utils.staged_files(dirs)).size > 0
-      if system("git grep -n -q debugger #{args}") 
-        puts "\n[ERROR] debugger statement(s) found:"
-        !system("git grep -n debugger #{args}") 
-      else
-        true
-      end
-    else
-      true
-    end
-  }
-
-  Tabs = lambda {
-    if (files = Utils.staged_files('*')).size > 0
-      if system("grep -PnH -q '^\t' #{files}")
-        puts "\n[ERROR] tab before initial space:"
-        !system("grep -PnH '^\t' #{files}")
-      else
-        true
-      end
-    else
-      true
-    end
-  }
-
   ClosureSyntaxCheck = lambda {
     compiler = "test/javascript/lib/compiler.jar"
 
@@ -88,12 +50,17 @@ class PreCommit
     :console_log          => ConsoleLog,
     :js_lint_all          => JSLintAll,
     :js_lint_new          => JSLintNew,
-    :debugger             => Debugger,
+    :debugger             => DebuggerCheck,
     :tabs                 => Tabs,
     :closure_syntax_check => ClosureSyntaxCheck,
     :merge_conflict       => MergeConflict
   }
 
+  # Can not delete this method with out a deprecation strategy.
+  # It is refered to in the generated pre-commit hook in versions 0.0-0.1.1
+  #
+  # NOTE: The deprecation strategy *may* be just delete it since, we're still
+  # pre 1.0.
   def self.checks_to_run
     checks_to_run = `git config pre-commit.checks`.chomp.split(/,\s*/).map(&:to_sym)
 

data/lib/pre-commit/checks/console_log.rb

@@ -0,0 +1,35 @@
+class ConsoleLog
+
+  attr_accessor :staged_files, :error_message
+
+  def self.call(quiet=false)
+    check = new
+    check.staged_files = Utils.staged_files('public/javascripts')
+
+    result = check.run
+    if !quiet && !result
+      puts check.error_message
+    end
+    result
+  end
+
+  def run
+    return true if staged_files.empty?
+    if detected_bad_code?
+      @error_message = "pre-commit: console.log found:\n"
+      @error_message += instances_of_console_log_violations
+      false
+    else
+      true
+    end
+  end
+
+  def detected_bad_code?
+    system("grep -q 'console.log' #{staged_files}")
+  end
+
+  def instances_of_console_log_violations
+    `grep -nH 'console.log' #{staged_files}`
+  end
+
+end

data/lib/pre-commit/checks/debugger_check.rb

@@ -0,0 +1,38 @@
+class DebuggerCheck
+  attr_accessor :staged_files, :error_message, :grep_command
+
+  def self.call(quiet=false)
+    dirs = ['app/', 'lib/', 'script/', 'vendor/', 'test/'].reject {|d| !File.exists?(d)}
+    check = new
+    check.staged_files = Utils.staged_files(*dirs)
+
+    result = check.run
+    if !quiet && !result
+      $stderr.puts check.error_message
+    end
+    result
+  end
+
+  def run
+    return true if staged_files.empty?
+
+    if detected_bad_code?
+      @error_message = "pre-commit: debugger statement found:\n"
+      @error_message += instances_of_debugger_violations
+      false
+    else
+      true
+    end
+  end
+
+  def detected_bad_code?
+    cmd = grep_command || "git grep"
+    system("#{cmd} -nH -q debugger #{staged_files}")
+  end
+
+  def instances_of_debugger_violations
+    cmd = grep_command || "git grep"
+    `#{cmd} -nH debugger #{staged_files}`
+  end
+
+end

data/lib/pre-commit/checks/tabs.rb

@@ -0,0 +1,39 @@
+class Tabs
+
+  attr_accessor :staged_files, :error_message
+
+  # Maintaining the functionality of `call` for backwards compatibility
+  # Currently, the call method is expected to:
+  # * run a check
+  # * print any corresponding error messages if the check fails
+  def self.call
+    check = new
+    check.staged_files = Utils.staged_files('*')
+    check.run
+  end
+
+  def run
+    return unless staged_files.size > 0
+
+    if detected_bad_code?
+      @error_message = "pre-commit: detected tab before initial space:\n"
+      @error_message += violations
+
+      $stderr.puts @error_message
+      $stderr.puts
+
+      @passed = false
+    else
+      @passed = true
+    end
+  end
+
+  def detected_bad_code?
+    system("grep -PnIH -q '^\t' #{staged_files}")
+  end
+
+  def violations
+    `grep -PnIH '^\t' #{staged_files}`
+  end
+
+end

data/lib/pre-commit/runner.rb

@@ -0,0 +1,19 @@
+class Runner
+
+  def run
+    checks_to_run = PreCommit.checks_to_run
+
+    all_passed = checks_to_run.inject(true) do |current_status, check|
+      passed = check.call
+
+      if !passed && check.respond_to?(:error_message)
+        puts check.error_message
+      end
+
+      check && current_status
+    end
+
+    exit(all_passed ? 0 : 1)
+  end
+
+end

data/lib/pre-commit/utils.rb

@@ -1,6 +1,8 @@
 class Utils
 
   def self.staged_files(*dirs)
+    dirs = reject_missing(dirs)
+
     @staged_files ||= {}
     @staged_files[dirs.join(' ')] ||= `git diff --cached --name-only --diff-filter=ACM #{dirs.join(' ')} | xargs`.chomp
   end
@@ -9,5 +11,9 @@ class Utils
     @new_files ||= {}
     @new_files[dirs.join(' ')] ||= `git status --short #{dirs.join(' ')} | grep ^A | xargs`.chomp.split("A ").join(" ")
   end
-  
+
+  def self.reject_missing(dirs)
+    dirs.reject { |dir| !File.exist?(dir) }
+  end
+
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pre-commit
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Shajith Chacko, Josh Lubaway
@@ -27,8 +28,12 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- lib/pre-commit/checks/console_log.rb
+- lib/pre-commit/checks/debugger_check.rb
 - lib/pre-commit/checks/merge_conflict.rb
+- lib/pre-commit/checks/tabs.rb
 - lib/pre-commit/checks.rb
+- lib/pre-commit/runner.rb
 - lib/pre-commit/utils.rb
 - lib/pre-commit.rb
 - lib/support/all.rb
@@ -55,6 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -63,6 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"