syntaxer 0.3.0 → 0.4.0

data/README.rdoc

@@ -3,7 +3,7 @@
 == Overview
 
 Syntaxer make possible check syntax of scripts. It may be used in standalone mode and with git repository for checking changed and added files only.
-It is useful for for rails team, because you need to store only 
+It is useful for for rails team, because you need to store only file with rules, and git hook will be generated for you.
 
 == Installation
 
@@ -11,11 +11,24 @@ To install syntaxer run
 
   [sudo] gem install syntaxer
   
- Works with 1.8.x and 1.9.x
+  
+== Usage with rails
+
+1) Add to Gemfile
+
+  gem "syntaxer"
+
+2)
 
-== Fast Usage for Rails team
+  bundle install
 
-== Usage
+3) 
+
+  rake syntaxer:install
+
+It creates config/syntaxer.rb file with common rails options, you may edit it as you wish, and .git/hooks/pre-commit script, which will run syntax checking before every commit.
+
+== Standalone usage
 
 Example of usage:
 
@@ -36,8 +49,6 @@ Indicate custom config file
   syntaxer -c config.rb
 
 
-Describe your rules in syntaxer.rb file and put in "initializers" folder for rails
-
 Example of syntaxer.rb file:
 
   syntaxer do
@@ -75,6 +86,8 @@ Options for usage
   -r, --repo            indicate type of repository. Available git and svn at this time.
   -i, --install         generates pre-commit hook and put it in .git/hooks folder. It checks syntax of languages what are indicated in options file before every commit
   -q, --quite           disable information messages. Is needed when you only want to know the result: 1 or 0
+  -l, --loud            informate about every checked file
+  -W, --warnings        show warning messages
   -h, --help            show help and options describe above.
 
 == Contributing to syntaxer
@@ -107,4 +120,4 @@ Artem Melnikov (ignar) Svitla Systems Inc (www.svitla.com)
 
 == Copyright
 
-See LICENSE.txt for further details.
+See LICENSE.txt for further details.

data/Rakefile

@@ -20,6 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.email = "kramarenko.artyom@gmail.com"
   gem.authors = ["artemk"]
   gem.executables = ["syntaxer"]
+  gem.files.include "lib/syntaxer/progress_bar.rb"
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/syntaxer

@@ -15,6 +15,8 @@ class SyntaxerCLI
     options.config_file = Syntaxer::SYNTAXER_RULES_FILE  
     options.root_path   = Dir.getwd
     options.languages   = :all
+    options.warnings    = false
+    options.rails       = false
 
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: syntaxer [options]"
@@ -40,14 +42,30 @@ class SyntaxerCLI
         options.repository = r
       end
       
-      opts.on("-q", "--quite", "Run in verbose mode") do |r|
+      opts.on("-q", "--quite", "Run in quite mode") do |r|
         options.quite = true
       end
 
+      opts.on("-l", "--loud", "Run in loud mode") do |r|
+        options.loud = true
+      end
+
       opts.on("-i", "--install", "Write hooks to git") do |r|
         options.generate = true
       end
 
+      opts.on("-W", "--warnings", "Turn warning messages on") do |r|
+        options.warnings = true
+      end
+
+      opts.on("-H", "--hook", "Use syntaxer in hook context") do |r|
+        options.hook = true
+      end
+
+      opts.on("-R", "--rails", "Use syntaxer with rails") do |r|
+        options.rails = true
+      end
+
       opts.separator ""
       opts.separator "Common options:"
 

data/features/plain_check.feature

@@ -8,7 +8,7 @@ Feature: Check syntax in plain mode
   @plain
   Scenario: Run checker in directory
     Given directory contains two files
-    When I run `syntaxer` interactively
+    When I run 'syntaxer'
     Then the exit status should not be 0
     And the output should not contain "Syntax OK"
 

data/features/printer_check.feature

@@ -0,0 +1,24 @@
+@announce
+Feature: Check output of script
+
+  In order to check outut of script
+  A user who used gem
+  Should to see errors in files
+
+  @plain @output
+  Scenario: Run checker with verbose mode
+    Given a file named "wrong.rb" with:
+      """
+      class A
+      """
+    And a file named "correct.rb" with:
+      """
+      class B; end;
+      """
+    Then I run 'syntaxer -l'
+    And the output should contain:
+      """
+correct.rb OK
+      """
+
+

data/features/rails_check.feature

