live_ast 0.7.0 → 0.7.1

data/CHANGES.rdoc

@@ -1,11 +1,15 @@
 
 = live_ast Changes
 
+== Version 0.7.1
+
+* fix rubygems problem when parser not loaded after live_ast/full
+
 == Version 0.7.0
 
 * eval replacement option now included in the gem
 * new 'boc' gem for eval replacement -- no more syntax restrictions
-* add require 'live_ast/full' -- shortcut for 'live_ast' + 'live_ast/replace_eval'
+* add require 'live_ast/full' -- shortcut for live_ast + live_ast/replace_eval
 * rubyspec conformance for require 'live_ast/full'
 * added required_ruby_version to gemspec
 * fixed error when IRB is partially required

data/MANIFEST

@@ -57,6 +57,7 @@ test/recursive_eval_test.rb
 test/redefine_method_test.rb
 test/reload_test.rb
 test/replace_eval_test.rb
+test/rubygems_test.rb
 test/rubyspec_test.rb
 test/stdlib_test.rb
 test/thread_test.rb

data/README.rdoc

@@ -133,7 +133,7 @@ for AST-accessible objects. +ast_eval+ has the same semantics as
   p u.to_ast
   # => s(:iter, s(:call, nil, :lambda, s(:arglist)), nil, s(:str, "dynamic3"))
   
-== Full integration
+== Full Integration
 
 In order for LiveAST to be transparent to the user, +eval+ must be
 replaced. This requires the +boc+ gem (http://quix.github.com/boc)
@@ -165,7 +165,7 @@ Since LiveAST itself is pure ruby, any new platforms supported by
 == Limitations
 
 A method or block definition must not share a line with other methods
-or blocks in order for its AST to be available.
+or blocks in order for its AST to be accessible.
 
   require 'live_ast'
   
@@ -176,16 +176,20 @@ or blocks in order for its AST to be available.
   
   a = lambda { } ; b = lambda { }
   a.to_ast # => raises LiveAST::MultipleDefinitionsOnSameLineError
-
+  
 Code given to the <code>-e</code> command-line switch is not
 AST-accessible.
 
-----
+Evaled code appearing before <code>require 'live_ast/full'</code> is
+not AST-accessible.
 
+In some circumstances +ast_eval+ and the replaced +eval+ will not give
+the same backtrace as the original +eval+ (next section).
+
+----
 == <em>Technical Issues</em>
 
 You can probably skip these next sections. Goodbye.
-
 ----
 
 == Backtraces

data/devel/levitate.rb

@@ -5,79 +5,47 @@ class Levitate
       require 'fileutils'
       require 'rbconfig'
       require 'find'
-      dest_root = RbConfig::CONFIG["sitelibdir"]
-      sources = []
-      Find.find("./lib") { |source|
-        if install_file?(source)
-          sources << source
-        end
-      }
-      @spec = sources.inject(Array.new) { |acc, source|
-        if source == "./lib"
-          acc
-        else
-          dest = File.join(dest_root, source.sub(%r!\A\./lib!, ""))
-  
-          install = lambda {
-            if File.directory?(source)
-              unless File.directory?(dest)
-                puts "mkdir #{dest}"
-                FileUtils.mkdir(dest)
-              end
-            else
-              puts "install #{source} --> #{dest}"
-              FileUtils.install(source, dest)
-            end
-          }
-            
-          uninstall = lambda {
-            if File.directory?(source)
-              if File.directory?(dest)
-                puts "rmdir #{dest}"
-                FileUtils.rmdir(dest)
-              end
-            else
-              if File.file?(dest)
-                puts "rm #{dest}"
-                FileUtils.rm(dest)
-              end
-            end
-          }
-  
-          acc << {
-            :source => source,
-            :dest => dest,
-            :install => install,
-            :uninstall => uninstall,
-          }
-        end
-      }
+
+      rb_root = RbConfig::CONFIG["sitelibdir"]
+      @spec = []
+
+      Find.find "lib" do |source|
+        next if source == "lib"
+        next unless File.directory?(source) || File.extname(source) == ".rb"
+        dest = File.join(rb_root, source.sub(%r!\Alib/!, ""))
+        @spec << { :source => source, :dest => dest }
+      end
     end
   
-    def install_file?(source)
-      File.directory?(source) or
-      (File.file?(source) and File.extname(source) == ".rb")
-    end
-
     def install
-      @spec.each { |entry|
-        entry[:install].call
-      }
+      @spec.each do |entry|
+        source, dest = entry.values_at(:source, :dest)
+        if File.directory?(source)
+          unless File.directory?(dest)
+            puts "mkdir #{dest}"
+            FileUtils.mkdir(dest)
+          end
+        else
+          puts "install #{source} --> #{dest}"
+          FileUtils.install(source, dest)
+        end
+      end
     end
   
     def uninstall
-      @spec.reverse.each { |entry|
-        entry[:uninstall].call
-      }
-    end
-
-    def run(args = ARGV)
-      if args.empty?
-        install
-      elsif args.size == 1 and args.first == "--uninstall"
-        uninstall
-      else
-        raise "unrecognized arguments: #{args.inspect}"
+      @spec.reverse.each do |entry|
+        source, dest = entry.values_at(:source, :dest)
+        if File.directory?(source)
+          if File.directory?(dest)
+            puts "rmdir #{dest}"
+            FileUtils.rmdir(dest)
+          end
+        else
+          if File.file?(dest)
+            puts "rm #{dest}"
+            FileUtils.rm(dest)
+          end
+        end
       end
     end
   end
@@ -522,6 +490,13 @@ class Levitate
   attribute :extensions do
     ["ext/#{gem_name}/extconf.rb"].select { |f| File.file? f }
   end
+  
+  attribute :so_file do
+    unless extensions.empty?
+      require 'rbconfig'
+      "lib/" + gem_name + "." + RbConfig::CONFIG["DLEXT"]
+    end
+  end
 
   def define_clean
     require 'rake/clean'
@@ -699,12 +674,28 @@ class Levitate
   def define_install
     desc "direct install (no gem)"
     task :install do
-      Installer.new.run([])
+      Installer.new.install
     end
 
     desc "direct uninstall (no gem)"
     task :uninstall do
-      Installer.new.run(["--uninstall"])
+      Installer.new.uninstall
+    end
+
+    if so_file
+      dest = File.join(RbConfig::CONFIG["sitearchdir"], File.basename(so_file))
+
+      task :install => so_file do
+        puts "install #{so_file} --> #{dest}"
+        FileUtils.install(so_file, dest)
+      end
+
+      task :uninstall do
+        if File.file?(dest)
+          puts "rm #{dest}"
+          FileUtils.rm(dest)
+        end
+      end
     end
   end
   
@@ -804,7 +795,7 @@ class Levitate
   end
 
   def define_extension
-    unless extensions.empty?
+    if so_file and (source_control? or !File.file?(so_file))
       require 'rbconfig'
       require 'rake/extensiontask'
       
@@ -817,9 +808,8 @@ class Levitate
         end
       end
 
-      so = "lib/#{gem_name}.#{RbConfig::CONFIG["DLEXT"]}"
-      if Rake::Task[so].needed?
-        task :test => so
+      if Rake::Task[so_file].needed?
+        task :test => so_file
       end
 
       task :cross_native_gem do
@@ -917,6 +907,7 @@ class Levitate
               raise "parse error"
             end
           )
+          code.gsub!(/^\s*%.*$/, "") # ignore shell command examples
           run_doc_code(code, expected, index, instance, &block)
           index += 1
         }

data/lib/live_ast/replace_eval.rb

@@ -45,6 +45,9 @@ module LiveAST
       end
     end
   end
+  
+  # ensure the parser is loaded -- rubygems calls eval
+  parser
 end
 
 module Kernel

data/lib/live_ast/version.rb

@@ -1,3 +1,3 @@
 module LiveAST
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/encoding_test.rb

@@ -1,34 +1,23 @@
 require_relative 'main'
 
-require_relative 'encoding_test/default.rb'
-require_relative 'encoding_test/usascii.rb'
-require_relative 'encoding_test/utf8.rb'
-require_relative 'encoding_test/utf8bom.rb'
-require_relative 'encoding_test/utf8bom_only.rb'
-require_relative 'encoding_test/usascii_with_utf8bom.rb'
-require_relative 'encoding_test/koi8_with_utf8bom.rb'
-require_relative 'encoding_test/cp932.rb'
-require_relative 'encoding_test/eucjp.rb'
-require_relative 'encoding_test/koi8.rb'
-require_relative 'encoding_test/koi8_shebang.rb'
-
 class AllEncodingTest < RegularTest
-  include EncodingTest
-
-  %w[
-
+  ENC_TESTS = Hash[*%w[
     default US-ASCII
     usascii US-ASCII
     utf8 UTF-8
     utf8bom UTF-8
+    utf8bom_only UTF-8
     usascii_with_utf8bom US-ASCII
     koi8_with_utf8bom KOI8-R
     cp932 Windows-31J
     eucjp EUC-JP
     koi8 KOI8-R
     koi8_shebang KOI8-R
+  ]]
+
+  ENC_TESTS.each_pair do |abbr, name|
+    require_relative "encoding_test/#{abbr}"
 
-  ].each_slice(2) do |abbr, name|
     define_method "test_#{abbr}" do
       str = send("#{abbr}_string")
       assert_equal name, str.encoding.to_s
@@ -43,6 +32,8 @@ class AllEncodingTest < RegularTest
     end
   end
 
+  include EncodingTest
+
   def test_bad
     orig = assert_raises ArgumentError do
       live_ast_original_load "./test/encoding_test/bad.rb"

data/test/readme_test.rb

@@ -8,6 +8,7 @@ if LiveAST.parser::Test.respond_to?(:unified_sexp?) and
     "+to_ruby+",
     "Noninvasive Interface",
     "Pure Ruby and +ast_eval+",
+    "Full Integration",
   ]
 
   Levitate.doc_to_test("README.rdoc", *sections)

data/test/rubygems_test.rb

@@ -0,0 +1,18 @@
+require_relative 'main'
+require_relative '../devel/levitate'
+
+class RubygemsTest < RegularTest
+  def test_rubygems
+    lib = File.expand_path(File.dirname(__FILE__) + "/../lib")
+    result = Levitate::Ruby.run_code_and_capture %{
+      $LOAD_PATH.unshift '#{lib}'
+      require 'live_ast/full'
+      defined?(LiveASTRipper) and LiveASTRipper.steamroll = true
+      f = eval %{
+        lambda { 'abc' }
+      }
+      p f.to_ast
+    }
+    assert_equal no_arg_block(:lambda, 'abc').to_s, result.chomp
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: live_ast
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -93,6 +93,7 @@ files:
 - test/redefine_method_test.rb
 - test/reload_test.rb
 - test/replace_eval_test.rb
+- test/rubygems_test.rb
 - test/rubyspec_test.rb
 - test/stdlib_test.rb
 - test/thread_test.rb