git-hooks-helper 0.0.2 → 0.0.3

data/Gemfile

@@ -1,5 +1,11 @@
 source :rubygems
 gemspec
-gem 'rspec'
-gem 'pry'
-gem 'rails_best_practices'
+gem 'rspec', '2.6.0'
+gem 'pry', '0.9.7.4'
+gem 'rails_best_practices', '1.7.2'
+gem 'sexp_processor', '3.0.9'
+
+group :test do
+  gem 'rails-erb-check', '0.1.0'
+  gem 'slim', '1.1.0'
+end

data/Gemfile.lock

@@ -6,47 +6,83 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    activesupport (3.0.11)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
     coderay (0.9.8)
     colored (1.2)
     diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.4)
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
-    progressbar (0.9.1)
+    multi_json (1.3.6)
+    progressbar (0.9.2)
     pry (0.9.7.4)
       coderay (~> 0.9.8)
       method_source (~> 0.6.7)
       ruby_parser (>= 2.3.1)
       slop (~> 2.1.0)
-    rails_best_practices (1.3.0)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails-erb-check (0.1.0)
+      actionpack (~> 3.0)
+    rails_best_practices (1.7.2)
       activesupport
       colored
       erubis
       i18n
       progressbar
       sexp_processor
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec-mocks (2.6.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.10)
+    sexp_processor (3.0.9)
+    slim (1.1.0)
+      temple (~> 0.3.5)
+      tilt (~> 1.3.2)
     slop (2.1.0)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    temple (0.3.5)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   git-hooks-helper!
-  pry
-  rails_best_practices
-  rspec
+  pry (= 0.9.7.4)
+  rails-erb-check (= 0.1.0)
+  rails_best_practices (= 1.7.2)
+  rspec (= 2.6.0)
+  sexp_processor (= 3.0.9)
+  slim (= 1.1.0)

data/README.md

@@ -2,15 +2,26 @@ Instalation
 -----------
   gem install git-hooks-helper
 
+Dependencies
+------------
+This gem has will have no dependencies and it will be up to you to provide required and possible dependencies.
+Possible dependencies are tied to checks you want to use:
+ * check_erb - rails-erb-check
+ * check_slim - slim
+ * check_haml - haml
+ * check_best_practices - rails_best_practices
+
+
 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
+1. :rb  -  .rb .rake .task .prawn
+2. :js  -  .js
+3. :erb -  .erb
+3. :slim - .slim
 
 Usage
 -----
@@ -39,8 +50,10 @@ and paste following code:
     # 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_ruby_syntax                                    # errors when ruby syntax is invalid
+    check_erb                                            # errors when ERB syntax is invalid
+    check_slim                                           # errors when SLIM syntax is invalid
+    check_haml                                           # errors when HAML syntax is invalid
     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

data/TODO

@@ -1,2 +1,6 @@
-1. 
 1. Add project to TravisCI
+2. Check how git-hooks-helper works in completely bundled environment.
+3. Add options to ignore text in comments.
+
+ALIEN TECHNOLOGY
+4. Add possibility to check for custom code standart. 

data/git-hooks-helper.gemspec

@@ -9,9 +9,7 @@ Gem::Specification.new do |s|
   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.}
-
-  s.rubyforge_project = "git-hooks-helper"
+  s.description = %q{Gem for creating simple pre-commit git hooks in ruby.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

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

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

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

@@ -1,29 +1,33 @@
-require "git-hooks-helper/result"
-require "git-hooks-helper/git"
-require "git-hooks-helper/ruby"
-require "git-hooks-helper/extensions/string"
-require "open3"
+require 'git-hooks-helper/result'
+require 'git-hooks-helper/git'
+require 'git-hooks-helper/ruby'
+require 'git-hooks-helper/extensions/string'
+require 'open3'
+require 'pry'
 
 module GitHooksHelper
   class Hook
 
-    RB_REGEXP     = /\.(rb|rake|task|prawn)\z/
-    ERB_REGEXP   = /\.erb\z/
-    JS_REGEXP   = /\.js\z/
-    HAML_REGEXP   = /\.haml\z/
-    COFFEE_REGEXP   = /\.coffee\z/
+    RB_REGEXP = /\.(rb|rake|task|prawn|[Rr]akefile|task)\z/
+    ERB_REGEXP  = /\.erb\z/
+    JS_REGEXP = /\.js\z/
+    HAML_REGEXP = /\.haml\z/
+    COFFEE_REGEXP = /\.coffee\z/
+    SLIM_REGEXP = /\.slim\z/
 
     FILETYPES = {
       rb:     RB_REGEXP,
       erb:    ERB_REGEXP,
       js:     JS_REGEXP,
       haml:   HAML_REGEXP,
-      coffee: COFFEE_REGEXP
+      coffee: COFFEE_REGEXP,
+      slim:   SLIM_REGEXP
     }
 
     RB_WARNING_REGEXP  = /[0-9]+:\s+warning:/
     HAML_INVALID_REGEXP = /error/
     ERB_INVALID_REGEXP = /invalid\z/
+    SLIM_INVALID_REGEXP = /invalid1\z/
     COLOR_REGEXP = /\e\[(\d+)m/
 
     # Set this to true if you want warnings to stop your commit
@@ -35,7 +39,6 @@ module GitHooksHelper
       @changed_files = GitHooksHelper::Git.in_index
       debug("changed files")
       debug @changed_files
-
       instance_eval(&block) if block
 
       if @result.errors?
@@ -131,15 +134,40 @@ module GitHooksHelper
     def check_erb
       each_changed_file([:erb]) do |file|
         Open3.popen3("rails-erb-check #{file}") do |stdin, stdout, stderr|
-          @result.errors.concat stdout.read.split("\n").map{|line| "#{file} => invalid ERB syntax" if line.gsub(COLOR_REGEXP, '') =~ ERB_INVALID_REGEXP}.compact
+          lines = stdout.read.split("\n")
+          errors = lines.map do |line| 
+            if line.gsub(COLOR_REGEXP, '') =~ ERB_INVALID_REGEXP
+              "#{file} => invalid ERB syntax" 
+            end
+          end.compact
+          @result.errors.concat errors
+        end
+      end
+    end
+
+
+    def check_slim
+      each_changed_file([:slim]) do |file|
+        Open3.popen3("slimrb -c #{file}") do |stdin, stdout, stderr|
+          lines = stderr.read.split("\n")
+          errors = if lines.size > 0
+            # skip last 2 lines from output. There is only trace info.
+            @result.errors << "#{file} => invalid SLIM syntax\n  " + lines[0..-3].join("\n  ")
+          end
         end
       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
+        Open3.popen3("haml --check #{file}") do |stdin, stdout, stderr|
+          lines = stderr.read.split("\n")
+          errors = lines.map do |line| 
+            if line.gsub(COLOR_REGEXP, '') =~ HAML_INVALID_REGEXP
+              "#{file} => invalid HAML syntax\n  #{line}" 
+            end
+          end.compact
+          @result.errors.concat errors
         end
       end
     end

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

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

data/spec/git_files/no_best_practices.rb

@@ -2,4 +2,4 @@ class Test
   # extra tab and whitespace in the end 
 	def test 
   end
-end
+end 

data/spec/git_files/ok.html.slim

@@ -0,0 +1,4 @@
+div class='#{@some_class}'
+  = @some_variable
+  span
+    | some text

data/spec/git_files/ok_best_practices.rb

@@ -1,5 +1,5 @@
 class Test
-  # extra tab and whitespace in the end
+  # no extra tab and whitespace in the end
   def test
   end
 end

data/spec/git_files/syntax_error.html.slim

@@ -0,0 +1,4 @@
+div class='#{@some_class'
+  = @some_variable
+  span
+    | some text

data/spec/git_hooks_helper_spec.rb

@@ -85,7 +85,7 @@ describe GitHooksHelper do
   end
 
   describe "check_erb" do
-    it "should stop even on warnings on syntax error in ERB" do
+    it "should stop on syntax error in ERB" do
       GitHooksHelper::Git.should_receive(:in_index).and_return(["spec/git_files/syntax_error.html.erb"])
       begin
         GitHooksHelper.results do
@@ -110,6 +110,34 @@ describe GitHooksHelper do
     end
   end
 
+  describe 'check_slim' do
+
+    it 'should stop on error in SLIM template' do
+      GitHooksHelper::Git.should_receive(:in_index).and_return(["spec/git_files/syntax_error.html.slim"])
+      begin
+        GitHooksHelper.results do
+          stop_on_warnings
+          check_slim
+        end
+      rescue SystemExit => e
+        $!.status.should eql 1
+      end
+    end
+
+    it 'should show to error in correct SLIM template' do
+      GitHooksHelper::Git.should_receive(:in_index).and_return(["spec/git_files/ok.html.slim"])
+      begin
+        GitHooksHelper.results do
+          stop_on_warnings
+          check_slim
+        end
+      rescue SystemExit => e
+        $!.status.should eql 0
+      end
+    end
+
+  end
+
   describe "warning_on" do
     it "should show error when file contains specific text" do
       GitHooksHelper::Git.should_receive(:in_index).and_return(["spec/git_files/ok.html.erb"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-hooks-helper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000Z
 dependencies: []
-description: Gem for creating simple git hooks in ruby.
+description: Gem for creating simple pre-commit git hooks in ruby.
 email:
 - no@email.com
 executables: []
@@ -38,8 +38,10 @@ files:
 - spec/git_files/good_syntax.rb
 - spec/git_files/no_best_practices.rb
 - spec/git_files/ok.html.erb
+- spec/git_files/ok.html.slim
 - spec/git_files/ok_best_practices.rb
 - spec/git_files/syntax_error.html.erb
+- spec/git_files/syntax_error.html.slim
 - spec/git_hooks_helper_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/BuGo/git-hooks-helper
@@ -61,8 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: git-hooks-helper
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Small gem to help write simple git hooks