live_ast 0.6.0 → 0.6.1

data/CHANGES.rdoc

@@ -1,5 +1,9 @@
 
-= LiveAST ChangeLog
+= live_ast Changes
+
+== Version 0.6.1
+
+* enable usage inside irb
 
 == Version 0.6.0
 

data/MANIFEST

@@ -9,6 +9,7 @@ lib/live_ast/ast_load.rb
 lib/live_ast/base.rb
 lib/live_ast/error.rb
 lib/live_ast/evaler.rb
+lib/live_ast/irb_spy.rb
 lib/live_ast/linker.rb
 lib/live_ast/loader.rb
 lib/live_ast/reader.rb
@@ -41,6 +42,7 @@ test/encoding_test/utf8bom_only.rb
 test/error_test.rb
 test/eval_test.rb
 test/flush_cache_test.rb
+test/irb_test.rb
 test/lambda_test.rb
 test/load_path_test.rb
 test/load_test.rb

data/devel/levitate.rb

@@ -249,12 +249,12 @@ class Levitate
   include AttrLazy
   include Util
 
-  def initialize(project_name)
+  def initialize(gem_name)
     $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
     require 'rubygems/package_task'
 
-    @project_name = project_name
+    @gem_name = gem_name
 
     yield self
 
@@ -269,24 +269,22 @@ class Levitate
     alias_method :attribute, :attr_lazy_accessor
   end
 
-  attribute :name do
-    @project_name
-  end
+  attr_reader :gem_name
 
   attribute :version_constant_name do
     "VERSION"
   end
 
   attribute :camel_name do
-    to_camel_case(name)
+    to_camel_case(gem_name)
   end
 
   attribute :version do
     catch :bail do
-      if File.file?(version_file = "./lib/#{name}/version.rb")
+      if File.file?(version_file = "./lib/#{gem_name}/version.rb")
         require version_file
-      elsif File.file?("./lib/#{name}.rb")
-        require name
+      elsif File.file?("./lib/#{gem_name}.rb")
+        require gem_name
       else
         throw :bail
       end
@@ -337,7 +335,7 @@ class Levitate
 
   [:gem, :tgz].each { |ext|
     attribute ext do
-      "pkg/#{name}-#{version}.#{ext}"
+      "pkg/#{gem_name}-#{version}.#{ext}"
     end
   }
 
@@ -383,7 +381,7 @@ class Levitate
   end
     
   attribute :rdoc_title do
-    "#{name}: #{summary}"
+    "#{gem_name}: #{summary}"
   end
 
   attribute :require_paths do
@@ -418,9 +416,7 @@ class Levitate
 
   attribute :gemspec do
     Gem::Specification.new do |g|
-      g.has_rdoc = true
       %w[
-        name
         authors
         email
         summary
@@ -430,18 +426,15 @@ class Levitate
         rdoc_options
         extra_rdoc_files
         require_paths
-      ].each { |param|
-        value = send(param) and (
-          g.send("#{param}=", value)
-        )
-      }
-
+      ].each do |param|
+        t = send(param) and g.send("#{param}=", t)
+      end
+      g.name = gem_name
+      g.has_rdoc = true
       g.homepage = url if url
-
       dependencies.each { |dep|
         g.add_dependency(*dep)
       }
-
       development_dependencies.each { |dep|
         g.add_development_dependency(*dep)
       }
@@ -495,7 +488,7 @@ class Levitate
   }
 
   attribute :url do
-    "http://#{github_user}.github.com/#{name}"
+    "http://#{github_user}.github.com/#{gem_name}"
   end
 
   attribute :github_user do
@@ -737,6 +730,43 @@ class Levitate
     end
   end
 
