gamefic-sdk 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c0f125ab1ce21b53aad57448dc6cec8bbbd0026
-  data.tar.gz: adbf7e761ad6e8be82b8151d58fe5aca7e80aeae
+  metadata.gz: 6950dc7d900b70606eb21d87497e78d18a38eea8
+  data.tar.gz: 4a3be87b77c9192303fcc68b41c758522c4ebff3
 SHA512:
-  metadata.gz: 37125ae82a687f340871cb9516ae47e82472fdf0162b17401c688e67c46dcc70bbaaf0370d29991e7bae1e7dcbdd866ea6e357d51ae8bf9aaf3f0725e1bf8635
-  data.tar.gz: 5e0da62f2011f16283235fc7d66be7e0c9344780eb8b67ff309b2eca6d65cd5933562fae5f1ac8e3aad900aba4950f4465a8d45673b8172bdf7fac86a0fb4d28
+  metadata.gz: 50059ed23b431c675ddbc0c8871ad5f08230bf34c6a88da6273323bbcea08120bd605b24a60b69843c2aa26bc0862afa2d58a2634c3c1560c25bfa134edf73d9
+  data.tar.gz: 846fc454de1f3f9cb795fa66b6f609f48f34f231718f6a13111e8a0fed3709b7e1f3d94ae4d4f0a04935ed3ae212a608902262ae8ca7858b4c338dabaaa963f9

data/bin/gfk

@@ -1,7 +1,16 @@
 #!/usr/bin/env ruby
 
 require 'gamefic'
+require 'gamefic/shell'
 require 'gamefic-sdk'
+require 'gamefic-sdk/shell'
+
+shell = Gamefic::Shell.new
+
+shell.register "init", Gamefic::Sdk::Shell::Command::Init
+shell.register "create", Gamefic::Sdk::Shell::Command::Init
+shell.register "build", Gamefic::Sdk::Shell::Command::Build
+shell.register "clean", Gamefic::Sdk::Shell::Command::Clean
+shell.register "test", Gamefic::Sdk::Shell::Command::Test
 
-shell = Gamefic::Sdk::Gfk.new
 shell.execute

data/lib/gamefic-sdk.rb

@@ -1,11 +1,12 @@
 require 'gamefic'
-require 'gamefic-sdk/gfk'
 require 'gamefic-sdk/platform'
 require 'gamefic-sdk/plot_config'
+require 'gamefic-sdk/debug'
+require 'gamefic-sdk/version'
 
 module Gamefic::Sdk
-  HTML_TEMPLATE_PATH = File.dirname(__FILE__) + "/../html/"
-  GLOBAL_SCRIPT_PATH = File.dirname(__FILE__) + "/../scripts/"
+  HTML_TEMPLATE_PATH = File.realpath(File.dirname(__FILE__) + "/../html/")
+  GLOBAL_SCRIPT_PATH = File.realpath(File.dirname(__FILE__) + "/../scripts/")
   # @deprecated
   GLOBAL_IMPORT_PATH = GLOBAL_SCRIPT_PATH
   LIB_PATH = File.dirname(__FILE__)

data/lib/gamefic-sdk/build.rb

@@ -3,27 +3,31 @@ require 'yaml'
 module Gamefic::Sdk
 
   module Build
-    def self.release directory
-      config = YAML.load(File.read("#{directory}/config.yaml"))
-      if File.file?("#{directory}/.uuid")
-        config['uuid'] = File.read("#{directory}/.uuid").strip
+    def self.release directory, quiet = false
+      config = YAML.load(File.read(File.join(directory, 'config.yaml')))
+      uuid_file = File.join(directory, '.uuid')
+      if File.file?(uuid_file)
+        config['uuid'] = File.read(uuid_file).strip
       end
-      platforms = YAML.load(File.read("#{directory}/build.yaml"))
+      build_file = File.join(directory, 'build.yaml')
+      platforms = YAML.load(File.read(build_file))
       platforms.each_pair { |k, v|
         v['name'] = k
         cls = Gamefic::Sdk::Platform.const_get(v['platform'])
         plat = cls.new(directory, v)
-        puts "Building #{k}..." #unless quiet
+        puts "Building #{k}..." unless quiet
         plat.build
       }
-      puts "Build#{platforms.length > 1 ? 's' : ''} complete." #unless quiet
+      puts "Build#{platforms.length > 1 ? 's' : ''} complete." unless quiet
     end
-    def self.clean directory, config
+    def self.clean directory
+      build_file = File.join(directory, 'build.yaml')
+      config = YAML.load(File.read(build_file))
       config.each_pair { |k, v|
         v['name'] = k
         puts "Cleaning #{k}..."
         build_dir = "#{directory}/build/#{k}"
-        platform_dir = "#{directory}/release/#{k}"
+        platform_dir = File.join(directory, release, k)
         cls = Gamefic::Sdk::Platform.const_get(v['platform'])
         plat = cls.new(directory, v)
         plat.clean

data/lib/gamefic-sdk/debug.rb

@@ -1,5 +1,4 @@
 module Gamefic::Sdk::Debug
   autoload :Plot, 'gamefic-sdk/debug/plot'
   autoload :Action, 'gamefic-sdk/debug/action'
-  autoload :Meta, 'gamefic-sdk/debug/meta'
 end

data/lib/gamefic-sdk/platform/base.rb

@@ -1,5 +1,6 @@
 require 'gamefic-sdk'
 require 'gamefic-sdk/debug/plot'
+require 'gamefic-sdk/plot_config'
 
 module Gamefic::Sdk
   class Platform::Base
@@ -19,10 +20,14 @@ module Gamefic::Sdk
       @config['build_dir'] = File.absolute_path(@config['build_dir'], source_dir)
     end
     
+    # @return [PlotConfig]
+    def plot_config
+      @plot_config ||= PlotConfig.new("#{source_dir}/config.yaml")
+    end
+    
     def plot
       if @plot.nil?
-        config = PlotConfig.new "#{source_dir}/config.yaml"
-        paths = config.script_paths + [Gamefic::Sdk::GLOBAL_SCRIPT_PATH]
+        paths = plot_config.script_paths + [Gamefic::Sdk::GLOBAL_SCRIPT_PATH]
         @plot = Gamefic::Sdk::Debug::Plot.new(Gamefic::Source::File.new(*paths))
         @plot.script 'main'
       end
@@ -44,5 +49,18 @@ module Gamefic::Sdk
     def clean
       puts "Nothing to do for this platform."
     end
+    
+    # Get a string of build metadata, represented as a hash.
+    #
+    # @return [Hash]
+    def metadata
+      hash = {}
+      uuid = File.exist?(source_dir + '/.uuid') ? File.read(source_dir + '/.uuid').strip : ''
+      hash[:uuid] = "#{uuid}"
+      hash[:gamefic_version] = "#{Gamefic::VERSION}"
+      hash[:sdk_version] = "#{Gamefic::Sdk::VERSION}"
+      hash[:build_data] = "#{DateTime.now}"
+      hash
+    end
   end
 end

data/lib/gamefic-sdk/platform/gfic.rb

@@ -1,5 +1,7 @@
 require 'zip'
-  
+require 'tempfile'
+require 'yaml'
+
 module Gamefic::Sdk
 
   class Platform::Gfic < Platform::Base
@@ -13,18 +15,19 @@ module Gamefic::Sdk
     def build
       target_dir = config['target_dir']
       if config['filename'].to_s == ''
-        filename = target_dir + '/' + source_dir.split('/').delete_if{|i| i.to_s == ''}.last + '.gfic'
+        filename = File.join(target_dir, source_dir.split('/').delete_if{|i| i.to_s == ''}.last + '.gfic')
       else
-        filename = "#{target_dir}/#{config['filename']}"
+        filename = File.join(target_dir, config['filename'])
       end
-      stream = StringIO.new("")
       FileUtils.rm filename if File.file?(filename)
       FileUtils.mkdir_p target_dir
       Zip::File.open(filename, Zip::File::CREATE) do |zipfile|
-        if plot.imported_scripts.length > 0
-          plot.imported_scripts.each { |script|
-            zipfile.add "scripts/#{script.path}", script.absolute_path
-          }
+        plot.imported_scripts.each { |script|
+          zipfile.add File.join('scripts', "#{script.path}.plot.rb"), script.absolute_path
+        }
+        Tempfile.open('metadata.yaml') do |file|
+          file.puts metadata.to_yaml
+          zipfile.add "metadata.yaml", file.path
         end
       end
     end

data/lib/gamefic-sdk/platform/web.rb

@@ -14,26 +14,60 @@ module Gamefic::Sdk
       }
     end
     
+    def app_config
+      @app_config ||= AppConfig.new source_dir, config
+    end
+    
     def build
       target_dir = config['target_dir']
       build_dir = config['build_dir']
-      app_config = AppConfig.new source_dir, config
       html_dir = app_config.html_dir
-
       
       FileUtils.mkdir_p target_dir
+      copy_html_files target_dir
+      build_opal_js build_dir
+      build_gamefic_js build_dir
+      build_static_js build_dir
+      build_scripts_js build_dir
+      render_index target_dir
+      copy_assets build_dir, target_dir
+      copy_media source_dir, target_dir
+      
+    end
+        
+    def clean
+      FileUtils.remove_entry_secure config['build_dir'] if File.exist?(config['build_dir'])
+      FileUtils.mkdir_p config['build_dir']
+      puts "#{config['build_dir']} cleaned."
+    end
+    
+    private
+    
+    def resolve filename, paths
+      absolute = nil
+      paths.each { |path|
+        if File.file?("#{path}/#{filename}")
+          absolute = File.join(path, filename)
+          break
+        end
+      }
+      raise "#{filename} not found" if absolute.nil?
+      absolute
+    end
 
-      # Copy everything in source except config and template
-      Dir.entries(html_dir).each { |entry|
-        if entry != 'config.rb' and entry != 'index.html.erb' and entry != '.' and entry != '..'
+    # Copy everything in source except config and template
+    def copy_html_files target_dir
+      Dir.entries(app_config.html_dir).each { |entry|
+        if entry != 'index.rb' and entry != 'index.html.erb' and entry != '.' and entry != '..'
           FileUtils.mkdir_p target_dir + '/' + File.dirname(entry)
-          FileUtils.cp_r "#{html_dir}/#{entry}", "#{target_dir}/#{entry}"
+          FileUtils.cp_r "#{app_config.html_dir}/#{entry}", "#{target_dir}/#{entry}"
         end
       }
+    end
 
-      # Make sure core exists in build directory      
+    def build_opal_js build_dir
+      # Make sure core exists in build directory
       FileUtils.mkdir_p build_dir + "/core"
-      
       # Opal core
       if !File.exist?(build_dir + "/core/opal.js")
         File.open(build_dir + "/core/opal.js", "w") do |file|
@@ -42,7 +76,9 @@ module Gamefic::Sdk
          file << Opal::Builder.build('native')
         end
       end
-      
+    end
+    
+    def build_gamefic_js build_dir
       # Gamefic core
       Opal.append_path Gamefic::Sdk::LIB_PATH
       if !File.exist?(build_dir + "/core/gamefic.js")
@@ -50,14 +86,18 @@ module Gamefic::Sdk
          file << Opal::Builder.build('gamefic').to_s
         end
       end
-      
+    end
+    
+    def build_static_js build_dir
       # GameficOpal
       if !File.exist?(build_dir + "/core/static.js")
-	      File.open(build_dir + "/core/static.js", "w") do |file|
-	        file << Opal::Builder.build('gamefic-sdk/platform/web/gamefic_opal')
-	      end
+        File.open(build_dir + "/core/static.js", "w") do |file|
+          file << Opal::Builder.build('gamefic-sdk/platform/web/gamefic_opal')
+        end
       end
-      
+    end
+    
+    def build_scripts_js build_dir
       # Plot scripts
       File.open("#{build_dir}/scripts.rb", 'w') do |file|
         file << "def GameficOpal.load_scripts\n"
@@ -67,51 +107,51 @@ module Gamefic::Sdk
           file << "\nend\n"
         }
         file << "end\n"
+        #file << metadata
       end
       Opal.append_path build_dir
       File.open(build_dir + "/core/scripts.js", 'w') do |file|
         file << Opal::Builder.build('scripts')
       end
-
+    end
+    
+    def render_index target_dir
       # Render index
       File.open(target_dir + "/index.html", "w") do |file|
         file << app_config.render
       end
-
-      # Copy requisite assets
-      app_config.resource_paths.push build_dir
+    end
+    
+    def copy_assets build_dir, target_dir
+      paths = app_config.resource_paths
+      paths.push build_dir
       app_config.javascripts.each { |js|
-        absolute = resolve(js, app_config.resource_paths)
+        absolute = resolve(js, paths)
         FileUtils.mkdir_p target_dir + "/" + File.dirname(js)
         FileUtils.cp_r absolute, target_dir + "/" + js
       }
       app_config.stylesheets.each { |css|
-        absolute = resolve(css, app_config.resource_paths)
+        absolute = resolve(css, paths)
         FileUtils.mkdir_p target_dir + "/" + File.dirname(css)
         FileUtils.cp_r absolute, target_dir + "/" + css
       }
     end
