fxri 0.1.0 → 0.2.0

data/fxri.gemspec

@@ -1,24 +1,24 @@
-#!/bin/env ruby
-require 'rubygems'
-
-spec = Gem::Specification.new do |s|
-	s.name = "fxri"
-	s.add_dependency('fxruby', '>= 1.2.0')
-	s.version = "0.1.0"
-	s.date = "2005-02-20"
-	s.summary = "Graphical interface to the RI documentation, with search engine."
-	s.require_paths = ["lib"]
-	s.email = "martin.ankerl@gmail.com"
-	s.homepage = "http://fxri.rubyforge.org/"
-	s.rubyforge_project = "fxri"
-	s.description = "FxRi is an FXRuby interface to the RI documentation, with a search engine that allows for search-on-typing."
-	s.has_rdoc = false
-	s.files = Dir.glob("**/*")
-	s.bindir = "."
-	s.executables = ["fxri"]
-end
-
-if __FILE__ == $0
-	Gem.manage_gems
-	Gem::Builder.new(spec).build
-end
+#!/bin/env ruby
+require 'rubygems'
+
+spec = Gem::Specification.new do |s|
+	s.name = "fxri"
+	s.add_dependency('fxruby', '>= 1.2.0')
+	s.version = "0.2.0"
+	s.date = "2005-02-20"
+	s.summary = "Graphical interface to the RI documentation, with search engine."
+	s.require_paths = ["lib"]
+	s.email = "martin.ankerl@gmail.com"
+	s.homepage = "http://fxri.rubyforge.org/"
+	s.rubyforge_project = "fxri"
+	s.description = "FxRi is an FXRuby interface to the RI documentation, with a search engine that allows for search-on-typing."
+	s.has_rdoc = false
+	s.files = Dir.glob("**/*")
+	s.bindir = "."
+	s.executables = ["fxri"]
+end
+
+if __FILE__ == $0
+	Gem.manage_gems
+	Gem::Builder.new(spec).build
+end

data/lib/fxirb.rb

@@ -3,11 +3,10 @@
 # TODO
 # - handle user input redirection
 # - readline
-# - multiline commands
 
 # Credits:
 # - Initial linux version:  Gilles Filippini
-# - Initial windows port : Marco Fraillis
+# - Initial windows port : Marco Frailis
 # - Currently maintained and developed by 
 #     Martin DeMello <martindemello@gmail.com>
 
@@ -22,60 +21,87 @@ STDOUT.sync = true
 
 class FXIRBInputMethod < IRB::StdioInputMethod
 
-	def initialize
-		super 
-		@history = 1
+	attr_accessor :print_prompt, :gets_mode
+
+  def initialize
+    super 
+    @history = 1
 		@begin = nil
+	  @print_prompt = true
 		@end = nil
-	end
+		@continued_from = nil
+		@gets_mode = false
+  end
 
-	def gets 
-		print @prompt
-		
-		if @prompt =~ /(\d+)[>*]/
-			print "  "*$1.to_i
+  def gets 
+		if @gets_mode
+			return FXIrb.instance.get_line
 		end
-		
-		str = FXIrb.instance.gets
-		if /^exit/ =~ str
-			exit
+
+		if (a = @prompt.match(/(\d+)[>*]/))
+			level = a[1].to_i
+		else
+			level = 0
 		end
+
+		if level > 0
+			@continued_from ||= @line_no
+		elsif @continued_from
+			merge_last(@line_no-@continued_from+1)
+			@continued_from = nil
+		end
+		
+		if @print_prompt
+			print @prompt
 		
+			#indentation
+			print "  "*level
+		end
+
+    str = FXIrb.instance.get_line
+
 		@line_no += 1
 		@history = @line_no + 1
 		@line[@line_no] = str
+
+		str
+  end
+
+	# merge a block spanning several lines into one \n-separated line
+	def merge_last(i)
+		return unless i > 1
+		range = -i..-1
+		@line[range] = @line[range].map {|l| l.chomp}.join("\n")
+		@line_no -= (i-1)
+		@history -= (i-1)
 	end
-	
-	def compact
-		print [@compact, @continued].inspect
-		if false # @compact
-			@compact = false
-			a = @line_no - @continued
-			@lines[a] = @lines[a..2].join
-		end
-	end
-	
-	def prevCmd
-		if @line_no > 0
-			@history -= 1 unless @history <= 1
-			return line(@history)
-		end
-		return ""
-	end
-	
-	def nextCmd
-		if (@line_no > 0) && (@history < @line_no)
-			@history += 1
-			return line(@history)
-		end
-		return ""
-	end
-	
+
+  def prevCmd
+		return "" if @gets_mode
+		
+    if @line_no > 0
+      @history -= 1 unless @history <= 1
+      return line(@history)
+    end
+    return ""
+  end
+
+  def nextCmd
+		return "" if @gets_mode
+
+    if (@line_no > 0) && (@history < @line_no)
+      @history += 1
+      return line(@history)
+    end
+    return ""
+  end
+
 end
 
 module IRB
-	def IRB.start_in_fxirb(im)
-		if RUBY_VERSION < "1.7.3"
+
+  def IRB.start_in_fxirb(im)
+    if RUBY_VERSION < "1.7.3"
 			IRB.initialize(nil)
 			IRB.parse_opts
 			IRB.load_modules
@@ -93,14 +119,27 @@ module IRB
 		trap("SIGINT") do
 			irb.signal_handle
 		end
-		
-		catch(:IRB_EXIT) do
-			irb.eval_input
+
+    class << irb.context.workspace.main
+			def gets
+				inp = IRB.conf[:MAIN_CONTEXT].io
+				inp.gets_mode = true
+				retval = IRB.conf[:MAIN_CONTEXT].io.gets
+				inp.gets_mode = false
+				retval
+			end
 		end