@@ -0,0 +1,12 @@
+@announce
+Feature: Check git repository before commit
+  
+  @repo @rails
+  Scenario: Installation hook in rails environment
+    Given rails project
+    And some lib with wrong syntax
+    And installed hook in rails context
+    When I run `git commit -m "some message"`
+    Then the syntaxer shoud stop commit
+    And the output should contain "Errors:"
+    And the output should contain "EE"

data/features/repository_check.feature

@@ -11,3 +11,7 @@ Feature: Check git repository before commit
     And some file with wrong syntax
     When run `git commit -m "some message"` interactively
     Then the syntaxer should stop commit
+
+
+
+

data/features/step_definitions/plain_checker.rb

@@ -1,7 +1,28 @@
+Given /^I'am using a clean gemset test$/ do
+  Aruba::Api::DEFAULT_TIMEOUT_SECONDS = 20
+  use_clean_gemset("test") 
+end
+
 Given /^directory contains two files$/ do
   create_temp_plain_work_dir
 end
 
+When /^I run 'syntaxer'$/ do
+  run_simple(unescape("#{File.join(File.dirname(__FILE__),'..','..','bin','syntaxer')}"), false)
+end
+
+Then /^I run 'syntaxer \-l'$/ do
+  run_simple(unescape("#{File.join(File.dirname(__FILE__),'..','..','bin','syntaxer')} -l"), false)
+end
+
+Then /^I run 'syntaxer \-W'$/ do
+  run_simple(unescape("#{File.join(File.dirname(__FILE__),'..','..','bin','syntaxer')} -W"), false)
+end
+
+Then /^I run 'syntaxer \-v'$/ do
+  run_simple(unescape("#{File.join(File.dirname(__FILE__),'..','..','bin','syntaxer')} -v"), false)
+end
+
 When /^I cd to working directory$/ do
   cd(@tmp_dir)
 end

data/features/step_definitions/rails_checker.rb

@@ -0,0 +1,29 @@
+Given /^rails project$/ do
+  in_current_dir do
+    FileUtils.mkdir("config")
+    FileUtils.mkdir("app")
+  end
+  write_file('app/correct.rb','class C;end;')
+  run_simple(unescape("git init"), false)
+  run_simple(unescape("git add ."), false)
+  run_simple(unescape("git commit -m'first commit'"), false)
+end
+
+Given /^some lib with wrong syntax$/ do
+  write_file('lib/wrong.rb', "mod A;end")
+  write_file('app/wrong.rb', "mod A;end")
+  run_simple(unescape("git add ."), false)
+end
+
+Given /^installed hook in rails context$/ do
+  run_simple("#{File.join(File.dirname(__FILE__),'..','..','bin','syntaxer')} -i -r git --hook --rails")
+  in_current_dir do
+    FileUtils.cp(File.join(File.dirname(__FILE__),'..','..',"syntaxer_rails_rules.dist.rb"),"config/syntaxer.rb")
+  end
+  run_simple('chmod 755 .git/hooks/pre-commit')
+end
+
+Then /^the syntaxer shoud stop commit$/ do
+  @last_exit_status.should eql(1)
+end
+

data/features/step_definitions/repository_checker.rb

@@ -3,15 +3,31 @@ Given /^git repository$/ do
 end
 
 Given /^some file with wrong syntax$/ do
-  in_current_dir do
+  #in_current_dir do
     add_fixtures_files
-  end
+  #end
 end
 
 When /^run `git commit \-m \"some message\"` interactively$/ do 
   add_hook
 end
 
+Then /^I run 'syntaxer \-i \-r git'$/ do
+  run_simple(unescape("#{File.join(File.dirname(__FILE__),'..','..','bin','syntaxer')} -i -r git"), false)
+end
+
+
 Then /^the syntaxer should stop commit$/ do
   lambda{make_git_commit}.should raise_exception
 end
+
+Given /^I init empty repository$/ do
+  run_simple(unescape("git init"), false)
+end
+
+Given /^I make first commit$/ do
+  run_simple(unescape("git add ."), false)
+  run_simple(unescape("git commit -m 'first commit'"), false)
+end
+
+

data/features/support/hooks.rb

@@ -2,6 +2,6 @@ Before do
   
 end
 
-After do
-  
+AfterStep do
+  FileUtils.rm_r('tmp/arba/.git') if File.directory?('tmp/arba/.git')
 end

data/features/syntaxer_check.feature

@@ -7,7 +7,25 @@ Feature: Test options
 
   @plain
   Scenario: Run version checking
-    When I run `syntaxer -v`
+    When I run 'syntaxer -v'
     Then the exit status should be 0
     And the output should be the same as in "VERSION" file
 
