portable_mruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ada6422e257bade3658f643305f46bc48a9810605fd49fc60ab6f7f818f74f1
-  data.tar.gz: a6e95aca26683ad89fbae6fe730b6374353dbe0fedfa830b5de492583679c46a
+  metadata.gz: 4c13244dc25d6b73ad04ec765cf3ccc28a087acb97c543af230d8faf85a6d316
+  data.tar.gz: a9557729a1483f51272561bffddff6ce2608766ea4e875642678d5ed096dccc8
 SHA512:
-  metadata.gz: b3bbb058a12480116b90847cdaebb2256a8e5baacdcc6fcb0dbe03f376dfb61b0af91f9b37ba648527df5ee4c4a7a55c44caaec084adb608ef6591d4325c66f0
-  data.tar.gz: 24d0bd7cc714d2f10f94debfe8fdf09305cd720e25db5f2bbf19ad15b7c42c5e1b904b84c41a7a002420abe0a55adc252a871de1dd2f51a8442891502826e894
+  metadata.gz: 9944881585d3517ed4a2a7ee8a355b34a61ae11734333ea97ea22e3498c74177fa17438e60a55e99e3db8c7c16fb749fd181471494e4360d44b3cf68363f9015
+  data.tar.gz: 4c34af1415fddfd3465bc1fcc0b9c80b8e9b3c6249ac92b91a76131abfbfc9e5993e742b12238c82b5fb1ea24b591637a28e70c5ebe0ae26afc0eacab0149a80

data/README.md

@@ -9,10 +9,11 @@ Build truly portable Ruby executables that run on Linux, macOS, Windows, FreeBSD
 gem install portable_mruby
 
 # Create a Ruby program
-echo 'puts "Hello from #{RUBY_ENGINE}!"' > hello.rb
+mkdir myapp
+echo 'puts "Hello from #{RUBY_ENGINE}!"' > myapp/hello.rb
 
 # Build portable executable
-portable-mruby build -e hello.rb -o hello.com
+portable-mruby build -d myapp -o hello.com
 
 # Run it (works on Linux, macOS, Windows, FreeBSD, OpenBSD, NetBSD)
 ./hello.com
@@ -38,16 +39,13 @@ A single binary runs on:
 gem install portable_mruby
 ```
 
-On first build, the Cosmopolitan toolchain (~400MB) will be automatically downloaded to `~/.portable-mruby/cosmocc/`.
+On first build, the Cosmopolitan toolchain (~60MB) will be automatically downloaded to `~/.portable-mruby/cosmocc/`.
 
 ## Usage
 
 ### Basic Usage
 
 ```bash
-# Build all .rb files in current directory
-portable-mruby build -o myapp.com
-
 # Build all .rb files in a directory
 portable-mruby build -d src/ -o myapp.com
 
@@ -55,14 +53,18 @@ portable-mruby build -d src/ -o myapp.com
 ./myapp.com
 ```
 
+All `.rb` files in the directory (recursively) are compiled and executed in sorted order.
+
 ### With Entry Point
 
+When you have multiple files and need a specific file to run last (e.g., your main program that uses classes defined in other files):
+
 ```bash
 # Specify an entry file (runs last, after all other files)
-portable-mruby build -e main.rb -d src/ -o myapp.com
+portable-mruby build -d src/ -e main.rb -o myapp.com
 ```
 
-All `.rb` files are compiled and executed in sorted order. If `--entry` is specified, that file runs last.
+**Important:** The `-e` (entry) path is relative to the `-d` (directory) path. In the example above, it looks for `src/main.rb`.
 
 ### Options
 
@@ -70,8 +72,8 @@ All `.rb` files are compiled and executed in sorted order. If `--entry` is speci
 Usage: portable-mruby build [options]
 
 Options:
-    -e, --entry FILE        Entry point Ruby file (runs last)
-    -d, --dir DIR           Source directory (default: .)
+    -d, --dir DIR           Source directory containing .rb files (required)
+    -e, --entry FILE        Entry point Ruby file, relative to -d (runs last)
     -o, --output FILE       Output binary name (default: app.com)
     --mruby-source DIR      Build mruby from custom source directory
     -v, --verbose           Verbose output
@@ -90,25 +92,27 @@ If you need custom mruby gems or configuration, you can build from source:
 git clone https://github.com/mruby/mruby.git ~/mruby
 
 # Build using your custom mruby
-portable-mruby build -e main.rb --mruby-source ~/mruby -o myapp.com
+portable-mruby build -d src/ --mruby-source ~/mruby -o myapp.com
 ```
 
 ## Example
 
 Create a simple Ruby program:
 
-```ruby
-# main.rb
+```bash
+mkdir hello
+cat > hello/main.rb << 'EOF'
 name = ARGV[0] || 'World'
 puts "Hello, #{name}!"
 puts "Running on: #{RUBY_ENGINE} #{RUBY_VERSION}"
 puts "Time: #{Time.now}"
+EOF
 ```
 
 Build it:
 
 ```bash
-portable-mruby build --entry main.rb --output hello.com
+portable-mruby build -d hello -o hello.com
 ```
 
 Run it anywhere:
@@ -130,7 +134,7 @@ myapp/
 ```
 
 ```ruby
-# lib/greeter.rb
+# myapp/lib/greeter.rb
 class Greeter
   def initialize(name)
     @name = name
@@ -143,16 +147,19 @@ end
 ```
 
 ```ruby
-# main.rb
+# myapp/main.rb
 greeter = Greeter.new(ARGV[0] || 'World')
 puts greeter.greet
 ```
 
 ```bash
-portable-mruby build -e main.rb -d myapp/ -o greeter.com
+# Build with main.rb as entry point (runs last, after lib/greeter.rb)
+portable-mruby build -d myapp -e main.rb -o greeter.com
 ./greeter.com Ruby  # => Hello, Ruby!
 ```
 
+Files are loaded in sorted order (`lib/greeter.rb` before `main.rb`), but `-e main.rb` ensures it runs last regardless of sort order.
+
 ## Build Process
 
 1. Ruby source files are compiled to mruby bytecode using `mrbc`
@@ -174,7 +181,7 @@ gem install portable_mruby
 
 ### Build fails with cosmocc errors
 
-Ensure you have enough disk space (~300MB for cosmocc). You can also manually install cosmocc:
+Ensure you have enough disk space (~60MB for cosmocc download, ~200MB extracted). You can also manually install cosmocc:
 
 ```bash
 mkdir -p ~/.portable-mruby/cosmocc
@@ -187,7 +194,7 @@ unzip cosmocc.zip
 
 ```bash
 export COSMO_ROOT=/path/to/cosmocc
-portable-mruby build -e main.rb -o app.com
+portable-mruby build -d src/ -o app.com
 ```
 
 ## License

data/lib/portable_mruby/c_generator.rb

@@ -52,6 +52,26 @@ module PortableMruby
               }
           }
 
+          /* Call __main__ if defined (optional entry point) */
+          /* Supports both __main__(argv) and __main__() signatures */
+          if (!mrb->exc && mrb_respond_to(mrb, mrb_top_self(mrb), mrb_intern_lit(mrb, "__main__"))) {
+              mrb_value full_argv = mrb_ary_new_capa(mrb, argc);
+              for (i = 0; i < argc; i++) {
+                  mrb_ary_push(mrb, full_argv, mrb_str_new_cstr(mrb, argv[i]));
+              }
+              /* Try calling with argv first */
+              mrb_funcall(mrb, mrb_top_self(mrb), "__main__", 1, full_argv);
+              /* If ArgumentError (wrong number of args), retry without args */
+              if (mrb->exc && mrb_obj_is_kind_of(mrb, mrb_obj_value(mrb->exc), mrb_class_get(mrb, "ArgumentError"))) {
+                  mrb->exc = NULL;
+                  mrb_funcall(mrb, mrb_top_self(mrb), "__main__", 0);
+              }
+              if (mrb->exc) {
+                  mrb_print_error(mrb);
+                  return_value = 1;
+              }
+          }
+
           mrb_close(mrb);
           return return_value;
       }

data/lib/portable_mruby/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module PortableMruby
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
   MRUBY_VERSION = "3.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portable_mruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Hasinski