inform-runtime 1.3.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff0b544812291d9f9c2a5169ada547843704aa26f0a5ad0fdd82b1e914acba15
-  data.tar.gz: e3d011e11b4e3531054d3b4a83d199343541e44d57a770708d219a73ca40f668
+  metadata.gz: 1f6e015e55549341a59f8e1556996c1aa58073a0fd59eefd773aa1258a126668
+  data.tar.gz: 3841f6b206db14c64d5f7da3535992998932e5e80af56b819ce132e539e930f1
 SHA512:
-  metadata.gz: 0c92163b72057f043cadce2abbcf7e79a20be080a51e9384289f44f62f5528738bc3c947e66758312b637c2042e480b092a342c2176bfbc0706389d49be636c2
-  data.tar.gz: 0e4355ed014b0e499e8e730d70ecf9b22ebaac3af317a5d6fc900ef528f819004526ee3004478e112e5c82221329fb4cb426b681e77c7b62aa1bb345269af17a
+  metadata.gz: 1cece70cd39f757e3c455e2dfc5712fb7d3f0aa3b21b0c66aaef53743ad375061a06529aed3cd44ed9e43341d6662377345ff347c0f9500b08fba65b9467d510
+  data.tar.gz: 4887504a753634d4247e792823a9389eda28fafc7b48acfd5603fa7a2586d5606977209a9efa64f6b5f2f4a4ed80cad5f21bcf7c96ac5fe78901d48f0428528c

data/lib/story_teller/io.rb

@@ -23,11 +23,17 @@
 module StoryTeller
   # The IO module
   module IO
+    class << self
+      attr_accessor :default_output
+    end
+
     def session
       return @session if defined?(@session) && !@session.nil?
       return nil unless defined?(StoryTeller::IO::Session)
 
-      StoryTeller::IO::Session.of(self)
+      StoryTeller::IO::Session.of(self).tap do |session|
+        log.trace "self: #{self}, session: #{session.inspect}"
+      end
     end
 
     def noop; end
@@ -40,13 +46,13 @@ module StoryTeller
       subscribed_connections
     end
 
-    def read
-      $stdin.gets(chomp: true)
-    end
-
     def out(s)
-      if defined?(Curses)
-        Curses.addstr s
+      current_session = session
+
+      if current_session
+        current_session.write_output(s)
+      elsif StoryTeller::IO.default_output
+        StoryTeller::IO.default_output.write(s)
       else
         $stdout.write(s)
       end
@@ -64,13 +70,9 @@ module StoryTeller
     alias update inform
 
     def flush_io
-      $stdout.flush
-    end
+      return if session
 
