muby 0.7.8 → 0.7.9

data/lib/muby/configuration.rb

@@ -4,7 +4,7 @@ require 'ncurses'
 module Muby
 
 
-  VERSION = "0.7.8" unless defined?(Muby::VERSION)
+  VERSION = "0.7.9" unless defined?(Muby::VERSION)
   
   #
   # The class that encapsulates all configuration.
@@ -50,6 +50,8 @@ module Muby
         :width => "Ncurses.COLS",
         :height => "conf.input_height + 2"
       }
+
+      @single_shot_gags = []
       
       @echo_keycodes = false
 

data/lib/muby/connection.rb

@@ -86,6 +86,31 @@ class Muby::Connection
         exception(e)
       end
     end
+    returnValue = true if single_shot_gag(matchBuffer)
+    returnValue
+  end
+
+  #
+  # Check if we want to gag the current matchBuffer with the single shot gags and debug about it.
+  # Remove all matching gags, and all gags producing regexp errors.
+  #
+  def single_shot_gag(matchBuffer)
+    returnValue = false
+    new_gags = []
+    conf.single_shot_gags.each do |gag|
+      this_gag_matched = false
+      begin
+        if matchBuffer.match(gag)
+          trace(matchBuffer + " matches " + gag.inspect + ": gag active (but only once)")
+          returnValue = true
+          this_gag_matched = true
+        end
+      rescue RegexpError => error
+        exception(e)
+      end
+      new_gags << gag unless this_gag_matched
+    end
+    conf.single_shot_gags = new_gags
     returnValue
   end
 
@@ -144,12 +169,6 @@ class Muby::Connection
     nil
   end
 
-  def getc
-    c = @socket.getc
-    log_input(c.chr) if c
-    c
-  end
-
   unless defined?(TELNET_COMMANDS)
     TELNET_COMMANDS = {
       240 => :end_of_sub_negotiation,
@@ -166,19 +185,13 @@ class Muby::Connection
     }
   end
 
-  #
-  # This is not telnet command OR ansi, lets treat it as nice MUD text!
-  #
-  # Debug about it, add it to match buffer, add it to show buffer and show if we want to show.
-  # Then check it for triggers.
-  #
-  def handle_regular_character(c)
-    @matchBuffer = @matchBuffer + c.chr
-    append_show_buffer(c.chr)
-    manage_buffers(c)
+  def getc
+    c = @socket.getc
+    log_input(c.chr) if c
+    c
   end
 
-  def handle(c)
+  def process(c)
     #
     # The telnet support (just so we dont explode or something)
     #
@@ -214,6 +227,7 @@ class Muby::Connection
           warn("Got an unknown TELNET command (#{c.chr}) which I don't know how to handle. Expect strange behaviour...")
         end
       end
+      return nil
     elsif c == 27 # escape char! this is probably some ANSI color or shite
       c = getc
       if c.chr == "[" # this is an ansi-something that is more than one char long
@@ -287,17 +301,19 @@ class Muby::Connection
           @showBuffer.push(style)
         end
       end
+      return nil
     elsif !conf.broken_keycodes.include?(c)
-      handle_regular_character(c)
+      return c
     end
   end
 
-  def append_show_buffer(c)
+  def append_buffers(c)
     if String === @showBuffer.last
-      @showBuffer.last << c
+      @showBuffer.last << c.chr
     else
-      @showBuffer << c
+      @showBuffer << c.chr
     end
+    @matchBuffer = @matchBuffer + c.chr
   end
 
   #
@@ -305,11 +321,29 @@ class Muby::Connection
   #
   def listen
     c = true
-    # We have to look at each byte for ncurses reasons as well as triggers etc.
+    # While we get characters
     while c
+      # While we have something to read within one second
       while select([@socket],nil,nil,1) && c = getc
-        handle(c)
+        # If it is a regular character
+        if regular_char = process(c)
+          # Append it to our match and show buffers
+          append_buffers(regular_char)
+          # Trigger all remote character triggers on it
+          trigger(@matchBuffer, conf.remote_character_triggers, true)
+          # If it is a newline
+          if regular_char == 10
+            # Trigger all normal remote triggers on it
+            run_remote_triggers
+            display_buffer
+            @matchBuffer = ""
+          end
+        end
       end
+      trigger(@matchBuffer, conf.remote_character_triggers, true)
+      run_remote_triggers
+      display_buffer if conf.flush
+      @matchBuffer = ""
     end
     status("Connection closed by remote end")
     @inputWindow.disconnect
@@ -326,16 +360,9 @@ class Muby::Connection
     end
   end
 
-  def manage_buffers(c)
-    trigger(@matchBuffer, conf.remote_character_triggers, true)
-    if c == 10 || conf.flush
-      display_buffer
-      if c == 10
-        trigger(@matchBuffer, conf.remote_triggers, false)
-        @matchBuffer = ""
-        @used_triggers = {}
-      end
-    end
+  def run_remote_triggers
+    trigger(@matchBuffer, conf.remote_triggers, false)
+    @used_triggers = {}
   end
 
   def homemade_split(s, r)

data/lib/muby/help.rb

@@ -4,6 +4,7 @@ module Muby
     def self.configuration
       {
         :connect_timeout => "The number of seconds we will try to connect before giving up.",
+        :single_shot_gags => "The gags that will only be used once and then discarded. Usually created by triggers.",
         :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.",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muby
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors: 
 - Martin Kihlgren, Sy Ali
@@ -9,11 +9,12 @@ autorequire: muby
 bindir: bin
 cert_chain: []
 
-date: 2008-05-24 00:00:00 +02:00
+date: 2008-09-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ncurses
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -30,20 +31,21 @@ extensions: []
 extra_rdoc_files: []
 
 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/helper_methods.rb
 - lib/muby/application.rb
+- lib/muby/helper_methods.rb
 - lib/muby/user_window.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.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,7 +66,6 @@ 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
 has_rdoc: true
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A simple but powerful mud client.