ruby2ruby 1.2.2 → 1.2.3

data.tar.gz.sig

@@ -0,0 +1 @@
+zm)�e��BQ��ʸc�I����f�o�I�}�e�,�<1����(L���70�R�U��_�*l`�?�:���΅�ț|T,8��5��h�34��)�
������۶4�s̕��Υ�B�{'1˥aL�7du��w׆Xzð�	x�巒b��Df�9�QuoJ��"���Wh��ȥ��a\��:�n�����$L��W��i���gCxP���7�<�>�dI}��p�E��r���C�4RW��0�O�h�

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.2.3 / 2009-06-23
+
+* 4 minor enhancements:
+
+  * Overhauled 4-generation tests to use RubyParser. Much cleaner
+  * Removed last of ParseTree. Fully switched to RubyParser.
+  * Switched to minitest
+  * Updated Rakefile to new hoe capabilities
+
 === 1.2.2 / 2009-01-20
 
 * 3 minor enhancements:

data/Rakefile

@@ -4,36 +4,20 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.add_include_dirs("lib",
-                     "../../ZenTest/dev/lib",
                      "../../ParseTree/dev/test",
-                     "../../ParseTree/dev/lib",
-                     "../../RubyInline/dev/lib",
                      "../../ruby_parser/dev/lib",
                      "../../sexp_processor/dev/lib")
 
-require './lib/ruby2ruby.rb'
+Hoe.plugin :seattlerb
 
-Hoe.new('ruby2ruby', Ruby2Ruby::VERSION) do |r2r|
-  r2r.rubyforge_name = 'seattlerb'
-  r2r.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+Hoe.spec 'ruby2ruby' do
+  developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-  r2r.clean_globs << File.expand_path("~/.ruby_inline")
-  r2r.extra_deps << ["ParseTree", "~> 3.0"]
-end
-
-task :test => :clean
-
-task :rcov_info do
-  pat = ENV['PATTERN'] || "test/test_*.rb"
-  ruby "#{Hoe::RUBY_FLAGS} -S rcov --text-report --save coverage.info #{pat}"
-end
+  self.rubyforge_name = 'seattlerb'
 
-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
+  extra_deps     << ["sexp_processor", "~> 3.0"]
+  extra_deps     << ["ruby_parser",    "~> 2.0"]
+  extra_dev_deps << ["ParseTree",      "~> 3.0"]
 end
 
-# vim: syntax=Ruby
+# vim: syntax=ruby

data/lib/ruby2ruby.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby -w
 
-begin require 'rubygems'; rescue LoadError; end
+require 'rubygems'
 require 'sexp_processor'
-require 'unified_ruby'
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
   LINE_LENGTH = 78
 
   ##
@@ -25,21 +24,6 @@ class Ruby2Ruby < SexpProcessor
                   :return,
                  ]
 
-  def self.translate(klass_or_str, method = nil)
-    require 'parse_tree'
-    sexp = ParseTree.translate(klass_or_str, method)
-
-    unifier = Unifier.new
-
-    unifier.processors.each do |p|
-      p.unsupported.delete :cfunc # HACK
-    end
-
-    sexp = unifier.process(sexp)
-
-    self.new.process(sexp)
-  end
-
   def initialize
     super
     @indent = "  "

data/test/test_ruby2ruby.rb

@@ -4,16 +4,12 @@ $TESTING = true
 
 $: << 'lib'
 
-SKIP_PROCS = ENV['FAST'] or RUBY_VERSION >= "1.9" or defined? RUBY_ENGINE
-
-require 'test/unit'
+require 'minitest/autorun'
 require 'ruby2ruby'
 require 'pt_testcase'
 require 'fileutils'
 require 'tmpdir'
 
-FileUtils.rm_rf File.expand_path("~/.ruby_inline") # for self-translation
-
 class R2RTestCase < ParseTreeTestCase
   def self.previous key
     "ParseTree"
@@ -36,21 +32,14 @@ class R2RTestCase < ParseTreeTestCase
   end
 end
 
-class TestRuby2Ruby < R2RTestCase
-  alias :refute_nil :assert_not_nil unless defined? Mini
+start = __LINE__
 
+class TestRuby2Ruby < R2RTestCase
   def setup
     super
     @processor = Ruby2Ruby.new
   end
 
-  def teardown
-    unless $DEBUG then
-      FileUtils.rm_rf @rootdir
-      ENV.delete 'INLINEDIR'
-    end if defined?(@rootdir) && @rootdir
-  end
-
   def test_dregx_slash
     inn = util_thingy(:dregx)
     out = "/blah\\\"blah#\{(1 + 1)}blah\\\"blah\\/blah/"
@@ -124,9 +113,9 @@ class TestRuby2Ruby < R2RTestCase
                 s(:call,
                   s(:call, nil, :line, s(:arglist)),
                   :split,
-                  s(:arglist, s(:lit, /=/), s(:lit, 2))))))
+                  s(:arglist, s(:lit, /\=/), s(:lit, 2))))))
 
-    out = 'x(*line.split(/=/, 2))'
+    out = 'x(*line.split(/\=/, 2))'
     util_compare inn, out
   end
 
@@ -135,12 +124,6 @@ class TestRuby2Ruby < R2RTestCase
     assert_equal expected_eval, eval(expected_ruby) if expected_eval
   end
 
-  def util_setup_inline
-    @rootdir = File.join(Dir.tmpdir, "test_ruby_to_ruby.#{$$}")
-    Dir.mkdir @rootdir, 0700 unless test ?d, @rootdir
-    ENV['INLINEDIR'] = @rootdir
-  end
-
   def util_thingy(type)
     s(type,
       'blah"blah',
@@ -149,44 +132,6 @@ class TestRuby2Ruby < R2RTestCase
   end
 end
 
-##
-# Converts a +target+ using a +processor+ and converts +target+ name
-# in the source adding +gen+ to allow easy renaming.
-
-$broken = false
-def morph_and_eval(processor, target, gen, n)
-  return if $broken
-  begin
-    processor = Object.const_get processor if Symbol === processor
-    target    = Object.const_get target    if Symbol === target
-    old_name  = target.name
-    new_name  = target.name.sub(/\d*$/, gen.to_s)
-    ruby      = processor.translate(target).sub(old_name, new_name)
-
-    old, $-w = $-w, nil
-    eval ruby
-    $-w = old
-
-    target.constants.each do |constant|
-      eval "#{new_name}::#{constant} = #{old_name}::#{constant}"
-    end
-  rescue Exception => e
-    warn "Self-Translation Generation #{n} failed:"
-    warn "#{e.class}: #{e.message}"
-    warn e.backtrace.join("\n  ")
-    warn ""
-    warn ruby
-    warn ""
-    $broken = true
-  else
-    begin
-      yield if block_given?
-    rescue
-      # probably already handled
-    end
-  end
-end
-
 ####################
 #         impl
 #         old  new
@@ -196,33 +141,44 @@ end
 # s
 # t  new    2    3
 
-# Self-Translation: 1st Generation - morph Ruby2Ruby using Ruby2Ruby
-morph_and_eval :Ruby2Ruby, :Ruby2Ruby, 2, 1 do
-  class TestRuby2Ruby1 < TestRuby2Ruby
-    def setup
-      super
-      @processor = Ruby2Ruby2.new
-    end
-  end
-end unless SKIP_PROCS
-
-# Self-Translation: 2nd Generation - morph TestRuby2Ruby using Ruby2Ruby
-morph_and_eval :Ruby2Ruby, :TestRuby2Ruby, 2, 2 do
-  # Self-Translation: 3rd Generation - test Ruby2Ruby2 with TestRuby2Ruby1
-  class TestRuby2Ruby3 < TestRuby2Ruby2
-    def setup
-      super
-      @processor = Ruby2Ruby2.new
-    end
-  end
-end unless SKIP_PROCS
-
-# Self-Translation: 4th (and final) Generation - fully circular
-morph_and_eval(:Ruby2Ruby2, :Ruby2Ruby2, 3, 4) do
-  class TestRuby2Ruby4 < TestRuby2Ruby3
-    def setup
-      super
-      @processor = Ruby2Ruby3.new
-    end
-  end
-end unless SKIP_PROCS
+tr2r = File.read(__FILE__).split(/\n/)[start+1..__LINE__-2].join("\n")
+ir2r = File.read("lib/ruby2ruby.rb")
+
+require 'ruby_parser'
+
+def silent_eval ruby
+  old, $-w = $-w, nil
+  eval ruby
+  $-w = old
+end
+
+def morph_and_eval src, from, to, processor
+  new_src = processor.new.process(RubyParser.new.process(src.sub(from, to)))
+  silent_eval new_src
+  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
+  end
+end

metadata

@@ -1,21 +1,62 @@
 --- !ruby/object:Gem::Specification 
 name: ruby2ruby
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ParseTree
+  name: sexp_processor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby_parser
   type: :runtime
   version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  type: :development
+  version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -30,9 +71,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 2.3.0
     version: 
-description: ruby2ruby provides a means of generating pure ruby code easily from ParseTree's Sexps. This makes making dynamic language processors much easier in ruby than ever before.
+description: |-
+  ruby2ruby provides a means of generating pure ruby code easily from
+  ParseTree's Sexps. This makes making dynamic language processors much
+  easier in ruby than ever before.
 email: 
 - ryand-ruby@zenspider.com
 executables: 
@@ -54,6 +98,8 @@ files:
 - test/test_ruby2ruby.rb
 has_rdoc: true
 homepage: http://seattlerb.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -75,9 +121,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ruby2ruby provides a means of generating pure ruby code easily from ParseTree's Sexps
 test_files: 
 - test/test_ruby2ruby.rb