esruby 0.0.9 → 0.0.10

data/resources/mruby/tasks/toolchains/visualcpp.rake

@@ -55,14 +55,15 @@ MRuby::Toolchain.new(:visualcpp) do |conf, _params|
 
   conf.file_separator = '\\'
 
-  if require 'open3'
-    Open3.popen3 conf.cc.command do |_, _, e, _|
-      if /Version (\d{2})\.\d{2}\.\d{5}/ =~ e.gets && $1.to_i <= 17
-        m = "# VS2010/2012 support will be dropped after the next release! #"
-        h = "#" * m.length
-        puts h, m, h
-      end
-    end
-  end
+  # Unreliable detection and will result in invalid encoding errors for localized versions of Visual C++
+  # if require 'open3'
+  #   Open3.popen3 conf.cc.command do |_, _, e, _|
+  #     if /Version (\d{2})\.\d{2}\.\d{5}/ =~ e.gets && $1.to_i <= 17
+  #       m = "# VS2010/2012 support will be dropped after the next release! #"
+  #       h = "#" * m.length
+  #       puts h, m, h
+  #     end
+  #   end
+  # end
 
 end

data/resources/mruby/test/t/string.rb

@@ -20,6 +20,7 @@ assert('String#<=>', '15.2.10.5.1') do
   assert_equal  1, c
   assert_equal(-1, d)
   assert_equal  1, e
+  assert_nil 'a' <=> 1024
 end
 
 assert('String#==', '15.2.10.5.2') do
@@ -685,7 +686,7 @@ assert('String#inspect', '15.2.10.5.46') do
   ("\1" * 100).inspect
   end
 
-  assert_equal "\"\\000\"", "\0".inspect
+  assert_equal "\"\\x00\"", "\0".inspect
 end
 
 # Not ISO specified

data/resources/project_template/config.rb

@@ -28,5 +28,10 @@ ESRuby::Build.new do |conf|
   
   # 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'
   
 end

data/resources/rb/append.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esruby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Rob Fors
@@ -42,9 +42,7 @@ files:
 - lib/esruby/gem.rb
 - lib/esruby/gem/specification.rb
 - resources/build_config.eruby
-- resources/cpp/esruby.cpp
-- resources/cpp/esruby.hpp
-- resources/js/esruby.js
+- resources/cpp/main.cpp
 - resources/mruby/AUTHORS
 - resources/mruby/CONTRIBUTING.md
 - resources/mruby/LEGAL
@@ -421,6 +419,7 @@ 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/cpp/esruby.cpp

@@ -1,51 +0,0 @@
-#include "esruby.hpp"
-
-mrb_state* ESRuby::_mrb = nullptr;
-
-void ESRuby::start()
-{
-  if (_mrb)
-  {
-    printf("Error: ESRuby already started\n");
-    throw std::runtime_error("Error: ESRuby already started");
-  }
-  _mrb = mrb_open();
-  if (!_mrb)
-  {
-    printf("error opening new mrb state\n");
-    throw std::runtime_error("error opening new mrb state");
-  }
-  mrb_load_irep(_mrb, app);
-  // print error if any
-  if (_mrb->exc)
-  {
-    mrb_p(_mrb, mrb_obj_value(_mrb->exc));
-    _mrb->exc = 0;
-    throw std::runtime_error("ruby error encountered");
-  }
-}
-
-void ESRuby::stop()
-{
-  if (!_mrb)
-  {
-    printf("Error: ESRuby not active\n");
-    throw std::runtime_error("Error: ESRuby not active");
-  }
-  mrb_close(_mrb);
-  // print error if any
-  if (_mrb->exc)
-  {
-    mrb_p(_mrb, mrb_obj_value(_mrb->exc));
-    _mrb->exc = 0;
-    throw std::runtime_error("ruby error encountered");
-  }
-}
-
-EMSCRIPTEN_BINDINGS(esruby)
-{
-  emscripten::class_<ESRuby>("ESRuby")
-    .class_function("start", &ESRuby::start)
-    .class_function("stop", &ESRuby::stop)
-  ;
-}

data/resources/cpp/esruby.hpp

@@ -1,38 +0,0 @@
-#ifndef _ESRUBY_HPP_
-#define _ESRUBY_HPP_
-
-#include <emscripten.h>
-#include <emscripten/bind.h>
-#include <emscripten/val.h>
-#include <stdio.h>
-#include <math.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/data.h>
-#include <mruby/proc.h>
-#include <mruby/string.h>
-#include <mruby/value.h>
-#include <mruby/variable.h>
-#include <mruby.h>
-#include <mruby/irep.h>
-
-
-extern const uint8_t app[];
-
-
-class ESRuby
-{
-
-  public:
-  
-  static void start();
-  static void stop();
-  
-  private:
-  
-  static mrb_state* _mrb;
-  
-};
-
-#endif

data/resources/js/esruby.js

@@ -1,17 +0,0 @@
-class ESRuby
-{
-  
-  static start()
-  {
-    Module.ESRuby.start();
-  }
-  
-  static stop()
-  {
-    Module.ESRuby.stop();
-  }
-  
-}
-
-window.addEventListener("load", ESRuby.start);
-window.addEventListener("unload", ESRuby.stop);