mrubyc-test 0.7.0.pre.rc1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ba5b056b71ff5fc5377dda272e651a3784dfdc7627f3a746e7ce6bb30ff975
-  data.tar.gz: 2d587b1e8d998ba84434634ff0f7599ccec2bd69b41a41ac80693b057593fb67
+  metadata.gz: f7e34da056a7c335a8b3815ade20bfe827209f662b882db33a71123fbd49c288
+  data.tar.gz: 71f6afa66472fec8af924fc5d30e19ed5a5a36c85554c023ba968ba87ac05fa2
 SHA512:
-  metadata.gz: a0c73ee66679987cc53adc9631e500f3cec3a70107807c3bebede1f3310dc2846db4e367a9eb215172b72c2535ddd7353a350bf50eeb45760d911ed7366ba6a5
-  data.tar.gz: a8a29d343d482ce81c2d83221f788d3cf9997739cafee556b2d3cd0342dee43d6e8a28880d5504e00fdc9465e68013e3da3c63dac754bd397ea72b4ad443e0c8
+  metadata.gz: 047d016d914acfd61668bfdd3a1c5acdba0555c88c535492274b98699f83751e7e649e2ed94dec92f502fcdf824f22af6686144b3d021f1dafd08a45eafa53e5
+  data.tar.gz: 5f8bf78d93d90e77377bc1a66ce179df33ad4b04a9930e9dbf848452688d8ab10ef511250b2242abb6469948cdd5396eb7c3c8c7bfa7293074ca06df1e7b81aa

data/Gemfile.lock

@@ -1,52 +1,50 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.6.2)
-      activesupport (~> 6.0)
+    mrubyc-test (0.7.1)
+      activesupport (~> 7.0)
       rufo (~> 0.12)
-      thor (~> 1.0)
+      thor (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rufo (0.13.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler (~> 2)
   mrubyc-test!
-  rake (~> 13.0)
+  rake (~> 13)
   rspec (~> 3.9)
 
 BUNDLED WITH

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

@@ -19,9 +19,10 @@ module Mrubyc
                 Module.const_get(class_name.upcase)
               end
               unless model_class
-                print "\e[33m"
-                puts "[WARN] #{model_file} doesn't have corresponding class `#{class_name}`."
-                print "\e[m"
+                # Deprecate 2022-06-01
+                #print "\e[33m"
+                #puts "[WARN] #{model_file} doesn't have corresponding class `#{class_name}`."
+                #print "\e[m"
                 next
               end
               model_class.class_eval do

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

@@ -13,12 +13,12 @@ module Mrubyc
             test_erb = ERB.new(
               File.read(
                 File.expand_path('../../../../templates/test.rb.erb', __FILE__)
-              ), nil, '-'
+              ), trim_mode: '-'
             )
             models_erb = ERB.new(
               File.read(
                 File.expand_path('../../../../templates/models.rb.erb', __FILE__)
-              ), nil, '-'
+              ), trim_mode: '-'
             )
             mrubyc_class_dir = File.expand_path('../../../../mrubyc-ext/', __FILE__)
             File.write(File.join(

data/lib/mrubyc/test/version.rb

@@ -1,5 +1,5 @@
 module Mrubyc
   module Test
-    VERSION = "0.7.0-rc1"
+    VERSION = "0.7.2"
   end
 end

data/lib/mrubyc-test.rb

@@ -47,34 +47,30 @@ module Mrubyc::Test
         tmp_dir = File.join(Dir.pwd, config['test_tmp_dir'])
         puts "cd #{tmp_dir}"
         puts
-        exit_code = 0
         pwd = Dir.pwd
         hal_path = "#{pwd}/#{config['mrubyc_src_dir']}/hal"
         hal_bak_path = "#{pwd}/#{config['mrubyc_src_dir']}/~hal"
         FileUtils.mv(hal_path, hal_bak_path) if FileTest.exist?(hal_path)
+        exit_code = 0
         begin
-          FileUtils.ln_s "#{pwd}/#{config['test_tmp_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
+          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']} -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c -DMRBC_USE_HAL_POSIX #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
-             "./test"].each do |cmd|
+              "#{mrbc_path} -B test test.rb",
+              "#{mrbc_path} -B models models.rb",
+              "cc -O0 -g3 -Wall -I #{pwd}/#{config['mrubyc_src_dir']} -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c -DMRBC_USE_MATH=1 -DMRBC_USE_HAL_POSIX #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
+              "./test"
+             ].each do |cmd|
                puts cmd
                puts
-               exit_code = system(cmd) ? 0 : 1
-               if exit_code > 0
-                 print "\e[31m"
-                 puts "exit code: #{exit_code}"
-                 puts "\e[0m"
-                 exit(exit_code)
-               end
+               exit_code = 1 unless system(cmd)
             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
 
       def init_env
@@ -132,10 +128,16 @@ module Mrubyc::Test
         end
         "RBENV_VERSION=#{mruby_version} mrbc"
       end
+      exit_code = 0
       Dir.glob(test_path).each_slice(options[:every]) do |test_files|
         prepare(test_files, options[:verbose], method_name_pattern)
-        make(mrbc_path)
+        exit_code += make(mrbc_path)
+      end
+      if exit_code > 0
+        puts "\e[31mFinished with error(s)\e[0m"
+        exit 1
       end
+      puts "\e[32mFinished without error\e[0m"
     end
 
     desc "version", "Print the version"

data/lib/templates/main.c.erb

@@ -24,6 +24,7 @@ static void c_instance_variable_get(struct VM *vm, mrbc_value v[], int argc)
   for(int i = 0; i < kvh->n_stored; i++) {
     if (strncmp(&name[1], symid_to_str(kvh->data[i].sym_id), strlen(name) - 1) == 0) {
       SET_RETURN(kvh->data[i].value);
+      mrbc_incref(&kvh->data[i].value);
       return;
     }
   }
@@ -40,9 +41,10 @@ static void c_debugprint(struct VM *vm, mrbc_value v[], int argc)
   console_putchar('\n');
   unsigned char *message = GET_STRING_ARG(1);
   console_printf("%s\n", message);
-  int total, used, free, fragment;
-  mrbc_alloc_statistics( &total, &used, &free, &fragment );
-  console_printf("Memory total:%d, used:%d, free:%d, fragment:%d\n", total, used, free, fragment );
+
+  struct MRBC_ALLOC_STATISTICS mem;
+  mrbc_alloc_statistics( &mem );
+  console_printf("Memory total:%d, used:%d, free:%d, fragment:%d\n", mem.total, mem.used, mem.free, mem.fragmentation );
   for( int i = 0; i < 79; i++ ) { console_putchar('='); }
   console_putchar('\n');
   console_putchar('\n');

data/mrubyc-test.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.9"
 
-  spec.add_dependency "thor", "~> 1.0"
-  spec.add_dependency "activesupport", "~> 6.0"
+  spec.add_dependency "thor", "~> 1.2"
+  spec.add_dependency "activesupport", "~> 7.0"
   spec.add_dependency "rufo", "~> 0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrubyc-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.rc1
+  version: 0.7.2
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -148,11 +148,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Test Framework for mruby/c