ruby2ruby 2.0.0.b1 → 2.0.0

data/History.txt

@@ -1,3 +1,13 @@
+=== 2.0.0 / 2012-11-02
+
+* 1 minor enhancement:
+
+  * Only do phase 1 testing if $SIMPLE=1.
+
+* 1 bug fix:
+
+  * Fixed block args processing for RP 3.0 sexp changes
+
 === 2.0.0.b1 / 2012-07-27
 
 * 4 major enhancements:

data/Rakefile

@@ -16,7 +16,7 @@ Hoe.spec 'ruby2ruby' do
   self.rubyforge_name = 'seattlerb'
 
   dependency "sexp_processor", "~> 4.0"
-  dependency "ruby_parser",    "~> 3.0.0.a4"
+  dependency "ruby_parser",    "~> 3.0.0.a10"
 end
 
 def process ruby, file="stdin"

data/lib/ruby2ruby.rb

@@ -24,7 +24,7 @@ class Regexp
 end
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = '2.0.0.b1'
+  VERSION = '2.0.0'
   LINE_LENGTH = 78
 
   BINARY = [:<=>, :==, :<, :>, :<=, :>=, :-, :+, :*, :/, :%, :<<, :>>, :**]
@@ -88,17 +88,10 @@ class Ruby2Ruby < SexpProcessor
       case arg
       when Symbol then
         args << arg
-      when Array then
+      when Sexp then
         case arg.first
-        when :block then
-          asgns = {}
-          arg[1..-1].each do |lasgn|
-            asgns[lasgn[1]] = process(lasgn)
-          end
-
-          args.each_with_index do |name, index|
-            args[index] = asgns[name] if asgns.has_key? name
-          end
+        when :lasgn then
+          args << process(arg)
         else
           raise "unknown arg type #{arg.first.inspect}"
         end
@@ -107,7 +100,7 @@ class Ruby2Ruby < SexpProcessor
       end
     end
 
-    return "(#{args.join ', '})"
+    "(#{args.join ', '})"
   end
 
   def process_array(exp)
@@ -336,7 +329,7 @@ class Ruby2Ruby < SexpProcessor
 
     comm = exp.comments
     name = exp.shift
-    args = process(exp.shift)
+    args = process exp.shift
     args = "" if args == "()"
 
     exp.shift if exp == s(s(:nil)) # empty it out of a default nil expression
@@ -513,9 +506,17 @@ class Ruby2Ruby < SexpProcessor
   def process_iter(exp)
     iter = process exp.shift
     args = exp.shift
-    args = (args == 0) ? '' : process(args)
     body = exp.empty? ? nil : process(exp.shift)
 
+    args = case args
+           when 0 then
+             " ||"
+           else
+             a = process(args)[1..-2]
+             a = " |#{a}|" unless a.empty?
+             a
+           end
+
     b, e = if iter == "END" then
              [ "{", "}" ]
            else
@@ -527,7 +528,7 @@ class Ruby2Ruby < SexpProcessor
     # REFACTOR: ugh
     result = []
     result << "#{iter} {"
-    result << " |#{args}|" if args
+    result << args
     if body then
       result << " #{body.strip} "
     else
@@ -539,7 +540,7 @@ class Ruby2Ruby < SexpProcessor
 
     result = []
     result << "#{iter} #{b}"
-    result << " |#{args}|" if args
+    result << args
     result << "\n"
     if body then
       result << indent(body.strip)

data/test/test_ruby2ruby.rb

@@ -390,27 +390,29 @@ def morph_and_eval src, from, to, processor
   new_src
 end
 
-____ = morph_and_eval tr2r, /TestRuby2Ruby/, 'TestRuby2Ruby2', Ruby2Ruby
-ruby = morph_and_eval ir2r, /Ruby2Ruby/,     'Ruby2Ruby2',     Ruby2Ruby
-____ = morph_and_eval ruby, /Ruby2Ruby2/,    'Ruby2Ruby3',     Ruby2Ruby2
-
-class TestRuby2Ruby1 < TestRuby2Ruby
-  def setup
-    super
-    @processor = Ruby2Ruby2.new
-  end
-end
-
-class TestRuby2Ruby3 < TestRuby2Ruby2
-  def setup
-    super
-    @processor = Ruby2Ruby2.new
-  end
-end
-
-class TestRuby2Ruby4 < TestRuby2Ruby2
-  def setup
-    super
-    @processor = Ruby2Ruby3.new
+unless ENV["SIMPLE"] then
+  ____ = morph_and_eval tr2r, /TestRuby2Ruby/, 'TestRuby2Ruby2', Ruby2Ruby
+  ruby = morph_and_eval ir2r, /Ruby2Ruby/,     'Ruby2Ruby2',     Ruby2Ruby
+  ____ = morph_and_eval ruby, /Ruby2Ruby2/,    'Ruby2Ruby3',     Ruby2Ruby2
+
+  class TestRuby2Ruby1 < TestRuby2Ruby
+    def setup
+      super
+      @processor = Ruby2Ruby2.new
+    end
+  end
+
+  class TestRuby2Ruby3 < TestRuby2Ruby2
+    def setup
+      super
+      @processor = Ruby2Ruby2.new
+    end
+  end
+
+  class TestRuby2Ruby4 < TestRuby2Ruby2
+    def setup
+      super
+      @processor = Ruby2Ruby3.new
+    end
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby2ruby
 version: !ruby/object:Gem::Version 
-  hash: -533234434
-  prerelease: 6
+  hash: 15
+  prerelease: 
   segments: 
   - 2
   - 0
   - 0
-  - b
-  - 1
-  version: 2.0.0.b1
+  version: 2.0.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-07-28 00:00:00 Z
+date: 2012-11-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -63,14 +61,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -533251372
+        hash: -965009208
         segments: 
         - 3
         - 0
         - 0
         - a
-        - 4
-        version: 3.0.0.a4
+        - 10
+        version: 3.0.0.a10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -81,11 +79,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 3
-        - 2
-        version: "3.2"
+        - 4
+        - 1
+        version: "4.1"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -111,11 +109,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 1
+        version: "3.1"
   type: :development
   version_requirements: *id005
 description: |-
@@ -163,14 +161,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: seattlerb