-		print "\n"
-	end
+    
+    catch(:IRB_EXIT) do
+      irb.eval_input
+		end
+    print "\n"
+
+  end
+
 end
 
+
 class FXIrb < FXText
 	include Singleton
 	include Responder
@@ -129,6 +168,7 @@ class FXIrb < FXText
 
 		super
 		setFont(FXFont.new(FXApp.instance, "lucida console", 9))
+		@anchor = 0
 	end
 
 	def create
@@ -140,7 +180,7 @@ class FXIrb < FXText
 		setFocus
 		setText("")
 		# IRB initialization
-		@inputAdded = false
+		@inputAdded = 0
 		@input = IO.pipe
 		$DEFAULT_OUTPUT = self
 
@@ -172,16 +212,21 @@ class FXIrb < FXText
 			setCursorPos(getLength)
 			super
 		when Fox::KEY_Up,Fox::KEY_KP_Up
-			str = @im.prevCmd.chop
-			if str != ""
-				removeText(@anchor, getLength-@anchor)
-				write(str)
+			str = extractText(@anchor, getCursorPos-@anchor)
+			if str =~ /\n/
+				@multiline = true
+				super
+				setCursorPos(@anchor+1) if getCursorPos < @anchor
+			else
+				history(:prev) unless @multiline
 			end
 		when Fox::KEY_Down,Fox::KEY_KP_Down
-			str = @im.nextCmd.chop
-			if str != ""
-				removeText(@anchor, getLength-@anchor)
-				write(str)
+			str = extractText(getCursorPos, getLength - getCursorPos)
+			if str =~ /\n/
+				@multiline = true
+				super
+			else
+				history(:next) unless @multiline
 			end
 		when Fox::KEY_Left,Fox::KEY_KP_Left
 			if getCursorPos > @anchor
@@ -195,16 +240,14 @@ class FXIrb < FXText
 			setCursorPos(@anchor)
 		when Fox::KEY_End, Fox::KEY_KP_End
 			setCursorPos(getLength)
-		when Fox::KEY_Page_Up, Fox::KEY_KP_Page_Up,
-			Fox::KEY_Page_Down, Fox::KEY_KP_Page_Down
+		when Fox::KEY_Page_Up, Fox::KEY_KP_Page_Up
+			history(:prev)
+		when Fox::KEY_Page_Down, Fox::KEY_KP_Page_Down
+			history(:next)
 		when Fox::KEY_bracketright
 			#auto-dedent if the } or ] is on a line by itself
 			if (emptyline? or (getline == "en")) and indented?
-				str = getline
-				@anchor -= 2
-				rmline
-				appendText(str)
-				setCursorPos(getLength)
+				dedent
 			end
 			super
 		when Fox::KEY_u
@@ -292,10 +335,18 @@ class FXIrb < FXText
 	end
 
 	def processCommandLine(cmd)
-		#write("[#{cmd}]")
-		@input[1].puts cmd
-		@inputAdded = true
-		@irb.run
+		@multiline = false
+		lines = cmd.split(/\n/)
+		lines.each {|i| 
+			@input[1].puts i
+			@inputAdded += 1
+		}
+		@im.print_prompt = false
+		while (@inputAdded > 0) do
+			@irb.run
+		end
+		@im.merge_last(lines.length)
+		@im.print_prompt = true 
 	end
 
 	def sendCommand(cmd)
@@ -314,12 +365,12 @@ class FXIrb < FXText
 		return str.length
 	end
 
-	def gets
+	def get_line
 		@anchor = getLength
-		if !@inputAdded
+		if @inputAdded == 0
 			Thread.stop
 		end
-		@inputAdded = false
+		@inputAdded -= 1
 		return @input[0].gets
 	end
 end
@@ -331,7 +382,7 @@ if __FILE__ == $0
 	Thread.abort_on_exception = true
 	application.init(ARGV)
 	window = FXMainWindow.new(application, "FXIrb", nil, nil, DECOR_ALL, 0, 0, 580, 500)
-	FXIrb.init(window, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP|TEXT_SHOWACTIVE)
+	fxirb = FXIrb.init(window, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP|TEXT_SHOWACTIVE)
 	application.create
 	window.show(PLACEMENT_SCREEN)
 	application.run

metadata

@@ -1,9 +1,9 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: fxri
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 date: 2005-02-20
 summary: "Graphical interface to the RI documentation, with search engine."
 require_paths: 
@@ -27,24 +27,24 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 authors: []
 files: 
-  - lib
   - fxri
   - fxri.gemspec
+  - lib
+  - lib/Empty_Text_Field_Handler.rb
   - lib/FoxDisplayer.rb
+  - lib/FoxTextFormatter.rb
+  - lib/fxirb.rb
+  - lib/Globals.rb
   - lib/icons
+  - lib/Icon_Loader.rb
+  - lib/Packet_Item.rb
+  - lib/Packet_List.rb
   - lib/Recursive_Open_Struct.rb
   - lib/RiManager.rb
-  - lib/Globals.rb
-  - lib/fxirb.rb
-  - lib/Packet_Item.rb
   - lib/Search_Engine.rb
-  - lib/Empty_Text_Field_Handler.rb
-  - lib/FoxTextFormatter.rb
-  - lib/Packet_List.rb
-  - lib/Icon_Loader.rb
-  - lib/icons/module.png
-  - lib/icons/method.png
   - lib/icons/class.png
+  - lib/icons/method.png
+  - lib/icons/module.png
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []