muby 0.7.10 → 0.7.11

data/lib/muby/configuration.rb

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

data/lib/muby/connection.rb

@@ -141,6 +141,7 @@ class Muby::Connection
   # Remove the trigger regexp if it is broken.
   #
   def trigger(matchBuffer, hash, skip_used = true)
+    rval = true
     hash.each do |key, value|
       if skip_used && @used_triggers.include?(key)
         trace("#{key.inspect} has already been matched on this line, skipping it")
@@ -150,7 +151,7 @@ class Muby::Connection
           if match = matchBuffer.match(key)
             trace(matchBuffer + " matches " + key.inspect + ": .call'ing Proc")
             # Run the procedure associated with that trigger:
-            @inputWindow.execute(value, @inputWindow, @outputWindow, match)
+            rval &&= @inputWindow.execute(value, @inputWindow, @outputWindow, match)
             @used_triggers[key] = true if skip_used
           end
           # If we received an error with the regular expression:
@@ -160,6 +161,7 @@ class Muby::Connection
         end
       end
     end
+    return rval
   end
 
   def feed(s)
@@ -361,7 +363,7 @@ class Muby::Connection
   end
 
   def run_remote_triggers
-    trigger(@matchBuffer, conf.remote_triggers, false)
+    @showBuffer = [] unless trigger(@matchBuffer, conf.remote_triggers, false)
     @used_triggers = {}
   end
 

data/lib/muby/help.rb

@@ -58,7 +58,9 @@ A line matching an anti gag and a gag will also be shown.",
 	:connect_triggers => "The connect triggers. Code in this array will be run in order when a connection is made.",
         :startup_triggers => "The startup triggers. Code in this array will be run in order after the windows have been properly initialized.",
         :remote_triggers => 'The remote triggers.
-Each line received from the server will be checked against all regular expression keys in this hash, and all values to matching keys will be executed with three parameters: the input window, the output window and the match object.
+Each line received from the server will be checked against all regular expression keys in this hash, 
+and all values to matching keys will be executed with three parameters: the input window, the output window and the match object.
+Only if the return value of this execution is not false will the line be shown to the user.
 Example: conf.remote_triggers[/^You feel dazed$/] = Proc.new do |inwin, outwin, match| inwin.set_status_message("dazed") end',
         :remote_character_triggers => 'The remote character triggers.
 All input from the server is added to a buffer that is cleared on newline and each time a new character is added to that buffer the buffer will be checked against all the regular expression keys in the remote_character_triggers.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muby
 version: !ruby/object:Gem::Version 
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors: 
 - Martin Kihlgren, Sy Ali