+  @plain
+  Scenario: Run syntaxer with warning option and ruby files
+    Given a file named "correct.rb" with:
+     """
+     Method /^I love ruby$/ do
+     end
+     """
+    When I run 'syntaxer -W'
+    Then the output should contain "warning: ambiguous first argument;"
+
+  @plain
+  Scenario: Run syntaxer with warning option and non ruby files
+    Given a file named "correct.php" with:
+      """
+      <%php echo 1; %>
+      """
+    When I run 'syntaxer -W'
+    Then the output should contain "Syntax OK"

data/lib/syntaxer.rb

@@ -3,20 +3,24 @@ require "rake"
 require "open3"
 require "forwardable"
 require "git"
+require "rainbow"
+require 'progress_bar'
 require File.join(%w{syntaxer reader})
 require File.join(%w{syntaxer file_status})
 require File.join(%w{syntaxer checker})
 require File.join(%w{syntaxer repository})
 require File.join(%w{syntaxer language_definition})
 require File.join(%w{syntaxer printer})
-require 'progress_bar'
+require File.join(%w{syntaxer progress_bar})
+
+require File.join(%w{syntaxer railtie}) if defined?(Rails)
 
 module Syntaxer
   DEFAULT_FILES_MASK = "**/*"
   SYNTAXER_RULES_FILE = File.join(File.dirname(__FILE__), "..", "syntaxer_rules.dist.rb")
   
   class << self
-    attr_reader :reader, :repository, :root_path, :result, :verbose
+    attr_reader :reader, :repository, :root_path, :results, :warnings, :hook
     
     def configure
       yield(self) if block_given?
@@ -35,13 +39,16 @@ module Syntaxer
     def check_syntax(options = {})
       @root_path = options[:root_path]
       Printer.quite = options[:quite] || false
+      Printer.loud = options[:loud] || false
+      @warnings = options[:warnings]
+      @hook = options[:hook]
       
       @reader = Reader::DSLReader.load(options[:config_file])
       @repository = Repository.factory(@root_path, options[:repository]) if options[:repository]
       
-      error_files = Checker.process(self).error_files
-      Printer.print_result error_files
-      exit(1) unless error_files.empty?
+      checker = Checker.process(self)
+      Printer.print_result checker
+      exit(1) unless checker.error_files.empty?
     end
 
     # This method generate and put hook to .git/hooks
@@ -56,10 +63,14 @@ module Syntaxer
       @root_path = options[:root_path]
       raise ArgumentError, 'Indicate repository type' unless options.include?(:repository)
       raise ArgumentError, "SVN is temporarily not supported" if options[:repository].to_sym == :svn
+      
       repo = Repository.factory(@root_path, options[:repository])
       hook_file = "#{@root_path}/.git/hooks/pre-commit"
+      hook_string = "syntaxer -r git --hook"
+      hook_string += " -c config/syntaxer.rb" if options[:rails]
+      
       File.open(hook_file, 'w') do |f|
-        f.puts "syntaxer -r git" # #{@root_path}"
+        f.puts hook_string
       end
       File.chmod(0755, hook_file)
     rescue Exception => e

data/lib/syntaxer/checker.rb

@@ -6,12 +6,16 @@ module Syntaxer
     include Observable
     extend Forwardable
 
-    def_delegators Syntaxer::FileStatus, :error_files, :fine_files      
-         
+    def_delegators Syntaxer::FileStatus, :error_files, :all_files
+    
     attr_accessor :syntaxer, :reader
     
     def initialize(syntaxer, count)
-      Printer.count_of_files count
+      Printer.setup do |p|
+        p.count_of_files = count
+        p.mode = syntaxer.hook ? :hook : :default
+      end
+
       add_observer(Printer)
       @syntaxer = syntaxer
       @reader = @syntaxer.reader
@@ -31,7 +35,23 @@ module Syntaxer
     end
 
     protected
+
     def check rule, file
+      changed
+      unless rule.exec_existence
+        # notify if not exists
+        notify_observers({:rule => rule})
+      else
+        if @syntaxer.warnings && rule.name == :ruby
+          rule.exec_rule = rule.exec_rule.gsub(/(-\S+)\s/,'\1w ')
+        end
+        errors = run_exec_rule(rule, file)
+        FileStatus.build(file, errors)
+        notify_observers({:file_status => errors.empty?})
+      end
+    end
+
+    def run_exec_rule rule, file
       popen3(rule.exec_rule.gsub('%filename%', file)) do |stdin, stdout, stderr, wait_thr|
         stderr.read.split("\n")
       end
