Olib 2.0.0.pre.rc.1 → 2.0.0.pre.rc.6

data/lib/Olib/pattern_matching/any.rb

@@ -1,11 +0,0 @@
-require "Olib/pattern_matching/result"
-
-class Any < Result
-  def self.===(*args)
-    true
-  end
-
-  def ===(other)
-    true
-  end
-end

data/lib/Olib/pattern_matching/result.rb

@@ -1,3 +1,6 @@
+
+require "Olib/pattern_matching/any"
+
 class Result
   def self.included(ctx)
     ctx.include(Result::Constructors)
@@ -32,7 +35,9 @@ class Result
     expected.all? do |k, v|
       if this.respond_to?(k.to_sym)
         _compare_values(v, this.send(k.to_sym))
-      elsif this.respond_to?(:[])
+      elsif this.is_a?(Array) and k.is_a?(Fixnum)
+        _compare_values(v, this[k.to_i])
+      elsif this.respond_to?(:[]) and not this.is_a?(Array)
         _compare_values(v, this[k.to_s]) or _compare_values(v, this[k.to_sym])
       else
         false
@@ -77,4 +82,14 @@ class Result
       Err[*args]
     end
   end
+end
+
+class Any < Result
+  def self.===(*args)
+    true
+  end
+
+  def ===(other)
+    true
+  end
 end

data/lib/Olib/pattern_matching/rill.rb

@@ -3,16 +3,21 @@ require "Olib/pattern_matching/outcome"
 require "Olib/ext/matchdata"
 
 class Rill
+  def self.union(*patterns)
+    patterns.join("|")
+  end
+
   PROMPT = /<prompt/
 
   include Enumerable
-  attr_reader :close, :start, :mode
+  attr_reader :close, :start, :mode, :timeout
 
-  def initialize(start: nil, close: PROMPT, mode: :xml)
+  def initialize(start: nil, close: PROMPT, mode: :xml, timeout: 5)
     fail "Rill.new() requires :start argument" if start.nil?
     @mode    = mode
     @close   = Outcome.new(close)
     @start   = Outcome.new(start)
+    @timeout = timeout
   end
 
   def capture(obj, command_template)
@@ -27,13 +32,16 @@ class Rill
     state         = :start
     lines         = []
     matches       = {}
-    XML.cmd(command) do |line|
+    XML.cmd(command, pattern: begin_pattern, timeout: @timeout) do |line|
       state = :open  if line.match(begin_pattern)
       lines  << line if state.eql?(:open)
-      if (result = (line.match(begin_pattern) || line.match(end_pattern)))
+      if (result = (line.match(begin_pattern) or line.match(end_pattern)))
         matches.merge!(result.to_h)
       end
-      return [matches, lines] if (line.match(end_pattern) and state.eql?(:open))
+
+      if (line.match(end_pattern) and state.eql?(:open))
+        return [:ok, matches, lines]
+      end
     end
   end
 

data/lib/Olib/version.rb

@@ -1,3 +1,3 @@
 module Olib
-  VERSION = "2.0.0-rc.1"
+  VERSION = "2.0.0-rc.6"
 end

data/lib/Olib/xml.rb

@@ -17,11 +17,15 @@ module XML
     result
   end
 
-  def self.cmd(cmd)
+  def self.cmd(cmd, timeout: 5, pattern:)
     XML.tap do 
-      fput(cmd)
+      result = dothistimeout(cmd, timeout, pattern)
+      return nil if result.nil?
+      yield(result)
+      ttl = Time.now + timeout
       while line = get
         yield(line)
+        break if Time.now > ttl
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Olib
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc.1
+  version: 2.0.0.pre.rc.6
 platform: ruby
 authors:
 - Ondreian Shamsiel
@@ -30,8 +30,11 @@ files:
 - lib/Olib/character/inventory.rb
 - lib/Olib/character/mind.rb
 - lib/Olib/character/stance.rb
+- lib/Olib/combat/attack.rb
 - lib/Olib/combat/creature.rb
+- lib/Olib/combat/creatures.json
 - lib/Olib/combat/creatures.rb
+- lib/Olib/combat/metadata.rb
 - lib/Olib/core/action.rb
 - lib/Olib/core/container.rb
 - lib/Olib/core/containers.rb
@@ -40,6 +43,7 @@ files:
 - lib/Olib/core/item.rb
 - lib/Olib/core/kinds.rb
 - lib/Olib/core/rummage.rb
+- lib/Olib/core/scroll.rb
 - lib/Olib/core/transaction.rb
 - lib/Olib/core/use.rb
 - lib/Olib/core/utils.rb
@@ -50,6 +54,7 @@ files:
 - lib/Olib/ext/string.rb
 - lib/Olib/ext/symbol.rb
 - lib/Olib/go2.rb
+- lib/Olib/log.rb
 - lib/Olib/loot.rb
 - lib/Olib/npcs/npc.rb
 - lib/Olib/npcs/npcs.rb
@@ -59,9 +64,9 @@ files:
 - lib/Olib/objects/jar.rb
 - lib/Olib/objects/jewel.rb
 - lib/Olib/objects/jewelry.rb
-- lib/Olib/objects/scroll.rb
 - lib/Olib/objects/uncommon.rb
 - lib/Olib/objects/wand.rb
+- lib/Olib/opts.rb
 - lib/Olib/pattern_matching/any.rb
 - lib/Olib/pattern_matching/err.rb
 - lib/Olib/pattern_matching/ok.rb
@@ -93,8 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.0.pre1
 signing_key: 
 specification_version: 4
 summary: Useful Lich extensions for Gemstone IV

data/lib/Olib/objects/scroll.rb

@@ -1,42 +0,0 @@
-class Scroll < Item
-  @@whitelist = [ 
-    101, 102, 103, 107, 116, 120, 
-    202, 211, 215, 219,
-    303, 307, 310, 313, 315,
-    401, 406, 414, 425, 430, 
-    503, 507, 508, 509, 511, 513, 520, 
-    601, 602, 606, 613, 617, 618, 625, 640, 
-    712, 716,
-    905, 911, 913, 920, 
-    1109, 1119, 1125, 1130,
-    1201, 1204,
-    1601, 1603, 1606, 1610, 1611, 1612, 1616,
-    1712, 1718
-  ]
-  attr_accessor :spells, :worthy, :whitelist
-  
-  def Scroll.whitelist
-    @@whitelist
-  end
-
-  def Scroll.add_to_whitelist(*args)
-    @@whitelist + args
-  end
-
-  def Scroll.remove_from_whitelist(*args)
-    @@whitelist = @@whitelist - args
-  end
-
-  def initialize(item)
-    super item
-    @spells = []
-    return self
-  end
-
-  def worthy?
-    @worthy = false
-    read unless @spells.length > 0
-    @spells.each do |spell| @worthy = true if Scroll.whitelist.include? spell[:n] end
-    @worthy
-  end
-end