-        
-    def clean
-      FileUtils.remove_entry_secure config['build_dir'] if File.exist?(config['build_dir'])
-      FileUtils.mkdir_p config['build_dir']
-      puts "#{config['build_dir']} cleaned."
-    end
     
-    private
-    
-    def resolve filename, paths
-      absolute = nil
-      paths.each { |path|
-        if File.file?("#{path}/#{filename}")
-          absolute = "#{path}/#{filename}"
-          break
+    def copy_media source_dir, target_dir
+      # Copy media
+      pc = PlotConfig.new "#{source_dir}/config.yaml"
+      pc.media_paths.each { |path|
+        if File.directory?(path)
+          FileUtils.mkdir_p target_dir + "/media"
+          Dir.entries(path).each { |entry|
+            if entry != '.' and entry != '..'
+              FileUtils.mkdir_p target_dir + "/media/" + File.dirname(entry)
+              FileUtils.cp_r path + "/" + entry, target_dir + "/media/" + entry
+            end
+          }
         end
       }
-      raise "#{filename} not found" if absolute.nil?
-      absolute
     end
-    
   end
 
 end

data/lib/gamefic-sdk/platform/web/app_config.rb

@@ -1,54 +1,57 @@
 require 'erb'
 require 'gamefic/stage'
 
-class Gamefic::Sdk::Platform::Web::AppConfig
-  include Stage
-  attr_reader :javascripts, :stylesheets, :resource_paths, :source_dir, :config, :html_dir
-  expose :javascripts, :stylesheets, :resource_paths
-  
-  # @param main_dir [String] The directory containing the resources (config file, HTML template, etc.) for this build
-  def initialize source_dir, config
-    @javascripts = []
-    @stylesheets = []
-    @source_dir = source_dir
-    @config = config
-    @html_dir = resolve_html_dir
-    @game_config = PlotConfig.new("#{source_dir}/config.yaml")
-    @resource_paths = ["#{html_dir}", Gamefic::Sdk::HTML_TEMPLATE_PATH]
-    config_file = "#{html_dir}/config.rb"
-    stage File.read(config_file), config_file
-    javascripts.push "core/opal.js", "core/gamefic.js", "core/static.js", "core/scripts.js", "core/engine.js"
+module Gamefic
+  module Sdk
+		class Gamefic::Sdk::Platform::Web::AppConfig
+		  include Stage
+		  attr_reader :javascripts, :stylesheets, :resource_paths, :source_dir, :config, :html_dir
+		  expose :javascripts, :stylesheets, :resource_paths
+		  
+		  # @param main_dir [String] The directory containing the resources (config file, HTML template, etc.) for this build
+		  def initialize source_dir, config
+		    @javascripts = []
+		    @stylesheets = []
+		    @source_dir = source_dir
+		    @config = config
+		    @html_dir = resolve_html_dir
+		    @game_config = PlotConfig.new("#{source_dir}/config.yaml")
+		    @resource_paths = ["#{html_dir}", Gamefic::Sdk::HTML_TEMPLATE_PATH]
+		    config_file = "#{html_dir}/index.rb"
+		    stage File.read(config_file), config_file
+		    javascripts.push "core/opal.js", "core/gamefic.js", "core/static.js", "core/scripts.js", "core/engine.js"
+		  end
+		  
+		  # @return [BuildConfig::Data]
+		  def data
+		    Data.new @game_config, @javascripts, @stylesheets
+		  end
+		  
+		  # Render HTML using the build config data
+		  #
+		  # @return [String] The resulting HTML
+		  def render
+		    erb = ERB.new(File.read(html_dir + "/index.html.erb"))
+		    erb.result data.get_binding
+		  end
+		  
+		  private
+		  
+		  def resolve_html_dir
+		    dir = "#{source_dir}/html"
+		    if !File.directory?(dir) and config['html_skin'].to_s != ''
+		      dir = "#{Gamefic::Sdk::HTML_TEMPLATE_PATH}/skins/#{config['html_skin']}"
+		    end
+		    if !File.directory?(dir)
+		      dir = "#{Gamefic::Sdk::HTML_TEMPLATE_PATH}/skins/minimal"
+		    end
+		    if !File.directory?(dir)
+		      raise "Could not resolve HTML directory"
+		    end
+		    dir
+		  end
+		end
   end
-  
-  # @return [BuildConfig::Data]
-  def data
-    Data.new @game_config, @javascripts, @stylesheets
-  end
-  
-  # Render HTML using the build config data
-  #
-  # @return [String] The resulting HTML
-  def render
-    erb = ERB.new(File.read(html_dir + "/index.html.erb"))
-    erb.result data.get_binding
-  end
-  
-  private
-  
-  def resolve_html_dir
-    dir = "#{source_dir}/html"
-    if !File.directory?(dir) and config['html_skin'].to_s != ''
-      dir = "#{Gamefic::Sdk::HTML_TEMPLATE_PATH}/skins/#{config['html_skin']}"
-    end
-    if !File.directory?(dir)
-      dir = "#{Gamefic::Sdk::HTML_TEMPLATE_PATH}/skins/minimal"
-    end
-    if !File.directory?(dir)
-      raise "Could not resolve HTML directory"
-    end
-    dir
-  end
-
 end
 
 class Gamefic::Sdk::Platform::Web::AppConfig::Data

data/lib/gamefic-sdk/platform/web/gamefic_opal.rb

@@ -2,12 +2,13 @@
 require 'gamefic/query/expression'
 require 'gamefic/query/matches'
 require 'gamefic/grammar/verb_set'
+require 'gamefic/scene/multiple_choice/input'
 
 # HACK Opal doesn't recognizes classes and modules declared from scripts
 def Object.const_missing sym
   Gamefic.const_get sym
 end
-  
+
 module GameficOpal
   def self.static_plot
     @@static_plot ||= WebPlot.new(Gamefic::Source::Text.new)
@@ -24,12 +25,15 @@ module GameficOpal
 	
 	class WebUser < Gamefic::User
 	  def save filename, data
-	    `Gamefic.Engine.save(filename, data);`
+	    `Gamefic.save(filename, data);`
 	  end
 	  def restore filename
-	    data = `Gamefic.Engine.restore(filename);`
+	    data = `Gamefic.restore(filename);`
 	    return data
 	  end
+	  def test_queue
+	    character[:test_queue] || []
+	  end
 	end
 end
 

data/lib/gamefic-sdk/plot_config.rb

@@ -1,12 +1,12 @@
 require 'yaml'
 
-module Gamefic
+module Gamefic::Sdk
   
   class PlotConfig
-    attr_reader :author, :title, :script_paths, :asset_paths
+    attr_reader :author, :title, :script_paths, :media_paths
     def initialize filename = nil
       @script_paths = []
-      @asset_paths = []
+      @media_paths = []
       if !filename.nil?
 	      config = YAML.load_file filename
 	      base_dir = File.dirname(filename)
@@ -15,9 +15,9 @@ module Gamefic
 	      config['script_paths'].each { |p|
 	        @script_paths.push File.absolute_path(p, base_dir)
 	      } if !config['script_paths'].nil?
-	      config['asset_paths'].map! { |p|
-	        @asset_paths.push File.absolute_path(p, base_dir)
-	      } if !config['asset_paths'].nil?
+	      config['media_paths'].map! { |p|
+	        @media_paths.push File.absolute_path(p, base_dir)
+	      } if !config['media_paths'].nil?
       end
     end
   end

data/lib/gamefic-sdk/shell.rb

@@ -0,0 +1,5 @@
+require 'gamefic/shell'
+
+class Gamefic::Sdk::Shell < Gamefic::Shell
+  autoload :Command, 'gamefic-sdk/shell/command'
+end

data/lib/gamefic-sdk/shell/command.rb

@@ -0,0 +1,8 @@
+require 'slop'
+
+module Gamefic::Sdk::Shell::Command
+  autoload :Init, 'gamefic-sdk/shell/command/init'
+  autoload :Build, 'gamefic-sdk/shell/command/build'
+  autoload :Clean, 'gamefic-sdk/shell/command/clean'
+  autoload :Test, 'gamefic-sdk/shell/command/test'
+end

data/lib/gamefic-sdk/shell/command/build.rb

@@ -0,0 +1,12 @@
+require 'gamefic-sdk/build'
+
+class Gamefic::Sdk::Shell::Command::Build < Gamefic::Shell::Command::Base
+  def initialize
+    options.boolean '-q', '--quiet', 'suppress output', default: false
+  end
+  
+  def run input
+    result = parse input
+    Gamefic::Sdk::Build.release result.arguments[1], result['--quiet']
+  end  
+end

data/lib/gamefic-sdk/shell/command/clean.rb

@@ -0,0 +1,12 @@
+require 'gamefic-sdk/build'
+
+class Gamefic::Sdk::Shell::Command::Clean < Gamefic::Shell::Command::Base
+  def initialize
+    #options.boolean '-q', '--quiet', 'suppress output', default: false
+  end
+  
+  def run input
+    result = parse input
+    Gamefic::Sdk::Build.clean result.arguments[1]
+  end  
+end

data/lib/gamefic-sdk/shell/command/init.rb

@@ -0,0 +1,100 @@
+require 'securerandom'
+require 'fileutils'
+require 'getoptlong'
+
+class Gamefic::Sdk::Shell::Command::Init < Gamefic::Shell::Command::Base
+  def initialize
+    @quiet = false
+    @html = 'standard'
+    @scripts = ['standard']
+    @platforms = ['Gfic', 'Web']
+    options.boolean '-q', '--quiet', 'suppress output', default: false
+  end
+  
+  def run input
+    get_arguments input
+    make_game_directories
+    write_main_script
+    write_test_script
+    write_build_yaml
+    write_config_yaml
+    write_uuid_file
+    copy_html_skin
+    Dir.mkdir(File.join(@directory, 'media'))
+    puts "Game directory '#{@directory}' initialized." unless @quiet
+  end
+  
+  private
+  
+  def get_arguments input
+    result = parse input
+    @quiet = result['--quiet']
+    @directory = result.arguments[1]
+  end
+
+  def make_game_directories
+    if @directory.to_s == ''
+      raise "No directory specified."
+    end
+    if File.exist?(@directory)
+      if File.file?(@directory)
+        raise "#{@directory} is a file."
+      else
+        if !Dir['your_directory/*'].empty?
+          raise "#{@directory} is not an empty directory."
+        end
+      end
+    else
+      Dir.mkdir(@directory)
+    end
+    Dir.mkdir(@directory + '/scripts')
+  end
+  
+  def write_main_script
+    main_file = File.join(@directory, 'scripts', 'main.plot.rb')
+    File.open(main_file, 'w') do |file|
+      @scripts.each { |script|
+        file.puts "script '#{script}'"
+      }
+    end
+  end
+  
+  def write_test_script
+    File.open("#{@directory}/scripts/test.plot.rb", 'w') do |file|
+      file.puts "script 'standard/test'"
+    end
+  end
+  
+  def write_build_yaml
+    File.open("#{@directory}/build.yaml", 'w') do |file|
+      file.puts "web:",
+      "  platform: Web",
+      "gfic:",
+      "  platform: Gfic"
+    end
+  end
+  
+  def write_config_yaml
+    File.open("#{@directory}/config.yaml", 'w') do |file|
+      file.puts "title: Untitled",
+      "author: Anonymous",
+      "",
+      "script_paths:",
+      "  - ./scripts",
+      "media_paths:",
+      "  - ./media"
+    end
+  end
+  
+  def write_uuid_file
+    uuid = SecureRandom.uuid
+    File.open("#{@directory}/.uuid", "w") { |f| f.write uuid }
+  end
+  
+  def copy_html_skin
+    Dir.mkdir("#{@directory}/html")
+    skin = 'standard'
+    FileUtils.cp_r(Dir[Gamefic::Sdk::HTML_TEMPLATE_PATH + "/skins/" + @html + "/*"], "#{@directory}/html")
+  end
+  
+end

data/lib/gamefic-sdk/shell/command/test.rb

@@ -0,0 +1,35 @@
+require 'gamefic/shell'
+require 'gamefic-sdk/plot_config'
+require 'gamefic/engine/tty'
+
+module Gamefic
+  module Sdk
+
+		class Shell::Command::Test < Gamefic::Shell::Command::Base
+		  def run input
+		    result = parse input
+		    puts "Loading..."
+		    path = result.arguments[1]
+		    if !File.exist?(path)
+		      raise "Invalid path: #{path}"
+		    end
+		    build_file = nil
+		    main_file = path
+		    test_file = nil
+		    if File.directory?(path)
+		      config = PlotConfig.new File.join(path, 'config.yaml')
+		    else
+		      config = PlotConfig.new
+		    end
+		    paths = config.script_paths + [Gamefic::Sdk::GLOBAL_SCRIPT_PATH]
+		    plot = Gamefic::Sdk::Debug::Plot.new Source::File.new(*paths)
+		    plot.script 'main'
+		    plot.script 'debug'
+		    engine = Tty::Engine.new plot
+		    puts "\n"
+		    engine.run
+		  end  
+		end
+    
+  end
+end

data/lib/gamefic-sdk/version.rb

@@ -1,5 +1,5 @@
 module Gamefic
   module Sdk
-    VERSION = '0.3.1'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,55 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Development tools for Gamefic
@@ -59,23 +87,28 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/gfk
+- html/skins/minimal/index.rb
+- html/skins/standard/index.rb
 - lib/gamefic-sdk.rb
+- lib/gamefic-sdk/build.rb
+- lib/gamefic-sdk/debug.rb
+- lib/gamefic-sdk/debug/action.rb
+- lib/gamefic-sdk/debug/plot.rb
+- lib/gamefic-sdk/platform.rb
 - lib/gamefic-sdk/platform/base.rb
 - lib/gamefic-sdk/platform/gfic.rb
 - lib/gamefic-sdk/platform/web.rb
 - lib/gamefic-sdk/platform/web/app_config.rb
 - lib/gamefic-sdk/platform/web/gamefic_opal.rb
 - lib/gamefic-sdk/plot_config.rb
+- lib/gamefic-sdk/shell.rb
+- lib/gamefic-sdk/shell/command.rb
+- lib/gamefic-sdk/shell/command/build.rb
+- lib/gamefic-sdk/shell/command/clean.rb
+- lib/gamefic-sdk/shell/command/init.rb
+- lib/gamefic-sdk/shell/command/test.rb
 - lib/gamefic-sdk/version.rb
-- lib/gamefic-sdk/debug.rb
-- lib/gamefic-sdk/debug/action.rb
-- lib/gamefic-sdk/debug/plot.rb
-- lib/gamefic-sdk/build.rb
-- lib/gamefic-sdk/gfk.rb
-- lib/gamefic-sdk/platform.rb
-- html/skins/standard/config.rb
-- html/skins/minimal/config.rb
-- bin/gfk
 homepage: http://gamefic.com
 licenses:
 - MIT
@@ -86,19 +119,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gamefic SDK
 test_files: []
-has_rdoc: 

data/lib/gamefic-sdk/gfk.rb

@@ -1,243 +0,0 @@
-require 'tmpdir'
-require 'zip'
-require 'getoptlong'
-require 'gamefic/engine/tty'
-require 'gamefic-sdk'
-require 'gamefic-sdk/build'
-require 'securerandom'
-require 'gamefic-sdk/debug'
-
-include Gamefic
-
-module Gamefic::Sdk
-  class Gfk
-    attr_accessor :argv
-    def initialize
-        
-    end
-    def execute
-      if ARGV.length == 0
-        ARGV.push 'help'
-      end
-      cmd = ARGV.shift
-      case cmd
-        when 'test'
-          test ARGV.shift
-        when 'init'
-          init ARGV.shift
-        when 'build'
-          build ARGV.shift
-        when 'clean'
-          clean ARGV.shift
-        when 'fetch'
-          fetch ARGV.shift
-        when 'help'
-          help ARGV.shift
-        else
-          help nil
-      end
-    end
-    private
-      def test path
-        puts "Loading..."
-        STDOUT.flush
-        if !File.exist?(path)
-          raise "Invalid path: #{path}"
-        end
-        build_file = nil
-        main_file = path
-        test_file = nil
-        if File.directory?(path)
-          config = PlotConfig.new "#{path}/config.yaml"
-        else
-          config = PlotConfig.new
-        end
-        paths = config.script_paths + [Gamefic::Sdk::GLOBAL_SCRIPT_PATH]
-        plot = Gamefic::Sdk::Debug::Plot.new Source::File.new(*paths)
-        plot.script 'main'
-        plot.script 'debug'
-        engine = Tty::Engine.new plot
-        puts "\n"
-        engine.run
-      end
-      def init directory
-        quiet = false
-        html = nil
-        imports = []
-        opts = GetoptLong.new(
-          [ '-q', '--quiet', GetoptLong::NO_ARGUMENT ],
-          [ '--with-html-skin', GetoptLong::OPTIONAL_ARGUMENT ],
-          [ '-i', '--import', GetoptLong::REQUIRED_ARGUMENT ]
-        )
-        begin
-          opts.each { |opt, arg|
-            case opt
-              when '-q'
-                quiet = true
-              when '--with-html-skin'
-                html = arg || 'standard'
-              when '-i'
-                imports = arg.split(';')
-            end
-          }
-        rescue Exception => e
-          puts "#{e}"
-          exit 1
-        end
-        if directory.to_s == ''
-          puts "No directory specified."
-          exit 1
-        elsif File.exist?(directory)
-          if File.directory?(directory)
-            files = Dir[directory + '/*']
-            if files.length > 0
-              dotfiles = Dir[directory + '/\.*']
-              if dotfiles.length < files.length
-                puts "'#{directory}' is not an empty directory."
-                exit 1
-              end
-            end
-          else
-            puts "'#{directory}' is a file."
-            exit 1
-          end
-        else
-          Dir.mkdir(directory)
-        end
-        Dir.mkdir(directory + '/scripts')
-        main_rb = File.new(directory + '/scripts/main.plot.rb', 'w')
-        main_rb.write <<EOS
-script 'standard'
-EOS
-        imports.each { |i|
-          main_rb.write "require '#{i}'\n"
-        }
-        main_rb.close
-        test_rb = File.new(directory + '/scripts/test.plot.rb', 'w')
-        test_rb.write <<EOS
-script 'standard/test'
-EOS
-        test_rb.close
-        build_rb = File.new(directory + '/build.yaml', 'w')
-        build_rb.write <<EOS
-web:
-  platform: Web
-gfic:
-  platform: Gfic
-EOS
-        build_rb.close
-        config_rb = File.new(directory + '/config.yaml', 'w')
-        config_rb.write <<EOS
-title: Untitled
-author: Anonymous
-
-script_paths:
-  - ./scripts
-asset_paths:
-  - ./assets
-EOS
-        config_rb.close
-        Dir.mkdir(directory + '/html')
-        if !html.nil?
-          FileUtils.cp_r(Dir[Gamefic::Sdk::HTML_TEMPLATE_PATH + "/skins/" + html + "/*"], directory + "/html")
-        end
-        uuid = SecureRandom.uuid
-        File.open("#{directory}/.uuid", "w") { |f| f.write uuid }
-        puts "Game directory '#{directory}' initialized." unless quiet
-      end
-      def fetch directory
-        if directory.to_s == ''
-          puts "No source directory was specified."
-          exit 1
-        end
-        if !File.directory?(directory)
-          puts "#{directory} is not a directory."
-          exit 1
-        end
-        puts "Loading game data..."
-        story = Plot.new(Source.new(GLOBAL_SCRIPT_PATH))
-        begin
-          story.load directory + '/main', true
-        rescue Exception => e
-          puts "'#{directory}' has errors or is not a valid source directory."
-          puts "#{e}"
-          exit 1
-        end
-        puts "Checking for external script references..."
-        fetched = 0
-        story.imported_scripts.each { |script|
-          if !script.filename.start_with?(directory)
-            base = script.filename[(script.filename.rindex('scripts/') + 7)..-1]
-            puts "Fetching #{base}"
-            FileUtils.mkdir_p directory + '/scripts/' + File.dirname(base)
-            FileUtils.copy script.filename, directory + '/scripts/' + base
-            fetched += 1
-          end
-        }
-        if fetched == 0
-          puts "Nothing to fetch."
-        else
-          puts "Done."
-        end
-      end
-      def build directory
-        Build.release directory
-      end
-      def clean directory
-        config = YAML.load(File.read(directory + '/build.yaml'))
-        Build.clean directory, config
-      end
-      def help command
-        shell_script = File.basename($0)
-        case command
-          when "test"
-            puts <<EOS
-#{shell_script} test [path]
-Test a Gamefic source directory or script.
-EOS
-          when "init"
-            puts <<EOS
-#{shell_script} init [directory]
-Initialize a Gamefic source directory. The resulting directory will contain
-source files ready to build into a Gamefic file.
-EOS
-          when "fetch"
-            puts <<EOS
-#{shell_script} fetch [directory]
-Copy shared scripts to the source directory.
-If the specified game directory imports external scripts, such as the ones
-that are distributed with the Gamefic gem, this command will copy them into
-the game's script directory. Fetching can be useful if you want to customize
-common features.
-EOS
-          when "build"
-            puts <<EOS
-#{shell_script} build [directory] [-o | --output filename]
-Build a distributable Gamefic file from the source directory. The default
-filename is [directory].gfic. You can change the filename with the -o option.
-EOS
-          when "clean"
-            puts <<EOS
-#{shell_script} clean [directory]
-Clean Gamefic source directories. This command will delete any intermediate
-files that are used during the build process. The next build will rebuild
-everything from source.
-EOS
-          when nil, "help"
-          puts <<EOS
-#{shell_script} init [directory] - initialize a Gamefic source directory
-#{shell_script} test [path] - test a Gamefic source directory or script
-#{shell_script} fetch [directory] - copy shared scripts into directory
-#{shell_script} build [directory] - build games
-#{shell_script} build [directory] - clean game directories
-#{shell_script} help - display this message
-#{shell_script} help [command] - display info about command
-EOS
-        else
-          puts "Unrecognized command '#{command}'"
-          exit 1
-        end
-      end
-  end
-
-end