rbz 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b95d8a3b12cf6b671276b3d16c6539ebc75df094194907c8f0ab6852211ad8a
-  data.tar.gz: 7408fb25e8df795d48f5ae9c7b4ca46765854fa67d3000d2540dcf4fa6ae63b5
+  metadata.gz: a774e972b1a624ed444a3b1ce0684ecd1a76d6ba5e70b909b628c8d637879cf0
+  data.tar.gz: b07e501ad4334413b71019ebc13f93377d1c15d5d5edda4fe7bdb7cfc87bf679
 SHA512:
-  metadata.gz: 3501cc82abbe3c728789ca8ab1d2b890b56150a29f431136d27b729322f0d61b1ec8886b238bf21fa2a81c530f6414d784dbde89f5af591c70c4b993c7514883
-  data.tar.gz: 1f3538bd3c5fda93e8eb6df8e06be4f84e65c631c84636bd49228cdb659e1694d4558ae1fb1dbf4f754b3b884652c1a781c3557682aca28919a5385798327e6f
+  metadata.gz: 58a4df4d1eeea6695711a4165b2e3f91e30d0988f92800a89bfca147383324fa506aa89e8904bd912accdc16d9acb316c321f1ec522f76c362acc99e1182cf33
+  data.tar.gz: 1a85d186663ebea35e6e385ba8f15b6bdd8388d887353b9d8db65f29574b44c1af187f7d84604101217415ea9ede441d2114811b2ce99a78f16c425f3331e626

data/README.md

@@ -25,6 +25,14 @@ Once the archive is generated, run it with `ruby`.
 
     $ ruby my-archive.rbz
 
+### Applications with simple Gemfile's
+
+If your application's Gemfile is simple (ie. no git or path sources, no C extensions)
+there is a good chance you can package it with rbz.
+
+rbz uses `bundle install --standalone` to vendor your dependencies, and then writes
+out it's own loader that sets up the load path to use those vendored gems.
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/examples/bundled/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+bundle/

data/examples/bundled/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "cli-ui", "~> 2.2"

data/examples/bundled/Gemfile.lock

@@ -0,0 +1,14 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    cli-ui (2.4.0)
+
+PLATFORMS
+  arm64-darwin-24
+  ruby
+
+DEPENDENCIES
+  cli-ui (~> 2.2)
+
+BUNDLED WITH
+   2.6.9

data/examples/bundled/main.rb

@@ -0,0 +1,7 @@
+require "cli/ui"
+
+CLI::UI::StdoutRouter.enable
+CLI::UI::Frame.open('Frame 1') do
+  CLI::UI::Frame.open('Frame 2') { puts "inside frame 2" }
+  puts "inside frame 1"
+end

data/exe/rbz

@@ -1,49 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rubygems/package"
-require "stringio"
-require "zlib"
+require "rbz"
 
-source = ARGV[0] or abort "Error: Missing source directory"
-io = StringIO.new
-
-Gem::Package::TarWriter.new(io) do |writer|
-  Dir.chdir(source) do
-    Dir.glob("**/*").each do |e|
-      next if File.directory?(e)
-      mode = File.lstat(e).mode
-      writer.add_file(e, mode) { |fio| fio.write File.read(e, mode: "rb") }
-    end
-  end
-end
-
-puts File.read(__FILE__).split("__END__").last.strip
-puts
-puts "__END__"
-puts [Zlib::Deflate.deflate(io.string)].pack("m")
-
-__END__
-
-#!/usr/bin/env ruby
-require "tmpdir"
-require "rubygems/package"
-require "stringio"
-require "zlib"
-
-Dir.mktmpdir("rbz") do |dir|
-  Dir.chdir(dir) do
-    tar = StringIO.new(Zlib::Inflate.inflate(DATA.read.unpack1("m")))
-    Gem::Package::TarReader.new(tar) do |reader|
-      reader.each do |entry|
-        next if entry.full_name.start_with?("._")
-        next if entry.full_name.start_with?("PaxHeader")
-
-        FileUtils.mkdir_p(File.dirname(entry.full_name))
-        File.write(entry.full_name, entry.read, mode: "wb")
-        File.chmod(entry.header.mode, entry.full_name)
-      end
-    end
-
-    load "main.rb"
-  end
-end
+RBZ::CLI.run(ARGV)

data/lib/rbz/cli.rb

@@ -0,0 +1,80 @@
+require "rubygems/package"
+require "stringio"
+require "zlib"
+require "optionparser"
+require "erb"
+
+module RBZ
+  module CLI
+    def self.run(argv)
+      options = {
+        main: "main.rb",
+        output: $stdout,
+        bundle: true
+      }
+
+      parser = OptionParser.new do |parser|
+        parser.accept(File) do |path|
+          abort "Error: #{path} already exists" if File.exist?(path)
+          f = File.open(path, mode: "w")
+          File.chmod(0o755, path)
+          f
+        end
+
+        parser.banner = "Usage: rbz [options] folder"
+        parser.on("-c", "--compile", "Store compiled Ruby iseq")
+        parser.on("-m FILE", "--main FILE", "Main entrypoint (relative to folder, default: main.rb)")
+        parser.on("-o FILE", "--output FILE", File, "Output path (default: stdout)")
+        parser.on("-b", "--[no-]bundle", "Use bundle if exists (default: true)")
+        parser.on("--verbose", "Verbose mode")
+      end
+      parser.parse!(into: options)
+
+      source = ARGV[0] or abort(parser.to_s)
+      output = options[:output]
+      io = StringIO.new
+
+      # Default output to stderr
+      $> = $stderr
+
+      Gem::Package::TarWriter.new(io) do |writer|
+        Dir.chdir(source) do
+          # Can't use bundle if no Gemfile
+          options[:bundle] = false unless File.exist?("Gemfile")
+
+          if options[:bundle]
+            system("bundle install --standalone >/dev/null 2>&1") or abort "Error: bundle install failed"
+            File.delete("bundle/bundler/setup.rb")
+            Dir.delete("bundle/bundler")
+            File.open("bundle/load.rb", "w") do |f|
+              f.puts "path = File.expand_path('../..', __FILE__)"
+
+              Dir["bundle/ruby/**/lib"].each do |dir|
+                f.puts %Q[$LOAD_PATH.unshift "\#{path}/#{dir}"]
+              end
+            end
+          end
+
+          Dir.glob("**/*").each do |e|
+            next if File.directory?(e)
+            mode = File.lstat(e).mode
+
+            if options[:compile] && File.extname(e) == ".rb"
+              contents = RubyVM::InstructionSequence.compile_file(e).to_binary
+              $stderr.puts "a #{e}.iseq" if options[:verbose] # standard:disable Style/StderrPuts
+              writer.add_file(e + ".iseq", mode) { |fio| fio.write(contents) }
+            end
+
+            $stderr.puts "a #{e}" if options[:verbose] # standard:disable Style/StderrPuts
+            writer.add_file(e, mode) { |fio| fio.write(File.binread(e)) }
+          end
+        end
+      end
+
+      output.puts ERB.new(RBZ.templates.join("bin.rb.erb").read, trim_mode: "-").result(binding)
+      output.puts
+      output.puts "__END__"
+      output.puts [Zlib::Deflate.deflate(io.string)].pack("m")
+    end
+  end
+end

data/lib/rbz/templates/bin.rb.erb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+require "tmpdir"
+require "rubygems/package"
+require "stringio"
+require "zlib"
+require "digest"
+require "tmpdir"
+
+<% if options[:compile] -%>
+module ISeqMixin
+  def load_iseq(path)
+    if File.exist?(path + ".iseq")
+      path = path + ".iseq"
+      RubyVM::InstructionSequence.load_from_binary(File.binread(path))
+    end
+  rescue SyntaxError, RuntimeError
+    nil
+  end
+end
+<% end -%>
+
+sha256 = Digest::SHA256.hexdigest(File.read(__FILE__))
+dir = File.join(Dir.tmpdir, "rbz-#{sha256}")
+Dir.mkdir(dir) unless Dir.exist?(dir)
+
+Dir.chdir(dir) do
+  sentinel = File.join(dir, ".rbz")
+  if !File.exist?(sentinel)
+    tar = StringIO.new(Zlib::Inflate.inflate(DATA.read.unpack1("m")))
+    Gem::Package::TarReader.new(tar) do |reader|
+      reader.each do |entry|
+        next if entry.full_name.start_with?("._")
+        next if entry.full_name.start_with?("PaxHeader")
+
+        FileUtils.mkdir_p(File.dirname(entry.full_name))
+        File.binwrite(entry.full_name, entry.read)
+        File.chmod(entry.header.mode, entry.full_name)
+      end
+    end
+
+    File.write(sentinel, "")
+  end
+
+  <%- if options[:compile] -%>
+  class << RubyVM::InstructionSequence
+    prepend ISeqMixin
+  end
+  <%- end -%>
+
+  <%- if options[:bundle] -%>
+  bundle_path = File.join(dir, "bundle/load.rb")
+  if File.exist?(bundle_path)
+    require bundle_path
+  end
+  <%- end -%>
+
+  load File.expand_path("<%= options[:main] %>", dir)
+end

data/lib/rbz/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module Rbz
-  VERSION = "0.2.0"
+module RBZ
+  VERSION = "0.3.0"
 end

data/lib/rbz.rb

@@ -1,3 +1,11 @@
 # frozen_string_literal: true
 
+require "pathname"
 require_relative "rbz/version"
+require_relative "rbz/cli"
+
+module RBZ
+  def self.templates
+    Pathname(__dir__).join("rbz/templates")
+  end
+end

data/sig/rbz.rbs

@@ -1,4 +1,4 @@
-module Rbz
+module RBZ
   VERSION: String
   # See the writing guide of rbs: https://github.com/ruby/rbs#guides
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbz
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Daniels
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description:
 email:
 - adam@mediadrive.ca
 executables:
@@ -23,11 +21,17 @@ files:
 - README.md
 - Rakefile
 - example.rbz
-- example/main.rb
-- example_2/lib/other_file.rb
-- example_2/main.rb
+- examples/bundled/.gitignore
+- examples/bundled/Gemfile
+- examples/bundled/Gemfile.lock
+- examples/bundled/main.rb
+- examples/example_1/main.rb
+- examples/example_2/lib/other_file.rb
+- examples/example_2/main.rb
 - exe/rbz
 - lib/rbz.rb
+- lib/rbz/cli.rb
+- lib/rbz/templates/bin.rb.erb
 - lib/rbz/version.rb
 - sig/rbz.rbs
 homepage: https://github.com/adam12/rbz
@@ -36,7 +40,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/adam12/rbz
   source_code_uri: https://github.com/adam12/rbz
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -51,8 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.8
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Single file Ruby archives. Crazy? Maybe.
 test_files: []