mrubyc-test 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80096778ca2a86911aca010ec509d7b5b38e00c6fc8700248c2af49df8ae27e9
-  data.tar.gz: 80b9f7b1e569a2188a4db828ce923509705a9a850683f5b2d7d6696af5f18688
+  metadata.gz: f6b6e64b49572a4c4a90f6a5a43d25309c42c91e004f6b6fc4e31ad84555d9c8
+  data.tar.gz: 1df134d8e5a19dc3b1c46e6ee97f5a25c89df2cf4287cac84589383b831dcb3b
 SHA512:
-  metadata.gz: 61d8df8a6941f9f9df0df6efce1f8b39622b3f15ad1b9d7711472292fe970ad08953b2cfa07ceecc02ccc529dc4fa1d39a4b6489a9d63ba58f31e5ff8a0caa5c
-  data.tar.gz: c90ff2c1955380504432038fc6cb4eaa6ff6722c3872f2101bcbb2c606345c4cbd5a66c7944e5acdd843bcb0b8889ae5806b9c9c5d882c26ce0ff63b35b574de
+  metadata.gz: fcb5ed97c767cb27084ccb99b5108e9556f196be113770369162362391304b46997ead657bf290b91eacb0aced27dc06051a11848b2a2570a9d69a3928d714a2
+  data.tar.gz: a7dc49998b925f0871819bcbd2d15eeb821d35ce2a7ebb48402a412f20cfa6c57012e8cd64cd556e8d91947ed96e4546e0a8400998d316f0832eca4deb99ed5c

data/.travis.yml

@@ -1,9 +1,8 @@
 ---
-sudo: false
 language: ruby
-bundler_args: --deployment
-cache: bundler
 rvm:
-  - 2.6.2
-before_install: gem install bundler --no-document
+  - 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,44 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.5.0)
-      activesupport (~> 5.2)
+    mrubyc-test (0.6.0)
+      activesupport (~> 6.0)
       rufo (~> 0.12)
       thor (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.1)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    i18n (1.8.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
-    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.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    minitest (5.14.3)
+    rake (13.0.3)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
     rufo (0.12.0)
     thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -49,4 +50,4 @@ DEPENDENCIES
   rspec (~> 3.9)
 
 BUNDLED WITH
-   2.1.2
+   2.2.5

data/README.md

@@ -1,6 +1,6 @@
 # mrubyc-test
 
-[![Build Status](https://travis-ci.com/mrubyc/mrubyc-test.svg?branch=master)](https://travis-ci.com/mrubyc/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.
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "mrubyc/test"
+require "mrubyc-test"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/mrubyc-test.rb

@@ -25,30 +25,30 @@ module Mrubyc::Test
       def prepare(test_files, verbose, method_name_pattern)
         config = Mrubyc::Test::Config.read
         model_files = Dir.glob(File.join(Dir.pwd, config['mruby_lib_dir'], 'models', '*.rb'))
-
         # gather attributes from your implementations and tests
-        attributes = Mrubyc::Test::Generator::Attribute.run(model_files: model_files, test_files: test_files)
-
+        attributes = Mrubyc::Test::Generator::Attribute.run(
+          model_files: model_files,
+          test_files: test_files
+        )
         # convert attributes into tast_cases
         test_cases = Mrubyc::Test::Generator::TestCase.run(attributes)
-
         # generate a ruby script that will be compiled by mrbc and executed in mruby/c VM
-        Mrubyc::Test::Generator::Script.run(model_files: model_files, test_files: test_files, test_cases: test_cases, verbose: verbose, method_name_pattern: method_name_pattern)
+        Mrubyc::Test::Generator::Script.run(
+          model_files: model_files,
+          test_files: test_files,
+          test_cases: test_cases,
+          verbose: verbose,
+          method_name_pattern: method_name_pattern
+        )
       end
 
-      def make
+      def make(mrbc_path)
         config = Mrubyc::Test::Config.read
         tmp_dir = File.join(Dir.pwd, config['test_tmp_dir'])
         puts "cd #{tmp_dir}"
         puts
         exit_code = 0
         pwd = Dir.pwd
-        mruby_version = File.read('.ruby-version').gsub("\n", '').chomp
-        unless mruby_version.index('mruby')
-          puts '.ruby-version doesn\'t set `mruby-x.x.x It is recommended to use the latest version of https://github.com/hasumikin/mrubyc-utils`'
-          print 'You can specify the version name of mruby [mruby-x.x.x]: '
-          mruby_version = STDIN.gets.chomp
-        end
         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)
@@ -56,9 +56,9 @@ module Mrubyc::Test
           FileUtils.ln_s "#{pwd}/#{config['test_tmp_dir']}/hal", "#{pwd}/#{config['mrubyc_src_dir']}/hal"
           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",
+             "#{mrbc_path} -E -B test test.rb",
+             "#{mrbc_path} -E -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 #{ENV["CFLAGS"]} #{ENV["LDFLAGS"]}",
              "./test"].each do |cmd|
                puts cmd
                puts
@@ -78,16 +78,41 @@ module Mrubyc::Test
       end
 
       def init_env
-        ENV["CFLAGS"] = "-std=gnu99 -DMRBC_DEBUG -DMRBC_USE_MATH=1 -Wall #{ENV["CFLAGS"]}"
-        ENV["LDFLAGS"] = "-Wl,--no-as-needed -lm #{ENV["LDFLAGS"]}"
+        ENV["CFLAGS"] = "-std=gnu99 -Wall #{ENV["CFLAGS"]}"
+        ENV["LDFLAGS"] = "-lm #{ENV["LDFLAGS"]}"
       end
 
     end
 
-    desc 'test', '[Default command] Execute test. You can specify a test file like `mrubyc-test test test/array_test.rb`'
-    option :every, type: :numeric, default: 10, aliases: "-e", banner: "NUMBER - To avoid Out of Memory, test will be devided up to every specified NUMBER of xxx_test.rb files"
-    option :verbose, type: :boolean, default: false, aliases: "-v", banner: "[true/false] - Show test result verbosely"
-    option :name, type: :string, aliases: "-n", banner: "NAME - Specify the NAME of tests you want to run. If you write --name='/PATTERN/', it will be processed as a regular expression. It must be single-quoted and doubled-backslash. eg) --name='/a\\\\db/' will create Regexp object `/a\\db/` and match strings like `a1b`"
+    desc 'test', <<~DESC
+      [Default command]
+      Execute test. You can specify a test file like
+      `mrubyc-test test test/array_test.rb`'
+    DESC
+    option :every, type: :numeric, default: 10, aliases: "-e",
+      banner: <<~DESC.chomp
+        NUMBER
+               To avoid Out of Memory, test will be devided up to
+               every specified NUMBER of xxx_test.rb files
+      DESC
+    option :verbose, type: :boolean, default: false, aliases: "-v",
+      banner: "[true/false] - Show test result verbosely"
+    option :name, type: :string, aliases: "-n",
+      banner: <<~DESC.chomp
+        NAME
+               Specify the NAME of tests you want to run. If you
+               write --name='/PATTERN/', it will be processed as a regular
+               expression. It must be single-quoted and doubled-backslash.
+               eg) --name='/a\\\\db/' will create Regexp object `/a\\db/`
+                   and match strings like `a1b`
+      DESC
+    option :mrbc_path, type: :string, aliases: "-p",
+      banner: <<~DESC.chomp
+        PATH
+               Specify the path to mrbc.
+               eg: /home/hoge/mruby/build/host/bin/mrbc
+               RBENV_VERSION will be ignored if you specify this option.
+      DESC
     def test(testfilepath = "test/*.rb")
       init_env
       method_name_pattern = (%r{\A/(.*)/\Z} =~ options[:name] ? Regexp.new($1) : options[:name])
