homura-runtime 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d8286719ce164088136af4d1caf0476c026d4ec2e42b98b08db8c84df6766d
-  data.tar.gz: 849f3bb4ae14131b950de3a89efff6032a4204e9878a19c84cfe9dcdfa618e8b
+  metadata.gz: 2f8d2b1f63c73d674a1e14a9ad376877678ed2f8697622e1282261f85ae092a2
+  data.tar.gz: dbedff400687b46bc6817df021ddc1c6560a4953d6c6a30c7a570980609e749a
 SHA512:
-  metadata.gz: c692cab5b2375646806e28b72b2e3c82da48563dcfc6a9074b8a8f3d9a756a92caee4ce100eee22bfaf81d00a459b3b85541176565fc1c3de5545f5c08b5216b
-  data.tar.gz: 0eda9cfebebb75b1efd6764d6be2b27710769e30a215e9c9cb5b9d635534afbf685cc8aeac632ad09378ecf106768d9b395093f4055c2293179b81817484f8a6
+  metadata.gz: 6416ec5f4d14535c6a2eeddd47183bc6e1cd59d095ee3620ad5b96d0f019b11e576cfcf2f1c147cf93326189bd3750611438a41e09ec542f8e12f749732f5b75
+  data.tar.gz: 344e21cf2f8f9ca6fc7c1291cf363ded09ac1857ccede0d1184599de39170c62c1494c7d9660e6675888cc4b97ef0d083fa83491935adea946e425b4de2ce6db

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.2.0 (2026-04-23)
+
+- Remove the old `cloudflare-workers-build` public executable and expose the
+  build pipeline through `homura build`.
+- Keep the internal build implementation in the runtime gem while letting the
+  single `homura` CLI dispatch to it.
+
+## 0.1.6 (2026-04-23)
+
+- Teach `cloudflare-workers-build --standalone --with-db` to add the packaged
+  `sequel-d1` gem `vendor/` directory to the Opal load path before the gem's
+  `lib/`, so `require 'sequel'` resolves to the bundled Opal-compatible Sequel
+  subset instead of the CRuby gem.
+
 ## 0.1.5 (2026-04-23)
 
 - Make `auto-await` emit rewritten files for existing hand-written `.__await__`

data/README.md

@@ -9,13 +9,13 @@ Core Ruby + Module Worker glue for [Opal](https://opalrb.com/) on [Cloudflare Wo
 - `runtime/worker_module.mjs` — fetch / scheduled / queue / DO adapters (**no Opal bundle import**).
 - `runtime/worker.mjs` — thin bootstrap (crypto shim → bundle → `worker_module`) for legacy layouts.
 - `runtime/setup-node-crypto.mjs` — `node:crypto` on `globalThis` before the Opal bundle loads.
-- `bin/cloudflare-workers-build` — single build pipeline (ERB → assets → Opal → patch → `worker.entrypoint.mjs`). Use `--standalone` in generated apps; it now restores `cf-runtime/` automatically and derives standalone template/asset namespaces from the project name by default.
+- `homura build` — single build pipeline (ERB → assets → Opal → patch → `worker.entrypoint.mjs`). Use `--standalone` in generated apps; it now restores `cf-runtime/` automatically and derives standalone template/asset namespaces from the project name by default.
 - `docs/ARCHITECTURE.md` — wrangler `main`, codegen entrypoint, and fixed-import policy.
 
 ## Quick start (homura monorepo)
 
 1. `Gemfile`: `gem 'homura-runtime', path: 'gems/homura-runtime'` and `gem 'opal-homura', '= 1.8.3.rc1', require: 'opal'` (path or exact pin).
-2. `bundle exec cloudflare-workers-build` — writes `build/hello.no-exit.mjs` and `build/worker.entrypoint.mjs`.
+2. `bundle exec homura build` — writes `build/hello.no-exit.mjs` and `build/worker.entrypoint.mjs`.
 3. `wrangler.toml`: `main = "build/worker.entrypoint.mjs"`, `compatibility_flags = ["nodejs_compat"]`.
 
 ## Support matrix (indicative)

data/bin/cloudflare-workers-build

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Single happy path: ERB precompile → assets embed → Opal bundle → patch-opal-evals → worker.entrypoint.mjs
-# No subcommands. Use --standalone for generated consumer apps (no homura inline routes).
+# homura build: ERB precompile → assets embed → Opal bundle → patch-opal-evals → worker.entrypoint.mjs
+# Use --standalone for generated consumer apps (no homura inline routes).
 
 require 'fileutils'
 require 'open3'
@@ -50,7 +50,7 @@ options = {
 }
 
 OptionParser.new do |o|
-  o.banner = 'usage: cloudflare-workers-build [options]'
+  o.banner = 'usage: homura build [options]'
   o.on('--root PATH', 'Project root (default: cwd)') { |p| options[:root] = p }
   o.on('--standalone', 'Consumer app (skip inline-routes; use Gemfile-resolved load paths)') do
     options[:standalone] = true
@@ -90,7 +90,7 @@ patch_target = options[:patch_input] || options[:opal_output]
 
 def run!(argv, chdir:)
   Dir.chdir(chdir) do
-    system(*argv) || abort("cloudflare-workers-build: failed: #{argv.join(' ')}")
+    system(*argv) || abort("homura build: failed: #{argv.join(' ')}")
   end
 end
 
@@ -113,7 +113,7 @@ def run_opal_homura!(root, opal_input, opal_output)
   env = { 'OPAL_PREFORK_DISABLE' => '1' }
   out_err, status = Open3.capture2e(env, *argv, chdir: root.to_s)
   File.write(stderr_log, out_err)
-  abort('cloudflare-workers-build: opal failed') unless status.success?
+  abort('homura build: opal failed') unless status.success?
 end
 
 def homura_vendor_from_gemfile(project_root)
@@ -121,24 +121,7 @@ def homura_vendor_from_gemfile(project_root)
 end
 
 def run_opal_standalone!(root, opal_input, opal_output, with_db:)
-  load_paths = []
-  hv = homura_vendor_from_gemfile(root)
-  load_paths << hv.to_s if hv
-  runtime_name = CloudflareWorkers::BuildSupport::RUNTIME_GEM_NAME
-  sinatra_name = CloudflareWorkers::BuildSupport::SINATRA_GEM_NAME
-
-  load_paths += ['build/auto_await/app', 'app']
-  [
-    CloudflareWorkersBuild.gem_lib(runtime_name),
-    CloudflareWorkersBuild.gem_vendor(runtime_name),
-    CloudflareWorkersBuild.gem_lib(sinatra_name),
-    CloudflareWorkersBuild.gem_vendor(sinatra_name)
-  ].compact.each do |path|
-    load_paths << path
-  end
-  load_paths << CloudflareWorkersBuild.gem_lib('sequel-d1') if with_db
-  load_paths << 'vendor' if root.join('vendor').directory?
-  load_paths << 'build'
+  load_paths = CloudflareWorkers::BuildSupport.standalone_load_paths(root, with_db: with_db)
 
   argv = ['bundle', 'exec', 'opal', '-c', '-E', '--esm', '--no-source-map']
   load_paths.each { |p| argv.push('-I', p) }
@@ -149,12 +132,12 @@ def run_opal_standalone!(root, opal_input, opal_output, with_db:)
   env = { 'OPAL_PREFORK_DISABLE' => '1' }
   out_err, status = Open3.capture2e(env, *argv, chdir: root.to_s)
   File.write(stderr_log, out_err)
-  abort('cloudflare-workers-build: opal failed') unless status.success?
+  abort('homura build: opal failed') unless status.success?
 end
 
 def write_entrypoint!(root, out_path, setup:, bundle:, worker_mod:)
   body = <<~JS
-    // GENERATED by cloudflare-workers-build — do not edit by hand.
+    // GENERATED by homura build — do not edit by hand.
     import "#{setup}";
     import "#{bundle}";
     export { default, HomuraCounterDO } from "#{worker_mod}";
@@ -260,4 +243,4 @@ write_entrypoint!(
   worker_mod: options[:worker_module_import]
 )
 
-$stderr.puts 'cloudflare-workers-build: ok'
+$stderr.puts 'homura build: ok'

data/docs/ARCHITECTURE.md

@@ -30,13 +30,13 @@ flowchart LR
 ## homura 本体
 
 - `wrangler.toml` の `main` は `build/worker.entrypoint.mjs`。
-- `bundle exec cloudflare-workers-build` が ERB / assets / Opal / patch / entrypoint 生成まで一括実行。
+- `bundle exec homura build` が ERB / assets / Opal / patch / entrypoint 生成まで一括実行。
 
 ## スキャフォールド済みアプリ
 
 - プロジェクト直下に `worker.entrypoint.mjs`（`main` と一致）。
 - `cf-runtime/` に `setup-node-crypto.mjs` と `worker_module.mjs` をコピー（gem から）。
-- `bundle exec cloudflare-workers-build --standalone` が consumer 向けパイプラインを実行し、`Gemfile` の `path:` から homura の `vendor/` を追加ロードパスへ取り込み（digest / zlib 等の Workers 向け補助ファイル）。
+- `bundle exec homura build --standalone` が consumer 向けパイプラインを実行し、`Gemfile` の `path:` から homura の `vendor/` を追加ロードパスへ取り込み（digest / zlib 等の Workers 向け補助ファイル）。
 
 ## Phase 17 — Email Service（`SEND_EMAIL`）
 

data/lib/cloudflare_workers/build_support.rb

@@ -7,6 +7,7 @@ module CloudflareWorkers
   module BuildSupport
     RUNTIME_GEM_NAME = 'homura-runtime'
     SINATRA_GEM_NAME = 'sinatra-homura'
+    SEQUEL_D1_GEM_NAME = 'sequel-d1'
 
     class << self
       def loaded_spec(name, loaded_specs: Gem.loaded_specs)
@@ -17,7 +18,7 @@ module CloudflareWorkers
         spec = loaded_spec(name, loaded_specs: loaded_specs)
         return spec.full_gem_path if spec
 
-        raise("cloudflare-workers-build: gem #{name} not loaded; use bundle exec from app root")
+        raise("homura build: gem #{name} not loaded; use bundle exec from app root")
       end
 
       def runtime_root(current_file:, loaded_specs: Gem.loaded_specs)
@@ -53,6 +54,37 @@ module CloudflareWorkers
         target_dir
       end
 
+      def standalone_load_paths(project_root, with_db:, loaded_specs: Gem.loaded_specs)
+        root = Pathname(project_root)
+        load_paths = []
+
+        hv = vendor_from_gemfile(root)
+        load_paths << hv.to_s if hv
+
+        load_paths += ['build/auto_await/app', 'app']
+        [
+          gem_lib(RUNTIME_GEM_NAME, loaded_specs: loaded_specs),
+          gem_vendor(RUNTIME_GEM_NAME, loaded_specs: loaded_specs),
+          gem_lib(SINATRA_GEM_NAME, loaded_specs: loaded_specs),
+          gem_vendor(SINATRA_GEM_NAME, loaded_specs: loaded_specs)
+        ].compact.each do |path|
+          load_paths << path
+        end
+
+        if with_db
+          [
+            gem_vendor(SEQUEL_D1_GEM_NAME, loaded_specs: loaded_specs),
+            gem_lib(SEQUEL_D1_GEM_NAME, loaded_specs: loaded_specs)
+          ].compact.each do |path|
+            load_paths << path
+          end
+        end
+
+        load_paths << 'vendor' if root.join('vendor').directory?
+        load_paths << 'build'
+        load_paths.uniq
+      end
+
       def standalone_namespace(project_root, suffix)
         base = Pathname(project_root).basename.to_s
         parts = base.split(/[^A-Za-z0-9]+/).reject(&:empty?)

data/lib/cloudflare_workers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudflareWorkers
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

data/lib/cloudflare_workers.rb

@@ -20,9 +20,10 @@
 #      style entry point and never sees a Cloudflare-specific symbol.
 #
 #   3. Cloudflare::D1Database / KVNamespace / R2Bucket — tiny Ruby wrappers
-#      around the JS bindings. They expose the binding methods as regular
-#      Ruby method calls returning native JS Promises, which the user
-#      routes can `.__await__` inside a `# await: true` block.
+#      around the JS bindings. At the raw runtime layer they still return
+#      Promises, but homura's build-time auto-await pass rewrites the
+#      common Sinatra-facing call sites (`db.execute`, `kv.get`, etc.) so
+#      app code usually stays sync-shaped.
 #
 # Note: Opal Strings are immutable (they map to JS Strings), so this file
 # uses reassignment (`@buffer = @buffer + str`) instead of `<<` mutation.
@@ -209,8 +210,10 @@ module Rack
 
           # Expose D1 / KV / R2 bindings as plain Ruby wrapper objects.
           # The user Sinatra routes reach them via
-          # `env['cloudflare.DB']` / `.KV` / `.BUCKET`, call normal-looking
-          # Ruby methods on them, and `.__await__` the resulting JS Promise.
+          # `env['cloudflare.DB']` / `.KV` / `.BUCKET` and call ordinary
+          # Ruby methods on them. Under the hood those methods are async,
+          # but homura's auto-await build step inserts `.__await__` for the
+          # common binding/helper patterns so app source usually does not.
           js_db = `#{js_env} && #{js_env}.DB`
           js_kv = `#{js_env} && #{js_env}.KV`
           js_r2 = `#{js_env} && #{js_env}.BUCKET`
@@ -603,8 +606,10 @@ module Cloudflare
 
     # ---- sqlite3-ruby compatible high-level API ----------------------
 
-    # Execute a SQL statement with optional bind parameters and return
-    # all result rows as an Array of Hashes.
+    # Execute a SQL statement with optional bind parameters.
+    # Returns a JS Promise resolving to an Array of Hashes; the build-time
+    # auto-await pass rewrites the usual Sinatra call sites so app code can
+    # stay `db.execute(...)` instead of spelling `.__await__`.
     #
     #   db.execute("SELECT * FROM users")                           → Array<Hash>
     #   db.execute("SELECT * FROM users WHERE id = ?", [1])         → Array<Hash>
@@ -616,6 +621,7 @@ module Cloudflare
     end
 
     # Execute and return only the first row (or nil).
+    # Returns a JS Promise resolving to a Hash or nil.
     #
     #   db.get_first_row("SELECT * FROM users WHERE id = ?", [1])  → Hash or nil
     def get_first_row(sql, bind_params = [])
@@ -626,6 +632,7 @@ module Cloudflare
 
     # Execute a write statement (INSERT / UPDATE / DELETE) and return
     # a metadata Hash with `changes`, `last_row_id`, `duration`, etc.
+    # Returns a JS Promise resolving to that metadata Hash.
     #
     #   meta = db.execute_insert("INSERT INTO users (name) VALUES (?)", ["alice"])
     #   meta['last_row_id']  # → 7
@@ -636,7 +643,7 @@ module Cloudflare
     end
 
     # Execute one or more raw SQL statements separated by semicolons.
-    # Useful for schema migrations. Returns the D1 exec result.
+    # Useful for schema migrations. Returns the raw async D1 exec result.
     def execute_batch(sql)
       exec(sql)
     end
@@ -697,6 +704,7 @@ module Cloudflare
     end
 
     # KV#get returns a JS Promise resolving to a String or nil.
+    # In normal Sinatra app code, auto-await usually hides that Promise.
     def get(key)
       js_kv = @js
       err_cls = Cloudflare::KVError
@@ -705,7 +713,8 @@ module Cloudflare
 
     # Put a value. `expiration_ttl:` (seconds) maps to the Workers KV
     # `expirationTtl` option so callers can set TTLs without reaching
-    # for backticks. Returns a JS Promise.
+    # for backticks. Returns a JS Promise; common route/helper call sites
+    # are auto-awaited during the build.
     def put(key, value, expiration_ttl: nil)
       js_kv = @js
       err_cls = Cloudflare::KVError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homura-runtime
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Kazuhiro NISHIYAMA
@@ -42,8 +42,7 @@ description: |
   Rack handler, D1/KV/R2/AI/Queue/Durable Object adapters, multipart/streaming,
   and Opal corelib patches. Use with the `opal` gem and a Module Worker
   (`runtime/worker.mjs` in this gem).
-executables:
-- cloudflare-workers-build
+executables: []
 extensions: []
 extra_rdoc_files: []
 files: