gamefic-sdk 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b6246feb78b9dfe2668e0409dad7e9c5866a248
-  data.tar.gz: c847fab4182447f1980d429e401af4543cd0a5ab
+  metadata.gz: 081a0f681badbcefc16326db3a53df75173afb59
+  data.tar.gz: 32377e4aac6d78e3a83fd21d3bfb82e9e9d57e08
 SHA512:
-  metadata.gz: d8ceec5b5493b56cd852794e192774a77405147e930fe3e0696a48df1142777cc336e84de889c49c5098b68842653bb04d4cdf46160fec5e53dd732eb56a006a
-  data.tar.gz: 0c3062e078cf8639569d5bffce9a4f8fa53f735973a446cf785dbc5ab3915a543925927d247ec90ed484365337e687427529a8fb447c6dd2a20f97300fa7c5fc
+  metadata.gz: 7ebc6cf34dfe63068722c297787af128150a7aadb537c7279cfd0c58f53c203e5afdb8ea6e4b1594f8ffece0e4e691451c54ceb7e9450748123cbcc93991a86b
+  data.tar.gz: 7b4091417b2d45ea4c26970a266d626810cdbf5d7093bf37af9bfff68f97014d47fae8fb5cf1888a0280fc85c1491716cb8137d9c4b3235082e6c7369a4e2952

data/bin/gfk

@@ -1,16 +1,6 @@
 #!/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.execute
+Gamefic::Sdk::Shell.start(ARGV)

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

@@ -1,30 +1,28 @@
 require 'gamefic'
 require 'gamefic-sdk'
-#require 'rubygems'
-#gem 'opal', '>= 0.9', '< 0.10'
 require 'opal'
 
 module Gamefic::Sdk
 
   class Platform::Web < Platform::Base
     autoload :AppConfig, 'gamefic-sdk/platform/web/app_config'
-    
+
     def defaults
       @defaults ||= {
         'html_skin' => 'standard',
         'with_media' => true
       }
     end
-    
+
     def app_config
       @app_config ||= AppConfig.new source_dir, config
     end
-    
+
     def build
       target_dir = config['target_dir']
       build_dir = config['build_dir']
       html_dir = app_config.html_dir
-      
+
       FileUtils.mkdir_p target_dir
       copy_html_files target_dir
       build_opal_js build_dir
@@ -34,17 +32,17 @@ module Gamefic::Sdk
       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|
@@ -79,26 +77,27 @@ module Gamefic::Sdk
         end
       end
     end
-    
+
     def build_gamefic_js build_dir
       # Gamefic core
-      Opal.append_path Gamefic::Sdk::LIB_PATH
+      Opal.use_gem 'gamefic'
       if !File.exist?(build_dir + "/core/gamefic.js")
         File.open(build_dir + "/core/gamefic.js", "w") do |file|
          file << Opal::Builder.build('gamefic').to_s
         end
       end
     end
-    
+
     def build_static_js build_dir
       # GameficOpal
+      Opal.append_path Gamefic::Sdk::LIB_PATH
       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
       end
     end
-    
+
     def build_scripts_js build_dir
       # Plot scripts
       File.open("#{build_dir}/scripts.rb", 'w') do |file|
@@ -116,14 +115,14 @@ module Gamefic::Sdk
         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
     end
-    
+
     def copy_assets build_dir, target_dir
       paths = app_config.resource_paths
       paths.push build_dir
@@ -138,7 +137,7 @@ module Gamefic::Sdk
         FileUtils.cp_r absolute, target_dir + "/" + css
       }
     end
-    
+
     def copy_media source_dir, target_dir
       # Copy media
       pc = PlotConfig.new "#{source_dir}/config.yaml"
@@ -154,7 +153,7 @@ module Gamefic::Sdk
         end
       }
     end
-    
+
     def metadata_code
       "\nGameficOpal.static_plot.metadata = JSON.parse('#{metadata.to_json}')"
     end

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

@@ -22,7 +22,7 @@ module GameficOpal
       # Stub
     end
   end
-  
+
   class WebUser < Gamefic::User
     def save filename, data
       data[:metadata] = character.plot.metadata

data/lib/gamefic-sdk/shell.rb

@@ -1,5 +1,53 @@
-require 'gamefic/shell'
+require 'thor'
+require 'gamefic-sdk/build'
 
-class Gamefic::Sdk::Shell < Gamefic::Shell
-  autoload :Command, 'gamefic-sdk/shell/command'
+module Gamefic
+  module Sdk
+    class Shell < Thor
+      autoload :Init, 'gamefic-sdk/shell/init'
+      autoload :Test, 'gamefic-sdk/shell/test'
+
+      map %w[--version -v] => :version
+      map [:create, :new] => :init
+      
+      desc "--version, -v", "Print the version"
+      def version
+        puts "gamefic-sdk #{Gamefic::Sdk::VERSION}"
+        puts "gamefic #{Gamefic::VERSION}"
+      end
+
+      desc 'init DIRECTORY_NAME', 'Initialize a new game in DIRECTORY_NAME'
+      option :quiet, type: :boolean, aliases: :q, desc: 'Suppress output'
+      option :standard, type: :boolean, default: true, desc: 'Include the standard script'
+      option :scripts, type: :array, aliases: [:s, :script], desc: 'Additional scripts'
+      option :webskin, default: 'standard', aliases: [:w], desc: 'Skin to use for the Web platform'
+      def init(directory_name)
+        Gamefic::Sdk::Shell::Init.new(directory: directory_name,
+          quiet: options[:quiet], scripts: options[:scripts], webskin: options[:webskin]).run
+      end
+
+      desc 'test DIRECTORY_NAME', 'Play the game in DIRECTORY_NAME'
+      def test(directory_name)
+        Gamefic::Sdk::Shell::Test.new(directory: directory_name).run
+      end
+
+      desc 'build DIRECTORY_NAME', 'Build the game for specified platforms in DIRECTORY_NAME'
+      option :quiet, type: :boolean, aliases: :q, desc: 'Suppress output'
+      def build(directory_name)
+        Gamefic::Sdk::Build.release(directory_name, options[:quiet])
+      end
+
+      desc 'clean DIRECTORY_NAME', 'Perform cleanup of DIRECTORY_NAME'
+      def clean(directory_name)
+        Gamefic::Sdk::Build.clean(directory_name)
+      end
+      
+      desc 'webskins', 'List the available skins for the Web platform'
+      def webskins
+        Dir[File.join(Gamefic::Sdk::HTML_TEMPLATE_PATH, 'skins', '*')].sort.each { |d|
+          puts File.basename(d)
+        }
+      end
+    end
+  end
 end

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

@@ -0,0 +1,92 @@
+require 'securerandom'
+require 'fileutils'
+
+module Gamefic
+  module Sdk
+    class Shell
+      class Init
+        def initialize(directory:, standard: true, quiet: false, scripts: [], webskin: 'standard')
+          @quiet = quiet
+          @directory = directory
+          @html = webskin
+          @scripts = []
+          @scripts.push('standard') if standard
+          @scripts += scripts if scripts
+          @platforms = ['Gfic', 'Web']
+        end
+
+        def run
+          make_game_directories
+          write_main_script
+          write_test_script
+          write_build_yaml
+          write_config_yaml
+          write_uuid_file
+          copy_html_skin
+          puts "Game directory '#{@directory}' initialized." unless @quiet
+        end
+
+        private
+
+        def make_game_directories
+          if File.exist?(@directory)
+            raise "#{@directory} is a file." if File.file?(@directory)
+            raise "#{@directory} is not an empty directory." unless Dir["#{@directory}/*"].empty?
+          else
+            Dir.mkdir(@directory)
+          end
+
+          Dir.mkdir(File.join(@directory, 'scripts'))
+          Dir.mkdir(File.join(@directory, 'media'))
+        end
+
+        def write_main_script
+          main_file = File.join(@directory, 'scripts', 'main.plot.rb')
+          File.open(main_file, 'w') do |file|
+            @scripts.each do |script|
+              file.puts "script '#{script}'"
+            end
+          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",
+            "  filename: game.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")
+          FileUtils.cp_r(Dir[Gamefic::Sdk::HTML_TEMPLATE_PATH + '/skins/' + @html + '/*'], "#{@directory}/html")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'gamefic-sdk/plot_config'
+require 'gamefic/engine/tty'
+
+module Gamefic
+  module Sdk
+    class Shell
+      class Test
+        def initialize(directory:)
+          @path = directory
+          raise "Invalid path: #{@path}" unless File.exist?(@path)
+          puts "Loading..."
+        end
+
+        def run
+          paths = config_path.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
+
+        private
+
+        def config_path
+          if File.directory?(@path)
+            PlotConfig.new File.join(@path, 'config.yaml')
+          else
+            PlotConfig.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gamefic-sdk/version.rb

@@ -1,5 +1,5 @@
 module Gamefic
   module Sdk
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/scripts/standard/entities/room.plot.rb

@@ -31,6 +31,7 @@ class Gamefic::Room < Gamefic::Entity
     end
     portal
   end
+  
   def synonyms
     @synonyms.to_s + " around here room"
   end

metadata

@@ -1,71 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 description: Development tools for Gamefic
 email: fsnyder@gamefic.com
 executables:
@@ -108,11 +120,8 @@ files:
 - 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/shell/init.rb
+- lib/gamefic-sdk/shell/test.rb
 - lib/gamefic-sdk/version.rb
 - scripts/ansi.plot.rb
 - scripts/autosuggest.plot.rb
@@ -228,19 +237,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gamefic SDK
 test_files: []
-has_rdoc: 

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

@@ -1,8 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,101 +0,0 @@
-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",
-      "  filename: game.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

@@ -1,35 +0,0 @@
-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