-    def tidy_output(s, columns = 76)
-      s.gsub!(/^\n+/, "\n")
-      return s if s.length < columns || columns == 0
-      s.gsub(/(.{#{columns}}\S+)( +|$\n?)/, "\\1\n")
+      $stdout.flush
     end
 
     def new_line
@@ -128,59 +130,6 @@ module StoryTeller
       DefaultLineLength
     end
 
-    # def many_per_line(items)
-    #   max = 0
-
-    #   lines = []
-    #   prefs = @player.linkto :preferences
-    #   line_length = preferred_line_length
-    #   buffer = ''
-
-    #   items.each do |item|
-    #     max = [item.length, max].max
-    #   end
-    #   max += MinimumColumnPadding
-    #   width = (line_length - MinimumCellPadding) / max
-    #   height = (items.length / width).ceil - 1
-
-    #   return if width == 0
-
-    #   columns = []
-    #   i = 0
-    #   loop do
-    #     # Build a list of columns with nil padding
-    #     column = items[i, height]
-    #     columns << column + Array.new(height - column.length)
-    #     i += height
-    #     break if (i + height) >= (items.length + height)
-    #   end
-
-    #   m = []
-    #   loop do
-    #     m << []
-    #     for column in columns
-    #       m.last << column.shift
-    #     end
-    #     break if columns.last.empty?
-    #   end
-
-    #   m.each do |row|
-    #     buffer = "\e[51m"
-    #     row.each do |item|
-    #       next unless item
-    #       n = [max - item.length, MinimumColumnPadding].max
-    #       padding = " " * n unless item == row.last
-    #       buffer += format(ItemPaddingString, item: item, padding: padding)
-    #     end
-    #     buffer += "\e[56m"
-    #     lines << buffer.strip
-    #     buffer = ''
-    #   end
-
-    #   lines
-    # end
-    # # def many_per_line
-
     # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/CyclomaticComplexity
     # rubocop: disable Metrics/MethodLength

data/lib/story_teller/library.rb

@@ -65,7 +65,6 @@ module StoryTeller
         library_methods.merge(mod.instance_methods(false))
       end
       @methods_index.concat(library_methods.to_a).sort
-      log.trace "Loaded library methods: #{@methods_index}"
     end
     # rubocop: enable Metrics/AbcSize
     # rubocop: enable Metrics/MethodLength

data/lib/story_teller/session.rb

@@ -144,6 +144,33 @@ end
 module StoryTeller
 # module IO
 module IO
+# The OutputBuffer class
+class OutputBuffer
+  def initialize
+    @content = String.new # rubocop: disable Style/EmptyLiteral
+    @mutex = Mutex.new
+  end
+
+  def write(value)
+    return if value.nil?
+
+    @mutex.synchronize { @content << value.to_s }
+  end
+
+  def drain
+    @mutex.synchronize do
+      content = @content.dup
+      @content.clear
+      content.strip.length.positive? ? content : ''
+    end
+  end
+
+  def reset
+    @mutex.synchronize { @content.clear }
+  end
+end
+# class OutputBuffer
+
 # The Session class
 # TODO: Refactor method implementations into modules
 # rubocop: disable Metrics/ClassLength
@@ -154,7 +181,7 @@ class Session
     include SessionManagementMethods
   end
   attr_accessor :channel, :machine, :player, :state, :status
-  attr_reader :last_good_state, :last_activity, :previous, :inbound, :outbound, :settings
+  attr_reader :last_good_state, :last_activity, :previous, :inbound, :outbound, :settings, :output
 
   # These states accept any input, including no input
   Promiscuous = Set.new
@@ -170,6 +197,7 @@ class Session
     @settings = settings
     @status = nil
     @last_activity = Time.now
+    self.output = OutputBuffer.new
 
     self.class.register(channel, self) unless channel.nil?
     control(player) unless player.nil?
@@ -178,11 +206,78 @@ class Session
 
   alias preferences settings
 
+  def output=(sink)
+    @output = sink
+    @outbound = sink
+  end
+
+  def write_output(value)
+    @output.write(value)
+  end
+
+  def drain_output
+    tidy_output(@outbound.drain)
+  end
+
+  def tidy_output(value, columns = word_wrap_column)
+    output = value.to_s
+    return '' if output.empty?
+
+    columns = columns.to_i
+    return output if columns <= 0
+
+    output.each_line.map do |line|
+      newline = line.end_with?("\n") ? "\n" : ''
+      wrap_line(line.chomp, columns) + newline
+    end.join
+  end
+
+  # rubocop: disable Metrics/AbcSize
+  # rubocop: disable Metrics/MethodLength
+  def wrap_line(line, columns)
+    return line if line.length <= columns
+
+    indentation = line[/\A[ \t]*/].to_s
+    words = line.strip.split(/[ \t]+/)
+    return line if words.empty?
+
+    lines = []
+    current = indentation.dup
+
+    words.each do |word|
+      candidate = current == indentation ? "#{current}#{word}" : "#{current} #{word}"
+
+      if candidate.length <= columns || current == indentation
+        current = candidate
+      else
+        lines << current.rstrip
+        current = "#{indentation}#{word}"
+      end
+    end
+
+    lines << current.rstrip
+    lines.join("\n")
+  end
+  # rubocop: enable Metrics/AbcSize
+  # rubocop: enable Metrics/MethodLength
+
+  def word_wrap_column
+    value = preferences[:word_wrap]
+    return 76 if value.nil?
+
+    value.to_i
+  end
+
+  def reset_output
+    @outbound.reset
+  end
+
   def init_channel_session(channel)
     Session[channel] = self
     @channel = channel
-    @inbound = Inbound.new(self)
-    @outbound = Outbound.new(self)
+    @inbound = Inbound.new(self) if defined?(Inbound)
+    @output = OutputBuffer.new
+    @outbound = @output
     @last_activity = Time.now
   end
 
@@ -230,7 +325,7 @@ class Session
   end
 
   def process(message, machine = @machine)
-    raise ArgumentError, 'session machine is required' if machine.nil?
+    raise ArgumentError, 'Session machine is required' if machine.nil?
 
     @machine = machine
     @buffer = sanitize(message)
@@ -239,10 +334,11 @@ class Session
 
     expose_to(machine)
     update(machine)
+    drain_output
   end
 
   def respond
-    flush_io
+    drain_output
   end
 
   def safely_progress(machine = self)

data/lib/story_teller/stdlib.rb

@@ -49,7 +49,7 @@ module StdLib
   end
 
   def inversion
-    print Inform::VERSION
+    print Inform::VERSION.dup
   end
 
   def standard_interpreter

data/lib/story_teller/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform-runtime
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Nels Nelson