mrubyc-test 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22552c0a71b7399d7eae38faa8ae82b48b6553f8059e42f210dce7d75f127ae
-  data.tar.gz: 90bcd3c1c4c76f1f1db76582bf181dd2550e6a78230e9ced1f5ed9f96abfdca8
+  metadata.gz: 56675156ca057519416d62929755a348cb2ba1340f7e6ad7a36066e0e2c2bf25
+  data.tar.gz: 5f7af355c9bc8760179b84976dcfd6c6be639ddc32cf78dca7c1e3f412f6b2d0
 SHA512:
-  metadata.gz: 454e1ba5ee921f0829c5f44cf42f34c82c812585144ff703fee4042c1bba9f7953e0480ea21e14cc361c8acf75861f125299f3b4b2993c8c884b7a21d76b451a
-  data.tar.gz: db8fdcfbf31995e6c3c9ca9964ebf813c09f4ad0757f9b0d5ef69f19f09e68ceb431ee1111bf5f83ce2d5d48451f3fb0a6a04519d42d1d88a7a95cabc2d7e8c6
+  metadata.gz: '09d6b1f937558236961b0543f34b7bfe319ea29719b6f7c844219c04e892627556f99a0dddfc718b9b4b9339869e49cccb5aa9d003e596bb1598ac55d8697f2a'
+  data.tar.gz: 3973153063d81e3b0367fab6d265dc47e674f06d799491b5aacc986bc73052c87d181bc8280cd35aa1e3a84ee1be751dee044f435738c4d075ee4e8ecef7abf7

data/.gitignore

@@ -15,3 +15,5 @@
 /test/
 /mrblib/
 /mrubyc_src/
+
+.rake_tasks~

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.7.4)
+    mrubyc-test (0.9.0)
       activesupport (~> 7.0)
       rufo (~> 0.12)
       thor (~> 1.2)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -18,24 +18,24 @@ GEM
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rufo (0.13.0)
     thor (1.2.1)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS

data/lib/mrubyc/test/config.rb

@@ -14,6 +14,13 @@ module Mrubyc
               raise 'Check if `Mrubycfile or .mrubycconfig` exists.'
             end
           end
+          if config && ENV['MRUBYCFILE']
+            config.each do |k, v|
+              if v && k != "mrbc_path"
+                config[k] = File.join File.dirname(ENV['MRUBYCFILE']), v
+              end
+            end
+          end
           config || {}
         end
 
@@ -24,9 +31,11 @@ module Mrubyc
         end
 
         def mrubycfile
-          if File.exists? 'Mrubycfile'
+          if ENV['MRUBYCFILE']
+            ENV['MRUBYCFILE']
+          elsif File.exists? 'Mrubycfile'
             'Mrubycfile'
-          elsif  File.exists? '.mrubycconfig'
+          elsif File.exists? '.mrubycconfig'
             '.mrubycconfig'
           else
             FileUtils.touch 'Mrubycfile'

data/lib/mrubyc/test/generator/attribute.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/string/inflections'
+require 'i18n/locale/fallbacks'
+require 'i18n/locale/tag/simple'
 
 module Mrubyc
   module Test

data/lib/mrubyc/test/generator/double.rb

@@ -12,7 +12,7 @@ module Mrubyc
 
         def initialize(type, object, location)
           @type = type
-          @klass = object.class
+          @klass = object.class == Class ? object : object.class
           @location = location
         end
 

data/lib/mrubyc/test/init.rb

@@ -63,7 +63,7 @@ module Mrubyc
         def init_main_c
           config = Mrubyc::Test::Config.read(check: false)
           puts '  cp test/tmp/main.c'
-          erb = ERB.new(File.read(File.expand_path('../../../templates/main.c.erb', __FILE__)), nil, '-')
+          erb = ERB.new(File.read(File.expand_path('../../../templates/main.c.erb', __FILE__)))
           File.write(File.join(config['test_tmp_dir'], 'main.c'), erb.result(binding))
 
         end

data/lib/mrubyc/test/version.rb

@@ -1,5 +1,5 @@
 module Mrubyc
   module Test
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

data/lib/mrubyc-ext/mrubyc_test_case.rb

