esruby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16d0112d53861ad14f8c825229b924f1a980cdf
-  data.tar.gz: 0df764960a1cdff6f71723c596825a92995f4709
+  metadata.gz: d42dbf349bcea95903d0de6774803ab39bd5fe32
+  data.tar.gz: b1b862fa53cf9ffdfbc8e0dc6f339084551f1ac6
 SHA512:
-  metadata.gz: 233b64432005b46c61fdcad9a06ef7e9a84f9a1eb79ce02ac38c6172a1e0c8a16a584f6e35b8b340b412d34e84a608468356a67fe6677df5e1e0d13e76957c30
-  data.tar.gz: 65d573fe29d8430b7ac4a55a8590c3e1396f0a43cc559d1050834b73eda6fcf0b3de97ba0314965463424f9ddbbe811c58b7811ff6ccbaae1c3ba0b5f50ef720
+  metadata.gz: d654fe70e2d4d3e4a6ada3bc14c76a2913ac6ab3c1f9232b8344bb158ebcd5246d3eb276c260febc9e6a77afeb3bd76b41190babd2d9a7ec9e8c664932c452ba
+  data.tar.gz: 168b15df66a42ad1fd0f9254afe4dd74fea26e96643ea232650fbb58bf26d5da313592dc8183bcb4bb977bca21a618a7099d89e0e8bbb5b64020b4a4aa945256

data/README.md

@@ -30,6 +30,7 @@ to your `.bashrc` and `.profile`
 # Try
 * create a new esruby project with `esruby new project`
 * `cd project`
+* download the gem `https://github.com/robfors/esruby-esruby` and put it in `gems/`
 * build the project with `esruby build config.rb`
 * you will now have `www/app.js` and `www/index.html`
 * a simple way to serve these files would be `ruby -run -e httpd www -p 4444`

data/lib/esruby.rb

@@ -2,6 +2,7 @@ require 'erubis'
 require 'fileutils'
 require 'forwardable'
 require 'rake'
+require 'json'
 
 require_relative "esruby/build.rb"
 require_relative "esruby/build/configuration.rb"

data/lib/esruby/build.rb

@@ -13,7 +13,7 @@ module ESRuby
       new_build
     end
     
-    def_delegators :@configuration, :root_directory, :build_directory,
+    def_delegators :@configuration, :project_directory, :build_directory,
       :build_mode, :output, :mruby_directory, :gems
     
     def initialize(&block)
@@ -23,9 +23,9 @@ module ESRuby
     
     def build
       FileUtils.mkdir_p(build_directory)
-      load_gems
       build_mruby_config
       build_mruby
+      load_gems
       build_app
     end
     
@@ -34,12 +34,18 @@ module ESRuby
     end
     
     def load_gems
-      @configuration.gems.each do |gem_path|
-        load("#{gem_path}/esruby_gem")
+      gem_paths = JSON.parse(File.read(gem_paths_file))
+      gem_paths.each do |gem_path|
+        esruby_spec_path = "#{gem_path}/esruby_gem"
+        load(esruby_spec_path) if File.file?(esruby_spec_path)
       end
       nil
     end
     
+    def gem_paths_file
+      "#{build_directory}/gem_paths.json"
+    end
+    
     def prepended_js_sources
       js_files = []
       Gem::Specification.specifications.each do |specification|
@@ -66,13 +72,12 @@ module ESRuby
       template = File.read("#{gem_directory}/resources/build_config.eruby")
       eruby = Erubis::Eruby.new(template)
       config = {}
-      config[:prepended_js_sources] = prepended_js_sources
-      config[:appended_js_sources] = appended_js_sources
       config[:optimization_argument] = optimization_argument
       config[:closure_argument] = closure_argument
       config[:debug_argument] = debug_argument
       config[:build_directory] = build_directory
       config[:gems] = gems
+      config[:gem_paths_file] = gem_paths_file
       new_output = eruby.result(config)
       output_path = "#{build_directory}/build_config.rb"
       old_output = File.read(output_path) if File.exists?(output_path)
@@ -114,7 +119,7 @@ module ESRuby
     end
     
     def build_app
-      mrbc = "#{mruby_directory}/bin/mrbc"
+      mrbc = "#{build_directory}/host/bin/mrbc"
       js_arguments = prepended_js_sources.map { |path| "--pre-js #{path}" }.join(" ")
       js_arguments += " "
       js_arguments += appended_js_sources.map { |path| "--post-js #{path}" }.join(" ")

data/lib/esruby/build/configuration.rb

@@ -7,7 +7,7 @@ module ESRuby
         :output
       
       def initialize
-        @root_directory = nil
+        @project_directory = nil
         @mruby_directory = "#{ESRuby.gem_directory}/resources/mruby"
         @output = 'output.js'
         @ruby_sources = []
@@ -16,31 +16,31 @@ module ESRuby
         @gems = []
       end
       
-      def root_directory
-        raise "'root_directory' not set" unless @root_directory
-        @root_directory
+      def project_directory
+        raise "'project_directory' not set" unless @project_directory
+        @project_directory
       end
       
-      def root_directory=(new_root_directory)
-        root_directory = File.expand_path(new_root_directory)
-        raise "'root_directory' not found" unless File.directory?(root_directory)
-        @root_directory = root_directory
+      def project_directory=(new_project_directory)
+        new_project_directory = File.expand_path(new_project_directory)
+        raise "'project_directory' not found" unless File.directory?(new_project_directory)
+        @project_directory = new_project_directory
       end
       
       def add_ruby_source(path)
-        @ruby_sources << File.expand_path(path, root_directory)
+        @ruby_sources << File.expand_path(path, project_directory)
       end
       
       def add_prepended_js_source(path)
-        @prepended_js_sources << File.expand_path(path, root_directory)
+        @prepended_js_sources << File.expand_path(path, project_directory)
       end
       
       def add_appended_js_source(path)
-        @appended_js_sources << File.expand_path(path, root_directory)
+        @appended_js_sources << File.expand_path(path, project_directory)
       end
       
       def build_directory=(new_build_directory)
-        @build_directory = File.expand_path(new_build_directory, root_directory)
+        @build_directory = File.expand_path(new_build_directory, project_directory)
       end
       
       def build_mode=(new_build_mode)
@@ -50,19 +50,21 @@ module ESRuby
       end
       
       def output=(new_output)
-        @output = File.expand_path(new_output, root_directory)
+        @output = File.expand_path(new_output, project_directory)
       end
       
       def mruby_directory=(new_mruby_directory)
-        mruby_directory = File.expand_path(new_mruby_directory, root_directory)
-        raise "'mruby_directory' not found" unless File.directory?(mruby_directory)
-        @mruby_directory = mruby_directory
+        new_mruby_directory = File.expand_path(new_mruby_directory, project_directory)
+        raise "'mruby_directory' not found" unless File.directory?(new_mruby_directory)
+        @mruby_directory = new_mruby_directory
       end
       
-      def add_gem(path)
-        path = File.expand_path(path, root_directory)
-        raise "gem #{path} not found" unless File.directory?(path)
-        @gems << path
+      def add_gem(arg)
+        if arg.is_a?(String)
+          arg = File.expand_path(arg, project_directory)
+          raise "gem #{arg} not found" unless File.directory?(arg)
+        end
+        @gems << arg
       end
     
     end

data/resources/build_config.eruby

@@ -34,21 +34,35 @@ MRuby::CrossBuild.new('app') do |conf|
     c.flags << "-Wall"
     c.flags << "-Wno-warn-absolute-paths"
     c.flags << "--bind"
-    <% for path in prepended_js_sources %>
-    c.flags << "--pre-js <%= path %>"
-    <% end %>
-    <% for path in appended_js_sources %>
-    c.flags << "--post-js <%= path %>"
-    <% end %>
     c.flags << "<%= optimization_argument %>"
     c.flags << "<%= closure_argument %>"
     c.flags << "<%= debug_argument %>"
   end
   
   conf.gembox('default')
-  #conf.gem :github => 'robfors/esruby-esruby'
+  conf.gem :github => 'robfors/esruby-esruby'
   <% for gem in gems %>
   conf.gem(<%= gem.inspect %>)
   <% end %>
   
 end
+
+
+module MRuby
+  module Gem
+    class List
+      
+      old_check = instance_method(:check)
+      define_method(:check) do |build|
+        return_value = old_check.bind(self).call(build)
+        if build.name == 'app'
+          gem_paths = map { |gem| gem.dir }
+          require 'json'
+          File.write("<%= gem_paths_file %>", gem_paths.to_json)
+        end
+        return return_value
+      end
+      
+    end
+  end
+end

data/resources/project_template/config.rb

@@ -1,37 +1,37 @@
 # This file sets up the build environment for a webruby project.
 ESRuby::Build.new do |conf|
 
-  conf.root_directory = File.dirname(__FILE__)
+  conf.project_directory = File.dirname(__FILE__)
   
   conf.add_ruby_source 'app/app.rb'  
-  #conf.add_prepended_js_source 'app/prepended.js'
-  #conf.add_appended_js_source 'app/appended.js'
+  #conf.add_prepended_js_source 'app/prepend.js'
+  #conf.add_appended_js_source 'app/append.js'
   
   # By default, the build output directory is "build/"
   conf.build_directory = 'build'
 
-  # Use 'release' for O2 mode build, and everything else for O0 mode.
-  # Or you can also use '-O0', '-O1', '-O2', '-O3', etc. directly
+  # note: dont change this yet
+  # Use :production for O2 mode build, and :development for O0 mode.
+  # Or you can not yet use '-O0', '-O1', '-O2', '-O3', etc. directly
+  # note :production mode is still having trouble working
   #conf.build_mode = :production
   conf.build_mode = :development
 
-  # By default the final output file name is "webruby.js"
+  # set the final output file name
   conf.output = "www/app.js"
   
+  # to override the mruby version, then specify your copy here
   #conf.mruby_directory = 'mruby'
   
+  # note: dont change this yet
   # We found that if memory init file is used, browsers will hang
   # for a long time without response. As a result, we disable memory
   # init file by default. However, you can test this yourself
   # and re-enable it by commenting/removing the next line.
   #conf.ldflags << "--memory-init-file 0"
   
-  # JavaScript calling interface
-  # conf.add_gem 'gems/esruby-bind'
-
-  # for now you will need to download the gem
-  #  https://github.com/robfors/esruby-esruby
-  #  and add it here
-  conf.add_gem 'gems/esruby-esruby'
+  # JavaScript binding interface
+  # see: https://github.com/robfors/esruby-bind for more info
+  # conf.add_gem :github => 'robfors/esruby-bind'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Rob Fors
@@ -419,7 +419,6 @@ files:
 - resources/project_template/app/app.rb
 - resources/project_template/config.rb
 - resources/project_template/www/index.html
-- resources/rb/append.rb
 homepage: https://github.com/robfors/esruby
 licenses:
 - MIT

data/resources/rb/append.rb

@@ -1,3 +0,0 @@
-#ESRuby.eval = Proc.new do |code|
-  #eval(code)
-#end