muby 0.7.1 → 0.7.2

data/lib/muby/configuration.rb

@@ -4,7 +4,7 @@ require 'ncurses'
 module Muby
 
 
-  VERSION = "0.7.1" unless defined?(Muby::VERSION)
+  VERSION = "0.7.2" unless defined?(Muby::VERSION)
   
   #
   # The class that encapsulates all configuration.

data/lib/muby/helper_methods.rb

@@ -7,24 +7,29 @@ module Muby
       execute_with_verbosity(:debug, command, *args)
     end
 
+    def do_execute(command, *args)
+      result = nil
+      if Proc === command
+        result = command.call(*args[0...(command.arity)])
+      elsif String === command
+        result = eval(command)
+      elsif Symbol === command
+        method = self.method(command)
+        args = args[0...(method.arity)]
+        result = method.call(*args)
+      elsif Array === command
+        method = self.method(command.first)
+        args = (command[1..-1] + args)[0...(method.arity)]
+        result = method.call(*args)
+      else
+        result = command
+      end
+      result
+    end
+
     def execute_with_verbosity(verbosity, command, *args)
       begin
-        result = nil
-        if Proc === command
-          result = command.call(*args[0...(command.arity)])
-        elsif String === command
-          result = eval(command)
-        elsif Symbol === command
-          method = self.method(command)
-          args = args[0...(method.arity)]
-          result = method.call(*args)
-        elsif Array === command
-          method = self.method(command.first)
-          args = (command[1..-1] + args)[0...(method.arity)]
-          result = method.call(*args)
-        else
-          result = command
-        end
+        result = do_execute(command, *args)
         unless result.nil?
           case result
           when String

data/lib/muby/inputwindow.rb

@@ -32,6 +32,17 @@ class Muby::InputWindow
   # Start working!
   #
   def go
+    # Ensure our size is calculable
+    begin
+      height
+      width
+      top
+      left
+    rescue Exception => e
+      Ncurses.endwin
+      raise "Unable to calculate input window geometry: #{e}\n\nCheck your config file (#{conf.loaded_rc_file}) for errors in 'conf.input_window_geometry!\n\n"
+    end
+
     # Init all the default values
     @buffer = ""
     @cursorPosition = 0
@@ -43,6 +54,12 @@ class Muby::InputWindow
     @recent_escape = []
     @handle_mode = :append_buffer!
 
+    resize!
+
+    help unless conf.user_edited_config_file
+  end
+
+  def resize!
     # Init the input box
     @inputBorder = Ncurses.newwin(height, width, top, left)
     @inputBorder.box(0,0)
@@ -55,31 +72,26 @@ class Muby::InputWindow
     @inputWindow.scrollok(true)
     @inputWindow.nodelay(true)
     @inputWindow.refresh
-
-    help unless conf.user_edited_config_file
   end
   
   def reload!
-    @left = nil
-    @top = nil
-    @width = nil
-    @height = nil
+    do_startup_triggers
   end
 
   def left
-    @left ||= execute_with_verbosity(:trace, conf.input_window_geometry[:left])
+    do_execute(conf.input_window_geometry[:left])
   end
 
   def top
-    @top ||= execute_with_verbosity(:trace, conf.input_window_geometry[:top])
+    do_execute(conf.input_window_geometry[:top])
   end
 
   def width
-    @width ||= execute_with_verbosity(:trace, conf.input_window_geometry[:width])
+    do_execute(conf.input_window_geometry[:width])
   end
 
   def height
-    @height ||= execute_with_verbosity(:trace, conf.input_window_geometry[:height])
+    do_execute(conf.input_window_geometry[:height])
   end
 
   #
@@ -159,20 +171,25 @@ class Muby::InputWindow
     end
   end
 
+  def do_startup_triggers
+    conf.startup_triggers.each do |trigger|
+      execute(trigger, self, Muby::OutputWindow.get_instance)
+    end
+  end
+
   #
   # Just keep listening to the keyboard input.
   #
   def process
     loadHistory
-    conf.startup_triggers.each do |trigger|
-      execute(trigger, self, Muby::OutputWindow.get_instance)
-    end
+    do_startup_triggers
     # We need to check one key at a time due to triggers and conf.key_commands
     while c = @inputWindow.wgetch
       if c == Ncurses.const_get("ERR")
         sleep(0.01)
       else
         handle(c, conf.key_commands)
+        update
       end
     end # while c = @inputWindow.wgetch
   end # def process

data/lib/muby/outputwindow.rb

@@ -28,6 +28,17 @@ class Muby::OutputWindow
   # Start working!
   #
   def go
+    # Ensure our size is calculable
+    begin
+      height
+      width
+      top
+      left
+    rescue Exception => e
+      Ncurses.endwin
+      raise "Unable to calculate output window geometry: #{e}\n\nCheck your config file (#{conf.loaded_rc_file}) for errors in 'conf.output_window_geometry!\n\n"
+    end
+
     @scrollback = 0
     @waitBuffer = []
     @lines = 0
@@ -47,27 +58,24 @@ class Muby::OutputWindow
     @ready = true
   end
 
-  def reload!
-    @left = nil
-    @top = nil
-    @width = nil
-    @height = nil
+  def resize!
+    refresh
   end
 
   def left
-    @left ||= execute_with_verbosity(:trace, conf.output_window_geometry[:left])
+    do_execute(conf.output_window_geometry[:left])
   end
 
   def top
-    @top ||= execute_with_verbosity(:trace, conf.output_window_geometry[:top])
+    do_execute(conf.output_window_geometry[:top])
   end
 
   def width
-    @width ||= execute_with_verbosity(:trace, conf.output_window_geometry[:width])
+    do_execute(conf.output_window_geometry[:width])
   end
 
   def height
-    @height ||= execute_with_verbosity(:trace, conf.output_window_geometry[:height])
+    do_execute(conf.output_window_geometry[:height])
   end
 
   def show_version

data/lib/muby/user_methods.rb

@@ -41,7 +41,7 @@ configuration file.
 (Then, you could type /help or press F1 to get the help text again)
 
 The configuration file the system has tried to create for you
-is at #{conf.loaded_rc_file}.
+is at #{File.expand_path(conf.loaded_rc_file)}.
 ENDTEXT
       info help
     end
@@ -229,10 +229,15 @@ ENDTEXT
       end
       nil
     end
+    
+    def resize_application!
+      Muby::OutputWindow.get_instance.resize!
+      Muby::InputWindow.get_instance.resize!
+    end
 
     def reload_application!
+      resize_application!
       conf.reload_application!
-      Muby::OutputWindow.get_instance.reload!
       Muby::InputWindow.get_instance.reload!
     end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: muby
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2007-10-19 00:00:00 +02:00
+  version: 0.7.2
+date: 2007-10-20 00:00:00 +02:00
 summary: A simple but powerful mud client.
 require_paths: 
 - lib