tebako 0.10.0 → 0.11.0

data/lib/tebako/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/src/tebako-main.cpp

@@ -53,9 +53,20 @@
 #include <tebako/tebako-version.h>
 #include <tebako/tebako-main.h>
 #include <tebako/tebako-fs.h>
-#include <tebako/tebako-cmdline-helpers.h>
+#include <tebako/tebako-cmdline.h>
 
 static int running_miniruby = 0;
+static tebako::cmdline_args* args = nullptr;
+static std::vector<char> package;
+
+static void tebako_clean(void)
+{
+  unmount_root_memfs();
+  if (args) {
+    delete args;
+    args = nullptr;
+  }
+}
 
 extern "C" int tebako_main(int* argc, char*** argv)
 {
@@ -70,26 +81,41 @@ extern "C" int tebako_main(int* argc, char*** argv)
     running_miniruby = -1;
   }
   else {
+    std::string mount_point = tebako::fs_mount_point;
+    std::string entry_point = tebako::fs_entry_point;
+    std::optional<std::string> cwd;
+    if (tebako::package_cwd != nullptr) {
+      cwd = tebako::package_cwd;
+    }
+    const void* data = &gfsData[0];
+    size_t size = gfsSize;
+
     try {
-      fsret = mount_root_memfs(&gfsData[0], gfsSize, tebako::fs_log_level, nullptr, nullptr, nullptr, nullptr, nullptr);
+      args = new tebako::cmdline_args(*argc, (const char**)*argv);
+      args->parse_arguments();
+      if (args->with_application()) {
+        args->process_package();
+        auto descriptor = args->get_descriptor();
+        package = std::move(args->get_package());
+        if (descriptor.has_value()) {
+          mount_point = descriptor->get_mount_point().c_str();
+          entry_point = descriptor->get_entry_point().c_str();
+          cwd = descriptor->get_cwd();
+          data = package.data();
+          size = package.size();
+        }
+      }
 
+      fsret = mount_root_memfs(data, size, tebako::fs_log_level, nullptr, nullptr, nullptr, nullptr, "auto");
       if (fsret == 0) {
-        if ((*argc > 1) && strcmp((*argv)[1], "--tebako-extract") == 0) {
-          ret = tebako::build_arguments_for_extract(argc, argv, tebako::fs_mount_point);
-        }
-        else {
-          auto [mountpoints, parsed_argv] = tebako::parse_arguments(*argc, *argv);
-          // for (auto& mp : mountpoints) {
-          // printf("Mountpoint: %s\n", mp.c_str());
-          // }
-          tebako::process_mountpoints(mountpoints);
-          std::tie(*argc, *argv) = tebako::build_arguments(parsed_argv, tebako::fs_mount_point, tebako::fs_entry_point);
-          ret = 0;
-        }
+        args->process_mountpoints();
+        args->build_arguments(mount_point.c_str(), entry_point.c_str());
+        *argc = args->get_argc();
+        *argv = args->get_argv();
+        ret = 0;
+        atexit(tebako_clean);
       }
-      atexit(unmount_root_memfs);
     }
-
     catch (std::exception e) {
       printf("Failed to process command line: %s\n", e.what());
     }
@@ -99,9 +125,9 @@ extern "C" int tebako_main(int* argc, char*** argv)
       ret = -1;
     }
 
-    if (tebako::package_cwd != nullptr) {
-      if (tebako_chdir(tebako::package_cwd) != 0) {
-        printf("Failed to chdir to '%s' : %s\n", tebako::package_cwd, strerror(errno));
+    if (cwd.has_value()) {
+      if (tebako_chdir(cwd->c_str()) != 0) {
+        printf("Failed to chdir to '%s' : %s\n", cwd->c_str(), strerror(errno));
         ret = -1;
       }
     }
@@ -110,17 +136,7 @@ extern "C" int tebako_main(int* argc, char*** argv)
   if (ret != 0) {
     try {
       printf("Tebako initialization failed\n");
-      if (new_argv) {
-        delete new_argv;
-        new_argv = nullptr;
-      }
-      if (argv_memory) {
-        delete argv_memory;
-        argv_memory = nullptr;
-      }
-      if (fsret == 0) {
-        unmount_root_memfs();
-      }
+      tebako_clean();
     }
     catch (...) {
       // Nested error, no recovery :(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2024-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,6 +171,7 @@ files:
 - lib/tebako/deploy_helper.rb
 - lib/tebako/error.rb
 - lib/tebako/options_manager.rb
+- lib/tebako/package_descriptor.rb
 - lib/tebako/packager.rb
 - lib/tebako/packager/pass1.rb
 - lib/tebako/packager/pass1a.rb
@@ -180,6 +181,7 @@ files:
 - lib/tebako/packager/patch_libraries.rb
 - lib/tebako/packager/patch_literals.rb
 - lib/tebako/packager/patch_main.rb
+- lib/tebako/packager_lite.rb
 - lib/tebako/ruby_builder.rb
 - lib/tebako/ruby_version.rb
 - lib/tebako/scenario_manager.rb