webruby 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db4715b363fbfb76c0443e048f891961f4522d8
-  data.tar.gz: 93babadac10f7e24a1529a38f37438c6adb0073c
+  metadata.gz: a820a2ac9abf12cba9386374ef4770f5483ef9ee
+  data.tar.gz: 528292cd94b2d6924caa37314ad6d3106f4815da
 SHA512:
-  metadata.gz: 840d18408d4b1c20d7a3f2ba9ff7f34d79ebac03c31a130fb7ee52973d15e7dd32812945910212e8c22531d849f9463cc5a4334ce8b0a81322c8dd55c89caa57
-  data.tar.gz: 9527854eee57e89652f6db80c47ce6a2200b623dfe3b31f40cc9be937845d9dcbf5f3885645f59a7145513dedfa9915b8b9702b0fb54a1d7bb3749d920dab1de
+  metadata.gz: 1fa9b17c31996090696a77d49293978d3a35a09a436ae367f2c85975e7769a3f520d90a547548d611f9a22fc64fee09d2ddbe5c9f40939f67cfea5a88a8696d6
+  data.tar.gz: baff4144d8e107f68c8fcfe5ed5417a95b00628f240bef27a2feb66aa4789203d38022a804ec093e813d519a2fef583f096f5d595d7b8fbf361d2bcc46a2ba6a

data/lib/webruby/config.rb

@@ -16,15 +16,15 @@ module Webruby
     end
 
     def is_release_mode
-      @compile_mode == 'release'
+      compile_mode == 'release'
     end
 
     def cflags
-      "-Wall -Werror-implicit-function-declaration -Wno-warn-absolute-paths #{optimization_flag}"
+      %w(-Wall -Werror-implicit-function-declaration -Wno-warn-absolute-paths) + [optimization_flag]
     end
 
     def ldflags
-      optimization_flag
+      [optimization_flag]
     end
 
     def optimization_flag

data/lib/webruby/rake/files.rake

@@ -28,7 +28,7 @@ end
 
 file "#{Webruby.build_dir}/app.o" => "#{Webruby.build_dir}/app.c" do |t|
   require_flag = (Webruby::App.config.source_processor == :gen_require) ? ("-DHAS_REQUIRE") : ("")
-  sh "#{EMCC} #{EMCC_CFLAGS} #{require_flag} #{Webruby::App.config.cflags} #{Webruby.build_dir}/app.c -o #{Webruby.build_dir}/app.o"
+  sh "#{EMCC} #{EMCC_CFLAGS} #{require_flag} #{Webruby::App.config.cflags.join(' ')} #{Webruby.build_dir}/app.c -o #{Webruby.build_dir}/app.o"
 end
 
 file "#{Webruby.build_dir}/link.js" =>
@@ -38,7 +38,7 @@ file "#{Webruby.build_dir}/link.js" =>
                                       Webruby::App.config.loading_mode,
                                       [])
 
-  sh "#{EMLD} #{Webruby.build_dir}/app.o #{Webruby.build_dir}/#{LIBMRUBY} -o #{Webruby.build_dir}/link.js #{Webruby.gem_js_flags} #{func_arg} #{Webruby::App.config.ldflags}"
+  sh "#{EMLD} #{Webruby.build_dir}/app.o #{Webruby.build_dir}/#{LIBMRUBY} -o #{Webruby.build_dir}/link.js #{Webruby.gem_js_flags} #{func_arg} #{Webruby::App.config.ldflags.join(' ')}"
 end
 
 append_file_deps = Webruby::App.config.append_file ?
@@ -62,5 +62,5 @@ file "#{Webruby.build_dir}/mrbtest.js" =>
   func_arg = Webruby.get_exported_arg("#{Webruby.build_dir}/functions",
                                       0, ['main'])
 
-  sh "#{EMLD} #{Webruby.build_dir}/mrbtest.bc -o #{Webruby.build_dir}/mrbtest.js -s TOTAL_MEMORY=33554432 #{Webruby.gem_test_js_flags} #{func_arg} #{Webruby::App.config.ldflags}"
+  sh "#{EMLD} #{Webruby.build_dir}/mrbtest.bc -o #{Webruby.build_dir}/mrbtest.js -s TOTAL_MEMORY=33554432 #{Webruby.gem_test_js_flags} #{func_arg} #{Webruby::App.config.ldflags.join(' ')}"
 end

data/lib/webruby/rake/mruby.rake

@@ -15,7 +15,7 @@ MRuby::Toolchain.new(:emscripten) do |conf|
 
   conf.cc do |cc|
     cc.command = '#{EMCC}'
-    cc.flags = '#{Webruby::App.config.cflags}'
+    cc.flags.push(*#{Webruby::App.config.cflags.inspect})
   end
 
   conf.linker.command = '#{EMLD}'

data/scripts/gen_require.rb

@@ -72,6 +72,7 @@ RUBY_SOURCE_PATH = "#{OUTPUT_PATH}.tmp"
 File.open(RUBY_SOURCE_PATH, "w") do |f|
   f.puts <<END
 module Kernel
+  @@REQUIRED_PATH = ""
   @@REQUIRED_MODULES = {
 END
 
@@ -84,10 +85,27 @@ END
 
   def require(name)
     return false unless @@REQUIRED_MODULES.include?(name)
+    @@REQUIRED_PATH = name[0, name.rindex('/') || 0]
     require_internal(@@REQUIRED_MODULES[name])
     @@REQUIRED_MODULES.delete(name)
     true
   end
+
+  def require_relative(path)
+    current_path = @@REQUIRED_PATH
+    path.split('/').each do |fragment|
+      case fragment
+      when '.'
+        # Doing nothing, current path
+      when '..'
+         current_path = current_path[0, current_path.rindex('/') || 0]
+      else
+        current_path = current_path.empty? ? fragment :
+          "\#{current_path}/\#{fragment}"
+      end
+    end
+    require(current_path)
+  end
 end
 END
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Xuejie Xiao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies: []
 description: compile your favourite Ruby source code for the browser!
 email: xxuejie@gmail.com
@@ -1537,9 +1537,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: webruby
 test_files: []
-has_rdoc: