mruby_tools 0.0.1.1 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa01e1c7834a6b9ba351aa1e70df7399628dc8c
-  data.tar.gz: 42b72b7ca714f805e00a0f73b12439d1611dbd65
+  metadata.gz: bde41419ba3eb29e2b6487d232c94b2cf630387f
+  data.tar.gz: 643bb284b8af86dbd22cd29a70d5badb5824fcfb
 SHA512:
-  metadata.gz: 5aae2588bb3b849cba817a377f2995c55d7e0e8b27f770b9f5c991093f6c9f3032a7d2e9e64810bee44ffb8b616b2e6a1f55694297af1b8ca20bc22c1c4b5cde
-  data.tar.gz: 2e225121b919de40e9fbd803fbf0c3aa2cf5ebb7b0433c1bfa30e58e52cce864361f4248ef00b90892669a239d5908c0cab64b1cbf3ea72f1ee868f63dd34a40
+  metadata.gz: 4dcbdcf5da887ffad6bb6ac220aa4e2525724e228af89329beb64e58131c7eea40bf66038d13cb95c6dd3a1fe2f321e6246a6bc1cac68cf7c7b564ec6d60dff5
+  data.tar.gz: 376214a2967c23a8c9fd27aa113337a6439b4ed18c48e4749b90b94f96ac9a9e465e9bf9a86a5ec8b20235155fca3cb0ef930328d6529da7dfe5fd8ed1e28376

data/VERSION

@@ -1 +1 @@
-0.0.1.1
+0.0.2.1

data/bin/mrbt

@@ -7,59 +7,24 @@ require 'mruby_tools'
 #  possibly: file1.rb -o outfile file2.rb -c generated.c
 
 opts = MRubyTools.args(ARGV)
-outfile = opts.fetch(:outfile)
-
-c_code = <<'EOF'
-#include <stdlib.h>
-#include <mruby.h>
-#include <mruby/compile.h>
-#include <mruby/string.h>
-
-void check_exc(mrb_state *mrb, char *filename) {
-  if (mrb->exc) {
-    mrb_value exc = mrb_obj_value(mrb->exc);
-    mrb_value exc_msg = mrb_funcall(mrb, exc, "to_s", 0);
-    fprintf(stderr, "ERROR in %s - %s: %s\n",
-            filename,
-            mrb_obj_classname(mrb, exc),
-            mrb_str_to_cstr(mrb, exc_msg));
-    /* mrb_print_backtrace(mrb);   # empty */
-    exit(1);
-  }
-}
-
-int
-main(void)
-{
-  mrb_state *mrb = mrb_open();
-  if (!mrb) {
-    printf("mrb problem");
-    exit(1);
-  }
-EOF
-
-c_code += opts.fetch(:rb_files).map { |rbf|
-  "\n" +  MRubyTools.rb2c(rbf) + "\n\n"
-}.join
-
-  c_code += <<EOF
-  mrb_close(mrb);
-  return 0;
-}
-EOF
+MRubyTools.usage if opts[:help]
 
+rb_files = opts.fetch(:rb_files)
+MRubyTools.usage("no .rb files provided") if rb_files.empty?
+c_code = MRubyTools.c_wrapper(rb_files)
 puts c_code + "\n" if opts[:verbose]
 
-file = opts[:cfile] || Tempfile.new(['generated', '.c'])
-file.write(c_code)
-file.close
+out_file = opts.fetch(:out_file)
+c_file = opts.fetch(:c_file)
+c_file.write(c_code)
+c_file.close
 
 msd = MRubyTools.mruby_src_dir
 
 gcc_args = [
-  '-std=c99', "-I", File.join(msd, 'include'), file.path, "-o", outfile,
+  '-std=c99', "-I", File.join(msd, 'include'), c_file.path, "-o", out_file,
   File.join(msd, 'build', 'host', 'lib', 'libmruby.a'), '-lm',
 ]
 
 puts "compiling..."
-puts "created binary executable: #{outfile}" if system('gcc', *gcc_args)
+puts "created binary executable: #{out_file}" if system('gcc', *gcc_args)

data/lib/mruby_tools.rb

@@ -1,4 +1,47 @@
+require 'tempfile'
+
 module MRubyTools
+  def self.c_wrapper(rb_files)
+    c_code = <<'EOF'
+#include <stdlib.h>
+#include <mruby.h>
+#include <mruby/compile.h>
+#include <mruby/string.h>
+
+void check_exc(mrb_state *mrb, char *filename) {
+  if (mrb->exc) {
+    mrb_value exc = mrb_obj_value(mrb->exc);
+    mrb_value exc_msg = mrb_funcall(mrb, exc, "to_s", 0);
+    fprintf(stderr, "ERROR in %s - %s: %s\n",
+            filename,
+            mrb_obj_classname(mrb, exc),
+            mrb_str_to_cstr(mrb, exc_msg));
+    /* mrb_print_backtrace(mrb);   # empty */
+    exit(1);
+  }
+}
+
+int
+main(void)
+{
+  mrb_state *mrb = mrb_open();
+  if (!mrb) {
+    printf("mrb problem");
+    exit(1);
+  }
+EOF
+    c_code += rb_files.map { |rbf|
+      "\n" + self.rb2c(rbf) + "\n\n"
+    }.join
+
+    c_code += <<EOF
+  mrb_close(mrb);
+  return 0;
+}
+EOF
+    c_code
+  end
+
   def self.rb2c(rb_filename, indent: '  ')
     c_str = File.read(rb_filename)
     size = c_str.size
@@ -19,30 +62,47 @@ module MRubyTools
     mruby_src_dir
   end
 
+  def self.usage(msg = nil)
+    puts <<EOF
+  USAGE: mrbt file1.rb file2.rb ...
+OPTIONS: -o outfile     (provide a name for the standalone executable)
+         -c generated.c (leave the specified C file on the filesystem)
+         -v             (verbose)
+EOF
+    warn "  ERROR: #{msg}" if msg
+    exit
+  end
+
   def self.args(argv = ARGV)
     rb_files = []
-    outfile = nil
-    cfile = nil
+    out_file = nil
+    c_file = nil
     verbose = false
+    help = false
 
     while !argv.empty?
       arg = argv.shift
       if arg == '-o'
-        outfile = argv.shift
-        raise "no outfile provided with -o" unless outfile
-        raise "#{outfile} is misnamed" if File.extname(outfile) == '.rb'
+        out_file = argv.shift
+        raise "no out_file provided with -o" unless out_file
+        raise "#{out_file} is misnamed" if File.extname(out_file) == '.rb'
       elsif arg == '-c'
-        cfile = File.open(argv.shift || 'generated.c', "w")
+        c_file = File.open(argv.shift || 'generated.c', "w")
       elsif arg == '-v'
         verbose = true
+      elsif arg == '-h'
+        help = true
       else
         rb_files << arg
       end
     end
 
+    c_file ||= Tempfile.new(['generated', '.c'])
+
     { verbose: verbose,
-      cfile: cfile,
-      outfile: outfile || 'outfile',
+      help: help,
+      c_file: c_file,
+      out_file: out_file || 'outfile',
       rb_files: rb_files }
   end
 end

data/test/mruby_tools.rb

@@ -0,0 +1,68 @@
+require 'mruby_tools'
+require 'minitest/autorun'
+
+describe MRubyTools do
+  describe "c_wrapper" do
+    it "must return a string of mruby C code" do
+      [[], [__FILE__]].each { |rb_files|
+        str = MRubyTools.c_wrapper(rb_files)
+        str.must_be_kind_of String
+        str.wont_be_empty
+        str.must_match(/main\(void\)/)
+        str.must_match(/return/)
+        str.must_match(/exit/)
+        str.must_match(/mruby/)
+        str.must_match(/mrb/)
+      }
+    end
+  end
+
+  describe "rb2c" do
+    it "must inject the contents of a ruby file into mrb_load_string()" do
+      str = MRubyTools.rb2c(__FILE__)
+      str.must_be_kind_of String
+      str.wont_be_empty
+      str.must_match(/mrb_load_n?string\(/)
+      str.must_match(/exc/)
+    end
+  end
+
+  describe "mruby_src_dir" do
+    it "must confirm the specified mruby source on the filesystem" do
+      candidates = []
+      %w{src git}.each { |subdir|
+        candidates +=
+          Dir[File.join(ENV['HOME'], subdir, 'mruby-1.*', 'include')]
+      }
+      unless candidates.empty?
+        latest = File.expand_path('..', candidates.last)
+        key = 'TESTING_MRUBY_SRC_DIR'
+        ENV[key] = latest
+        dir = MRubyTools.mruby_src_dir(key)
+        File.directory?(dir).must_equal true
+        File.directory?(File.join(dir, 'include')).must_equal true
+      end
+    end
+
+    it "must accept the dir specification from the environment" do
+      proc { MRubyTools.mruby_src_dir('bad key') }.must_raise Exception
+    end
+  end
+
+  describe "args" do
+    it "must provide a hash with expected keys" do
+      h = MRubyTools.args([])
+      h.must_be_kind_of Hash
+      [:verbose, :help, :c_file, :out_file, :rb_files].each { |key|
+        h.key?(key).must_equal true
+      }
+      h[:verbose].must_equal false
+      h[:help].must_equal false
+      [Tempfile, File].must_include h[:c_file].class
+      h[:out_file].must_be_kind_of String
+      h[:out_file].wont_be_empty
+      h[:rb_files].must_be_kind_of Array
+      h[:rb_files].must_be_empty
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mruby_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Rick Hull
@@ -57,6 +57,7 @@ files:
 - examples/timer.rb
 - lib/mruby_tools.rb
 - mruby_tools.gemspec
+- test/mruby_tools.rb
 homepage: https://github.com/rickhull/mruby-tools
 licenses:
 - LGPL-3.0