gamefic-sdk 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7395294d50944bd37c3f1876c55c6a946bbcf9ee
-  data.tar.gz: fdf9b3cbb95019b3279687b987522edc0ff3794f
+SHA256:
+  metadata.gz: ce08abec9929267cbcd41b95da9a7bd313e3449ce3160277b26160aadd8437bf
+  data.tar.gz: 1e7c8e9827b24816addfec88ff81f1c9d9e8112f9e5422f045a2ef07471375b1
 SHA512:
-  metadata.gz: b760a05656461913ac13ce5623c21c30ab8918e8afe822d3365811cb10d0e011064f4e4b7c6055d20c79586dfd395c2b9cfc3b771553d558dcd84cec17091f20
-  data.tar.gz: 86b311a43a5658c4fad44f8180c56ab5b1b32b5312aa3172d652a890d2c86f07c116010ee0272ddee200a1285df089ee69decabd7d5d21919ea26685a7d108c4
+  metadata.gz: 1dc60435ac2e35ed97f76de2d2ba8494c5dad6a54b6aeb943b4767159c866cdd799e21763f29ed1b9360e117a8b2912934ad607b6b343d986cac9c4769d004bd
+  data.tar.gz: 76c10bcf57491365f4b61b78f2f076d3bdd9bab43b0d46a6ed838b612c2a7c82026cb6d2ef5d94bc7f0fa817fe364ff3325b1550e8de7bfc49b5e95e47a4d910

data/bin/gamefic

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'gamefic-sdk'
+require 'gamefic-sdk/shell'
+
+Gamefic::Sdk::Shell.start(ARGV)
+
+#!/usr/bin/env ruby
+
+#require 'gamefic'
+#require 'gamefic-tty'
+
+# Make play the default command if the first argument is an existing file
+#args = %w(play help).include?(ARGV[0]) || ARGV.count.zero? || !File.exist?(ARGV[0]) ? ARGV : ARGV.dup.unshift('play')
+
+#Gamefic::Tty::Shell.start(args)

data/lib/gamefic-sdk.rb

@@ -1,30 +1,10 @@
 require 'gamefic'
-require 'gamefic-sdk/platform'
-#require 'gamefic-sdk/plot_config'
-require 'gamefic-sdk/debug'
 require 'gamefic-sdk/version'
 
 module Gamefic::Sdk
   autoload :Server, 'gamefic-sdk/server'
-  autoload :Config, 'gamefic-sdk/config'
-
-  HTML_TEMPLATE_PATH = File.realpath(File.dirname(__FILE__) + "/../html/")
-  GLOBAL_SCRIPT_PATH = File.realpath(File.dirname(__FILE__) + "/../scripts/")
-  LIB_PATH = File.dirname(__FILE__)
-end
-
-class Class
-  def descendants
-    result = []
-    ObjectSpace.each_object(::Class) {|klass| result << klass if klass < self }
-    result
-  end
-end
-
-class Gamefic::Entity
-  def self.names
-    result = []
-    Entity.descendants.each { |e| result << e.to_s.split('::').last }
-    result
-  end
+  autoload :Diagram, 'gamefic-sdk/diagram'
+  autoload :Scaffold, 'gamefic-sdk/scaffold'
+  autoload :Tasks, 'gamefic-sdk/tasks'
+  SCAFFOLDS_PATH = File.realpath(File.join(File.dirname(__FILE__), '..', 'scaffolds'))
 end

data/lib/gamefic-sdk/diagram.rb

@@ -0,0 +1,205 @@
+require 'json'
+
+module Gamefic
+  module Sdk
+    class Diagram
+      class Position
+        attr_accessor :x, :y
+
+        def initialize x = 0, y = 0
+          @x = x
+          @y = y
+          freeze
+        end
+
+        def move x, y
+          Position.new(self.x + x, self.y + y)
+        end
+      end
+
+      # @return [Gamefic::Plot]
+      attr_reader :plot
+
+      def initialize plot
+        @plot = plot
+      end
+
+      def get type
+        if valid?(type)
+          send(type)
+        else
+          raise ArgumentError, "Unknown diagram type '#{type}'"
+        end
+      end
+
+      def verbs
+        plot.verbs
+      end
+
+      def rooms
+        clear
+        position = Position.new
+        plot.entities.that_are(Room).each do |room|
+          proceed_from room, position
+          next_x = right
+          next_y = bottom
+          if next_x > next_y
+            position = Position.new(0, next_y + distance)
+          else
+            position = Position.new(next_x + distance, 0)
+          end
+        end
+        elements.values
+      end
+
+      def entities
+        plot.initial_state[:entities].map do |e|
+          e.transform_keys do |k|
+            str = k.to_s
+            if str.start_with?('@')
+              str[1..-1]
+            else
+              str
+            end
+          end
+        end
+      end
+
+      def actions
+        plot.actions.map do |act|
+          {
+            verb: act.verb,
+            meta: act.meta?,
+            signature: act.signature
+          }
+        end
+      end
+
+      def commands
+        {
+          actions: actions,
+          verbs: verbs,
+          syntaxes: syntaxes
+        }
+      end
+
+      def verbs
+        plot.verbs
+      end
+
+      def syntaxes
+        plot.syntaxes.map do |syn|
+          {
+            template: syn.template,
+            command: syn.command,
+            first_word: syn.first_word,
+            verb: syn.verb
+          }
+        end
+      end
+
+      def valid? type
+        %w[rooms entities actions verbs syntaxes commands].include?(type)
+      end
+
+      private
+
+      def distance
+        150
+      end
+
+      def elements
+        @elements ||= {}
+      end
+
+      def entity_uid entity
+        raise "Invalid entity" if plot.entities.index(entity).nil?
+        "EIN_#{plot.entities.index(entity)}"
+      end
+
+      def proceed_from room, position
+        return if elements.has_key?(room)
+        directions = ['north', 'south', 'west', 'east', 'northwest', 'northeast', 'southwest', 'southeast']
+        rel = { data: {} }
+        rel[:data][:id] = entity_uid(room)
+        rel[:data][:label] = room.definitely
+        rel[:position] = { x: position.x, y: position.y }
+        elements[room] = rel
+        room.children.that_are(Portal).each do |portal|
+          next if portal.destination.nil?
+          # For lack of a better way to lay them out, 'up' and 'down' are not
+          # treated as specific directions
+          if portal.direction.nil? or portal.direction.to_s == 'up' or portal.direction.to_s == 'down'
+            direction = directions.shift
+            new_pos = move_from(position, direction)
+            while position_taken?(new_pos)
+              direction = directions.shift
+              return if direction.nil?
+              new_pos = move_from(position, direction)
+            end
+          else
+            directions.delete portal.direction.to_s
+            new_pos = move_from(position, portal.direction.to_s)
+          end
+          proceed_from portal.destination, new_pos
+          pel = { data: {} }
+          pel[:data][:id] = entity_uid(portal)
+          pel[:data][:source] = entity_uid(room)
+          pel[:data][:target] = entity_uid(portal.destination)
+          elements[portal] = pel
+        end
+      end
+
+      def clear
+        elements.clear
+      end
+
+      def bottom
+        max_y = 0
+        elements.values.each do |el|
+          next if el[:position].nil?
+          max_y = [max_y, el[:position][:y]].max
+        end
+        max_y
+      end
+
+      def right
+        max_x = 0
+        elements.values.each do |el|
+          next if el[:position].nil?
+          max_x = [max_x, el[:position][:x]].max
+        end
+        max_x
+      end
+
+      def position_taken?(position)
+        elements.values.each do |el|
+          next if el[:position].nil?
+          return true if el[:position][:x] == position.x and el[:position][:y] == position.y
+        end
+        false
+      end
+
+      def move_from position, direction
+        case direction
+        when 'north'
+          position.move 0, -distance
+        when 'south'
+          position.move 0, distance
+        when 'west'
+          position.move -distance, 0
+        when 'east'
+          position.move distance, 0
+        when 'northwest'
+          position.move -distance * 0.5, -distance * 0.5
+        when 'northeast'
+          position.move distance * 0.5, -distance * 0.5
+        when 'southwest'
+          position.move -distance * 0.5, distance * 0.5
+        when 'southeast'
+          position.move distance * 0.5, distance * 0.5
+        end
+      end
+    end
+  end
+end

data/lib/gamefic-sdk/scaffold.rb

@@ -0,0 +1,54 @@
+require 'fileutils'
+require 'erb'
+require 'pathname'
+require 'securerandom'
+require 'shellwords'
+
+module Gamefic
+  module Sdk
+    module Scaffold
+      class Binder < OpenStruct
+        def get_binding
+          binding()
+        end
+      end
+
+      module_function
+
+      def render(file, data)
+        template = File.read(file)
+        erb = ERB.new(template)
+        erb.result(data.get_binding)
+      end
+
+      def custom_copy origin, destination, data
+        FileUtils.mkdir_p File.dirname(destination)
+        if destination.end_with?('.gf.erb')
+          File.write destination[0..-8], render(origin, data)
+        else
+          FileUtils.cp_r origin, destination
+        end
+      end
+
+      def build name, destination
+        dir = File.join(SCAFFOLDS_PATH, name)
+        raise LoadError, "Scaffold `#{name}` does not exist" unless File.directory?(dir)
+        path = Pathname.new('.').join(destination).realdirpath
+        data = Binder.new(name: File.basename(path))
+        files = Dir.glob(File.join(dir, '**', '*'), File::FNM_DOTMATCH).select { |entry| File.file?(entry) }
+        map = {}
+        files.each do |file|
+          rename = File.join(File.dirname(file), File.basename(file).gsub('__name__', data.name))
+          dst = File.join(destination, rename[dir.length..-1])
+          if File.file?(dst)
+            raise "Gamefic generation would overwrite existing file #{rename}"
+          else
+            map[file] = dst
+          end
+        end
+        map.each_pair { |src, dst| custom_copy src, dst, data }
+        system "bundle install --gemfile=#{Shellwords.escape(File.join(destination, 'Gemfile'))}"
+      end
+    end
+  end
+end

