inform-runtime 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d774723c5ea67091209135a26685ab0e250a780e3fbadb8a1752fbda94a505
-  data.tar.gz: 7b40b742e14c98abeef2f5695923a502032334c61e48c00a11d53d40501442cc
+  metadata.gz: 292c815478358e64e452d30e5e2b1bc31fb2d5d42fd0998f5020fa2e0b0dc443
+  data.tar.gz: 5ae2379ccf6e9adb181a9e5b5c32ba73df67f04fa88722955f9763b77aa4e6a1
 SHA512:
-  metadata.gz: 87cdf76656079aca4ccccee3feed0f6dfd6e9f3698b0fb8b46317996316be50a1b7ae00777cbc8ac53dbfa76c09d18bbdda152ee13842f5c5be857cbdaefb83b
-  data.tar.gz: a18a9f118a5ba0c17271cf9c7a2e632da133ed41d19a4bd22fd2ae8b0e3ca651439e5d79469c7ec29b2084818ff2708e971e2b36373ac9823c9875986a27772e
+  metadata.gz: 81793423acc602817ebdd087d7d221cceddbcb7708757647513197d36c644b36deac714f566574f13c37e12525435941ca1cf4abb6639e3835bfcddde6935473
+  data.tar.gz: 67a7b61f7d854a5311b600fef2da12340689dcc6e707616adc5d250993b5c0028a32d198f1877443355042bc2d44c873f774f29dbc761386e7f488c400752e11

data/lib/story_teller/io.rb

@@ -57,7 +57,10 @@ module StoryTeller
       overrides = Thread.current[:channel_overrides]
       return overrides[self] if overrides&.key?(self)
 
-      @channel ||= current_session || default || $stdout
+      resolved_session = current_session
+      return resolved_session unless resolved_session.nil?
+
+      @channel ||= default || $stdout
     end
 
     # rubocop: disable Metrics/MethodLength

data/lib/story_teller/session.rb

@@ -181,19 +181,20 @@ class Session
     include SessionManagementMethods
   end
   attr_accessor :channel, :machine, :player, :state, :status
-  attr_reader :last_good_state, :last_activity, :previous, :inbound, :outbound, :settings, :output
+  attr_reader :initial_state, :last_good_state, :last_activity, :previous, :inbound, :outbound, :settings, :output
 
   # These states accept any input, including no input
   Promiscuous = Set.new
   class BadStateError < StandardError; end
 
   # rubocop: disable Metrics/MethodLength
-  def initialize(channel = nil, machine: nil, player: nil, state: :playing, settings: {})
+  def initialize(channel = nil, machine: nil, player: nil, state: nil, settings: {})
     @channel = channel
     @machine = machine
     @player = nil
-    @state = state
-    @last_good_state = state
+    @state = state || resolve_initial_state(machine)
+    @initial_state = @state
+    @last_good_state = @state
     @session_data = {}
     @settings = settings
     @status = nil
@@ -205,6 +206,33 @@ class Session
   end
   # rubocop: enable Metrics/MethodLength
 
+  def awaiting_input?(machine = @machine)
+    return true unless machine.respond_to?(:awaiting_input?)
+
+    machine.awaiting_input?
+  end
+
+  def prompt_required?(machine = @machine)
+    return true unless machine.respond_to?(:prompt_required?)
+
+    machine.prompt_required?
+  end
+
+  def before_input(machine = @machine)
+    machine.before_input if machine.respond_to?(:before_input)
+  end
+
+  def advance(machine = @machine)
+    raise ArgumentError, 'Session machine is required' if machine.nil?
+
+    @machine = machine
+    @last_activity = Time.now
+    @status = :active
+    expose_to(machine)
+    update(machine)
+    drain_output
+  end
+
   alias preferences settings
 
   def output=(sink)
@@ -364,6 +392,12 @@ class Session
 
   private
 
+  def resolve_initial_state(machine)
+    return machine.initial_state if machine.respond_to?(:initial_state)
+
+    :playing
+  end
+
   def prepare_machine(machine)
     return if machine.equal?(self)
 

data/lib/story_teller/stdlib.rb

@@ -655,8 +655,23 @@ module Inform
 # commonly found in interactive fiction games, specifically those created
 # using Inform.  Supporting the principle of least surprise mandates that
 # the expectations held by the users of such games should be satisfied.
-# TODO: Perhaps this should go in the mudlib
 module Rules
+  def initial_state
+    :playing
+  end
+
+  def awaiting_input?
+    true
+  end
+
+  def prompt_required?
+    session.nil? || session.state != :more
+  end
+
+  def before_input
+    very__late__error if session && session.state == :playing
+  end
+
   def ask(s = nil)
     println s if s.is_a?(String)
     if session

data/lib/story_teller/version.rb

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

metadata

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