@@ -22,7 +22,7 @@ class MrubycTestCase
       description: @information[:description].to_s,
       message: message,
       assertion: assertion.to_s,
-      expected: expected.to_s,
+      expected: expected.to_ss,
       actual: actual.to_ss,
       error: error
     }

data/lib/mrubyc-ext/object.rb

@@ -7,7 +7,7 @@ class Object
     elsif self.class.to_s.end_with? "Error"
       "#<#{self.class}: #{self.message}>"
     else
-      self.to_s + ' [' + self.class_name + ']'
+      self.inspect + ' [' + self.class_name + ']'
     end
   end
   def class_name

data/lib/mrubyc-test.rb

@@ -48,30 +48,23 @@ module Mrubyc::Test
         puts "cd #{tmp_dir}"
         puts
         pwd = Dir.pwd
-        hal_path = "#{pwd}/#{config['mrubyc_src_dir']}/hal"
-        hal_bak_path = "#{pwd}/#{config['mrubyc_src_dir']}/~hal"
-        FileUtils.rm_rf hal_bak_path
-        FileUtils.mv(hal_path, hal_bak_path) if FileTest.exist?(hal_path)
         exit_code = 0
         cc = ENV['CC'].to_s.length > 0 ? ENV['CC'] : "gcc"
         qemu = ENV['QEMU']
-        begin
-          FileUtils.ln_sf "#{pwd}/#{config['test_tmp_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
-          Dir.chdir(tmp_dir) do
-            [
-              "#{mrbc_path} -B test test.rb",
-              "#{mrbc_path} -B models models.rb",
-              "#{cc} -O0 -g3 -Wall -I #{pwd}/#{config['mrubyc_src_dir']} -static -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c -DMRBC_INT64 -DMAX_SYMBOLS_COUNT=1000 -DMRBC_USE_MATH=1 -DMRBC_USE_HAL_POSIX #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
-              "#{qemu} ./test"
-            ].each do |cmd|
-              puts cmd
-              puts
-              exit_code = 1 unless Kernel.system(cmd)
+        Dir.chdir(tmp_dir) do
+          [
+            "#{mrbc_path} -B test test.rb",
+            "#{mrbc_path} -B models models.rb",
+            "#{cc} -O0 -g3 -Wall -I #{pwd}/#{config['mrubyc_src_dir']} -static -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal_posix/*.c -DMRBC_INT64 -DMAX_SYMBOLS_COUNT=1000 -DMRBC_USE_MATH=1 -DMRBC_USE_HAL_POSIX #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]} -Wl,--allow-multiple-definition",
+            "#{qemu} ./test"
+          ].each do |cmd|
+            puts cmd
+            puts
+            unless Kernel.system(cmd)
+              exit_code = 1
+              break
             end
           end
-        ensure
-          FileUtils.rm hal_path
-          FileUtils.mv(hal_bak_path, hal_path) if FileTest.exist?(hal_bak_path)
         end
         return exit_code
       end
@@ -112,7 +105,7 @@ module Mrubyc::Test
                eg: /home/hoge/mruby/build/host/bin/mrbc
                RBENV_VERSION will be ignored if you specify this option.
       DESC
-    def test(testfilepath = "test/*.rb")
+    def test(testfilepath = "")
       Mrubyc::Test::Init.init_main_c
       init_env
       config = Mrubyc::Test::Config.read

data/lib/templates/main.c.erb

@@ -94,5 +94,8 @@ main(void) {
   mrbc_define_method(0, mrbc_class_object, "instance_variable_get", c_instance_variable_get);
   mrbc_load_model(models);
   mrbc_load_model(test);
+  /* test should be a task so that methods like sleep work */
+  mrbc_create_task(test, 0);
+  mrbc_run();
   return exit_code;
 }

data/lib/templates/test.rb.erb

@@ -43,7 +43,7 @@ def summerize
     puts "Pendings:\n"
     $pendings.each_with_index do |pending, index|
       puts $colors[:pending]
-      puts "#{index+1}) " + pending[:class_and_method]
+      puts "#{index + 1}) " + pending[:class_and_method]
       print $colors[:info]
       puts "  # " + pending[:path] + ":" + pending[:line]
       puts $colors[:reset]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrubyc-test
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-24 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler