syntaxer 0.1.1 → 0.2.0

data/Gemfile

@@ -1,15 +1,15 @@
 source "http://rubygems.org"
-gem "git"
+
+#for managing git repos
+gem "git" 
+
+#for colorizing output
 gem "rainbow"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", ">= 2.5.0"
   gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
   gem "cucumber"
   gem "aruba"
 end

data/Gemfile.lock

@@ -1,10 +1,10 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.3.2)
-      childprocess (~> 0.1.6)
-      cucumber (~> 0.10.0)
-      rspec (~> 2.3.0)
+    aruba (0.3.6)
+      childprocess (>= 0.1.7)
+      cucumber (>= 0.10.0)
+      rspec (>= 2.5.0)
     builder (3.0.0)
     childprocess (0.1.8)
       ffi (~> 1.0.6)
@@ -27,28 +27,25 @@ GEM
     json (1.5.1)
     rainbow (1.1.1)
     rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.5.0)
     term-ansicolor (1.0.5)
-    yard (0.6.4)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aruba
-  bundler (~> 1.0.0)
   cucumber
   git
   jeweler (~> 1.5.2)
   rainbow
-  rcov
-  rspec (~> 2.3.0)
+  rspec (>= 2.5.0)
   yard (~> 0.6.0)

data/README.rdoc

@@ -9,11 +9,10 @@ When syntaxer is used with git it checks syntax in added and changed files befor
 
 To install syntaxer run
 
-  sudo gem install syntaxer
+  [sudo] gem install syntaxer
 
-== Usage
 
-== Syntaxer with rails
+== Usage
 
 Example of usage:
 
@@ -88,16 +87,20 @@ Options for usage
 
 == TODO
 
-* Have to fix the problem with only created repository and initial commit with GIT reposytory
+* Have to fix the problem with only created repository and initial commit with GIT repository
 * Add SVN support
 
+== Known problems
+* Git gem doesn't work properly on the very first commit.
+
+
 == Author
 
-Artyom Kramarenko (artemk) Svitla Systems Inc (svitla.com)
+Artyom Kramarenko (artemk) Svitla Systems Inc (www.svitla.com)
 
 == Contributors
 
-Artem Melnikov (ignar) Svitla Systems Inc (svitla.com)
+Artem Melnikov (ignar) Svitla Systems Inc (www.svitla.com)
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/syntaxer

@@ -57,7 +57,7 @@ class SyntaxerCLI
       end
 
       opts.on_tail("--version", "Show version") do
-        puts Syntaxer::VERSION
+        puts IO.readlines('../VERSION','').first.to_s
         exit
       end
     end

data/features/plain_check.feature

@@ -3,11 +3,11 @@ Feature: Check syntax in plain mode
 
   In order to check syntax
   A user who used gem
-  Should be abble run command
+  Should be able run command
 
   @plain
   Scenario: Run checker in directory
-    Given directory containt two files
+    Given directory contains two files
     When I run `syntaxer` interactively
     Then the exit status should not be 0
     And the output should not contain "Syntax OK"

data/features/repository_check.feature

@@ -8,6 +8,6 @@ Feature: Check git repository before commit
   @repo
   Scenario: Run "git commit"
     Given git repository
-    And some file with worng syntax
+    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,4 +1,4 @@
-Given /^directory containt two files$/ do
+Given /^directory contains two files$/ do
   create_temp_plain_work_dir
 end
 
@@ -6,3 +6,7 @@ When /^I cd to working directory$/ do
   cd(@tmp_dir)
 end
 
+Then /^the output should be the same as in "(.*)" file$/ do |f|
+  content = IO.readlines(File.join(SYNTAXER_ROOT_PATH, f),'').first.to_s
+  Then %{the output should contain "#{content}"}  
+end

data/features/step_definitions/repository_checker.rb

@@ -2,7 +2,7 @@ Given /^git repository$/ do
   create_temp_repo_work_dir
 end
 
-Given /^some file with worng syntax$/ do
+Given /^some file with wrong syntax$/ do
   in_current_dir do
     add_fixtures_files
   end
@@ -14,5 +14,4 @@ end
 
 Then /^the syntaxer should stop commit$/ do
   lambda{make_git_commit}.should raise_exception
-  #@last_exit_status.should_not == 0
 end

data/features/support/env.rb

@@ -1,3 +1,3 @@
 require 'aruba/cucumber'
 require 'fileutils'
-require "git"
+require "git"

data/features/support/plain_helpers.rb

@@ -1,7 +1,9 @@
 module PlainHelpers
+  SYNTAXER_ROOT_PATH = File.join(File.dirname(__FILE__), '..', '..')
+  
   @tmp_dir
   def temp_dir
-    tmpdir = File.expand_path current_dir #"#{Time.now.to_i}"
+    tmpdir = File.expand_path current_dir
     @tmp_dir = tmpdir
     tmpdir
   end
@@ -31,15 +33,19 @@ module PlainHelpers
   
   def create_temp_plain_work_dir
     tmp = create_tmp_dir
+    
     in_current_dir do
       add_fixtures_files
     end
+    
   end
 
   def create_temp_repo_work_dir
     create_tmp_dir
-    g = Git.init(File.expand_path(File.join(@tmp_dir)))
+    
+    g = Git.init(File.expand_path(File.join(@tmp_dir)))    
     FileUtils.touch(File.join(@tmp_dir,'README'))
+    
     g.add('.')
     g.commit('first commit')
   end
@@ -56,16 +62,11 @@ module PlainHelpers
   end
 
   def make_git_commit
-    g = Git.open File.expand_path(@tmp_dir) #(File.expand_path(File.join(current_dir)))
+    g = Git.open File.expand_path(@tmp_dir) 
     g.add
-    #pp File.expand_path(current_dir)
-    #Dir.chdir(File.expand_path(current_dir)) do
-      #g = Git.open Dir.pwd
-      #g.add
-    Dir.chdir(current_dir)
-      g.commit('second commit')
-    #end
     
+    Dir.chdir(current_dir)
+    g.commit('second commit')    
   end
 
 end

data/features/syntaxer_check.feature

@@ -0,0 +1,13 @@
+@announce
+Feature: Test options
+
+  In order to check syntax
+  A user who used gem
+  Should be able run command
+
+  @plain
+  Scenario: Run version checking
+    When I run `syntaxer -v` interactively
+    Then the exit status should not be 0
+    And the output should be the same as in "VERSION" file
+

data/lib/syntaxer.rb

@@ -7,7 +7,6 @@ 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 version})
 require File.join(%w{syntaxer printer})
 
 module Syntaxer
@@ -34,11 +33,11 @@ module Syntaxer
     def check_syntax(options = {})
       @root_path = options[:root_path]
       Printer.quite = options[:quite] || false
+      
       @reader = Reader::DSLReader.load(options[:config_file])
       @repository = Repository.factory(@root_path, options[:repository]) if options[:repository]
       
-      Checker.process(self)
-      error_files = Checker.error_files
+      error_files = Checker.process(self).error_files
       Printer.print_result error_files
       exit(1) unless error_files.empty?
     end

data/lib/syntaxer/checker.rb

@@ -5,30 +5,9 @@ module Syntaxer
     include Open3
     extend Forwardable
 
-    # Does not working
     def_delegators Syntaxer::FileStatus, :error_files, :fine_files      
          
     attr_accessor :syntaxer, :reader
-
-    # List of files with correct syntax
-    #
-    # @return [Array<FileStatus>, #each] array with files
-    #
-    # @see FileStatus#fine_files
-    
-    def self.fine_files
-      FileStatus.fine_files
-    end
-
-    # List of files with wrong syntax
-    #
-    # @return [Array<FileStatus>, #each] array with files
-    #
-    # @see FileStatus#fine_files
-
-    def self.error_files
-      FileStatus.error_files
-    end
     
     def initialize(syntaxer)
       @syntaxer = syntaxer
@@ -81,7 +60,8 @@ module Syntaxer
           FileStatus.build(file, errors)
         end
       end
-      FileStatus
+      
+      self
     end
 
     private
@@ -107,7 +87,8 @@ module Syntaxer
           FileStatus.build(file, errors)
         end
       end
-      FileStatus
+      
+      self
     end
 
   end

data/spec/spec_helper.rb

@@ -9,8 +9,6 @@ require "tmpdir"
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-# RSpec.configure do |config|
-# end
 
 ROOT = File.join(File.dirname(__FILE__), '..')
 
@@ -40,6 +38,7 @@ end
 
 def make_git_add(ruby_repo_dir)
   g = Git.open(Dir.new(ruby_repo_dir))
+  
   g.chdir do
     g.add('.')
   end
@@ -48,23 +47,29 @@ end
 def make_initial_commit(ruby_repo_dir)
   g = Git.open(Dir.new(ruby_repo_dir))
   FileUtils.touch(File.join(ruby_repo_dir, 'README'))
+  
   make_git_add(ruby_repo_dir)
   g.commit('first commit')
+  
 end
 
 def make_commit(ruby_repo_dir)
   g = Git.open(Dir.new(ruby_repo_dir))
+  
   g.chdir do
     g.commit('second commit')
   end
+  
 end
 
 def add_hook(ruby_repo_dir)
-  bin_file = File.join(File.expand_path('../'),'syntaxer/bin', 'syntaxer')
+  bin_file = File.join(ROOT,'bin', 'syntaxer')  
   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}"
   end
+  
   File.chmod(0755, hook_file)
 end
 

data/syntaxer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{syntaxer}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["artemk"]
-  s.date = %q{2011-04-16}
+  s.date = %q{2011-04-17}
   s.default_executable = %q{syntaxer}
   s.description = %q{Syntax checker for ruby and other languages}
   s.email = %q{kramarenko.artyom@gmail.com}
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "features/support/hooks.rb",
     "features/support/plain_helpers.rb",
+    "features/syntaxer_check.feature",
     "init.rb",
     "lib/syntaxer.rb",
     "lib/syntaxer/checker.rb",
@@ -42,7 +43,6 @@ Gem::Specification.new do |s|
     "lib/syntaxer/railtie.rb",
     "lib/syntaxer/reader.rb",
     "lib/syntaxer/repository.rb",
-    "lib/syntaxer/version.rb",
     "lib/tasks/syntaxer.rake",
     "rails/init.rb",
     "spec/checker_spec.rb",
@@ -84,32 +84,26 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<git>, [">= 0"])
       s.add_runtime_dependency(%q<rainbow>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
     else
       s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<rainbow>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<aruba>, [">= 0"])
     end
   else
     s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<rainbow>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, [">= 2.5.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])
   end

metadata

@@ -2,7 +2,7 @@
 name: syntaxer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - artemk
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 +03:00
+date: 2011-04-17 00:00:00 +03:00
 default_executable: syntaxer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: *id003
@@ -57,20 +57,9 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,21 +67,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,10 +78,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: aruba
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,7 +89,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id007
 description: Syntax checker for ruby and other languages
 email: kramarenko.artyom@gmail.com
 executables: 
@@ -136,6 +114,7 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/plain_helpers.rb
+- features/syntaxer_check.feature
 - init.rb
 - lib/syntaxer.rb
 - lib/syntaxer/checker.rb
@@ -145,7 +124,6 @@ files:
 - lib/syntaxer/railtie.rb
 - lib/syntaxer/reader.rb
 - lib/syntaxer/repository.rb
-- lib/syntaxer/version.rb
 - lib/tasks/syntaxer.rake
 - rails/init.rb
 - spec/checker_spec.rb
@@ -177,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 846946609352155882
+      hash: 3897909288735270095
       segments: 
       - 0
       version: "0"

data/lib/syntaxer/version.rb

@@ -1,3 +0,0 @@
-module Syntaxer
-  VERSION = "0.0.1" unless defined? Syntaxer::VERSION
-end