git-hooks-helper 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1 @@
-gitt-hooks-helper-*.gem
+git-hooks-helper-*.gem

data/Gemfile.lock

@@ -1,30 +1,13 @@
 PATH
   remote: .
   specs:
-    git-hooks-helper (0.0.1)
-      rails-erb-check
-      rails_best_practices
+    git-hooks-helper (0.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionpack (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
     activesupport (3.0.11)
-    builder (2.1.2)
     coderay (0.9.8)
     colored (1.2)
     diff-lcs (1.1.3)
@@ -39,13 +22,6 @@ GEM
       method_source (~> 0.6.7)
       ruby_parser (>= 2.3.1)
       slop (~> 2.1.0)
-    rack (1.2.4)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails-erb-check (0.1.0)
-      actionpack (~> 3.0)
     rails_best_practices (1.3.0)
       activesupport
       colored
@@ -65,7 +41,6 @@ GEM
       sexp_processor (~> 3.0)
     sexp_processor (3.0.10)
     slop (2.1.0)
-    tzinfo (0.3.31)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,15 +1,53 @@
-#!/usr/bin/env ruby
+Instalation
+-----------
+  gem install git-hooks-helper
 
-require "git-hooks-helper"
+File clasification
+------------------
 
-GitHooksHelper.results do
-  do_not_stop_on_warnings
+Most commands use file classes internally or accept type class as a param.
+File type classes and associated file extensions:
 
-  check_ruby_syntax
-  check_erb
-  check_best_practices
-  warning_on "WTF?", "binding.pry", "<<<<<<<"
-  warning_on "console.log", "debugger", {:in => [:js]}
+1. :rb  - .rb .rake .task .prawn
+2. :js  - .js
+3. :erb - .erb
 
-  info "Run rspec tests and have a nice day."
-end
+Usage
+-----
+Create your hit hook in .git/hooks directory and make it executable.
+
+My example pre-commit hook that i use myself.
+To create such a hook type in console:
+
+  cd your/project/
+  touch .git/hooks/pre-commit
+  chmod +x .git/hooks/pre-commit
+  vim .git/hooks/pre-commit
+
+and paste following code:
+
+
+```ruby
+  #!/usr/bin/env ruby
+
+  require "git-hooks-helper"
+
+  GitHooksHelper.results do
+    # fail/pass options
+    # stop_on_warnings                                   # makes git commit fail if any warnings are found
+    # never_stop                                         # hooks never fails commits
+    # list_files                                         # shows list of all changed files
+
+    # checks
+    check_ruby_syntax                                    # errors when ruby syntax has errors
+    check_erb                                            # errors when ERB syntax has errors
+    check_best_practices                                 # warnings when ruby best practices are violated
+    warning_on "WTF?", "binding.pry", "<<<<<<<"          # warnings when any of these texts are present in any commited files
+    warning_on "console.log", "debugger", {:in => [:js]} # warning when any of these texts are present in JS files
+
+    # messages
+    info   "Run rspec tests and have a nice day."        # Green text
+    notice "Or bad things will happen"                   # Yellow text
+    warn   "Cthulhu"                                     # Red text
+  end
+```

data/TODO

@@ -0,0 +1,2 @@
+1. 
+1. Add project to TravisCI

data/git-hooks-helper.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "git-hooks-helper"
   s.version     = GitHooksHelper::VERSION
   s.authors     = ["Martynas Margis"]
-  s.email       = []
-  s.homepage    = ""
+  s.email       = ["no@email.com"]
+  s.homepage    = "https://github.com/BuGo/git-hooks-helper"
   s.summary     = %q{Small gem to help write simple git hooks}
   s.description = %q{Gem for creating simple git hooks in ruby.}
 
@@ -18,6 +18,5 @@ Gem::Specification.new do |s|
 #  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "rails-erb-check"
-  s.add_runtime_dependency "rails_best_practices"
+  # s.add_runtime_dependency "open3"
 end

data/lib/git-hooks-helper/git.rb

@@ -1,10 +1,11 @@
 module GitHooksHelper
   class Git
     class << self
-      FILES_TO_WATCH = /(.+\.(e?rb|task|rake|thor|prawn)|[Rr]akefile|[Tt]horfile)/
+      FILES_TO_WATCH = /(.+\.(e?rb|task|rake|thor|prawn|haml|coffee)|[Rr]akefile|[Tt]horfile)/
 
       def in_index
-        `git diff-index --name-only --cached HEAD`.split("\n").select{ |file| file =~ FILES_TO_WATCH }.map(&:chomp)
+        #`git diff-index --name-only --cached HEAD`.split("\n").select{ |file| file =~ FILES_TO_WATCH }.map(&:chomp)
+        `git diff --cached --name-only --diff-filter=AM HEAD`.split("\n").map(&:chomp).select{|file| file =~ FILES_TO_WATCH}
       end
     end
   end

data/lib/git-hooks-helper/hook.rb

@@ -1,5 +1,6 @@
 require "git-hooks-helper/result"
 require "git-hooks-helper/git"
+require "git-hooks-helper/ruby"
 require "git-hooks-helper/extensions/string"
 require "open3"
 
@@ -9,17 +10,31 @@ module GitHooksHelper
     RB_REGEXP     = /\.(rb|rake|task|prawn)\z/
     ERB_REGEXP   = /\.erb\z/
     JS_REGEXP   = /\.js\z/
+    HAML_REGEXP   = /\.haml\z/
+    COFFEE_REGEXP   = /\.coffee\z/
+
+    FILETYPES = {
+      rb:     RB_REGEXP,
+      erb:    ERB_REGEXP,
+      js:     JS_REGEXP,
+      haml:   HAML_REGEXP,
+      coffee: COFFEE_REGEXP
+    }
 
     RB_WARNING_REGEXP  = /[0-9]+:\s+warning:/
+    HAML_INVALID_REGEXP = /error/
     ERB_INVALID_REGEXP = /invalid\z/
     COLOR_REGEXP = /\e\[(\d+)m/
 
     # Set this to true if you want warnings to stop your commit
     def initialize(&block)
-      @compiler_ruby = `which ruby`.strip
+      @ruby = GitHooksHelper::Ruby.new
+      @debug = false
 
       @result = GitHooksHelper::Result.new(false)
-      @changed_ruby_files = GitHooksHelper::Git.in_index
+      @changed_files = GitHooksHelper::Git.in_index
+      debug("changed files")
+      debug @changed_files
 
       instance_eval(&block) if block
 
@@ -54,6 +69,14 @@ module GitHooksHelper
       end
     end
 
+    def start_debug
+      @debug = true
+    end
+
+    def stop_debug
+      @debug = false
+    end
+
     def stop_on_warnings
       @result.stop_on_warnings = true
     end
@@ -67,25 +90,37 @@ module GitHooksHelper
     end
 
     def list_files(filetypes = [:all])
+      puts "--- Listing files of type: #{filetypes}"
       each_changed_file(filetypes) do |file|
         puts file
       end
+      puts "--- End of list"
     end
 
     def each_changed_file(filetypes = [:all])
+      filetypes = [filetypes] unless filetypes.class == Array
       if @result.continue?
-        @changed_ruby_files.each do |file|
-          unless filetypes.include?(:all)
-            next unless (filetypes.include?(:rb) and file =~ RB_REGEXP) or (filetypes.include?(:erb) and file =~ ERB_REGEXP) or (filetypes.include?(:js) and file =~ JS_REGEXP)
-          end
+        debug("Can continue")
+        @changed_files.each do |file|
+          next unless file_matches_filetypes?(file, filetypes)
           yield file if File.readable?(file)
         end
+      else
+        debug("Cannot continue")
+      end
+    end
+
+    def file_matches_filetypes?(file, filetypes)
+      return true if filetypes.include?(:all)
+      filetypes.each do |type|
+        return true if file =~ FILETYPES[type]
       end
+      return false
     end
 
     def check_ruby_syntax
       each_changed_file([:rb]) do |file|
-        Open3.popen3("#{@compiler_ruby} -wc #{file}") do |stdin, stdout, stderr|
+        Open3.popen3(GitHooksHelper::Ruby.check_syntax(file)) do |stdin, stdout, stderr|
           stderr.read.split("\n").each do |line|
             line =~ RB_WARNING_REGEXP ? @result.warnings << line : @result.errors << line
           end
@@ -101,10 +136,17 @@ module GitHooksHelper
       end
     end
 
+    def check_haml
+      each_changed_file([:haml]) do |file|
+        popen3("haml --check #{file}") do |stdin, stdout, stderr|
+          @result.errors.concat stderr.read.split("\n").map{|line| "#{file} => invalid HAML syntax\n#{line}" if line.gsub(COLOR_REGEXP, '') =~ HAML_INVALID_REGEXP}.compact
+        end
+      end
+    end
+
     def check_best_practices
-      each_changed_file([:rb, :erb]) do |file|
-        puts "bundle exec rails_best_practices --spec --test #{file}"
-        Open3.popen3("bundle exec rails_best_practices --spec --test #{file}") do |stdin, stdout, stderr|
+      each_changed_file([:rb, :erb, :haml]) do |file|
+        Open3.popen3("rails_best_practices --spec --test #{file}") do |stdin, stdout, stderr|
           @result.warn(stdout.read.split("\n").map do |line|
             if line =~ /#{file}/
               line.gsub(COLOR_REGEXP, '').strip
@@ -141,5 +183,9 @@ module GitHooksHelper
       puts(text.red)
     end
 
+    def debug(msg)
+      puts msg if @debug
+    end
+
   end
 end

data/lib/git-hooks-helper/ruby.rb

@@ -0,0 +1,8 @@
+module GitHooksHelper
+  class Ruby
+    def self.check_syntax(file)
+      @compiler_ruby = `which ruby`.strip
+      "#{@compiler_ruby} -wc #{file}"
+    end
+  end
+end

data/lib/git-hooks-helper/version.rb

@@ -1,3 +1,3 @@
 module GitHooksHelper
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-hooks-helper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,32 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails-erb-check
-  requirement: &19072720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *19072720
-- !ruby/object:Gem::Dependency
-  name: rails_best_practices
-  requirement: &19071260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *19071260
+date: 2012-04-16 00:00:00.000000000 Z
+dependencies: []
 description: Gem for creating simple git hooks in ruby.
-email: []
+email:
+- no@email.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -44,15 +23,16 @@ files:
 - Gemfile.lock
 - HISTORY
 - LICENSE
-- README
 - README.md
 - Rakefile
+- TODO
 - git-hooks-helper.gemspec
 - lib/git-hooks-helper.rb
 - lib/git-hooks-helper/extensions/string.rb
 - lib/git-hooks-helper/git.rb
 - lib/git-hooks-helper/hook.rb
 - lib/git-hooks-helper/result.rb
+- lib/git-hooks-helper/ruby.rb
 - lib/git-hooks-helper/version.rb
 - spec/git_files/bad_syntax.rb
 - spec/git_files/good_syntax.rb
@@ -62,7 +42,7 @@ files:
 - spec/git_files/syntax_error.html.erb
 - spec/git_hooks_helper_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/BuGo/git-hooks-helper
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -82,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: git-hooks-helper
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Small gem to help write simple git hooks

data/README

@@ -1,50 +0,0 @@
-Instalation
------------
-  gem install git-hooks-helper
-
-File clasification
-------------------
-
-Most commands use file classes internally or accept type class as a param.
-File type classes and associated file extensions:
-1. :rb  - .rb .rake .task .prawn
-2. :js  - .js
-3. :erb - .erb
-
-Usage
------
-Create your hit hook in .git/hooks directory and make it executable.
-
-My example pre-commit hook that i use myself.
-To create such a hook type in console:
-
-  cd your/project/
-  touch .git/hooks/pre-commit
-  chmod +x .git/hooks/pre-commit
-  vim .git/hooks/pre-commit
-
-and paste following code:
-
-
-```ruby
-  #!/usr/bin/env ruby
-
-  require "git-hooks-helper"
-
-  GitHooksHelper.results do
-    # fail/pass options
-    # stop_on_warnings                                   # makes git commit fail if any warnings are found
-    # never_stop                                         # hooks never fails commits
-    # list_files                                         # shows list of all changed files
-
-    # schecks
-    check_ruby_syntax                                    # errors when ruby syntax has errors
-    check_erb                                            # errors when ERB syntax has errors
-    check_best_practices                                 # warnings when ruby best practices are violated
-    warning_on "WTF?", "binding.pry", "<<<<<<<"          # warnings when any of these texts are present in any commited files
-    warning_on "console.log", "debugger", {:in => [:js]} # warning when any of these texts are present in JS files
-
-    # messages
-    info "Run rspec tests and have a nice day."
-  end
-```