mrubyc-test 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01fd00e01ce7b93d321a0345e0f658a9a1e9da234c1527b337a9e3fcc3b3b5fd
-  data.tar.gz: 969827d51ef5b523fef3399174529b7ffaf73952d2011ef8c32a59afd80361f6
+  metadata.gz: f487ca59fe60282d05eefb7eaeee8b93971d690ac2b99985b473bb7c82d8ec50
+  data.tar.gz: 372db4c64cf31926758dbc249a2364972eccdbc9b620e38b446992821a261e8d
 SHA512:
-  metadata.gz: a8ef624b18f81ec4a7071b11001fa55fdc059940a6358635fd86ec10c8537fc308cab9c5c29fba6252c3ee78996d3ccbe64078f3f22657b375cf91cbd933ab22
-  data.tar.gz: 466243707b3bd2f7f3c98c1b32d20c09607d72cb3b581b3b7f55e2b5544ec12df367e41c38b6fb3a2c7451e4e81dabc8bcfa9dd2112b3225d93dd113e50d348b
+  metadata.gz: 9ca5dc64f934ad214ee5e7ccc4426ade163771b85a0e245bf24f0b59c3f6a0cf12b43b0d37cb8536ad818b139975c7d58da7b94f261144ed92bab727c6c85400
+  data.tar.gz: d930234bca65fc38e5fa1fd8f26a71b6547b401560ada86df860d9aea0c34afd07af5012eb3222d5be165b976bbc99572a1beb01da8f2156ee13a4ace4fb7334

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mrubyc-test (0.5.2)
+    mrubyc-test (0.6.0)
       activesupport (~> 6.0)
       rufo (~> 0.12)
       thor (~> 1.0)
@@ -9,23 +9,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    i18n (1.8.2)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     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-core (3.9.3)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -39,7 +39,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -51,4 +51,4 @@ DEPENDENCIES
   rspec (~> 3.9)
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

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,8 +56,8 @@ 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",
+             "#{mrbc_path} -E -B test test.rb",
+             "#{mrbc_path} -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
@@ -84,10 +84,35 @@ module Mrubyc::Test
 
     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/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.3"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrubyc-test
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler