kompo 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a48f38a6abeb3b4587b542da43b0ecc1813a9c86db2104f162e706bb71a542
-  data.tar.gz: 5c0b5d0b3c1fdd021482c4746befa09e699569e7c2fbe63ac746adae8656a6ba
+  metadata.gz: 824cb5818444206e527f8a70d899c53b922f05a2ee44b1433b9103e2bc00dec9
+  data.tar.gz: bc82fea90c7f254f3f1e2221cadd4dedb9ec0e0c64ae4a68163e5784a0de35d1
 SHA512:
-  metadata.gz: 81f9ac47065c925cfcd51807123080fa0dd2304d75070bb7b44cfeba5c885ee7dd87d9498dde962d5dd48cb045af5deb62d438747f7e41d73925fd23412cfc5e
-  data.tar.gz: 6d2c8f0613ce1ca07f28d364b8e37f306c7e0d0d760a5b11b88003c6198e19196f75dd807d4f413f9c39a5b5402c68d18995200a8169715eeb70c2e44e4272d5
+  metadata.gz: 164750a94ce03e80d4dbdbd6c88a33ea76e92e5ddcd0a7ee2170aa76e2c24c3471616739a21adcd37724a49a0af93bb3805b73e14446159dc218cb514fb0fc9a
+  data.tar.gz: 7668b48ea202b6f21dccceb8a67097d1df27b6661295c36b756f9a537c09f5479ed326f86c0374b7bb5fef860d62f54a599c520212798a31b02c03ddb6bc295a

data/README.md

@@ -36,12 +36,11 @@ $ LIB_KOMPO_DIR=/path/to/kompo-vfs/target/release
   * simple hello world script.
 * sinatra_and_sqlite
   * sinatra app with sqlite3 with Gemfile.
-
+* rails
+  * 🚧
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/exe/kompo

@@ -3,17 +3,7 @@
 require_relative '../lib/kompo'
 require 'optparse'
 
-option = Kompo::Option.new
-
-option.on('-e VAL', '--entrypoint=VAL') { |v| option.entrypoint = v }
-option.on('-o VAL', '--output=VAL') { |v| option.output = v }
-option.on('--[no-]gemfile') { |v| option.gemfile = v }
-option.on('--[no-]stdlib') { |v| option.stdlib = v }
-option.on('--dest-dir=VAL') { |v| option.dest_dir = v }
-option.on('--ruby-src-path=VAL') { |v| option.ruby_src_path = v }
-option.on('--cache-bundle-path=VAL') { |v| option.cache_bundle_path = v }
-option.on('--ruby-version=VAL') { |v| option.ruby_version = v }
-# option.on('--compress') { |v| option.compress = v }
+option = Kompo::Option.default
 
 Kompo::Tasks.cd_work_dir(option) do |task|
   task.clone_ruby_src

data/lib/kompo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kompo
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/kompo.rb

@@ -12,24 +12,43 @@ module Kompo
 
   class Option
     extend Forwardable
-    attr_accessor :entrypoint, :output, :gemfile, :stdlib, :dest_dir, :ruby_src_path, :cache_bundle_path, :ruby_version, :compress, :context, :args
+    attr_accessor :entrypoint, :output, :gemfile, :ignore_stdlib, :dyn_link_lib, :dest_dir, :ruby_src_path, :cache_bundle_path, :ruby_version, :compress, :context, :args, :use_group
     delegate %i[on] => :@opt
 
     def initialize(dir = Dir.getwd, opt = OptionParser.new)
       @entrypoint = File.join(dir, 'main.rb')
       @output = File.basename(dir)
-      @gemfile = File.exist?(File.join(Dir.pwd, 'Gemfile'))
-      @stdlib = true
+      @gemfile = File.exist?(File.join(Dir.getwd, 'Gemfile'))
+      @ignore_stdlib = []
+      @dyn_link_lib = []
       @dest_dir = dir
       @ruby_src_path = nil
       @cache_bundle_path = nil
       @ruby_version = "v#{RUBY_VERSION.gsub('.', '_')}"
       @compress = false
+      @use_group = 'default'
 
       @context = dir
       @opt = opt
     end
 
+    def self.default
+      option = new
+      option.on('-e VAL', '--entrypoint=VAL', "File path to use for entry point. (default: \'./main.rb\')") { |v| option.entrypoint = v }
+      option.on('-o VAL', '--output=VAL', 'Name of the generated file. (default: current dir name)') { |v| option.output = v }
+      option.on('-g VAL', '--use-group=VAL', "Group name to use with \'bundle install\'. (default: \'default\')") { |v| option.use_group = v }
+      option.on('--[no-]gemfile', "Use gem in Gemfile. (default: automatically true if Gemfile is present)") { |v| option.gemfile = v }
+      option.on('--ignore-stdlib=VAL', Array, "Specify stdlibs not to include, separated by commas.") { |v| option.ignore_stdlib = v }
+      option.on('--dyn-link-lib=VAL', Array, "Specify libraries to be dynamic link, separated by commas.") { |v| option.dyn_link_lib = v }
+      option.on('--dest-dir=VAL', "Output directry path. (default: current dir)") { |v| option.dest_dir = v }
+      option.on('--ruby-src-path=VAL', "Your Ruby source directry. Must be compiled with \'--with-static-linked-ext\'.") { |v| option.ruby_src_path = v }
+      option.on('--cache-bundle-path=VAL', "Specify the directory created by \'bundle install --standalone\'.") { |v| option.cache_bundle_path = v }
+      option.on('--ruby-version=VAL', "Specify Ruby version. (default: current Ruby version)") { |v| option.ruby_version = v }
+      # option.on('--compress') { |v| option.compress = v }
+
+      option
+    end
+
     def build
       @opt.parse!(ARGV)
 
@@ -53,9 +72,9 @@ module Kompo
 
   class Tasks
     extend Forwardable
-    attr_reader :task, :fs, :work_dir, :ruby_src_dir, :ruby_pc, :ruby_bin, :extinit_o, :encinit_o, :lib_ruby_static_dir, :bundle_setup, :bundle_ruby, :std_libs, :gem_libs
+    attr_reader :task, :fs, :work_dir, :ruby_src_dir, :ruby_pc, :ruby_bin, :extinit_o, :encinit_o, :lib_ruby_static_dir, :bundle_setup, :bundle_ruby, :std_libs, :gem_libs, :exts_libs
 
-    delegate %i[entrypoint output gemfile stdlib dest_dir ruby_src_path cache_bundle_path ruby_version compress context args] => :@option
+    delegate %i[entrypoint output gemfile ignore_stdlib dyn_link_lib dest_dir ruby_src_path cache_bundle_path ruby_version compress context args use_group] => :@option
     delegate %i[komop_cli lib_kompo_dir] => :@fs
 
     def initialize(option, dir)
@@ -64,14 +83,27 @@ module Kompo
       @work_dir = dir
       @fs = Fs.new
 
-      @ruby_pc = File.join(ruby_src_path || File.join(dir, 'dest_dir', 'lib', 'pkgconfig'), 'ruby.pc')
       @ruby_bin = File.join(ruby_src_path || File.join(dir, 'dest_dir', 'bin'), 'ruby')
+      @ruby_pc = File.join(ruby_src_path || File.join(dir, 'dest_dir', 'lib', 'pkgconfig'), get_ruby_pc_name)
       @extinit_o = File.join(ruby_src_dir, 'ext', 'extinit.o')
       @encinit_o = File.join(ruby_src_dir, 'enc', 'encinit.o')
       @lib_ruby_static_dir = ruby_src_path || File.join(dir, 'dest_dir', 'lib')
 
       @std_libs = []
       @gem_libs = []
+      @exts_libs = []
+    end
+
+    def get_ruby_pc_name
+      return 'ruby.pc' unless ruby_src_path
+
+      command = [
+        ruby_bin,
+        '-e',
+        "'puts RbConfig::CONFIG[\"ruby_pc\"]'",
+      ].join(' ')
+
+      exec_command command, 'get ruby.pc name', true
     end
 
     def valid?
@@ -108,7 +140,7 @@ module Kompo
             "--disable-install-capi",
             "--with-static-linked-ext",
             "--with-ruby-pc=ruby.pc",
-            "--with-ext=#{get_exts_dir}"
+            "--with-ext=#{get_ruby_exts_dir}"
           ].join(' ')
           exec_command command, 'configure'
 
@@ -139,7 +171,7 @@ module Kompo
         command = [
           './bundler',
           'install',
-          '--standalone'
+          "--standalone=#{use_group}",
         ].join(' ')
 
         exec_command command, 'bundle install'
@@ -182,10 +214,25 @@ module Kompo
             exec_command command, 'cargo build'
             copy_targets = Dir.glob(File.join(dir_name, 'target/release/*.a'))
           else
-            objs = File.read(makefile).scan(/OBJS = (.*\.o)/).join(' ')
-            command = ['make', '-C', dir_name, objs, '--always-make'].join(' ')
-            exec_command command, 'make'
-            copy_targets = objs.split(' ').map { File.join(dir_name, _1) }
+            copy_targets = []
+            Dir.chdir(dir_name) {|path|
+              command = [
+                ruby_bin,
+                'extconf.rb',
+              ].join(' ')
+
+              exec_command command, 'ruby extconf.rb'
+
+              objs = File.read('./Makefile').match(/OBJS = (.*\.o)/)[1]
+
+              command = ['make', objs, '--always-make'].join(' ')
+
+              exec_command command, 'make OBJS'
+
+              @exts_libs += File.read('./Makefile').match(/^libpath = (.*)/)[1].split(' ')
+
+              copy_targets = objs.split(' ').map { File.join(dir_name, _1) }
+            }
           end
 
           dir = FileUtils.mkdir_p('exts/' + File.basename(dir_name)).first
@@ -204,16 +251,19 @@ module Kompo
         'gcc',
         '-O3',
         '-Wall',
+        get_ruby_header,
+        "#{lib_ruby_static_dir.nil? ? '' : '-L' + lib_ruby_static_dir}",
+        "#{lib_kompo_dir.nil? ? '' : '-L' + lib_kompo_dir}",
+        "#{exts_libs.uniq.select{_1.start_with?('/')}.map{"-L#{_1}"}.join(' ')}",
         'main.c',
+        '-Wl,--start-group',
         Dir.glob('exts/**/*.o').join(' '),
         'fs.o',
-        "#{lib_ruby_static_dir.nil? ? '' : '-L' + lib_ruby_static_dir}",
-        "#{lib_kompo_dir.nil? ? '' : '-L' + lib_kompo_dir}",
-        get_ruby_header,
-        get_exts,
+        get_ruby_exts,
         '-lkompo',
         '-lruby-static',
         get_libs,
+        '-Wl,--end-group',
         '-o',
         output
       ].join(' ')
@@ -243,16 +293,37 @@ module Kompo
       end
     end
 
-    def get_exts
-      ["#{extinit_o}", "#{encinit_o}", *Dir.glob("#{ruby_src_dir}/ext/**/*.a"), *Dir.glob("#{ruby_src_dir}/enc/**/*.a")].join(' ')
+    def get_ruby_exts
+      ["#{extinit_o}", "#{encinit_o}", *(Dir.glob("#{ruby_src_dir}/ext/**/*.a") - ignore_stdlib_archives), *Dir.glob("#{ruby_src_dir}/enc/**/*.a")].join(' ')
+    end
+
+    def ignore_stdlib_archives
+      if ruby_src_path
+        ignore_stdlib.map do |stdlib|
+          File.join(ruby_src_path, 'ext', stdlib, File.basename(stdlib) + '.a')
+        end
+      else
+        []
+      end
+    end
+
+    def extract_gem_libs
+      Dir.glob("bundle/ruby/#{get_semantic_ruby_version}/gems/*/ext/*/Makefile")
+         .flat_map{ File.read(_1)
+         .scan(/^LIBS = (.*)/)[0] }
+         .flat_map { _1.split(' ') }
+         .uniq
+         .flat_map { _1.start_with?("-l") ? _1 : "-l" + File.basename(_1, '.a').delete_prefix('lib') }
+         .join(" ")
     end
 
     def get_libs
       main_lib = get_mainlibs
       ext_libs = Dir.glob("#{ruby_src_dir}/ext/**/exts.mk").flat_map { File.read(_1).scan(/EXTLIBS = (.*)/) }.join(" ")
-      gem_libs = Dir.glob("bundle/ruby/#{get_semantic_ruby_version}/gems/*/ext/*/Makefile").flat_map{ File.read(_1).scan(/LIBS = (.*)/)}.join(" ")
+      gem_libs = extract_gem_libs
+      dyn_link_libs = (['pthread', 'dl', 'm', 'c'] + dyn_link_lib).map { "-l" + _1 }
       dyn, static = eval("%W[#{main_lib} #{ext_libs} #{gem_libs}]").uniq
-                                                                   .partition { _1 == "-lpthread" || _1 == "-ldl" || _1 == "-lm" || _1 == "-lc" }
+                                                                   .partition { dyn_link_libs.include?(_1) }
       dyn.unshift "-Wl,-Bdynamic"
       static.unshift "-Wl,-Bstatic"
 
@@ -277,24 +348,22 @@ module Kompo
         load_paths += gem_libs
       end
 
-      if stdlib
-        load_paths += std_libs
-      end
+      load_paths += std_libs
 
       load_paths
     end
 
-    def get_exts_dir
+    def get_ruby_exts_dir
       Dir.glob("#{ruby_src_dir}/**/extconf.rb")
          .reject { _1 =~ /-test-/ }
          .reject { _1 =~ /win32/ } # TODO
          .map { File.dirname(_1) }
          .map { _1.split("#{ruby_src_dir}/ext/")[1] }
+         .reject { ignore_stdlib.include?(_1) }
          .join(',')
     end
 
     def std_libs
-      return [] unless stdlib
       return @std_libs unless @std_libs.empty?
 
       command = ["#{ruby_bin}", '-e', "'puts $:'"].join(' ')

data/lib/main.c.erb

@@ -1,5 +1,4 @@
 #include <ruby.h>
-#include <string.h>
 
 extern char *get_kompo_patch(void);
 extern void ruby_init_ext(const char *name, void (*init)(void));
@@ -14,14 +13,21 @@ void Init_gems(void)
     ruby_init_ext("<%= so_path %>", <%= func %>);
   <% end %>
 }
+<% ignore_stdlib.each do |stdlib|%>
+void <%= "Init_#{stdlib.gsub('/', '_')}" %>(void){}
+<% end %>
 
 int main(int argc, char **argv)
 {
-  int c = 3;
+  int c = argc + 2;
+  char *argv2[c];
 
-  // HACK: argv[0] is rewritten and reused by setproctitle()
-  argv[1] = "-e";
-  argv[2] = get_kompo_patch();
+  argv2[0] = argv[0];
+  argv2[1] = "-e";
+  argv2[2] = get_kompo_patch();
+  for (int i = 1; i < argc; i++) {
+    argv2[i + 2] = argv[i];
+  }
 
   ruby_sysinit(&c, &argv);
 
@@ -31,7 +37,7 @@ int main(int argc, char **argv)
   Init_kompo_fs();
   Init_gems();
 
-  void *node = ruby_options(c, argv);
+  void *node = ruby_options(c, argv2);
 
   // set $0
   ruby_script(get_start_file_name());

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kompo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Sho Hirano
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
-dependencies: []
+date: 2024-05-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A tool to pack Ruby and Ruby scripts in one binary. This tool is still
   under development.
 email: