muby 0.7.3 → 0.7.4

data/lib/muby/configuration.rb

@@ -4,7 +4,7 @@ require 'ncurses'
 module Muby
 
 
-  VERSION = "0.7.3" unless defined?(Muby::VERSION)
+  VERSION = "0.7.4" unless defined?(Muby::VERSION)
   
   #
   # The class that encapsulates all configuration.
@@ -127,7 +127,7 @@ module Muby
       }
       
       @key_commands = {
-        #18 => :resize, # ctrl-l
+        12 => :resize_application!, # ctrl-l
         Ncurses.const_get("KEY_PPAGE") => :scroll_up!,
         Ncurses.const_get("KEY_NPAGE") => :scroll_down!,
         Ncurses.const_get("KEY_ENTER") => :process_buffer!,
@@ -138,10 +138,15 @@ module Muby
         127 => :backspace_buffer!, # backspace
         Ncurses.const_get("KEY_BACKSPACE") => :backspace_buffer!,
         27 => {
+          263 => :word_backspace_buffer!, # alt-backspace
           91 => {
-            53 => {
-              68 => :previous_word_buffer!, # ctrl-key_left
-              67 => :next_word_buffer!, # ctrl-key_right
+            49 => {
+              59 => {
+                53 => {
+                  68 => :previous_word_buffer!, # ctrl-key_left
+                  67 => :next_word_buffer!, # ctrl-key_right
+                }
+              }
             }
           }
         },
@@ -160,6 +165,8 @@ module Muby
       # miscellaneous options #
       #
 
+      @connect_timeout = 10
+
       @feed_completer_with_history = true
 
       @feed_completer_with_input = true

data/lib/muby/connection.rb

@@ -19,7 +19,7 @@ class Muby::Connection
     status("Connecting to " + host.inspect + ":" + port.inspect)
     @host = host
     @port = port
-    @socket = TCPSocket.open(host, port) if host && port
+    connect!
     conf.connect_triggers.each do |command|
       @inputWindow.execute(command, @inputWindow, @outputWindow)
     end
@@ -40,6 +40,25 @@ class Muby::Connection
     end if @socket
   end
 
+  #
+  # Almost ripped from the documentation: http://www.ruby-doc.org/core/classes/Socket.src/M002114.html
+  #
+  def connect!
+    @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    addr = Socket.sockaddr_in(@port, @host)
+    begin
+      @socket.connect_nonblock(addr)
+    rescue Errno::EINPROGRESS
+      IO.select(nil, [@socket], nil, conf.connect_timeout)
+      begin
+        @socket.connect_nonblock(addr)
+      rescue Errno::EISCONN
+      rescue Errno::EALREADY
+        raise "Connection timed out"
+      end
+    end
+  end
+
   #
   # Display a status message in the outputwindow if wanted (conf.connection_status)
   #

data/lib/muby/help.rb

@@ -3,6 +3,7 @@ module Muby
   module Help
     def self.configuration
       {
+        :connect_timeout => "The number of seconds we will try to connect before giving up.",
         :feed_completer_with_history => "If true, the completion command will use history to calculate possible completions.",
         :feed_completer_with_input => "If true, the completion command will use everything seen from the remote end to calculate possible completions.",
         :extra_completions => "Fill this array with words that you allways want to be able to complete to.",

data/lib/muby/inputwindow.rb

@@ -134,7 +134,7 @@ class Muby::InputWindow
   def loadHistory
     begin
       if FileTest.readable?(conf.history_file)
-        info("Reading history file")
+        info("Reading #{conf.history_file}")
         Kernel::open(conf.history_file) do |input|
           @history = Marshal.load(input.read)
         end

data/lib/muby/user_methods.rb

@@ -105,10 +105,25 @@ ENDTEXT
       disconnect
       @last_host = host
       @last_port = port
-      @connection = Muby::Connection.new(self, Muby::OutputWindow.get_instance, host, port)
+      rescue_thread do
+        @connection = Muby::Connection.new(self, Muby::OutputWindow.get_instance, host, port)
+      end
       "Connecting"
     end
 
+    #
+    # Do block in a thread that displays errors that happen.
+    #
+    def rescue_thread(&block)
+      Thread.new do
+        begin
+          yield
+        rescue Exception => e
+          exception(e)
+        end
+      end
+    end
+
     #
     # Make a fake connection for debug purposes
     #

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: muby
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
-date: 2007-10-20 00:00:00 +02:00
+  version: 0.7.4
+date: 2007-11-15 00:00:00 +01:00
 summary: A simple but powerful mud client.
 require_paths: 
 - lib
@@ -29,21 +29,20 @@ post_install_message:
 authors: 
 - Martin Kihlgren, Sy Ali
 files: 
-- lib/muby/completer.rb
-- lib/muby/configuration.rb
 - lib/muby/connection.rb
-- lib/muby/displayer.rb
-- lib/muby/help.rb
-- lib/muby/inputwindow.rb
 - lib/muby/logger.rb
-- lib/muby/outputwindow.rb
 - lib/muby/style.rb
 - lib/muby/user_methods.rb
 - lib/muby/application.rb
+- lib/muby/configuration.rb
+- lib/muby/inputwindow.rb
+- lib/muby/help.rb
+- lib/muby/outputwindow.rb
+- lib/muby/completer.rb
+- lib/muby/displayer.rb
 - lib/muby/helper_methods.rb
 - lib/muby/user_window.rb
 - lib/muby.rb
-- contrib/sy/cce.rb
 - contrib/aardmud.org_4000/aliases/aard-aliases.rb
 - contrib/aardmud.org_4000/gags/aard-gags.rb
 - contrib/aardmud.org_4000/speedwalks/aard-sw-areas-vidblain.rb
@@ -64,6 +63,7 @@ files:
 - contrib/aardmud.org_4000/misc/aard_consider_substitutions.rb
 - contrib/aardmud.org_4000/aard-helpers.rb
 - contrib/aardmud.org_4000/aard-config.rb
+- contrib/sy/cce.rb
 - contrib/aardmud.org_4000/README.txt
 - LICENSE
 test_files: []