ruby_everywhere 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b4e596b2b262da233f7afa1971c3e2e207e4e7f2416b52c30236892f233b490
-  data.tar.gz: 6395de83ed4e1122c728689ed8f496b4c86178a90f4d917680f7a1913f65e2c3
+  metadata.gz: 43abb21e2044de5630a87ca49d653368af5d84c6186ec993fd4c1b2a588e31c8
+  data.tar.gz: cfb169771be7b208b230c6c9d7b0a63f7ed53061724d0008d5551409309e315f
 SHA512:
-  metadata.gz: d741017d5a726cb2e13aa951fe495ae5bd90793b410fe614fc72b77550da1e6a6589647924d0d3f5ce84771d545b9eff2f144e77319b15d7c5b462b051246e68
-  data.tar.gz: 8952e90b1206420b0aa23ad047c6ea4380dc850bc63b9e8ef389a12af9a690d88c0501d009c11c2f316994065bb87c19ef807d4a0408c78e2324bc2ba5235475
+  metadata.gz: b5086b64a57d5f010bea583175eb954881370c2d9cb304243249645ccd324a900df7b2748037cf2950894722ea85b9c1ae3ddf71617676c42b5ddb5c619b74cc
+  data.tar.gz: e87e280008d30d90a5a85446191673bd7bb2ada124a68a6578068b5f5f078f455461993fddfb5975e606144b029bd49c3fe71379361ee38c3b002769f9af6c19

data/lib/everywhere/commands/build.rb

@@ -50,9 +50,13 @@ module Everywhere
           return
         end
 
-        framework = Framework.detect(root)
-        output ||= File.join("dist", File.basename(framework.root))
-        output_path = File.expand_path(output)
+        framework = Framework.detect(root_path)
+        # dist/ belongs to the APP, not to the shell's cwd: `every platform
+        # runner` invokes us with --root <snapshot> from its own working
+        # directory, and `every release` looks for the .app under <root>/dist.
+        # Resolving a relative default against Dir.pwd scattered the build
+        # products into the runner's checkout instead.
+        output_path = output ? File.expand_path(output) : File.join(root_path, "dist", File.basename(root_path))
         entry_path = File.join(framework.root, entry)
 
         unless File.exist?(entry_path)
@@ -62,22 +66,47 @@ module Everywhere
         UI.step("#{UI.bold(framework.name)} app at #{framework.root}")
 
         if skip_press
-          UI.die!("--skip-press given but #{output} doesn't exist") unless File.exist?(output_path)
-          UI.step("reusing pressed binary #{output}")
+          UI.die!("--skip-press given but #{rel(output_path, root_path)} doesn't exist") unless File.exist?(output_path)
+          UI.step("reusing pressed binary #{rel(output_path, root_path)}")
         else
           press!(framework, entry, ruby, output_path)
         end
 
         bundle_app(output_path, app_name, shell_dir, config, target: target) if RUBY_PLATFORM.include?("darwin")
 
-        UI.success("built #{output} (#{(File.size(output_path) / 1024.0 / 1024.0).round}MB)")
+        UI.success("built #{rel(output_path, root_path)} (#{(File.size(output_path) / 1024.0 / 1024.0).round}MB)")
       end
 
       private
 
+      def rel(path, root_path) = UI.short_path(path.sub("#{root_path}/", "").sub("#{Dir.pwd}/", ""))
+
+      # The precompile step runs against the HOST Ruby — unlike tebako press,
+      # which installs the app's gems itself inside the packaged Ruby. A fresh
+      # machine (a hosted build runner, a brand-new checkout) has Gemfile.lock
+      # but none of the gems, so bin/rails would die with Bundler::GemNotFound.
+      def ensure_gems!(framework)
+        return if Shellout.run?(bundle_env, "bundle", "check", chdir: framework.root, quiet: true)
+
+        UI.step("installing gems #{UI.dim("(bundle install — first build on this machine)")}")
+        Shellout.run!(bundle_env, "bundle", "install", chdir: framework.root)
+      end
+
+      # EVERY_BUNDLE_PATH (set by `every platform runner`) redirects the app's
+      # gems to a stable per-user dir so CI can cache them across builds. It
+      # must be merged EXPLICITLY into each host-side bundler command:
+      # Shellout.unbundled strips inherited BUNDLE_* vars, so an inherited
+      # BUNDLE_PATH would never survive to the child process.
+      def bundle_env
+        path = ENV["EVERY_BUNDLE_PATH"]
+        path ? { "BUNDLE_PATH" => File.expand_path(path) } : {}
+      end
+
       def press!(framework, entry, ruby, output_path)
+        ensure_gems!(framework) if framework.precompile?
+
         UI.step("precompiling assets")
-        Shellout.run!(framework.precompile_env, framework.precompile_command, chdir: framework.root)
+        Shellout.run!(framework.precompile_env.merge(bundle_env), framework.precompile_command, chdir: framework.root)
 
         out_dir = File.dirname(output_path)
         # Tebako packages the whole app root, so stale build products in an
@@ -108,7 +137,7 @@ module Everywhere
         # Leaving precompiled assets behind shadows dev-mode assets (new JS
         # wouldn't load in `every dev` until someone clobbers by hand).
         UI.step("cleaning up precompiled assets")
-        Shellout.run!(framework.precompile_env, framework.cleanup_command, chdir: framework.root)
+        Shellout.run!(framework.precompile_env.merge(bundle_env), framework.cleanup_command, chdir: framework.root)
 
         surface_warnings(log)
       end

data/lib/everywhere/commands/platform/runner.rb

@@ -8,6 +8,7 @@ require "base64"
 require "json"
 require "open3"
 require_relative "../../ui"
+require_relative "../../paths"
 require_relative "../../platform/client"
 
 module Everywhere
@@ -133,7 +134,12 @@ module Everywhere
         # The web UI renders ANSI, but `every release` runs here as a pipe (not a
         # TTY) so it would otherwise strip all color. Force it on — for our own
         # output and for cargo — so the hosted log looks like the local one.
-        forced = { "CLICOLOR_FORCE" => "1", "CARGO_TERM_COLOR" => "always" }
+        #
+        # EVERY_BUNDLE_PATH sends the app's gems to a stable per-user dir
+        # (instead of the runner's own gem env) so CI can cache them across
+        # builds of the same app — the gem analogue of the shell-target cache.
+        forced = { "CLICOLOR_FORCE" => "1", "CARGO_TERM_COLOR" => "always",
+                   "EVERY_BUNDLE_PATH" => Everywhere::Paths.app_bundle_dir }
         success = stream(forced.merge(signing_env), cmd)
 
         dist = File.join(src, "dist")

data/lib/everywhere/framework.rb

@@ -73,6 +73,10 @@ module Everywhere
     # Env each framework needs set before the app loads, beyond NATIVE_PACKAGED.
     def env_exports = {}
 
+    # Whether the build must run anything against the app's bundle on the HOST
+    # Ruby (asset precompile). Sinatra's no-op precompile opts out.
+    def precompile? = precompile_command != "true"
+
     def render_boot_stub(env, setup_line)
       exports = ({ "NATIVE_PACKAGED" => "1" }.merge(env))
         .map { |k, v| "ENV[#{k.inspect}] ||= #{v.inspect}" }.join("\n")

data/lib/everywhere/paths.rb

@@ -45,5 +45,13 @@ module Everywhere
     def cargo_target_dir
       File.join(cache_dir, "shell-target")
     end
+
+    # Where a build runner installs the APP's gems (BUNDLE_PATH), so CI can
+    # cache them across builds of the same app. Local builds never use this —
+    # dev machines keep their own bundler setup; the runner opts in by setting
+    # EVERY_BUNDLE_PATH (see Commands::Build#bundle_env).
+    def app_bundle_dir
+      File.join(cache_dir, "bundle")
+    end
   end
 end

data/lib/everywhere/shellout.rb

@@ -17,8 +17,10 @@ module Everywhere
       UI.die!("command failed: #{cmd.join(" ")}") unless success
     end
 
-    def run?(*cmd)
-      unbundled { system(*cmd) }
+    def run?(*cmd, chdir: Dir.pwd, quiet: false)
+      opts = { chdir: chdir }
+      opts.update(out: File::NULL, err: File::NULL) if quiet
+      unbundled { system(*cmd, **opts) }
     end
 
     # Run a command and capture its combined stdout+stderr. Returns

data/lib/everywhere/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Everywhere
-  VERSION = "0.1.12"
+  VERSION = "0.1.14"
 
   # Version of the @rubyeverywhere/bridge JS this gem ships. bridge/ in the
   # gem IS the npm package (served to Rails apps by Everywhere::Engine,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_everywhere
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Andrea Fomera