inform-runtime 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0411c83f9c461e9b8f2687c5f27aa49591933e786f74efa489ca111b3cf9b74
-  data.tar.gz: 582fa29d5e602c4e36a499dcc259e21391fa3982348f7fcb2196b8a740c028e3
+  metadata.gz: 30d774723c5ea67091209135a26685ab0e250a780e3fbadb8a1752fbda94a505
+  data.tar.gz: 7b40b742e14c98abeef2f5695923a502032334c61e48c00a11d53d40501442cc
 SHA512:
-  metadata.gz: 3ccb26de6ef43e0bedeaf044b964c30ecba16e09809a5c081f32aac1acacfe1644a321cc1f9b68483f1f70496a17e72892fd55a596ba95f83cdc72011f41fa44
-  data.tar.gz: ce1fb4b1b4993d8ff7ccd230ee141d1c5347b08c85cc9a074873ff7d66753f588289460dcf9fef0d4aababeb6c98cd09724ebb562f9dfe5381cb108ec2942c88
+  metadata.gz: 87cdf76656079aca4ccccee3feed0f6dfd6e9f3698b0fb8b46317996316be50a1b7ae00777cbc8ac53dbfa76c09d18bbdda152ee13842f5c5be857cbdaefb83b
+  data.tar.gz: a18a9f118a5ba0c17271cf9c7a2e632da133ed41d19a4bd22fd2ae8b0e3ca651439e5d79469c7ec29b2084818ff2708e971e2b36373ac9823c9875986a27772e

data/README.md

@@ -109,7 +109,6 @@ Sun May 10 09:36:13 CDT 2026
 │   │   ├── color.rb
 │   │   ├── command.rb
 │   │   ├── context.rb
-│   │   ├── daemon.rb
 │   │   ├── engine.rb
 │   │   ├── events.rb
 │   │   ├── experimental

data/lib/story_teller/builtins.rb

@@ -280,7 +280,7 @@ module Builtins
   def visibility_ceiling=(visibility_ceiling)
     e = Thread.current[:event]
     @visibility_ceiling = visibility_ceiling
-    e.visibility_ceiling = visibility_ceiling if e
+    e.visibility_ceiling = visibility_ceiling unless e.nil?
   end
 
   def topic
@@ -288,14 +288,13 @@ module Builtins
   end
   alias text topic
 
-  def number(x = nil)
-    if !x.nil? && self.object? && self.defining_object?
-      self.properties[:number] = x
+  def number(n = nil)
+    if !n.nil? && self.object? && self.defining_object?
+      self.properties[:number] = n
       return
     end
-    return special_number1 if x.nil?
-    LanguageNumber(x)
-    ''
+    return special_number1 if n.nil?
+    capture_output { EnglishNumber(n) }
   end
 
   def special

data/lib/story_teller/events.rb

@@ -412,10 +412,7 @@ module PrivateEventMethods
   end
 
   def handle(event, result)
-    case result
-    when String
-      event.cause.println result
-    end
+    event.cause.print_routine_result(result)
   end
 
   def deactivate(obj)

data/lib/story_teller/inform/ephemeral/module.rb

@@ -119,6 +119,7 @@ module Inform
         remove_module(Inform::Module.find(name: mod))
       end
       save
+      # TODO: Explain why the following is being done.
       i = parent(self)
       self.remove
       i << self

data/lib/story_teller/inform/ephemeral/object.rb

@@ -181,6 +181,7 @@ module Inform
 
       def remove
         @children.clear
+        @parent&.remove_child(self)
         @parent = nil
       end
 

data/lib/story_teller/io.rb

@@ -19,12 +19,14 @@
 # You should have received a copy of the GNU General Public License
 # along with the StoryTeller.  If not, see <http://www.gnu.org/licenses/>.
 
+require 'stringio'
+
 # The StoryTeller module
 module StoryTeller
   # The IO module
   module IO
     class << self
-      attr_accessor :default_output
+      attr_accessor :default_channel
     end
 
     def session
@@ -46,18 +48,44 @@ module StoryTeller
       subscribed_connections
     end
 
-    def out(s)
-      current_session = session
-      current_session ||= inflib.session if respond_to?(:inflib) && inflib
+    def out(s, ch = channel(StoryTeller::IO.default_channel))
+      ch&.write(s)
+      true
+    end
+
+    def channel(default = nil)
+      overrides = Thread.current[:channel_overrides]
+      return overrides[self] if overrides&.key?(self)
+
+      @channel ||= current_session || default || $stdout
+    end
+
+    # rubocop: disable Metrics/MethodLength
+    def capture_output(buffer = StringIO.new)
+      overrides = Thread.current[:channel_overrides] ||= {}.compare_by_identity
+      previous = overrides[self]
+      had_previous = overrides.key?(self)
+
+      begin
+        overrides[self] = buffer
+        yield
+        buffer.string
+      ensure
+        if had_previous
+          overrides[self] = previous
+        else
+          overrides.delete(self)
+        end
+      end
+    end
+    # rubocop: enable Metrics/MethodLength
 
-      if current_session
-        current_session.write_output(s)
-      elsif StoryTeller::IO.default_output
-        StoryTeller::IO.default_output.write(s)
-      else
-        $stdout.write(s)
+    def current_session
+      session || begin
+        if self.respond_to?(:inflib) && !self.inflib.equal?(self)
+          self.inflib&.session
+        end
       end
