gamefic-sdk 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61acd296a500629ea97c6e31db00b4c966aa975d
-  data.tar.gz: cbe43ae8d137c1708f7a65c008230f534bf1a3d6
+  metadata.gz: 9c0f125ab1ce21b53aad57448dc6cec8bbbd0026
+  data.tar.gz: adbf7e761ad6e8be82b8151d58fe5aca7e80aeae
 SHA512:
-  metadata.gz: 1ed83278eacd87d0582a3f0bf9cd8097b9b9425a1f2f4b6ace6514bd9c6873cfeff95d33987307fd8944c3b46f5a05df9481d57ee876107b11064674398e29f1
-  data.tar.gz: 250a6098b55a035e05141758ee2115a72afacb1ae6342b7f91fbfbecd1d2ffec5611ed6e2480caa1fab43a642bb8c77a3b0f245a10d0b5b6e1acda0e12f3f582
+  metadata.gz: 37125ae82a687f340871cb9516ae47e82472fdf0162b17401c688e67c46dcc70bbaaf0370d29991e7bae1e7dcbdd866ea6e357d51ae8bf9aaf3f0725e1bf8635
+  data.tar.gz: 5e0da62f2011f16283235fc7d66be7e0c9344780eb8b67ff309b2eca6d65cd5933562fae5f1ac8e3aad900aba4950f4465a8d45673b8172bdf7fac86a0fb4d28

data/html/skins/minimal/config.rb

@@ -1,10 +1,4 @@
-javascripts.push "core/opal.js"
-javascripts.push "core/gamefic.js"
-javascripts.push "core/static.js"
-javascripts.push "core/scripts.js"
-javascripts.push "core/engine.js"
 javascripts.push "core/jquery.js"
-
 javascripts.push "play.js"
 
 stylesheets.push "style.css"

data/html/skins/standard/config.rb

@@ -0,0 +1,4 @@
+javascripts.push "core/jquery.js"
+javascripts.push "play.js"
+
+stylesheets.push "style.css"

data/lib/gamefic-sdk/gfk.rb

@@ -66,7 +66,7 @@ module Gamefic::Sdk
         imports = []
         opts = GetoptLong.new(
           [ '-q', '--quiet', GetoptLong::NO_ARGUMENT ],
-          [ '--with-html', GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--with-html-skin', GetoptLong::OPTIONAL_ARGUMENT ],
           [ '-i', '--import', GetoptLong::REQUIRED_ARGUMENT ]
         )
         begin
@@ -74,8 +74,8 @@ module Gamefic::Sdk
             case opt
               when '-q'
                 quiet = true
-              when '--with-html'
-                html = arg
+              when '--with-html-skin'
+                html = arg || 'standard'
               when '-i'
                 imports = arg.split(';')
             end
@@ -139,7 +139,6 @@ EOS
         config_rb.close
         Dir.mkdir(directory + '/html')
         if !html.nil?
-          FileUtils.cp_r(Dir[Gamefic::Sdk::HTML_TEMPLATE_PATH + "/core/*"], directory + "/html")
           FileUtils.cp_r(Dir[Gamefic::Sdk::HTML_TEMPLATE_PATH + "/skins/" + html + "/*"], directory + "/html")
         end
         uuid = SecureRandom.uuid

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

@@ -9,24 +9,24 @@ module Gamefic::Sdk
     
     def defaults
       @defaults ||= {
-        :html_skin => 'multimedia',
-        :with_media => true
+        'html_skin' => 'standard',
+        'with_media' => true
       }
     end
     
     def build
       target_dir = config['target_dir']
-      # TODO Configurable build folder?
       build_dir = config['build_dir']
-      html_dir = resolve_html_dir
-      app_config = AppConfig.new html_dir
+      app_config = AppConfig.new source_dir, config
+      html_dir = app_config.html_dir
 
+      
       FileUtils.mkdir_p target_dir
 
       # 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 != '..'
-          FileUtils.mkdir_p target_dir + File.dirname(entry)
+          FileUtils.mkdir_p target_dir + '/' + File.dirname(entry)
           FileUtils.cp_r "#{html_dir}/#{entry}", "#{target_dir}/#{entry}"
         end
       }
@@ -112,19 +112,6 @@ module Gamefic::Sdk
       absolute
     end
     
-    def resolve_html_dir
-      html_dir = "#{source_dir}/html"
-      if !File.directory?(html_dir) and config['html_skin'].to_s != ''
-        html_dir = "#{Gamefic::Sdk::HTML_TEMPLATE_PATH}/skins/#{config['html_skin']}"
-      end
-      if !File.directory?(html_dir)
-        html_dir = "#{Gamefic::Sdk::HTML_TEMPLATE_PATH}/skins/minimal"
-      end
-      if !File.directory?(html_dir)
-        raise "Could not resolve HTML directory"
-      end
-      html_dir
-    end
   end
 
 end

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

@@ -3,36 +3,59 @@ require 'gamefic/stage'
 
 class Gamefic::Sdk::Platform::Web::AppConfig
   include Stage
-  attr_reader :javascripts, :stylesheets, :resource_paths
+  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
+  def initialize source_dir, config
     @javascripts = []
     @stylesheets = []
     @source_dir = source_dir
-    @resource_paths = ["#{source_dir}", Gamefic::Sdk::HTML_TEMPLATE_PATH]
-    config_file = "#{source_dir}/config.rb"
+    @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"
   end
   
   # @return [BuildConfig::Data]
   def data
-    Data.new @javascripts, @stylesheets
+    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(@source_dir + "/index.html.erb"))
+    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
-  attr_reader :javascripts, :stylesheets
-  def initialize javascripts, stylesheets
+  attr_reader :author, :title, :javascripts, :stylesheets
+  def initialize config, javascripts, stylesheets
+    @author = config.author
+    @title = config.title
     @javascripts = javascripts
     @stylesheets = stylesheets
   end

data/lib/gamefic-sdk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
@@ -73,6 +73,7 @@ files:
 - 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