reek 1.2.11 → 1.2.12

data/{History.txt → CHANGELOG}

@@ -1,3 +1,8 @@
+== 1.2.12 (2012-06-09)
+
+* (mvz) Use ripper_ruby_parser on Ruby 1.9.3 and up (thus making reek able
+        to parse the new 1.9 hash syntax).
+
 == 1.2.11 (2012-06-08)
 
 * (mvz) Make Bundler a development dependency.

data/README.md

@@ -67,8 +67,6 @@ Reek integrates with many of your favourite tools:
 * `require 'reek/spec'` to add the `should_not reek` custom matcher to your Rspec examples
 * Reek is compatible with Ruby 1.8.6, 1.8.7, 1.9.2 and 1.9.3
 
-At present Reek is unable to parse the new Ruby 1.9 hash syntax of {a: 1}.
-
 ### Dependencies
 
 Reek makes use of the following other gems:

data/features/command_line_interface/stdin.feature

@@ -48,9 +48,5 @@ Feature: Reek reads from $stdin when no files are given
       $stdin -- 0 warnings
 
       """
-    And stderr reports:
-      """
-      $stdin: Racc::ParseError: 
-      parse error on value "$end" ($end)
+    And it reports a parsing error
 
-      """

data/features/step_definitions/reek_steps.rb

@@ -56,6 +56,14 @@ Then /^it reports the error ['"](.*)['"]$/ do |string|
   @last_stderr.chomp.should == string
 end
 
+Then /^it reports a parsing error$/ do
+  if RUBY_VERSION < "1.9.3"
+    @last_stderr.chomp.should match /Racc::ParseError/
+  else
+    @last_stderr.chomp.should match /RipperRubyParser::SyntaxError/
+  end
+end
+
 Then /^it reports the current version$/ do
   @last_stdout.should == "reek #{Reek::VERSION}\n"
 end

data/lib/reek/source/source_code.rb

@@ -1,4 +1,3 @@
-require 'ruby_parser'
 require File.join(File.dirname(File.expand_path(__FILE__)), 'config_file')
 require File.join(File.dirname(File.expand_path(__FILE__)), 'tree_dresser')
 
@@ -22,7 +21,19 @@ module Reek
 
       attr_reader :desc
 
-      def initialize(code, desc, parser = RubyParser.new)
+      # At runtime, reek tries to load ripper_ruby_parser. If that succeeds,
+      # reek uses that parser and will be able to handle Ruby 1.9 syntax. On
+      # Ruby versions below 1.9.3, it will fail and reek will use ruby_parser
+      # and handle Ruby 1.8 syntax only.
+      PARSER_CLASS = begin
+                       require 'ripper_ruby_parser'
+                       RipperRubyParser::Parser
+                     rescue LoadError
+                       require 'ruby_parser'
+                       RubyParser
+                     end
+
+      def initialize(code, desc, parser = PARSER_CLASS.new)
         @source = code
         @desc = desc
         @parser = parser

data/lib/reek/version.rb

@@ -1,3 +1,3 @@
 module Reek
-  VERSION = '1.2.11'
+  VERSION = '1.2.12'
 end

data/reek.gemspec

@@ -13,8 +13,8 @@ and reports any code smells it finds.
 }
   s.email = ["timo.roessner@googlemail.com"]
   s.executables = ["reek"]
-  s.extra_rdoc_files = ["History.txt", "License.txt"]
-  s.files = Dir[".yardopts", "History.txt", "License.txt", "README.md",
+  s.extra_rdoc_files = ["CHANGELOG", "License.txt"]
+  s.files = Dir[".yardopts", "CHANGELOG", "License.txt", "README.md",
                 "Rakefile", "bin/reek", "config/defaults.reek",
                 "{features,lib,spec,tasks}/**/*",
                 "reek.gemspec" ] & `git ls-files -z`.split("\0")
@@ -27,6 +27,7 @@ and reports any code smells it finds.
   s.summary = %q{Code smell detector for Ruby}
 
   s.add_runtime_dependency(%q<ruby_parser>, ["~> 2.0"])
+  s.add_runtime_dependency(%q<ripper_ruby_parser>, ["~> 0.0.7"])
   s.add_runtime_dependency(%q<ruby2ruby>, ["~> 1.2.5"])
   s.add_runtime_dependency(%q<sexp_processor>, ["~> 3.0"])
 

data/spec/reek/smells/control_couple_spec.rb

@@ -51,7 +51,11 @@ EOS
 
     it 'has the correct fields' do
       @warning.smell[ControlCouple::PARAMETER_KEY].should == 'arg'
-      @warning.lines.should == [3,6]
+      if RUBY_VERSION < "1.9.3"
+        @warning.lines.should == [3,6]
+      else
+        @warning.lines.should == [3,5]
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: reek
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 2
-  - 11
-  version: 1.2.11
+  - 12
+  version: 1.2.12
 platform: ruby
 authors: 
 - Kevin Rutherford
@@ -35,9 +35,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby2ruby
+  name: ripper_ruby_parser
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 0
+        - 7
+        version: 0.0.7
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +65,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +80,11 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,11 +95,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +109,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,11 +123,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -123,7 +139,7 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: |
   Reek is a tool that examines Ruby classes, modules and methods
   and reports any code smells it finds.
@@ -135,11 +151,11 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
+- CHANGELOG
 - License.txt
 files: 
 - .yardopts
-- History.txt
+- CHANGELOG
 - License.txt
 - README.md
 - Rakefile