-      true
     end
 
     def inform(s = '')
@@ -96,7 +124,7 @@ module StoryTeller
     end
 
     def print_routine_result(value)
-      return value unless value.is_a?(String)
+      return value unless value.is_a?(String) || value.is_a?(Array)
 
       print value
       new_line

data/lib/story_teller/library/directives.rb

@@ -63,6 +63,28 @@ module StoryTeller
       # rubocop: enable Metrics/AbcSize
       # rubocop: enable Metrics/MethodLength
 
+      # rubocop: disable Metrics/MethodLength
+      def Array(constant, *values)
+        inform_name = constant.to_sym
+        ruby_name = if constant.to_s.match?(/\A[A-Za-z0-9_]*\z/)
+          inform_name
+        else
+          constant.to_s.upcase.to_sym
+        end
+
+        log.debug "Setting constant ::Object.#{ruby_name} to #{values}"
+        log.debug "  inform_name: #{inform_name}"
+        reset_constant(ruby_name, values, ::Object)
+
+        return values if inform_name == ruby_name
+
+        install_global_reader(inform_name, ruby_name, ::Object)
+      rescue StandardError => e
+        log.error "Unexpected error resetting constant #{constant}", e
+        nil
+      end
+      # rubocop: enable Metrics/MethodLength
+
       def Attribute(attribute)
         StoryTeller::Library.declarations.add_attribute(attribute)
       end
@@ -88,11 +110,13 @@ module StoryTeller
           target.const_get(ruby_name)
         rescue RuntimeError => _e
           # Ignore error
+          value
         rescue StandardError => _e
           # Ignore error
+          value
         end
 
-        reset_constant(ruby_name, value, target) if value.nil?
+        reset_constant(ruby_name, value, target) unless value.nil?
 
         return value if inform_name == ruby_name
 
@@ -126,7 +150,7 @@ module StoryTeller
       # rubocop: enable Metrics/MethodLength
 
       def install_global_reader(inform_name, ruby_name, target = ::Object)
-        reader = -> { target.target.instance_eval { const_get(ruby_name) } }
+        reader = -> { target.instance_eval { const_get(ruby_name) } }
 
         Kernel.define_method(inform_name, &reader)
         Kernel.send(:private, inform_name)

data/lib/story_teller/logging.rb

@@ -165,26 +165,29 @@ class Logger
   end
 end
 
-# Add extra severity to the standard Logger class.
-# Also add support for including backtraces implicitly.
-class ExtraLogger < Logger
-  alias original_error error
-  def error(error_or_message = nil, error = nil, &block)
-    return log_error(error_or_message, &block) if error.nil?
-
-    original_error(TraceHelpers.generate_message(error_or_message, error))
-    TraceHelpers.extract_backtrace(error, []).each do |trace|
-      original_error(trace) unless trace.nil?
+# module LoggerErrorBacktrace
+module LoggerErrorBacktrace
+  def error(message = nil, error = nil, &block)
+    if message.respond_to?(:message)
+      error = message
+      message = error.message
     end
-  end
 
-  def log_error(error_or_message = nil, &block)
-    original_error(error_or_message, &block)
-    TraceHelpers.extract_backtrace(error_or_message, []).each do |trace|
-      original_error(trace) unless trace.nil?
+    result = super(message, &block)
+
+    TraceHelpers.extract_backtrace(error)&.each do |trace|
+      add(Logger::ERROR, trace)
     end
+
+    result
   end
+end
+
+Logger.include(LoggerErrorBacktrace)
 
+# Add extra severity to the standard Logger class.
+# Also add support for including backtraces implicitly.
+module TraceLogging
   SEV_LABEL_EXTRA = (Logger::SEV_LABEL + %w(TRACE)).freeze
   def format_severity(severity)
     SEV_LABEL_EXTRA[severity] || super
@@ -195,6 +198,8 @@ class ExtraLogger < Logger
   end
 end
 
+Logger.include(TraceLogging)
+
 # The LoggingHelpers module
 module LoggingHelpers
   if defined?(Java)
@@ -221,7 +226,7 @@ module LoggingHelpers
   def init_ruby_logger(obj, level = nil, logger_name = nil, source_location = nil)
     logger_name = get_formatted_logger_name(obj, logger_name)
     logger_name = source_location.split(FORWARD_SLASH_PATTERN).last if logger_name.empty?
-    log = ExtraLogger.new($stdout, progname: logger_name)
+    log = Logger.new($stdout, progname: logger_name)
     log.level = normalize_ruby_log_level(level) unless level.nil?
     log.formatter = method(:ruby_log_formatter)
     log

data/lib/story_teller/session.rb

@@ -212,7 +212,7 @@ class Session
     @outbound = sink
   end
 
-  def write_output(value)
+  def write(value)
     @output.write(value)
   end
 

data/lib/story_teller/stdlib.rb

@@ -139,14 +139,6 @@ module StdLib
 
   def StatusLineHeight; end
 
-  def ScoreSub
-    false
-  end
-
-  def FullScoreSub
-    false
-  end
-
   def Message(*args)
     println(args[:fatalerror] || args.values.first)
   end

data/lib/story_teller/version.rb

@@ -23,7 +23,7 @@
 module StoryTeller
   # module Engine
   module Engine
-    VERSION = '1.6.0'.freeze
+    VERSION = '1.6.2'.freeze
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform-runtime
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Nels Nelson
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement