Refactor gem build

Author: Taucher2003

.github/workflows/publish.yml

@@ -26,7 +26,7 @@ jobs:
         working-directory: gem
     steps:
       # Set up
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

gem/Rakefile

@@ -2,101 +2,11 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-require 'rubygems/package_task'
-require 'open-uri'
-require 'digest'
-
-RSpec::Core::RakeTask.new(:spec)
-
 require 'rubocop/rake_task'
 
+RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
 task default: %i[prepare_build spec rubocop]
-
-require_relative 'lib/triangulum/bun'
-
-TRIANGULUM_GEMSPEC = Bundler.load_gemspec('triangulum.gemspec')
-
 task prepare_build: %i[download build:entrypoints]
-
 task package: %i[clobber prepare_build]
-
-desc 'Clean downloaded bun binaries'
-task 'clobber:bun' do
-  Triangulum::Bun::NATIVE_PLATFORMS.each_key do |platform|
-    bun_path = File.join('exe', platform, 'bun')
-    rm bun_path if File.exist?(bun_path)
-  end
-end
-
-task clobber: %i[clobber:bun]
-
-exepaths = []
-
-Triangulum::Bun::NATIVE_PLATFORMS.each do |platform, (zip_filename, expected_checksum)|
-  TRIANGULUM_GEMSPEC.dup.tap do |gemspec|
-    exedir = File.join('exe', platform)
-    exepath = File.join(exedir, 'bun')
-
-    exepaths << exepath
-
-    gemspec.platform = platform
-    gemspec.files += [exepath]
-
-    gem_path = Gem::PackageTask.new(gemspec).define
-    desc "Build the #{platform} gem"
-    task "gem:#{platform}" => [gem_path]
-
-    directory exedir
-    file exepath => [exedir] do
-      url = Triangulum::Bun.download_url(zip_filename)
-      warn "Downloading #{exepath} from #{url} ..."
-
-      URI.open(url) do |remote| # rubocop:disable Security/Open
-        zip_data = remote.read
-
-        actual_checksum = Digest::SHA256.hexdigest(zip_data)
-        unless actual_checksum == expected_checksum
-          raise "Checksum mismatch for #{zip_filename}: expected #{expected_checksum}, got #{actual_checksum}"
-        end
-
-        # Bun zips contain a directory with the binary inside
-        require 'zip'
-        Zip::File.open_buffer(zip_data) do |zip|
-          bun_entry = zip.find { |e| File.basename(e.name) == 'bun' }
-          raise "bun binary not found in #{zip_filename}" unless bun_entry
-
-          File.binwrite(exepath, bun_entry.get_input_stream.read)
-        end
-      end
-
-      FileUtils.chmod(0o755, exepath, verbose: true)
-    end
-  end
-end
-
-desc 'Download all bun binaries'
-task download: exepaths
-
-desc 'Bundle the TypeScript entrypoints into single JS files'
-task 'build:entrypoints' do
-  rm_rf 'lib/triangulum/js'
-  directory 'lib/triangulum/js'
-
-  entrypoints = %w[single-validation]
-
-  entrypoints.each do |entrypoint|
-    entrypoint_src = File.expand_path("../entrypoint/#{entrypoint}.ts", __dir__)
-    entrypoint_dst = File.expand_path("lib/triangulum/js/#{entrypoint}.js", __dir__)
-
-    sh 'bun', 'build', entrypoint_src, '--outfile', entrypoint_dst, '--target', 'bun'
-  end
-end
-
-desc 'Push all platform gems to RubyGems'
-task 'push:all' do
-  Dir['pkg/*.gem'].each do |gem_file|
-    sh 'gem', 'push', gem_file
-  end
-end

gem/lib/triangulum/bun.rb

@@ -7,8 +7,11 @@ class Validation
     class TriangulumFailed < Triangulum::Error
     end
 
-    Result = Struct.new(:valid?, :return_type, :diagnostics)
-    Diagnostic = Struct.new(:message, :code, :severity, :node_id, :parameter_index)
+    class BunNotFound < Triangulum::Error
+    end
+
+    Result = Struct.new(:valid?, :return_type, :diagnostics, keyword_init: true)
+    Diagnostic = Struct.new(:message, :code, :severity, :node_id, :parameter_index, keyword_init: true)
 
     ENTRYPOINT = File.expand_path('js/single-validation.js', __dir__)
     BUN_EXE = Dir.glob(File.expand_path('../../exe/*/bun', __dir__)).find do |path|
@@ -35,6 +38,8 @@ def validate
     private
 
     def run_ts_triangulum(input)
+      raise BunNotFound, "No bundled bun binary found for #{Gem::Platform.local}" if BUN_EXE.nil?
+
       stdout_s, stderr_s, status = Open3.capture3(
         BUN_EXE, 'run', ENTRYPOINT,
         stdin_data: input
@@ -70,15 +75,15 @@ def parse_output(output)
       json = JSON.parse(output, symbolize_names: true)
 
       Result.new(
-        json[:isValid],
-        json[:returnType],
-        json[:diagnostics].map do |diagnostic|
+        valid?: json[:isValid],
+        return_type: json[:returnType],
+        diagnostics: json[:diagnostics].map do |diagnostic|
           Diagnostic.new(
-            diagnostic[:message],
-            diagnostic[:code],
-            diagnostic[:severity],
-            diagnostic[:nodeId],
-            diagnostic[:parameterIndex]
+            message: diagnostic[:message],
+            code: diagnostic[:code],
+            severity: diagnostic[:severity],
+            node_id: diagnostic[:nodeId],
+            parameter_index: diagnostic[:parameterIndex]
           )
         end
       )

gem/lib/triangulum/validation.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+BUN_VERSION = 'v1.3.11'
+
+# rubocop:disable Layout/LineLength
+# rubygems platform name => [bun release zip filename, sha256 checksum]
+BUN_PLATFORMS = {
+  'arm64-darwin' => %w[bun-darwin-aarch64.zip 6f5a3467ed9caec4795bf78cd476507d9f870c7d57b86c945fcb338126772ffc],
+  'x86_64-darwin' => %w[bun-darwin-x64.zip c4fe2b9247218b0295f24e895aaec8fee62e74452679a9026b67eacbd611a286],
+  'x86_64-linux-gnu' => %w[bun-linux-x64.zip 8611ba935af886f05a6f38740a15160326c15e5d5d07adef966130b4493607ed],
+  'x86_64-linux-musl' => %w[bun-linux-x64-musl.zip b0fce3bc4fab52f26a1e0d8886dc07fd0c0eb2a274cb343b59c83a2d5997b5b1],
+  'aarch64-linux-gnu' => %w[bun-linux-aarch64.zip d13944da12a53ecc74bf6a720bd1d04c4555c038dfe422365356a7be47691fdf],
+  'aarch64-linux-musl' => %w[bun-linux-aarch64-musl.zip 0f5bf5dc3f276053196274bb84f90a44e2fa40c9432bd6757e3247a8d9476a3d]
+}.freeze
+# rubocop:enable Layout/LineLength
+
+def bun_download_url(filename)
+  "https://github.com/oven-sh/bun/releases/download/bun-#{BUN_VERSION}/#{filename}"
+end

gem/rakelib/bun.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+desc 'Bundle the TypeScript entrypoints into single JS files'
+task 'build:entrypoints' do
+  rm_rf 'lib/triangulum/js'
+  directory 'lib/triangulum/js'
+
+  entrypoints = %w[single-validation]
+
+  entrypoints.each do |entrypoint|
+    entrypoint_src = File.expand_path("../../entrypoint/#{entrypoint}.ts", __dir__)
+    entrypoint_dst = File.expand_path("../lib/triangulum/js/#{entrypoint}.js", __dir__)
+
+    sh 'bun', 'build', entrypoint_src, '--outfile', entrypoint_dst, '--target', 'bun'
+  end
+end

gem/rakelib/entrypoints.rake

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'rubygems/package_task'
+require 'open-uri'
+require 'digest'
+require_relative 'bun'
+
+desc 'Clean downloaded bun binaries'
+task 'clobber:bun' do
+  BUN_PLATFORMS.each_key do |platform|
+    bun_path = File.join('exe', platform, 'bun')
+    rm bun_path if File.exist?(bun_path)
+  end
+end
+
+task clobber: %i[clobber:bun]
+
+exepaths = []
+
+TRIANGULUM_GEMSPEC = Bundler.load_gemspec('triangulum.gemspec')
+
+BUN_PLATFORMS.each do |platform, (zip_filename, expected_checksum)|
+  TRIANGULUM_GEMSPEC.dup.tap do |gemspec|
+    exedir = File.join('exe', platform)
+    exepath = File.join(exedir, 'bun')
+
+    exepaths << exepath
+
+    gemspec.platform = platform
+    gemspec.files += [exepath]
+
+    gem_path = Gem::PackageTask.new(gemspec).define
+    desc "Build the #{platform} gem"
+    task "gem:#{platform}" => [gem_path]
+
+    directory exedir
+    file exepath => [exedir] do
+      url = bun_download_url(zip_filename)
+      warn "Downloading #{exepath} from #{url} ..."
+
+      URI.open(url) do |remote| # rubocop:disable Security/Open
+        zip_data = remote.read
+
+        actual_checksum = Digest::SHA256.hexdigest(zip_data)
+        unless actual_checksum == expected_checksum
+          raise "Checksum mismatch for #{zip_filename}: expected #{expected_checksum}, got #{actual_checksum}"
+        end
+
+        require 'zip'
+        Zip::File.open_buffer(zip_data) do |zip|
+          bun_entry = zip.find { |e| File.basename(e.name) == 'bun' }
+          raise "bun binary not found in #{zip_filename}" unless bun_entry
+
+          File.binwrite(exepath, bun_entry.get_input_stream.read)
+        end
+      end
+
+      FileUtils.chmod(0o755, exepath, verbose: true)
+    end
+  end
+end
+
+desc 'Download all bun binaries'
+task download: exepaths

gem/rakelib/package.rake

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+desc 'Push all platform gems to RubyGems'
+task 'push:all' do
+  Dir['pkg/*.gem'].each do |gem_file|
+    sh 'gem', 'push', gem_file
+  end
+end

gem/rakelib/push.rake

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   spec.files = Dir.glob('lib/**/*', base: __dir__).select { |f| File.file?(File.join(__dir__, f)) } + ['README.md']
-  spec.bindir = 'exe'
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_dependency 'base64', '~> 0.3'