data/lib/gamefic-sdk/server.rb

@@ -1,65 +1,81 @@
-require 'sinatra/base'
-require 'yaml'
-
-module Gamefic
-  module Sdk
-
-    class Server < Sinatra::Base
-      set :port, 4342
-
-      get '/' do
-        config = Gamefic::Sdk::Config.load(settings.source_dir)
-        paths = [config.script_path, config.import_path, Gamefic::Sdk::GLOBAL_SCRIPT_PATH]
-        @@plot = Gamefic::Sdk::Debug::Plot.new Source::File.new(*paths)
-        @@plot.script 'main'
-        #@@plot.script 'debug'
-        sinatra = Gamefic::Sdk::Platform::Sinatra.new(config: config)
-        sinatra.build
-        File.read File.join(sinatra.release_target, 'index.html')
-      end
-
-      post '/start' do
-        content_type :json
-        @@character = @@plot.player_class.new(name: 'player', synonyms: 'me myself self you yourself', description: 'As good-looking as ever.')
-        @@plot.introduce @@character
-        @@plot.ready
-        @@character.state.to_json
-      end
-
-      post '/update' do
-        content_type :json
-        @@character.queue.push params['command']
-        @@plot.update
-        @@plot.ready
-        @@character.state.merge(input: params['command']).to_json
-      end
-
-      post '/restore' do
-        content_type :json
-        snapshot = JSON.parse(params['snapshot'], symbolize_names: true)
-        @@plot.restore snapshot
-        @@character.cue @@plot.default_scene
-        @@plot.update
-        @@plot.ready
-        @@character.state.to_json
-      end
-
-      class << self
-
-        def run!
-          start_browser if settings.browser
-          super
-        end
-        
-        def start_browser
-          Thread.new {
-            sleep 1 until Server.running?
-            `start http://localhost:#{settings.port}`
-          }
-        end
-
-      end
-    end
-
-  end
-end
+require 'sinatra/base'
+require 'yaml'
+
+module Gamefic
+  module Sdk
+    class Server < Sinatra::Base
+      set :port, 4342
+      set :server, :webrick
+
+      get '/' do
+        File.read File.join(settings.public_folder, 'index.html')
+      end
+
+      post '/start' do
+        content_type :json
+        reset_features
+        load File.join(settings.source_dir, 'main.rb')
+        @@plot = Gamefic::Plot.new
+        @@character = @@plot.get_player_character
+        @@plot.introduce @@character
+        @@plot.ready
+        @@character.output.to_json
+      end
+
+      post '/receive' do
+        content_type :json
+        @@character.queue.push params['command']
+        {}.to_json
+      end
+
+      post '/update' do
+        content_type :json
+        @@plot.update
+        @@plot.ready
+        # @@character.state.merge(input: params['command'], continued: @@character.queue.any?).to_json
+        @@character.output.to_json
+      end
+
+      get '/snapshot' do
+        content_type :json
+        @@plot.save.to_json
+      end
+
+      post '/restore' do
+        content_type :json
+        # The snapshot needs to be received as a JSON string because of issues
+        # with IndifferentHash malforming arrays.
+        snapshot = JSON.parse(params['snapshot'], symbolize_names: true)
+        @@plot.restore snapshot
+        @@character.cue @@plot.default_scene
+        @@plot.update
+        @@plot.ready
+        @@character.output.to_json
+      end
+
+      def reset_features
+        @@old_features ||= $LOADED_FEATURES.clone
+        @@old_constants ||= Object.constants(false)
+        $LOADED_FEATURES.keep_if { |e| @@old_features.include?(e) }
+        Object.constants(false).each do |const|
+          Object.send(:remove_const, const) unless @@old_constants.include?(const)
+        end
+        Gamefic::Plot.blocks.clear
+      end
+
+      class << self
+        # def run!
+        #   start_browser if settings.browser
+        #   super
+        # end
+
+        # def start_browser
+        #   Thread.new {
+        #     sleep 1 until Server.running?
+        #     `start http://localhost:#{settings.port}`
+        #   }
+        # end
+      end
+    end
+  end
+end