ruby_parser - rubygems Package Compare versions

Comparing version 2.0.2 to 2.0.3

History.txt

@@ -0,1 +1,17 @@
+=== 2.0.3 / 2009-06-23
+
+* 4 minor enhancements:
+
+  * Removed dead code handling d/regex match node cruft.
+  * Switched to minitest
+  * Updated .autotest and rakefile wrt rcov for new hoe capabilities
+  * Updated hoe for new capabilities
+
+* 4 bug fixes:
+
+  * Environment#all now deals with strange edge cases in RAD.
+  * Fixed packaging/compilation issue.
+  * Minor 1.9 fixes
+  * hoe -> flay -> rubyparser rakefile circularity fixed
+
 === 2.0.2 / 2009-01-20
@@ -2,0 +18,0 @@

lib/ruby_parser_extras.rb

@@ -8,7 +8,9 @@ require 'stringio'
 class Regexp
-  ONCE     = 0 # 16 # ?
-  ENC_NONE = /x/n.options
-  ENC_EUC  = /x/e.options
-  ENC_SJIS = /x/s.options
-  ENC_UTF8 = /x/u.options
+  unless defined? ONCE then
+    ONCE     = 0 # 16 # ?
+    ENC_NONE = /x/n.options
+    ENC_EUC  = /x/e.options
+    ENC_SJIS = /x/s.options
+    ENC_UTF8 = /x/u.options
+  end
 end
@@ -117,3 +119,3 @@
 class RubyParser < Racc::Parser
-  VERSION = '2.0.2'
+  VERSION = '2.0.3' unless constants.include? "VERSION" # SIGH
 
@@ -249,6 +251,2 @@ attr_accessor :lexer, :in_def, :in_single, :file
     case node.first
-    when :dregex then
-      return s(:match2, node, s(:gvar, "$_".to_sym))
-    when :regex then
-      return s(:match, node)
     when :lit then
@@ -891,3 +889,4 @@ if Regexp === node.last then
 
-  WORDLIST = Hash[*wordlist.map { |o| [o.name, o] }.flatten]
+  WORDLIST = Hash[*wordlist.map { |o| [o.name, o] }.flatten] unless
+    defined? WORDLIST
 
@@ -912,3 +911,3 @@ def self.keyword str
   def all
-    idx = @dyn.index false
+    idx = @dyn.index(false) || 0
     @env[0..idx].reverse.inject { |env, scope| env.merge scope }
@@ -934,3 +933,3 @@ end
     @use.unshift({})
-   end
+  end
 
@@ -937,0 +936,0 @@ def initialize dyn = false

Rakefile

@@ -6,15 +6,15 @@ # -*- ruby -*-
 
-Hoe.add_include_dirs("../../ParseTree/dev/lib",
-                     "../../ParseTree/dev/test",
+Hoe.plugin :seattlerb
+
+Hoe.add_include_dirs("../../ParseTree/dev/test",
                      "../../RubyInline/dev/lib",
                      "../../sexp_processor/dev/lib")
 
-require './lib/ruby_parser_extras.rb'
+hoe = Hoe.spec 'ruby_parser' do
+  developer 'Ryan Davis', '[e-mail]'
 
-hoe = Hoe.new('ruby_parser', RubyParser::VERSION) do |parser|
-  parser.rubyforge_name = 'parsetree'
-  parser.developer('Ryan Davis', '[e-mail]')
+  self.rubyforge_name = 'parsetree'
 
-  parser.extra_dev_deps << 'ParseTree'
-  parser.extra_deps << ['sexp_processor', '>= 3.0.1']
+  extra_dev_deps << 'ParseTree'
+  extra_deps     << ['sexp_processor', '>= 3.0.1']
 end
@@ -28,3 +28,3 @@
 
-path = "pkg/ruby_parser-#{RubyParser::VERSION}"
+path = "pkg/ruby_parser-#{hoe.version}"
 task path => :parser do
@@ -59,16 +59,2 @@ Dir.chdir path do
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    pattern = ENV['PATTERN'] || 'test/test_ruby_*.rb'
-
-    t.test_files = FileList[pattern]
-    t.verbose = true
-    t.rcov_opts << "--threshold 80"
-    t.rcov_opts << "--no-color"
-  end
-rescue LoadError
-  # skip
-end
-
 desc "Compares PT to RP and deletes all files that match"
@@ -100,15 +86,2 @@ task :compare do
 
-task :rcov_info => :parser do
-  pattern = ENV['PATTERN'] || "test/test_*.rb"
-  ruby "-Ilib -S rcov --text-report --save coverage.info #{pattern}"
-end
-
-task :rcov_overlay do
-  rcov, eol = Marshal.load(File.read("coverage.info")).last[ENV["FILE"]], 1
-  puts rcov[:lines].zip(rcov[:coverage]).map { |line, coverage|
-    bol, eol = eol, eol + line.length
-    [bol, eol, "#ffcccc"] unless coverage
-  }.compact.inspect
-end
-
 task :loc do
@@ -115,0 +88,0 @@ loc1  = `wc -l ../1.0.0/lib/ruby_lexer.rb`[/\d+/]

test/test_ruby_lexer.rb

 #!/usr/local/bin/ruby
 
-require "test/unit"
+require "minitest/autorun"
 require "ruby_lexer"
 
-class TestRubyLexer < Test::Unit::TestCase
-  def deny cond, msg = nil
-    assert ! cond, msg
-  end
+class TestRubyLexer < MiniTest::Unit::TestCase
+  alias :deny :refute
 
@@ -11,0 +9,0 @@ def setup

test/test_ruby_parser_extras.rb

@@ -1,5 +0,5 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'ruby_parser_extras'
 
-class TestStackState < Test::Unit::TestCase
+class TestStackState < MiniTest::Unit::TestCase
   def test_stack_state
@@ -52,3 +52,3 @@ s = StackState.new :test
 
-class TestEnvironment < Test::Unit::TestCase
+class TestEnvironment < MiniTest::Unit::TestCase
   def deny t
@@ -55,0 +55,0 @@ assert ! t

test/test_ruby_parser.rb

 #!/usr/local/bin/ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'ruby_parser'
 
-$: << File.expand_path('~/Work/p4/zss/src/ParseTree/dev/lib')
 $: << File.expand_path('~/Work/p4/zss/src/ParseTree/dev/test')
@@ -33,4 +32,2 @@
 class TestRubyParser < RubyParserTestCase
-  alias :refute_nil :assert_not_nil unless defined? Mini
-
   def setup
@@ -37,0 +34,0 @@ super

No alert changes

No metric changes