mrubyc-test 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31b74ac4ad811032a16bb95564665c6973640c2fa6787a05e23261fcab090b0
-  data.tar.gz: 5cd106d0092c7b4ec2913002ec218c9349162b006d34753b758ad450d28e7fdf
+  metadata.gz: a9f4cb5b6755213662af408a2858c478cdd6d39d2961b40357b5f88f1cb17c60
+  data.tar.gz: 012174027264751b90eec5eec729b31b91b8210d1bf70b510638cf9c30169e3c
 SHA512:
-  metadata.gz: 468f307d73c03d7fc9b9b76519ed1d1d89e6bc4713609e3f3177c5a621ff1666b2529d86a026900ea41c5bd7aca2de306a73a5ce8867f46ca0ad78565144c85f
-  data.tar.gz: 4a04ad62d05bf7765dbe26ecfae09c96d23167e933e91260dbe636ce16454c89ff3d10b0d9f2feb90aee19a12b5735095b930933cd8f9250a3393753749130da
+  metadata.gz: 4950349c1738fc8a6a32bc0bd4ba4fac9fdcf4e8db2fa03b4b4915d24173c831e2b19fc7a8fff7fd3b894ce3fa1b9218498e644e923db18aeb81cd259fcd33d4
+  data.tar.gz: 0d0fc87eb61128eddb4f749035eb5252a5217921fc5e52d3992adeeebcc31226241565576ecbb40950c5df7eebd6afbe229a622001b73b162e65d10022151ff0

data/.travis.yml

@@ -1,7 +1,9 @@
 ---
 sudo: false
 language: ruby
+bundler_args: --deployment
 cache: bundler
 rvm:
-  - 2.6.0
-before_install: gem install bundler -v 2.0.1
+  - 2.6.2
+before_install: gem install bundler --no-document
+script: bundle exec rake spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.2.0)
+    mrubyc-test (0.4.0)
       activesupport (~> 5.2)
       rufo (~> 0.4)
       thor (~> 0.20)
@@ -9,14 +9,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    i18n (1.5.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     rake (10.5.0)
@@ -33,7 +33,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rufo (0.4.1)
+    rufo (0.7.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)

data/README.md

@@ -1,5 +1,7 @@
 # mrubyc-test
 
+[![Build Status](https://travis-ci.com/mrubyc/mrubyc-test.svg?branch=master)](https://travis-ci.com/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",
+             "RBENV_VERSION=#{mruby_version} mrbc -E -B models models.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",
              "./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

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.4.0"
   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 -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrubyc-test
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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.0.3
 signing_key: 
 specification_version: 4
 summary: Test Framework for mruby/c