@@ -53,26 +73,29 @@ module Syntaxer
 
     def process
       checked_files = Set.new
+      rule_files = {}
+      
       @reader.rules.each do |rule|
-        files_collection = []
+        rule_files[rule.name] = {}
+        rule_files[rule.name][:rule] = rule
+        rule_files[rule.name][:files] = []
         rule.extensions.each do |ext|
           files.each do |file|
-            if file.include?(ext) && !checked_files.include?(file)
-              files_collection << file
-              checked_files.add(file)
+            if File.extname(file).gsub(/\./,'') == ext || \
+              (!rule.specific_files.nil? && !rule_files[rule.name][:files].include?(file) && rule.specific_files.include?(file))
+              rule_files[rule.name][:files].push(file)
             end
           end
         end
+      end
 
-        files_collection.each do |file|
+      rule_files.each do |rule_name, rule|
+        rule[:files].each do |file|
           full_path = File.join(@syntaxer.root_path,file)
-          errors = check(rule, full_path)
-          FileStatus.build(file, errors)
-          changed
-          notify_observers(errors.empty?)
+          check(rule[:rule], full_path)
         end
       end
-      
+
       self
     end
 
@@ -94,11 +117,9 @@ module Syntaxer
 
     def process
       @reader.rules.each do |rule|
+        # check if executor exists
         rule.files_list(@syntaxer.root_path).each do |file|
-          errors = check(rule, file)
-          FileStatus.build(file, errors)
-          changed
-          notify_observers(errors.empty?)
+          check(rule, file)
         end
       end
       

data/lib/syntaxer/file_status.rb

@@ -4,7 +4,7 @@ module Syntaxer
 
   class FileStatus
     @@error_files = []
-    @@fine_files = []
+    @@all_files = []
     
     attr_reader :file_name, :status, :errors
     
@@ -17,15 +17,16 @@ module Syntaxer
     class << self
       def build(file_name, errors = [])
         file_status = new(file_name, errors)
-        errors.empty? ? @@fine_files << file_status : @@error_files << file_status
+        @@all_files << file_status
+        @@error_files << file_status unless errors.empty?
       end   
       
       def error_files
-         @@error_files
+        @@error_files
       end
 
-      def fine_files
-        @@fine_files
+      def all_files
+        @@all_files
       end
          
     end

data/lib/syntaxer/language_definition.rb

@@ -1,19 +1,21 @@
 module Syntaxer
   class LanguageDefinitionException < Exception; end
     
-  LanguageDefinition = Struct.new(:name, :extensions, :specific_files, :folders, :ignore_folders, :exec_rule) do
+  LanguageDefinition = Struct.new(:name, :extensions, :specific_files, :folders, :ignore_folders, :exec_rule, :executor, :exec_existence) do
     def initialize(*args)
-      super(*args)      
+      super(*args)
       raise LanguageDefinitionException.new "name can't be blank" unless self.name     
     end
     
     
     def files_list(root_path)
+      root_path += "/" if root_path.match(/\/$/).nil?
       main_rule = folders.map{|f| root_path + f + ".\{#{extensions.join(',')}\}"}
       list = Rake::FileList.new(main_rule) do |fl|              
-        #fl.add(specific_files) if specific_files  TODO:fix this
         fl.exclude(ignore_folders) if ignore_folders
       end
+      all_files = Rake::FileList.new(root_path+'*')
+      list += all_files.find_all {|f| f if !File.directory?(f) && !specific_files.nil? && specific_files.include?(File.basename(f)) }
       list
     end
   end

data/lib/syntaxer/printer.rb

@@ -1,46 +1,73 @@
-require "rainbow"
 module Syntaxer
 
   # Print system messages
 
   class Printer
     class << self
+      NON_EXISTENT_RULE_MESSAGE = "exec_rule `%s` for language %s not exists. Skip"
+      
       @@bar = nil
-      attr_accessor :quite
+      @@not_exists_rules = []
+      attr_accessor :quite, :loud, :mode, :count_of_files
 
-      # Set count of files for progress bar
-      #
-      # @param [Integer] count of files
-
-      def count_of_files count
-        @@bar = ProgressBar.new(count, :bar, :counter)
+      def setup &block
+        yield self if block_given?
+        if @mode == :hook
+          @@bar = Syntaxer::ProgressBar.new
+        else
+          @@bar = ::ProgressBar.new(@count_of_files, :bar, :counter)
+        end
       end
 
       # Show progress
       #
       # @param [Boolean] (true|false)
 
