ruby2ruby 1.2.5 → 1.3.0

data/.autotest

@@ -6,9 +6,8 @@ Autotest.add_hook :initialize do |at|
   at.order = :random
   at.testlib = "minitest/autorun"
 
-  at.extra_files << "../../ParseTree/dev/test/pt_testcase.rb"
-  at.extra_files << "../../ParseTree/dev/lib/unified_ruby.rb"
-  at.libs << ":../../sexp_processor/dev/lib:../../ParseTree/dev/lib:../../ParseTree/dev/test"
+  at.extra_files << "../../sexp_processor/dev/lib/pt_testcase.rb"
+  at.libs << ":../../sexp_processor/dev/lib:../../ruby_parser/dev/lib"
 
   (1..4).each do |n|
     at.extra_class_map["TestRuby2Ruby#{n}"] = "test/test_ruby2ruby.rb"

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.0 / 2011-09-01
+
+* 1 minor enhancement:
+
+  * output comments for class and method definitions. (pythonic)
+
 === 1.2.5 / 2010-09-01
 
 * 4 minor enhancements:

data/README.txt

@@ -1,7 +1,7 @@
 = ruby2ruby
 
-* http://seattlerb.rubyforge.org/
-* http://rubyforge.org/projects/seattlerb
+home :: https://github.com/seattlerb/ruby2ruby
+rdoc :: http://seattlerb.rubyforge.org/ruby2ruby
 
 == DESCRIPTION:
 
@@ -52,7 +52,7 @@ processors in ruby easier than ever!
 
 (The MIT License)
 
-Copyright (c) Ryan Davis, Seattle.rb
+Copyright (c) Ryan Davis, seattle.rb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,22 +2,23 @@
 
 require 'rubygems'
 require 'hoe'
+require 'isolate/rake'
 
 Hoe.add_include_dirs("lib",
-                     "../../ParseTree/dev/test",
                      "../../ruby_parser/dev/lib",
                      "../../sexp_processor/dev/lib")
 
 Hoe.plugin :seattlerb
+Hoe.plugin :isolate
 
 Hoe.spec 'ruby2ruby' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
   self.rubyforge_name = 'seattlerb'
 
-  extra_deps     << ["sexp_processor", "~> 3.0"]
-  extra_deps     << ["ruby_parser",    "~> 2.0"]
-  extra_dev_deps << ["ParseTree",      "~> 3.0"]
+  dependency "sexp_processor", "~> 3.0"
+  dependency "ruby_parser",    "~> 2.0"
+  dependency "ParseTree",      "~> 3.0", :developer
 end
 
 task :stress do

data/lib/ruby2ruby.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'sexp_processor'
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = '1.2.5'
+  VERSION = '1.3.0'
   LINE_LENGTH = 78
 
   BINARY = [:<=>, :==, :<, :>, :<=, :>=, :-, :+, :*, :/, :%, :<<, :>>, :**]
@@ -247,7 +247,7 @@ class Ruby2Ruby < SexpProcessor
   end
 
   def process_class(exp)
-    "class #{util_module_or_class(exp, true)}"
+    "#{exp.comments}class #{util_module_or_class(exp, true)}"
   end
 
   def process_colon2(exp)
@@ -306,7 +306,7 @@ class Ruby2Ruby < SexpProcessor
         body << indent(process(exp.shift))
       end
       body = body.join("\n")
-      return "def #{name}#{args}\n#{body}\nend".gsub(/\n\s*\n+/, "\n")
+      return "#{exp.comments}def #{name}#{args}\n#{body}\nend".gsub(/\n\s*\n+/, "\n")
     else
       raise "Unknown defn type: #{type1} for #{exp.inspect}"
     end
@@ -592,7 +592,7 @@ class Ruby2Ruby < SexpProcessor
   end
 
   def process_module(exp)
-    "module #{util_module_or_class(exp)}"
+    "#{exp.comments}module #{util_module_or_class(exp)}"
   end
 
   def process_next(exp)

data/test/test_ruby2ruby.rb

@@ -197,6 +197,27 @@ class TestRuby2Ruby < R2RTestCase
     util_compare inn, out
   end
 
+  def test_class_comments
+    inn = s(:class, :Z, nil, s(:scope))
+    inn.comments = "# x\n# y\n"
+    out = "# x\n# y\nclass Z\nend"
+    util_compare inn, out
+  end
+
+  def test_module_comments
+    inn = s(:module, :Z, s(:scope))
+    inn.comments = "# x\n# y\n"
+    out = "# x\n# y\nmodule Z\nend"
+    util_compare inn, out
+  end
+
+  def test_method_comments
+    inn = s(:defn, :z, s(:args), s(:scope, s(:block, s(:nil))))
+    inn.comments = "# x\n# y\n"
+    out = "# x\n# y\ndef z\n  # do nothing\nend"
+    util_compare inn, out
+  end
+
   def util_compare sexp, expected_ruby, expected_eval = nil
     assert_equal expected_ruby, @processor.process(sexp)
     assert_equal expected_eval, eval(expected_ruby) if expected_eval

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby2ruby
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,8 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-09-01 00:00:00 -07:00
-default_executable: 
+date: 2011-09-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -70,41 +69,24 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 9
         segments: 
         - 2
-        - 0
-        - 4
-        version: 2.0.4
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 7
-        - 1
-        version: 1.7.1
-  type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ParseTree
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -115,23 +97,22 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
         - 2
-        - 6
-        - 2
-        version: 2.6.2
+        - 12
+        version: "2.12"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: |-
   ruby2ruby provides a means of generating pure ruby code easily from
   RubyParser compatible Sexps. This makes making dynamic language
@@ -155,8 +136,8 @@ files:
 - bin/r2r_show
 - lib/ruby2ruby.rb
 - test/test_ruby2ruby.rb
-has_rdoc: true
-homepage: http://seattlerb.rubyforge.org/
+- .gemtest
+homepage: https://github.com/seattlerb/ruby2ruby
 licenses: []
 
 post_install_message: 
@@ -186,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ruby2ruby provides a means of generating pure ruby code easily from RubyParser compatible Sexps