mrubyc-test 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134dba24482cd854d18c548f67c6884f29762de6c5cff34c8dd16b33349cfc49
-  data.tar.gz: 16c91f515cc2507629df555eef9222be0c92fccf0e5a11b72883854e99ceb7e7
+  metadata.gz: 42dad60691e5384546bea0da13394891c4b0a18ca96033542e9674f2cc6637c3
+  data.tar.gz: 5c36b3b893edb879b94acdb752a60a892c9b38b0b7d018ecb2b6fca67cf657ff
 SHA512:
-  metadata.gz: a83d79c076b05e91f452293501776ab70d590214c84169bdb65a5c329ff10a554135077ad814b91846361a7658a9b40f919ff765a333b5cbe2be9d95c13b173a
-  data.tar.gz: db81ffe8ca22180eb7ac156c39d3bbaeac5c2048c60f38aa9020c5a642c0fc9f8e48d5924accd81488828224383ec4dd754c88baeb9221b55677b9a5ec0904d4
+  metadata.gz: 00bd3455fca3ae3336f263ec19881c8007e3c6dffb24e47082e82f86228e4143989ea122f8dbb9220d8108ff726f786daeed31085346cafdb2f87532f7a3adc6
+  data.tar.gz: 3bbf2aeb541bd4bfc6e5109049103a5b9a09a39195594295db5fac490d1d1c6bb687e72589b78de761307b9dbe01e1d930e3874568f6a2d1f6309b421e98acf1

data/Gemfile.lock

@@ -1,20 +1,19 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.7.0)
-      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.6)
+    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.10)
     diff-lcs (1.5.0)
     i18n (1.10.0)
@@ -38,15 +37,14 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.5.4)
 
 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"
+    VERSION = "0.7.1"
   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"
           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/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
+  version: 0.7.1
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-10 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
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Test Framework for mruby/c