script_core 0.2.3 → 0.3.0

data/ext/enterprise_script_service/mruby/tasks/test.rake

@@ -0,0 +1,68 @@
+desc "build and run all mruby tests"
+task :test => "test:build" do
+  Rake::Task["test:run"].invoke
+end
+
+namespace :test do |test_ns|
+  desc "build and run library tests"
+  task :lib => "build:lib" do
+    test_ns["run:lib"].invoke
+  end
+
+  desc "build and run command binaries tests"
+  task :bin => :all do
+    test_ns["run:bin"].invoke
+  end
+
+  desc "build all mruby tests"
+  task :build => "build:lib"
+
+  namespace :build do |test_build_ns|
+    desc "build library tests"
+    task :lib => :all do
+      MRuby.each_target{|build| build.gem(core: 'mruby-test')}
+      test_build_ns["lib_without_loading_gem"].invoke
+    end
+  end
+
+  desc "run all mruby tests"
+  task :run
+
+  namespace :run do
+    desc "run library tests"
+    task :lib
+
+    desc "run command binaries tests"
+    task :bin
+  end
+end
+
+MRuby.each_target do |build|
+  if build.test_enabled?
+    t = task "test:build:lib_without_loading_gem:#{build.name}" do
+      gem = build.gems["mruby-test"]
+      gem.setup
+      gem.setup_compilers
+      Rake::Task[build.define_installer_if_needed("mrbtest")].invoke
+    end
+    task "test:build:lib_without_loading_gem" => t
+
+    t = task "test:run:lib:#{build.name}" do
+      build.run_test
+    end
+    task "test:run" => t
+    task "test:run:lib" => t
+  end
+  if build.bintest_enabled?
+    t = task "test:run:bin:#{build.name}" do
+      build.run_bintest
+    end
+    task "test:run" => t
+    task "test:run:bin" => t
+  end
+end
+
+task :clean do
+  host = MRuby.targets["host"]
+  rm_f host.exefile("#{host.class.install_dir}/mrbtest") if host && host.test_enabled?
+end

data/ext/enterprise_script_service/mruby/tasks/toolchains/android.rake

@@ -10,6 +10,7 @@ class MRuby::Toolchain::Android
     ~/Android/Sdk/ndk-bundle
     %LOCALAPPDATA%/Android/android-sdk/ndk-bundle
     %LOCALAPPDATA%/Android/android-ndk
+    %LOCALAPPDATA%/Android/Sdk/ndk/*
     ~/Library/Android/sdk/ndk-bundle
     ~/Library/Android/ndk
   }
@@ -40,6 +41,19 @@ def message
     end
   end
 
+  class SysrootNotReady < StandardError
+    def message
+      <<-EOM
+Couldn't find standard header files
+Please Move/Copy important file inside
+  <NDK_HOME>/sysroot/usr/include/
+to
+  <NDK_HOME>/platforms/<ANDROID_VERSION>/<ARCH>/usr/include/
+Higher NDK version will be use.
+      EOM
+    end
+  end
+
   attr_reader :params
 
   def initialize(params)
@@ -74,6 +88,25 @@ def home_path
         path.gsub! '%LOCALAPPDATA%', ENV['LOCALAPPDATA'] || '%LOCALAPPDATA%'
         path.gsub! '\\', '/'
         path.gsub! '~', Dir.home || '~'
+        path.gsub!('*') do
+          next nil unless path[-1] == "*"
+          dirs = Dir.glob(path).collect do |d|
+            m = d.match(/(\d+)\.(\d+)\.(\d+)$/)
+            m ? [m[1], m[2], m[3]].collect { |v| v.to_i } : nil
+          end
+          dirs.compact!
+          dirs.sort! do |before, after|
+            f = 0
+            if (f = (after.first <=> before.first)) != 0
+              next f
+            elsif (f = (after[1] <=> before[1])) != 0
+              next f
+            else
+              next after.last <=> before.last
+            end
+          end
+          dirs.empty? ? nil.to_s : dirs.first.join(".")
+        end
         File.directory?(path)
       } || raise(AndroidNDKHomeNotFound)
     )
@@ -146,7 +179,8 @@ def arch
   end
 
   def sysroot
-    @sysroot ||= home_path.join('platforms', platform,
+    return @sysroot if @sysroot
+    sysroot_path = home_path.join('platforms', platform,
         case arch
         when /armeabi/    then 'arch-arm'
         when /arm64-v8a/  then 'arch-arm64'
@@ -156,6 +190,11 @@ def sysroot
         when /mips/       then 'arch-mips'
         end
       ).to_s
+    if Dir.exist?(File.join(sysroot_path, "usr", "include"))
+      return @sysroot = sysroot_path
+    else
+      raise(SysrootNotReady)
+    end
   end
 
   def platform
@@ -259,6 +298,12 @@ def ctarget
   def cflags
     flags = []
 
+    case RUBY_PLATFORM
+    when /mswin|mingw|win32/
+      # Build for Android dont need window flag
+      flags += %W(-U_WIN32 -U_WIN64)
+    end
+
     flags += %W(-MMD -MP -D__android__ -DANDROID --sysroot="#{sysroot}")
     flags += ctarget
     case toolchain

data/ext/enterprise_script_service/mruby/tasks/toolchains/gcc.rake

@@ -2,19 +2,21 @@
   default_command = params[:default_command] || 'gcc'
   compiler_flags = %w(-g -O3 -Wall -Wundef)
   c_mandatory_flags = %w(-std=gnu99)
-  cxx_invalid_flags = %w(-Wdeclaration-after-statement -Werror-implicit-function-declaration)
+  cxx_invalid_flags = %w(-Werror-implicit-function-declaration)
+  compile_opt = '%{flags} -o "%{outfile}" "%{infile}"'
 
   [conf.cc, conf.objc, conf.asm, conf.cxx].each do |compiler|
     if compiler == conf.cxx
-      compiler.command = ENV['CXX'] || default_command.sub(/cc|$/, '++')
+      compiler.command = ENV['CXX'] || conf.cc.command.sub(/g\Kcc|$/, '++')
       compiler.flags = [ENV['CXXFLAGS'] || ENV['CFLAGS'] || compiler_flags]
     else
       compiler.command = ENV['CC'] || default_command
       compiler.flags = [c_mandatory_flags, ENV['CFLAGS'] || [compiler_flags, cxx_invalid_flags, %w(-Wwrite-strings)]]
     end
-    compiler.option_include_path = '-I%s'
+    compiler.option_include_path = %q[-I"%s"]
     compiler.option_define = '-D%s'
-    compiler.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
+    compiler.compile_options = "-MMD -c #{compile_opt}"
+    compiler.preprocess_options = "-E -P #{compile_opt}"
     compiler.cxx_compile_flag = '-x c++ -std=gnu++03'
     compiler.cxx_exception_flag = '-fexceptions'
     compiler.cxx_invalid_flags = c_mandatory_flags + cxx_invalid_flags
@@ -27,7 +29,7 @@
     linker.library_paths = []
     linker.option_library = '-l%s'
     linker.option_library_path = '-L%s'
-    linker.link_options = '%{flags} -o %{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}'
+    linker.link_options = '%{flags} -o "%{outfile}" %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}'
   end
 
   [[conf.cc, 'c'], [conf.cxx, 'c++']].each do |cc, lang|
@@ -35,8 +37,7 @@
     def cc.header_search_paths
       if @header_search_command != command
         result = `echo | #{build.filename command} -x#{@header_search_language} -Wp,-v - -fsyntax-only 2>&1`
-        result = `echo | #{command} -x#{@header_search_language} -Wp,-v - -fsyntax-only 2>&1` if $?.exitstatus != 0
-        return include_paths if  $?.exitstatus != 0
+        return include_paths if $?.exitstatus != 0
 
         @frameworks = []
         @header_search_paths = result.lines.map { |v|

data/ext/enterprise_script_service/mruby/tasks/toolchains/openwrt.rake

@@ -1,24 +1,20 @@
 # usage of environmental variables to set the
 # cross compiling toolchain proper
 MRuby::Toolchain.new(:openwrt) do |conf|
-  [conf.cc, conf.objc, conf.asm].each do |cc|
-    cc.command = ENV['TARGET_CC']
-    cc.flags = ENV['TARGET_CFLAGS']
-    cc.include_paths = ["#{MRUBY_ROOT}/include"]
-    cc.option_include_path = '-I%s'
+  [conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc|
+    if cc == conf.cxx
+      cc.command = ENV['TARGET_CXX']
+      cc.flags = ENV['TARGET_CXXFLAGS']
+    else
+      cc.command = ENV['TARGET_CC']
+      cc.flags = ENV['TARGET_CFLAGS']
+    end
+    cc.option_include_path = %q[-I"%s"]
     cc.option_define = '-D%s'
-    cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
+    cc.compile_options = '%{flags} -MMD -o "%{outfile}" -c "%{infile}"'
+    cc.preprocess_options = '%{flags} -o "%{outfile}" -E -P "%{infile}"'
   end
 
-  [conf.cxx].each do |cxx|
-    cxx.command = ENV['TARGET_CXX']
-    cxx.flags = ENV['TARGET_CXXFLAGS']
-    cxx.include_paths = ["#{MRUBY_ROOT}/include"]
-    cxx.option_include_path = '-I%s'
-    cxx.option_define = '-D%s'
-    cxx.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
-   end
-
   conf.linker do |linker|
     linker.command = ENV['TARGET_CC']
     linker.flags = ENV['TARGET_LDFLAGS']
@@ -26,11 +22,11 @@
     linker.library_paths = []
     linker.option_library = '-l%s'
     linker.option_library_path = '-L%s'
-    linker.link_options = '%{flags} -o %{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}'
+    linker.link_options = '%{flags} -o "%{outfile}" %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}'
   end
 
   conf.archiver do |archiver|
     archiver.command = ENV['TARGET_AR']
-    archiver.archive_options = 'rs %{outfile} %{objs}'
+    archiver.archive_options = 'rs "%{outfile}" %{objs}'
   end
 end

data/ext/enterprise_script_service/mruby/tasks/toolchains/visualcpp.rake

@@ -1,25 +1,21 @@
 MRuby::Toolchain.new(:visualcpp) do |conf, _params|
-  conf.cc do |cc|
-    cc.command = ENV['CC'] || 'cl.exe'
-    # C4013: implicit function declaration
-    cc.flags = [ENV['CFLAGS'] || %w(/c /nologo /W3 /we4013 /Zi /MD /O2 /D_CRT_SECURE_NO_WARNINGS)]
-    cc.defines = %w(MRB_STACK_EXTEND_DOUBLING)
-    cc.option_include_path = '/I%s'
-    cc.option_define = '/D%s'
-    cc.compile_options = "%{flags} /Fo%{outfile} %{infile}"
-    cc.cxx_compile_flag = '/TP'
-    cc.cxx_exception_flag = '/EHs'
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = ENV['CXX'] || 'cl.exe'
-    cxx.flags = [ENV['CXXFLAGS'] || ENV['CFLAGS'] || %w(/c /nologo /W3 /Zi /MD /O2 /EHs /D_CRT_SECURE_NO_WARNINGS)]
-    cxx.defines = %w(MRB_STACK_EXTEND_DOUBLING)
-    cxx.option_include_path = '/I%s'
-    cxx.option_define = '/D%s'
-    cxx.compile_options = "%{flags} /Fo%{outfile} %{infile}"
-    cxx.cxx_compile_flag = '/TP'
-    cxx.cxx_exception_flag = '/EHs'
+  compiler_flags = %w(/nologo /W3 /MD /O2 /D_CRT_SECURE_NO_WARNINGS)
+  [conf.cc, conf.cxx].each do |compiler|
+    if compiler == conf.cc
+      compiler.command = ENV['CC'] || 'cl.exe'
+      # C4013: implicit function declaration
+      compiler.flags = [*(ENV['CFLAGS'] || compiler_flags + %w(/we4013))]
+    else
+      compiler.command = ENV['CXX'] || 'cl.exe'
+      compiler.flags = [*(ENV['CXXFLAGS'] || ENV['CFLAGS'] || compiler_flags + %w(/EHs))]
+    end
+    compiler.defines = %w(MRB_STACK_EXTEND_DOUBLING)
+    compiler.option_include_path = %q[/I"%s"]
+    compiler.option_define = '/D%s'
+    compiler.compile_options = %Q[/Zi /c /Fo"%{outfile}" %{flags} "%{infile}"]
+    compiler.preprocess_options = %Q[/EP %{flags} "%{infile}" > "%{outfile}"]
+    compiler.cxx_compile_flag = '/TP'
+    compiler.cxx_exception_flag = '/EHs'
   end
 
   conf.linker do |linker|
@@ -29,22 +25,22 @@
     linker.library_paths = %w()
     linker.option_library = '%s.lib'
     linker.option_library_path = '/LIBPATH:%s'
-    linker.link_options = "%{flags} /OUT:%{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}"
+    linker.link_options = %Q[%{flags} /OUT:"%{outfile}" %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}]
   end
 
   conf.archiver do |archiver|
     archiver.command = ENV['AR'] || 'lib.exe'
-    archiver.archive_options = '/nologo /OUT:%{outfile} %{objs}'
+    archiver.archive_options = '/nologo /OUT:"%{outfile}" %{objs}'
   end
 
   conf.yacc do |yacc|
     yacc.command = ENV['YACC'] || 'bison.exe'
-    yacc.compile_options = '-o %{outfile} %{infile}'
+    yacc.compile_options = %q[-o "%{outfile}" "%{infile}"]
   end
 
   conf.gperf do |gperf|
     gperf.command = 'gperf.exe'
-    gperf.compile_options = '-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" %{infile} > %{outfile}'
+    gperf.compile_options = %q[-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" "%{infile}" > "%{outfile}"]
   end
 
   conf.exts do |exts|

data/ext/enterprise_script_service/mruby/test/assert.rb

@@ -56,7 +56,9 @@ def assertion_string(err, str, iso=nil, e=nil, bt=nil)
   msg = "#{err}#{str}"
   msg += " [#{iso}]" if iso && !iso.empty?
   msg += " => #{e}" if e && !e.to_s.empty?
-  msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})"
+  if Object.const_defined?(:GEMNAME)
+    msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})"
+  end
   if $mrbtest_assert
     $mrbtest_assert.each do |idx, assert_msg, diff|
       msg += "\n - Assertion[#{idx}]"
@@ -64,7 +66,7 @@ def assertion_string(err, str, iso=nil, e=nil, bt=nil)
       msg += "\n#{diff}" if diff && !diff.empty?
     end
   end
-  msg += "\nbacktrace:\n        #{bt.join("\n        ")}" if bt
+  msg += "\nbacktrace:\n        #{bt.join("\n        ")}" if bt && !bt.empty?
   msg
 end
 
@@ -122,8 +124,7 @@ class << $mrbtest_assert_idx
     $mrbtest_child_noassert[-2] += 1
     t_print('?')
   rescue Exception => e
-    bt = e.backtrace if $mrbtest_verbose
-    $asserts.push(assertion_string("#{e.class}: ", str, iso, e, bt))
+    $asserts.push(assertion_string("#{e.class}: ", str, iso, e, e.backtrace))
     $kill_test += 1
     t_print('X')
   ensure

data/ext/enterprise_script_service/mruby/test/bintest.rb

@@ -4,12 +4,12 @@
 GEMNAME = ""
 
 def cmd(s)
-  case RbConfig::CONFIG['host_os']
-  when /mswin(?!ce)|mingw|bccwin/
-    "bin\\#{s}.exe"
-  else
-    "bin/#{s}"
+  path = s == "mrbc" ? ENV['MRBCFILE'] : "#{ENV['BUILD_DIR']}/bin/#{s}"
+  path = path.sub(/\.exe\z/, "")
+  if /mswin(?!ce)|mingw|bccwin/ =~ RbConfig::CONFIG['host_os']
+    path = "#{path}.exe".tr("/", "\\")
   end
+  path
 end
 
 def shellquote(s)

data/ext/enterprise_script_service/mruby/test/t/argumenterror.rb

@@ -1,6 +1,13 @@
 ##
 # ArgumentError ISO Test
 
+def assert_argnum_error(given, expected, &block)
+  assert("wrong number of arguments") do
+    message = "wrong number of arguments (given #{given}, expected #{expected})"
+    assert_raise_with_message(ArgumentError, message, &block)
+  end
+end
+
 assert('ArgumentError', '15.2.24') do
   e2 = nil
   a = []
@@ -14,3 +21,12 @@
   assert_equal(Class, ArgumentError.class)
   assert_equal(ArgumentError, e2.class)
 end
+
+assert("'wrong number of arguments' from mrb_get_args") do
+  assert_argnum_error(0, "1+"){__send__}
+  assert_argnum_error(0, 1..2){Object.const_defined?}
+  assert_argnum_error(3, 1..2){Object.const_defined?(:A, true, 2)}
+  assert_argnum_error(2, 0..1){{}.default(1, 2)}
+  assert_argnum_error(1, 2){Object.const_set(:B)}
+  assert_argnum_error(3, 2){Object.const_set(:C, 1, 2)}
+end

data/ext/enterprise_script_service/mruby/test/t/array.rb

@@ -5,7 +5,7 @@
   assert_equal(Class, Array.class)
 end
 
-assert('Array inclueded modules', '15.2.12.3') do
+assert('Array included modules', '15.2.12.3') do
   assert_true(Array.include?(Enumerable))
 end
 
@@ -57,6 +57,7 @@ class SubArray < Array
   a = [ "a", "b", "c", "d", "e" ]
   assert_equal(["b", "c"], a[1,2])
   assert_equal(["b", "c", "d"], a[1..-2])
+  assert_equal(["b", "c", "d", "e"], a[1..])
   skip unless Object.const_defined?(:Float)
   assert_equal("b", a[1.1])
 end
@@ -92,6 +93,10 @@ class SubArray < Array
   a[2...4] = 6
   assert_equal([1,2,6,5], a)
 
+  a = [1,2,3,4,5]
+  a[2...] = 6
+  assert_equal([1,2,6], a)
+
   # passing self (#3274)
   a = [1,2,3]
   a[1,0] = a
@@ -372,8 +377,7 @@ class SubArray < Array
 assert('Array#hash', '15.2.12.5.35') do
   a = [ 1, 2, 3 ]
 
-  #assert_true(a.hash.is_a? Integer)
-  assert_true(a.hash.is_a? Integral)  # mruby special
+  assert_true(a.hash.is_a? Integer)
   assert_equal([1,2].hash, [1,2].hash)
 end
 

data/ext/enterprise_script_service/mruby/test/t/bs_literal.rb

@@ -34,5 +34,5 @@
 end
 
 assert('BS Literal 9') do
-  assert_equal Fixnum, 1234.class
+  assert_equal Integer, 1234.class
 end

data/ext/enterprise_script_service/mruby/test/t/ensure.rb

@@ -1,16 +1,16 @@
 ##
 # ensure Test
 
-assert('ensure - context - yield') do
-  class EnsureYieldBreak
-    attr_reader :ensure_context
-    def try
-      yield
-    ensure
-      @ensure_context = self
-    end
+class EnsureYieldBreak
+  attr_reader :ensure_context
+  def try
+    yield
+  ensure
+    @ensure_context = self
   end
+end
 
+assert('ensure - context - yield') do
   yielder = EnsureYieldBreak.new
   yielder.try do
   end
@@ -18,15 +18,6 @@ def try
 end
 
 assert('ensure - context - yield and break') do
-  class EnsureYieldBreak
-    attr_reader :ensure_context
-    def try
-      yield
-    ensure
-      @ensure_context = self
-    end
-  end
-
   yielder = EnsureYieldBreak.new
   yielder.try do
     break
@@ -35,15 +26,6 @@ def try
 end
 
 assert('ensure - context - yield and return') do
-  class EnsureYieldBreak
-    attr_reader :ensure_context
-    def try
-      yield
-    ensure
-      @ensure_context = self
-    end
-  end
-
   yielder = EnsureYieldBreak.new
   lambda do
     yielder.try do