+  def define_update_levitate
+    url = ENV["LEVITATE"] ||
+      "https://github.com/quix/levitate/raw/master/levitate.rb"
+    task :update_levitate do
+      if system "curl", "-s", "-o", __FILE__, url
+        if `git diff #{__FILE__}` == ""
+          puts "Already up-to-date."
+        else
+          git "commit", __FILE__, "-m", "updated levitate"
+          puts "Updated levitate."
+        end
+      else
+        raise "levitate download failed"
+      end
+    end
+  end
+
+  def define_changes
+    task :changes do
+      header = "\n\n== Version ____\n\n"
+
+      bullets = `git log --format=%s #{last_release}..HEAD`.lines.map { |line|
+        "* #{line}"
+      }.join.chomp
+
+      write_file(history_file) do
+        File.read(history_file).sub(/(?<=#{gem_name} Changes)/) {
+          header + bullets
+        }
+      end
+    end
+  end
+
+  def last_release
+    `git tag`.lines.select { |t| t.index(gem_name) == 0 }.last.chomp
+  end
+
   def git(*args)
     sh "git", *args
   end
@@ -751,7 +781,7 @@ class Levitate
     task :prerelease => [:clean, :check_directory, :ping, history_file]
 
     task :finish_release do
-      git "tag", "#{name}-" + version.to_s
+      git "tag", "#{gem_name}-" + version.to_s
       git "push", "--tags", "origin", "master"
       sh "gem", "push", gem
     end

data/lib/live_ast/base.rb

@@ -5,6 +5,7 @@ require 'live_ast/evaler'
 require 'live_ast/linker'
 require 'live_ast/loader'
 require 'live_ast/error'
+require 'live_ast/irb_spy' if defined?(IRB) && defined?(Readline::HISTORY)
 
 module LiveAST
   NATIVE_EVAL = Kernel.method(:eval)  #:nodoc:

data/lib/live_ast/irb_spy.rb

@@ -0,0 +1,74 @@
+#
+# Some hacks to get LiveAST working with IRB.
+#
+# (1) Because Readline::HISTORY is empty at startup, we count the
+# lines of the history file in order to determine where the new
+# history begins for this IRB session.
+#
+# (2) IRB::ReadlineInputMethod#gets discards empty input lines,
+# causing Readline::HISTORY to be out of sync with the current line
+# number, thereby fouling up source_location. We redefine #gets to
+# keep empty lines.
+#
+
+module LiveAST
+  module IRBSpy
+    class << self
+      def code_at(line)
+        history = Readline::HISTORY.to_a
+        start = @history_start + line - 1
+        grow = 0
+        begin
+          code = history[start..(start + grow)].join("\n")
+          LiveAST.parser.new.parse(code) or raise "#{LiveAST.parser} error"
+        rescue
+          grow += 1
+          retry if start + grow < history.size
+          raise
+        end
+        code
+      end
+
+      #
+      # Find the starting point of history for this IRB session.
+      #
+      def find_history_start
+        if IRB.conf[:HISTORY_FILE]
+          # cut & paste from irb/ext/save-history.rb
+          if history_file = IRB.conf[:HISTORY_FILE]
+            history_file = File.expand_path(history_file)
+          end
+          history_file = IRB.rc_file("_history") unless history_file
+          
+          if File.exist?(history_file)
+            File.readlines(history_file).size
+          else
+            0
+          end
+        else
+          0
+        end
+      end
+    end
+
+    @history_start = find_history_start
+  end
+end
+
+#
+# From irb/input-method.rb.
+#
+class IRB::ReadlineInputMethod
+  alias_method :live_ast_original_gets, :gets
+  def gets
+    Readline.input = @stdin
+    Readline.output = @stdout
+    if l = readline(@prompt, false)
+      HISTORY.push(l) #if !l.empty?  # <---- only this line modified
+      @line[@line_no += 1] = l + "\n"
+    else
+      @eof = true
+      l
+    end
+  end
+end

data/lib/live_ast/linker.rb

@@ -81,11 +81,19 @@ module LiveAST
       def fetch_from_cache(file, line)
         cache = @caches[file]
         if !cache and !file.index(REVISION_TOKEN)
-          #
-          # File was loaded by 'require'.
-          # Play catch-up: assume it has not changed in the meantime.
-          #
-          _, cache = new_cache(Reader.read(file), file, 1, true)
+          _, cache =
+            if defined?(IRB) and file == "(irb)"
+              unless defined? Readline::HISTORY
+                raise "LiveAST requires readline enabled in irb."
+              end
+              new_cache(IRBSpy.code_at(line), file, line, false)
+            else
+              #
+              # File was loaded by 'require'.
+              # Play catch-up: assume it has not changed in the meantime.
+              #
+              new_cache(Reader.read(file), file, 1, true)
+            end
         end
         cache.fetch_ast(line) if cache
       end

data/lib/live_ast/version.rb

@@ -1,3 +1,3 @@
 module LiveAST
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/define_method_test.rb

@@ -1,7 +1,7 @@
 require_relative 'main'
 
 class DefineMethodTest < RegularTest
-  DEFINE = lambda do
+  WITH_BLOCKS = lambda do
     class A
       {
         :f => :+,
@@ -26,8 +26,8 @@ class DefineMethodTest < RegularTest
     end
   end
 
-  def test_define_method
-    DEFINE.call
+  def test_with_block
+    WITH_BLOCKS.call
 
     assert_equal binop_define_method_with_var(:name, :+),
                  A.instance_method(:f).to_ast
@@ -38,4 +38,30 @@ class DefineMethodTest < RegularTest
     assert_equal binop_define_method_with_var(:name, :-),
                  A.instance_method(:h).to_ast
   end
+
+  WITH_PROCS = lambda do
+    class B
+      op = lambda { |x, y| x / y }
+      
+      no_arg = proc { "B#f" }
+
+      define_method :g, &no_arg ; define_method :f, &op
+    end
+  end
+
+  def test_via_block
+    WITH_PROCS.call
+
+    assert_equal binop_block(:lambda, :/),
+                 B.instance_method(:f).to_ast
+
+    assert_equal binop_block(:lambda, :/),
+                 B.new.method(:f).to_ast
+
+    assert_equal no_arg_block(:proc, "B#f"),
+                 B.instance_method(:g).to_ast
+
+    assert_equal no_arg_block(:proc, "B#f"),
+                 B.new.method(:g).to_ast
+  end
 end

data/test/irb_test.rb

@@ -0,0 +1,38 @@
+require_relative 'main'
+
+class IRBTest < RegularTest
+  def with_module(parent, child)
+    parent.const_set child, Module.new
+    begin
+      yield
+    ensure
+      parent.send :remove_const, child
+    end
+  end
+
+  def test_readline_not_present
+    with_module(Object, :IRB) do
+      error = assert_raises RuntimeError do
+        LiveAST::Linker.fetch_from_cache("(irb)", 33)
+      end
+      assert_match(/readline enabled/, error.message)
+    end
+  end
+
+  def test_irb
+    with_module(Object, :IRB) do
+      with_module(Object, :Readline) do
+        with_module(Readline, :HISTORY) do
+          with_module(LiveAST, :IRBSpy) do
+            LiveAST::IRBSpy.class_eval do
+              def self.code_at(line)
+                "def f ; end"
+              end
+            end
+            LiveAST::Linker.fetch_from_cache("(irb)", 1)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: live_ast
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-26 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - lib/live_ast/base.rb
 - lib/live_ast/error.rb
 - lib/live_ast/evaler.rb
+- lib/live_ast/irb_spy.rb
 - lib/live_ast/linker.rb
 - lib/live_ast/loader.rb
 - lib/live_ast/reader.rb
@@ -76,6 +77,7 @@ files:
 - test/error_test.rb
 - test/eval_test.rb
 - test/flush_cache_test.rb
+- test/irb_test.rb
 - test/lambda_test.rb
 - test/load_path_test.rb
 - test/load_test.rb
@@ -109,6 +111,8 @@ rdoc_options:
 - --exclude
 - lib/live_ast/evaler.rb
 - --exclude
+- lib/live_ast/irb_spy.rb
+- --exclude
 - lib/live_ast/linker.rb
 - --exclude
 - lib/live_ast/loader.rb
@@ -138,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A pure Ruby library for obtaining live abstract syntax trees of methods and procs.