mrubyc-test 0.3.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31b74ac4ad811032a16bb95564665c6973640c2fa6787a05e23261fcab090b0
-  data.tar.gz: 5cd106d0092c7b4ec2913002ec218c9349162b006d34753b758ad450d28e7fdf
+  metadata.gz: 01fd00e01ce7b93d321a0345e0f658a9a1e9da234c1527b337a9e3fcc3b3b5fd
+  data.tar.gz: 969827d51ef5b523fef3399174529b7ffaf73952d2011ef8c32a59afd80361f6
 SHA512:
-  metadata.gz: 468f307d73c03d7fc9b9b76519ed1d1d89e6bc4713609e3f3177c5a621ff1666b2529d86a026900ea41c5bd7aca2de306a73a5ce8867f46ca0ad78565144c85f
-  data.tar.gz: 4a04ad62d05bf7765dbe26ecfae09c96d23167e933e91260dbe636ce16454c89ff3d10b0d9f2feb90aee19a12b5735095b930933cd8f9250a3393753749130da
+  metadata.gz: a8ef624b18f81ec4a7071b11001fa55fdc059940a6358635fd86ec10c8537fc308cab9c5c29fba6252c3ee78996d3ccbe64078f3f22657b375cf91cbd933ab22
+  data.tar.gz: 466243707b3bd2f7f3c98c1b32d20c09607d72cb3b581b3b7f55e2b5544ec12df367e41c38b6fb3a2c7451e4e81dabc8bcfa9dd2112b3225d93dd113e50d348b

data/.travis.yml

@@ -1,7 +1,8 @@
 ---
-sudo: false
 language: ruby
-cache: bundler
 rvm:
-  - 2.6.0
-before_install: gem install bundler -v 2.0.1
+  - 2.7.0
+before_install:
+  - gem install bundler -v 2.1.2
+  - bundle install
+script: bundle exec rake spec

data/Gemfile.lock

@@ -1,43 +1,45 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.2.0)
-      activesupport (~> 5.2)
-      rufo (~> 0.4)
-      thor (~> 0.20)
+    mrubyc-test (0.5.2)
+      activesupport (~> 6.0)
+      rufo (~> 0.12)
+      thor (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.4)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    i18n (1.5.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rufo (0.4.1)
-    thor (0.20.3)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rufo (0.12.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -45,8 +47,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   mrubyc-test!
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  rake (~> 13.0)
+  rspec (~> 3.9)
 
 BUNDLED WITH
-   2.0.1
+   2.1.2

data/README.md

@@ -1,5 +1,7 @@
 # mrubyc-test
 
+[![Build Status](https://travis-ci.org/mrubyc/mrubyc-test.svg?branch=master)](https://travis-ci.org/mrubyc/mrubyc-test)
+
 mrubyc-test is an unit test framework for [mruby/c](https://github.com/mrubyc/mrubyc), supporting basic assertions, stub and mock.
 
 ## Acknowledgements
@@ -92,11 +94,9 @@ Assuming you have a model file at `mrblib/models/sample.rb`
 
 ```ruby
 class Sample
-  def do_something
-    attr_accessor :result
-    def do_something(arg)
-      @result = arg + still_not_defined_method
-    end
+  attr_accessor :result
+  def do_something(arg)
+    @result = arg + still_not_defined_method
   end
 end
 ```

data/lib/mrubyc-test.rb

@@ -57,13 +57,19 @@ module Mrubyc::Test
           Dir.chdir(tmp_dir) do
             [
              "RBENV_VERSION=#{mruby_version} mrbc -E -B test test.rb",
-             "cc #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]} -I #{pwd}/#{config['mrubyc_src_dir']} -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c",
+             "RBENV_VERSION=#{mruby_version} mrbc -E -B models models.rb",
+             "cc -I #{pwd}/#{config['mrubyc_src_dir']} -o test main.c #{pwd}/#{config['mrubyc_src_dir']}/*.c #{pwd}/#{config['mrubyc_src_dir']}/hal/*.c #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
              "./test"].each do |cmd|
                puts cmd
                puts
                exit_code = system(cmd) ? 0 : 1
-               exit(exit_code) if exit_code > 0
-             end
+               if exit_code > 0
+                 print "\e[31m"
+                 puts "exit code: #{exit_code}"
+                 puts "\e[0m"
+                 exit(exit_code)
+               end
+            end
           end
         ensure
           FileUtils.rm hal_path
@@ -72,8 +78,8 @@ module Mrubyc::Test
       end
 
       def init_env
-        ENV["CFLAGS"] ||= "-std=gnu99 -DMRBC_DEBUG -DMRBC_USE_MATH=1 -Wall"
-        ENV["LDFLAGS"] ||= "-Wl,--no-as-needed -lm"
+        ENV["CFLAGS"] = "-std=gnu99 -Wall #{ENV["CFLAGS"]}"
+        ENV["LDFLAGS"] = "-lm #{ENV["LDFLAGS"]}"
       end
 
     end

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

@@ -10,9 +10,11 @@ module Mrubyc
         class << self
           def run(model_files: [], test_files:, test_cases:, verbose:, method_name_pattern:)
             config = Mrubyc::Test::Config.read
-            erb = ERB.new(File.read(File.expand_path('../../../../templates/test.rb.erb', __FILE__)), nil, '-')
+            test_erb = ERB.new(File.read(File.expand_path('../../../../templates/test.rb.erb', __FILE__)), nil, '-')
+            models_erb = ERB.new(File.read(File.expand_path('../../../../templates/models.rb.erb', __FILE__)), nil, '-')
             mrubyc_class_dir = File.expand_path('../../../../mrubyc-ext/', __FILE__)
-            File.write(File.join(config['test_tmp_dir'], 'test.rb'), Rufo.format(erb.result(binding)))
+            File.write(File.join(config['test_tmp_dir'], 'test.rb'), Rufo.format(test_erb.result(binding)))
+            File.write(File.join(config['test_tmp_dir'], 'models.rb'), Rufo.format(models_erb.result(binding)))
           end
         end
       end

data/lib/mrubyc/test/init.rb

@@ -26,6 +26,8 @@ module Mrubyc
           puts "  write #{config['test_tmp_dir']}/.gitignore"
           File.open("#{config['test_tmp_dir']}/.gitignore", "w") do |f|
             f.puts "test"
+            f.puts "models.rb"
+            f.puts "models.c"
             f.puts "test.rb"
             f.puts "test.c"
           end

data/lib/mrubyc/test/version.rb

@@ -1,5 +1,5 @@
 module Mrubyc
   module Test
-    VERSION = "0.3.0"
+    VERSION = "0.5.3"
   end
 end

data/lib/templates/main.c.erb

@@ -1,6 +1,7 @@
 #include "mrubyc.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include "models.c"
 #include "test.c"
 
 #define MEMORY_SIZE (1024*64)-1
@@ -33,6 +34,7 @@ int main(void) {
   mrbc_init(my_memory_pool, MEMORY_SIZE);
   mrbc_define_method(0, mrbc_class_object, "debugprint", c_debugprint);
   mrbc_define_method(0, mrbc_class_object, "exit", c_exit);
+  mrbc_create_task( models, 0 );
   mrbc_create_task( test, 0 );
   mrbc_run();
   return exit_code;

data/lib/templates/models.rb.erb

@@ -0,0 +1,3 @@
+<% model_files.each do |file_name| -%>
+  <%= File.read(file_name) %>
+<% end -%>

data/lib/templates/test.rb.erb

@@ -14,6 +14,7 @@ if RUBY_VERSION == '1.9' && MRUBYC_VERSION
   end
   RUBY_DESCRIPTION = 'mruby/c ' + MRUBYC_VERSION
 else
+  require_relative "./models.rb"
   require 'objspace'
   def debugprint(message)
     puts
@@ -82,10 +83,6 @@ end
   <%= File.read(File.join(mrubyc_class_dir, basename + '.rb')) %>
 <% end -%>
 
-<% model_files.each do |file_name| -%>
-  <%= File.read(file_name) %>
-<% end -%>
-
 <% test_files.each do |file_name| -%>
   <%= File.read(file_name).gsub(/(\bpend\b)/, '\1;return') -%>
 <% end -%>

data/mrubyc-test.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
 
-  spec.add_dependency "thor", "~> 0.20"
-  spec.add_dependency "activesupport", "~> 5.2"
-  spec.add_dependency "rufo", "~> 0.4"
+  spec.add_dependency "thor", "~> 1.0"
+  spec.add_dependency "activesupport", "~> 6.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.3.0
+  version: 0.5.3
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,70 +30,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.12'
 description: mrubyc-test is an unit test framework for mruby/c, supporting basic assertions,
   stub and mock.
 email:
@@ -129,6 +129,7 @@ files:
 - lib/mrubyc/test/version.rb
 - lib/mrubyc_test_case/mrubyc_test_case.rb
 - lib/templates/main.c.erb
+- lib/templates/models.rb.erb
 - lib/templates/sample_test.rb.erb
 - lib/templates/test.rb.erb
 - mrubyc-test.gemspec
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Test Framework for mruby/c