flog 2.5.3 → 3.0.0.b1

data/.autotest

@@ -1,11 +1,14 @@
 # -*- ruby -*-
 
 require 'autotest/restart'
-require 'autotest/rcov'
+require 'autotest/rcov' if ENV['RCOV']
 
 Autotest.add_hook :initialize do |at|
   at.order = :random
 
+  at.libs << ":../../ruby_parser/dev/lib"
+  at.libs << ":../../sexp_processor/dev/lib"
+
   at.add_mapping(/^spec\/.*_spec\.rb$/) do |filename, _|
     filename
   end

data/History.txt

@@ -1,3 +1,17 @@
+=== 3.0.0.b1 / 2012-07-26
+
+* 4 minor enhancements:
+
+  * Added --18 and --19 flags to specify parser. Defaults to hybrid.
+  * Explicitly use Ruby18Parser to remove deprecation warnings.
+  * Modified processor to deal with cleaner sexps from RP 3.x.
+  * Use File.binread (File.read in 1.8) to bypass encoding errors
+
+* 2 bug fixes:
+
+  * Cleaned up some 1.9 warnings.
+  * Fixed failing tests against ruby_parser 3
+
 === 2.5.3 / 2011-09-21
 
 * 1 minor enhancement:

data/README.txt

@@ -27,7 +27,7 @@ report. The higher the score, the more pain the code is in.
 == REQUIREMENTS:
 
 * ruby2ruby (only for -v)
-* ParseTree (soon to switch to ruby_parser)
+* ruby_parser
 
 == INSTALL:
 

data/Rakefile

@@ -17,8 +17,8 @@ Hoe.spec 'flog' do
 
   self.rubyforge_name = 'seattlerb'
 
-  extra_deps << ['sexp_processor', '~> 3.0']
-  extra_deps << ['ruby_parser',    '~> 2.0']
+  extra_deps << ['sexp_processor', '~> 4.0']
+  extra_deps << ['ruby_parser',    '~> 3.0.0.a4']
 end
 
 # vim: syntax=ruby

data/lib/flog.rb

@@ -3,8 +3,16 @@ require 'sexp_processor'
 require 'ruby_parser'
 require 'optparse'
 
+class File
+  RUBY19 = "<3".respond_to? :encoding
+
+  class << self
+    alias :binread :read unless RUBY19
+  end
+end
+
 class Flog < SexpProcessor
-  VERSION = '2.5.3'
+  VERSION = '3.0.0.b1'
 
   THRESHOLD = 0.60
   SCORES = Hash.new 1
@@ -125,6 +133,7 @@ class Flog < SexpProcessor
     option = {
       :quiet    => true,
       :continue => false,
+      :parser   => RubyParser,
     }
 
     OptionParser.new do |opts|
@@ -177,6 +186,14 @@ class Flog < SexpProcessor
         option[:verbose] = true
       end
 
+      opts.on("--18", "Use a ruby 1.8 parser.") do
+        option[:parser] = Ruby18Parser
+      end
+
+      opts.on("--19", "Use a ruby 1.9 parser.") do
+        option[:parser] = Ruby19Parser
+      end
+
       next if self.plugins.empty?
       opts.separator "Plugin options:"
 
@@ -235,7 +252,7 @@ class Flog < SexpProcessor
     files.each do |file|
       begin
         # TODO: replace File.open to deal with "-"
-        ruby = file == '-' ? $stdin.read : File.read(file)
+        ruby = file == '-' ? $stdin.read : File.binread(file)
         warn "** flogging #{file}" if option[:verbose]
 
         ast = @parser.process(ruby, file)
@@ -243,7 +260,7 @@ class Flog < SexpProcessor
         mass[file] = ast.mass
         process ast
       rescue RegexpError, SyntaxError, Racc::ParseError => e
-        if e.inspect =~ /<%|%>/ or ruby =~ /<%|%>/ then
+        if e.inspect =~ /<\%|%\>/ or ruby =~ /<\%|%\>/ then
           warn "#{e.inspect} at #{e.backtrace.first(5).join(', ')}"
           warn "\n...stupid lemmings and their bad erb templates... skipping"
         else
@@ -300,7 +317,7 @@ class Flog < SexpProcessor
     @method_stack        = []
     @method_locations    = {}
     @mass                = {}
-    @parser              = RubyParser.new
+    @parser              = option[:parser].new
     self.auto_shift_type = true
     self.reset
   end
@@ -506,7 +523,7 @@ class Flog < SexpProcessor
     add_to_score :assignment
     process exp.shift # lhs
     exp.shift # name
-    process exp.shift # rhs
+    process_until_empty exp # rhs
     s()
   end
 
@@ -544,9 +561,11 @@ class Flog < SexpProcessor
     penalize_by 0.2 do
       process exp.shift # recv
     end
+
     name = exp.shift
+
     penalize_by 0.2 do
-      process exp.shift # args
+      process_until_empty exp
     end
 
     add_to_score name, SCORES[name]

data/test/test_flog.rb

@@ -3,7 +3,7 @@ require 'flog'
 
 class TestFlog < MiniTest::Unit::TestCase
   def setup
-    @flog = Flog.new
+    @flog = Flog.new :parser => RubyParser
   end
 
   def test_add_to_score
@@ -106,7 +106,7 @@ class TestFlog < MiniTest::Unit::TestCase
     assert_equal exp, @flog.calls
 
     assert_equal 1.6, @flog.total unless @flog.option[:methods]
-    assert_equal 4, @flog.mass["-"] # HACK: 3 is for an unpublished sexp fmt
+    assert_equal 3, @flog.mass["-"]
   ensure
     $stdin = old_stdin
   end
@@ -562,7 +562,7 @@ class TestFlog < MiniTest::Unit::TestCase
     @flog.option[:all] = true
 
     assert_equal 1.6, @flog.total unless @flog.option[:methods]
-    assert_equal 4, @flog.mass["-"] # HACK: 3 is for an unpublished sexp fmt
+    assert_equal 3, @flog.mass["-"]
 
     o = StringIO.new
     @flog.report o

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: flog
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 1257799903
+  prerelease: 6
   segments: 
-  - 2
-  - 5
   - 3
-  version: 2.5.3
+  - 0
+  - 0
+  - b
+  - 1
+  version: 3.0.0.b1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-09-21 00:00:00 Z
+date: 2012-07-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -46,11 +48,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 27
         segments: 
-        - 3
+        - 4
         - 0
-        version: "3.0"
+        version: "4.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -61,11 +63,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1257782997
         segments: 
-        - 2
+        - 3
+        - 0
         - 0
-        version: "2.0"
+        - a
+        - 4
+        version: 3.0.0.a4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -76,28 +81,43 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
+        - 3
         - 2
-        - 6
-        version: "2.6"
+        version: "3.2"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id005
 description: |-
   Flog reports the most tortured code in an easy to read pain
   report. The higher the score, the more pain the code is in.
@@ -144,16 +164,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Flog reports the most tortured code in an easy to read pain report