@@ -96,9 +121,20 @@ module Mrubyc::Test
       else
         File.join(Dir.pwd, testfilepath)
       end
+      mrbc_path = if options[:mrbc_path]
+        options[:mrbc_path]
+      else
+        mruby_version = File.read('.ruby-version').gsub("\n", '').chomp
+        unless mruby_version.index('mruby')
+          puts '.ruby-version doesn\'t set `mruby-x.x.x It is recommended to use the latest version of https://github.com/hasumikin/mrubyc-utils`'
+          print 'You can specify the version name of mruby [mruby-x.x.x]: '
+          mruby_version = STDIN.gets.chomp
+        end
+        "RBENV_VERSION=#{mruby_version} mrbc"
+      end
       Dir.glob(test_path).each_slice(options[:every]) do |test_files|
         prepare(test_files, options[:verbose], method_name_pattern)
-        make
+        make(mrbc_path)
       end
     end
 

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

@@ -10,6 +10,7 @@ module Mrubyc
           def run(model_files: [], test_files:)
             # get information from model files(application code)
             model_files.each do |model_file|
+              puts "loading #{model_file}"
               load model_file
               class_name = File.basename(model_file, '.rb').camelize
               begin
@@ -18,6 +19,7 @@ module Mrubyc
                 print "\e[33m"
                 puts "[WARN] #{model_file} doesn't have corresponding class `#{class_name}`."
                 print "\e[m"
+                next
               end
               model_class.class_eval do
                 def method_missing(_method_name, *_args)

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

@@ -10,11 +10,25 @@ module Mrubyc
         class << self
           def run(model_files: [], test_files:, test_cases:, verbose:, method_name_pattern:)
             config = Mrubyc::Test::Config.read
-            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, '-')
+            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(test_erb.result(binding)))
-            File.write(File.join(config['test_tmp_dir'], 'models.rb'), Rufo.format(models_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/version.rb

@@ -1,5 +1,5 @@
 module Mrubyc
   module Test
-    VERSION = "0.5.0"
+    VERSION = "0.6.1"
   end
 end

data/mrubyc-test.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.9"
 
   spec.add_dependency "thor", "~> 1.0"
-  spec.add_dependency "activesupport", "~> 5.2"
+  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.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - HASUMI Hitoshi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     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
@@ -137,7 +137,7 @@ homepage: https://github.com/mrubyc/mrubyc-test
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Test Framework for mruby/c
 test_files: []