-      def update status
-        @@bar.increment! unless @quite
+      def update *args #not_exists_rule = nil, file_status = (status=true;)
+        args = args.first
+        @@not_exists_rules << args[:rule] if args.include?(:rule) && !@@not_exists_rules.include?(args[:rule])
+        return if @quite
+        if args.include?(:file_status)
+          @mode == :hook ? @@bar.increment!(args[:file_status]) : @@bar.increment!
+          # @@bar.increment!(args[:file_status]) if @mode == :hook
+          # @@bar.increment! unless @mode == :hook
+        end
+        true
       end
 
       # Print error message for each if file
       #
       # @param [Array, #each] files
 
-      def print_result files
+      def print_result checker
         return if @quite
         puts "\n"
-        puts "Syntax OK".color(:green) if files.empty?
-        puts "Errors:".color(:red) unless files.empty?
+        puts "Syntax OK".color(:green) if checker.error_files.empty?
 
+        @loud ? (files = checker.all_files) : (files = checker.error_files)
         files.each do |file|
-          puts file.file_name
-          file.errors.each do |error|
-            puts "\t #{error}".color(:red)
+          print_message(file)
+        end
+
+        unless @@not_exists_rules.empty?
+          puts "\n"
+          @@not_exists_rules.each do |rule|
+            puts (NON_EXISTENT_RULE_MESSAGE % [rule.executor, rule.name]).color(:yellow)
           end
         end
       end
+
+      def print_message filestatus
+        return if @quite
+        puts "\n"
+        print filestatus.file_name
+        puts " OK".color(:green) if filestatus.status == :ok && @loud
+        puts "\nErrors:".color(:red) if filestatus.status == :failed
+        filestatus.errors.each do |error|
+          puts "\t #{error}".color(:red)
+        end
+      end
+
     end
   end
 end

data/lib/syntaxer/progress_bar.rb

@@ -0,0 +1,13 @@
+module Syntaxer
+  class ProgressBar
+    
+    def increment! status
+      if status
+        print ".".color(:green)
+      else
+        print "E".color(:red)
+      end
+    end
+    
+  end
+end

data/lib/syntaxer/railtie.rb

@@ -9,4 +9,4 @@ module Syntaxer
       end
     end
   end
-end
+end

data/lib/syntaxer/reader.rb

@@ -125,6 +125,8 @@ module Syntaxer
       end
             
       def exec_rule(exec_string)
+        current_rule.executor = exec_string.scan(/\w+/).first
+        current_rule.exec_existence = system("which #{current_rule.executor} > /dev/null")
         current_rule.exec_rule = exec_string    
       end
       

data/lib/tasks/syntaxer.rake

@@ -0,0 +1,9 @@
+namespace :syntaxer do
+  desc 'my plugins rake task'
+  task :install => :environment do
+    system('syntaxer -i -r git --hook --rails')
+    FileUtils.cp(File.join(File.dirname(__FILE__),'..','..','syntaxer_rails_rules.dist.rb'),\
+                 File.join(Rails.root,'config','syntaxer.rb'))
+    puts "Syntaxer hook installed. Look to the config/syntaxer.rb to change configuration.".color(:green)
+  end
+end

data/rails/init.rb

@@ -1,5 +1,5 @@
 require 'syntaxer/railtie'
 
 Syntaxer.configure do |syntaxer|
-  syntaxer.root = Rails.root
+  syntaxer.root_path = Rails.root
 end

data/spec/checker_spec.rb

@@ -6,28 +6,29 @@ describe "Syntaxer::Checker" do
     
     before(:each) do
       reader = mock('Reader')
-      reader.stub!(:rules).and_return([Syntaxer::LanguageDefinition.new(:ruby, ["rb.example", "rake"], ["Rakefile", "Thorfile"], ["**/*"], nil, "ruby -wc %filename%")])
-      reader.stub!(:files_count).and_return(2)
+      reader.stub!(:rules).and_return([Syntaxer::LanguageDefinition.new(:ruby, ["rb.example", "rake"], ["Rakefile", "Thorfile"], ["**/*"], nil, "ruby -c %filename%", "ruby", true)])
+      reader.stub!(:files_count).and_return(3)
       Syntaxer.should_receive(:reader).any_number_of_times.and_return(reader)
       Syntaxer.stub!(:root_path).and_return(fixtures_path(:ruby))
 
       Syntaxer::Printer.stub!(:print_result)
-      Syntaxer::Printer.stub!(:print_progress)
+      Syntaxer::Printer.stub!(:print_message)
+      Syntaxer::Printer.stub!(:update)
     end
     
     subject {Syntaxer::PlainChecker.new(Syntaxer)}
     
     it {should respond_to(:error_files)}
