live_ast 0.6.1 → 0.6.2

data/CHANGES.rdoc

@@ -1,6 +1,11 @@
 
 = live_ast Changes
 
+== Version 0.6.2
+
+* simplified irb handling; readline no longer required
+* add -e notes to readme
+
 == Version 0.6.1
 
 * enable usage inside irb

data/README.rdoc

@@ -162,6 +162,9 @@ 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.
+
 ----
 
 == <em>Technical Issues</em>

data/devel/levitate.rb

@@ -250,7 +250,7 @@ class Levitate
   include Util
 
   def initialize(gem_name)
-    $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+    $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
     require 'rubygems/package_task'
 
@@ -402,7 +402,7 @@ class Levitate
   end
 
   attribute :extra_rdoc_files do
-    File.file?(readme_file) ? [readme_file] : []
+    [readme_file, history_file].select { |file| File.file?(file) }
   end
 
   attribute :browser do
@@ -478,9 +478,11 @@ class Levitate
       begin
         sections[send("#{section}_section")].
         gsub("\n", " ").
-        split(%r!\.\s*!m).
+        split(%r!\.\s+!m).
         first(send("#{section}_sentences")).
-        join(".  ") << "."
+        join(". ").
+        concat(".").
+        sub(%r!\.+\Z!, ".")
       rescue
         "FIXME: #{section}"
       end
@@ -749,7 +751,11 @@ class Levitate
 
   def define_changes
     task :changes do
-      header = "\n\n== Version ____\n\n"
+      if File.read(history_file).index version
+        raise "version not updated"
+      end
+
+      header = "\n\n== Version #{version}\n\n"
 
       bullets = `git log --format=%s #{last_release}..HEAD`.lines.map { |line|
         "* #{line}"

data/lib/live_ast/base.rb

@@ -5,7 +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)
+require 'live_ast/irb_spy' if defined?(IRB)
 
 module LiveAST
   NATIVE_EVAL = Kernel.method(:eval)  #:nodoc:

data/lib/live_ast/irb_spy.rb

@@ -1,74 +1,37 @@
-#
-# 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
+    def self.code_at(line)
+      unless defined?(@history)
+        raise NotImplementedError,
+        "LiveAST cannot access history for this IRB input method"
       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
+      grow = 0
+      begin
+        code = @history[line..(line + grow)].join
+        LiveAST.parser.new.parse(code) or raise "#{LiveAST.parser} error"
+      rescue
+        grow += 1
+        retry if line + grow < @history.size
+        raise
       end
+      code
     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
+[
+ IRB::StdioInputMethod,
+ defined?(IRB::ReadlineInputMethod) ? IRB::ReadlineInputMethod : nil,
+].compact.each do |klass|
+  klass.module_eval do
+    alias_method :live_ast_original_gets, :gets
+    def gets
+      live_ast_original_gets.tap do
+        if defined?(@line)
+          LiveAST::IRBSpy.instance_variable_set(:@history, @line)
+        end
+      end
     end
   end
 end

data/lib/live_ast/linker.rb

@@ -83,9 +83,6 @@ module LiveAST
         if !cache and !file.index(REVISION_TOKEN)
           _, 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
               #

data/lib/live_ast/version.rb

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

data/test/irb_test.rb

@@ -10,28 +10,15 @@ class IRBTest < RegularTest
     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)
+      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

metadata

@@ -2,7 +2,7 @@
 name: live_ast
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -05:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,7 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
+- CHANGES.rdoc
 files: 
 - CHANGES.rdoc
 - README.rdoc