-    it {should respond_to(:fine_files)}
+    it {should respond_to(:all_files)}
 
     it "should return correct error_files " do
       subject.process
-      subject.fine_files.size.should == 1      
-      subject.error_files.size.should == 1
+      subject.all_files.size.should == 3
+      subject.error_files.size.should == 2
     end
     
     it "should send to FileStatus" do
-      Syntaxer::FileStatus.should_receive(:build).twice
+      Syntaxer::FileStatus.should_receive(:build).exactly(3).times
       subject.process      
     end
   end
@@ -40,7 +41,8 @@ describe "Syntaxer::Checker" do
 
     before(:all) do
       Syntaxer::Printer.stub!(:print_result)
-      Syntaxer::Printer.stub!(:print_progress)
+      Syntaxer::Printer.stub!(:print_message)
+      Syntaxer::Printer.stub!(:update)
     end
     
     before(:each) do
@@ -51,7 +53,7 @@ describe "Syntaxer::Checker" do
       make_git_add(@repo_dir)
 
       reader = mock('Reader')
-      reader.stub!(:rules).and_return([Syntaxer::LanguageDefinition.new(:ruby, ["rb.example", "rake"], ["Rakefile", "Thorfile"], ["**/*"], nil, "ruby -wc %filename%")])
+      reader.stub!(:rules).and_return([Syntaxer::LanguageDefinition.new(:ruby, ["example", "rake"], ["Rakefile", "Thorfile"], ["**/*"], nil, "ruby -c %filename%", "ruby", true)])
       Syntaxer.should_receive(:reader).and_return(reader)
       Syntaxer.stub!(:root_path).and_return(@repo_dir)
       repo = Syntaxer::Repository.factory(@repo_dir, :git)
@@ -62,7 +64,7 @@ describe "Syntaxer::Checker" do
 
     it "should return correct error_files" do
       subject.process
-      subject.fine_files.size.should_not eql(0)
+      subject.all_files.size.should_not eql(0)
       subject.error_files.size.should_not eql(0)
     end
 

data/spec/fixtures/ruby/correct.rb.example

@@ -2,4 +2,8 @@ class A
   def some_method
     puts "Do nothing"
   end
-end
+end
+
+Method /^I love ruby$/ do
+
+end

data/spec/fixtures/ruby/subfolder/wrong.rb.example

@@ -0,0 +1,2 @@
+cals A
+end

data/spec/fixtures/syntaxer_rules.rb

@@ -1,11 +1,12 @@
 syntaxer do
 
   languages :ruby do
-    folders 'app/controllers/**/*'
+    extensions "example"
+    folders '**/*'
   end
   
   languages :haml do
-    folders 'app/views/**/*'  
+    folders '**/*'  
   end
 
   #ignore_folders "app/models/**" # this folders will be deleted from all languages

data/spec/language_rules_spec.rb

@@ -27,7 +27,7 @@ describe "LanguageRules" do
   
   context "LanguageDefinition" do
     it "#file_list should return correct file list based on rules" do
-      correct_array = Rake::FileList.new(File.dirname(__FILE__) + '/fixtures/ruby/*')
+      correct_array = Rake::FileList.new(File.dirname(__FILE__) + '/fixtures/ruby/**/*.example')
       ld = Syntaxer::LanguageDefinition.new(:ruby, ["rb.example", "rake"], ["Rakefile", "Thorfile"], ["**/*"], nil, "`ruby -wc %filename%`")
       ld.files_list(File.dirname(__FILE__) + '/fixtures/').should == correct_array
     end

data/spec/printer_spec.rb

@@ -9,9 +9,9 @@ describe "Syntaxer" do
     subject{Syntaxer::Printer}
 
     it "should be quite if passed --quite option" do
-      ProgressBar.new.should_not_receive(:update)
+      ::ProgressBar.new.should_not_receive(:update)
       subject.quite = true
-      subject.update true
+      subject.update({})
       subject.print_result ['a','b']
     end
   end

data/spec/reader_spec.rb

@@ -5,10 +5,9 @@ describe "Syntaxer::Reader::DSLReader" do
   context "#build" do
     it "should build from default distr rules files" do
       @reader = Syntaxer::Reader::DSLReader.build
-      
-      @reader.rules.find(:ruby).should == Syntaxer::LanguageDefinition.new(:ruby, ["rb", "rake"], ["Rakefile", "Thorfile"], ["**/*"], nil, "ruby -wc %filename%")
-      @reader.rules.find(:haml).should == Syntaxer::LanguageDefinition.new(:haml, ["haml"], nil, ["**/*"], nil, "haml -c %filename%")
-      @reader.rules.find(:sass).should == Syntaxer::LanguageDefinition.new(:sass, ["sass"], nil, ["**/*"], nil, "sass -c %filename%")      
+      @reader.rules.find(:ruby).should == Syntaxer::LanguageDefinition.new(:ruby, ["rb", "rake"], ["Rakefile", "Thorfile", "Gemfile"], ["**/*"], nil, "ruby -c %filename%", "ruby", true)
+      @reader.rules.find(:haml).should == Syntaxer::LanguageDefinition.new(:haml, ["haml"], nil, ["**/*"], nil, "haml -c %filename%", "haml", system("which haml 2>&1 > /dev/null"))
+      @reader.rules.find(:sass).should == Syntaxer::LanguageDefinition.new(:sass, ["sass"], nil, ["**/*"], nil, "sass -c %filename%", "sass", system("which haml 2>&1 > /dev/null"))
       
     end
   end
@@ -36,8 +35,8 @@ describe "Syntaxer::Reader::DSLReader" do
     
     it "should load from file" do
       reader = Syntaxer::Reader::DSLReader.load(syntaxer_rules_example_file)
-      reader.rules.find(:ruby).folders.should == ["app/controllers/**/*"]
-      reader.rules.find(:haml).folders.should == ["app/views/**/*"]     
+      reader.rules.find(:ruby).folders.should == ["**/*"]
+      reader.rules.find(:haml).folders.should == ["**/*"]     
     end
     
     it "should do substitution for the same rules" do

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rubygems'
 require 'rspec'
 require 'git'
 require 'syntaxer'
 require "tmpdir"
+require 'aruba/api'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -67,7 +69,7 @@ def add_hook(ruby_repo_dir)
   hook_file = File.join(ruby_repo_dir,'.git/hooks/pre-commit')
   
   File.open(hook_file, 'w') do |f|
-    f.puts "#{bin_file} -c #{syntaxer_rules_example_file('syntaxer_rules_git')} -r git -p #{ruby_repo_dir}"
+    f.puts "#{bin_file} -c #{syntaxer_rules_example_file} -r git -p #{ruby_repo_dir} --hook"
   end
   
   File.chmod(0755, hook_file)
@@ -83,3 +85,12 @@ def syntaxer_rules_example_file file = ''
   File.join(fixtures_path, "#{file.empty? ? 'syntaxer_rules': file}.rb" )
 end
 
+class ArubaHelper
+  include Aruba::Api
+  class << self
+    def method_missing method, *args
+      ArubaHelper.new.send(method, *args)
+    end
+  end
+end
+

data/spec/syntaxer_spec.rb

@@ -6,13 +6,19 @@ describe "Syntaxer" do
   it {should respond_to(:check_syntax)}
 
   context "in plain mode" do
+    before(:all) do
+      Syntaxer::Printer.stub!(:print_result)
+      Syntaxer::Printer.stub!(:print_message)
+      Syntaxer::Printer.stub!(:update)
+    end
+    
     it "should exit with error if where is syntax mistake" do
       lambda{ subject.check_syntax({:root_path => fixtures_path, :config_file => syntaxer_rules_example_file}) }.should raise_exception
     end
   end
 
   context "checking GIT repo" do
-    
+
     before(:each) do
       @repo_dir = create_temp_ruby_project
       make_initial_commit(@repo_dir)

data/syntaxer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{syntaxer}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["artemk"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-04-23}
   s.default_executable = %q{syntaxer}
   s.description = %q{Syntax checker for ruby and other languages}
   s.email = %q{kramarenko.artyom@gmail.com}
@@ -27,8 +27,11 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/syntaxer",
     "features/plain_check.feature",
+    "features/printer_check.feature",
+    "features/rails_check.feature",
     "features/repository_check.feature",
     "features/step_definitions/plain_checker.rb",
+    "features/step_definitions/rails_checker.rb",
     "features/step_definitions/repository_checker.rb",
     "features/support/env.rb",
     "features/support/hooks.rb",
@@ -40,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/syntaxer/file_status.rb",
     "lib/syntaxer/language_definition.rb",
     "lib/syntaxer/printer.rb",
+    "lib/syntaxer/progress_bar.rb",
     "lib/syntaxer/railtie.rb",
     "lib/syntaxer/reader.rb",
     "lib/syntaxer/repository.rb",
@@ -49,6 +53,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/haml/correct.html.haml",
     "spec/fixtures/haml/wrong.html.haml",
     "spec/fixtures/ruby/correct.rb.example",
+    "spec/fixtures/ruby/subfolder/wrong.rb.example",
     "spec/fixtures/ruby/wrong.rb.example",
     "spec/fixtures/syntaxer_rules.rb",
     "spec/fixtures/syntaxer_rules_git.rb",
@@ -59,6 +64,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/syntaxer_spec.rb",
     "syntaxer.gemspec",
+    "syntaxer_rails_rules.dist.rb",
     "syntaxer_rules.dist.rb"
   ]
   s.homepage = %q{http://github.com/artemk/syntaxer}

data/syntaxer_rails_rules.dist.rb

@@ -0,0 +1,20 @@
+syntaxer do    
+  languages :ruby do
+    folders "app/*", "app/**/*", "lib/*", "lib/**/*"
+    extensions "rb", "rake"
+    specific_files "Rakefile", "Thorfile", "Gemfile"
+    exec_rule "ruby -c %filename%"
+  end
+  
+  lang :sass do
+    folders "public/stylesheets/**/*"
+    extensions "sass"
+    exec_rule "sass -c %filename%"    
+  end
+  
+  lang :haml do
+    folders "app/views/**/*", "app/views/*"
+    extensions "haml"
+    exec_rule "haml -c %filename%"
+  end
+end

data/syntaxer_rules.dist.rb

@@ -2,8 +2,8 @@ syntaxer do
   languages :ruby do
     folders "**/*"
     extensions "rb", "rake"
-    specific_files "Rakefile", "Thorfile"
-    exec_rule "ruby -wc %filename%"
+    specific_files "Rakefile", "Thorfile", "Gemfile"
+    exec_rule "ruby -c %filename%"
   end
   
   lang :sass do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: syntaxer
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - artemk
@@ -15,127 +10,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 +03:00
+date: 2011-04-23 00:00:00 +03:00
 default_executable: syntaxer
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: git
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: git
-  version_requirements: *id001
+  type: :runtime
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: rainbow
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: rainbow
-  version_requirements: *id002
+  type: :runtime
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: progress_bar
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: progress_bar
-  version_requirements: *id003
+  type: :runtime
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
-  name: rspec
-  version_requirements: *id004
+  type: :development
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: yard
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
-  name: yard
-  version_requirements: *id005
+  type: :development
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: jeweler
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  name: jeweler
-  version_requirements: *id006
+  type: :development
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: cucumber
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: cucumber
-  version_requirements: *id007
+  type: :development
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: aruba
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: aruba
-  version_requirements: *id008
+  type: :development
   prerelease: false
+  version_requirements: *id008
 description: Syntax checker for ruby and other languages
 email: kramarenko.artyom@gmail.com
 executables: 
@@ -154,8 +119,11 @@ files:
 - VERSION
 - bin/syntaxer
 - features/plain_check.feature
+- features/printer_check.feature
+- features/rails_check.feature
 - features/repository_check.feature
 - features/step_definitions/plain_checker.rb
+- features/step_definitions/rails_checker.rb
 - features/step_definitions/repository_checker.rb
 - features/support/env.rb
 - features/support/hooks.rb
@@ -167,6 +135,7 @@ files:
 - lib/syntaxer/file_status.rb
 - lib/syntaxer/language_definition.rb
 - lib/syntaxer/printer.rb
+- lib/syntaxer/progress_bar.rb
 - lib/syntaxer/railtie.rb
 - lib/syntaxer/reader.rb
 - lib/syntaxer/repository.rb
@@ -176,6 +145,7 @@ files:
 - spec/fixtures/haml/correct.html.haml
 - spec/fixtures/haml/wrong.html.haml
 - spec/fixtures/ruby/correct.rb.example
+- spec/fixtures/ruby/subfolder/wrong.rb.example
 - spec/fixtures/ruby/wrong.rb.example
 - spec/fixtures/syntaxer_rules.rb
 - spec/fixtures/syntaxer_rules_git.rb
@@ -186,6 +156,7 @@ files:
 - spec/spec_helper.rb
 - spec/syntaxer_spec.rb
 - syntaxer.gemspec
+- syntaxer_rails_rules.dist.rb
 - syntaxer_rules.dist.rb
 has_rdoc: true
 homepage: http://github.com/artemk/syntaxer
@@ -201,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -199843106065902149
       segments: 
       - 0
       version: "0"
@@ -210,9 +181,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []