expedite 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a83d8e6d3ba40d5e35466b011f32538004da8cf4c680cbf7b7b8d492110d46b
-  data.tar.gz: 8cbdb627f4c2cf7468be1d478fe3811a974a95a6ac429ace89bfea14ad09090a
+  metadata.gz: 8babab9c1e4ea0a7e6b07fe21738b029200d6f32cf1630552bce7fef3a7f6092
+  data.tar.gz: c24fd8f9e9cd7720c32d37329c67cccb089987b8a24df30bfedb45cdb20f48e8
 SHA512:
-  metadata.gz: 875af703feeeae36c5f0986a6049dbd0867182298446aa6d9a6a1e2bce1ecc1914b7be8acfa367c6a140cb77743b1654fb7088c3913c8573f38e45cb21e6865b
-  data.tar.gz: 589627e2e61a4dc7fef263da86ff44f24ac31b32f301063595f3d0ba979ff579ccd5d54365ecca608ce2c2dd7e4cd88aeda089573189500c0da495d84bf778f5
+  metadata.gz: 8beb17a4d477869134b0775b8437e15f51dbb9e51138b49355ea5fade24e7a771b07fdfec98f92c5bb28bf0cc876fa673befd3bd38848ca8c74fcda143996bd9
+  data.tar.gz: 3d810666ae634dfc032c99ee2b73d55f17790b552c85ab6dd4ba1e486c19374ac6e1d36fb0ff73badb1d5a807a5a1f1520ca7060dcda9e72ee2d306efed6cec1

data/lib/expedite/client/agent_proxy.rb

@@ -0,0 +1,27 @@
+require 'expedite/client/exec'
+require 'expedite/client/invoke'
+
+module Expedite
+  module Client
+    class AgentProxy
+      attr_accessor :env, :agent
+
+      ##
+      #
+      # @param env [Expedite::Env] Environment
+      # @param agent [String] Name of the agent
+      def initialize(env:, agent:)
+        self.env = env
+        self.agent = agent
+      end
+
+      def exec(*args)
+        Client::Exec.new(env: env, agent: agent).call(*args)
+      end
+
+      def invoke(*args)
+        Client::Invoke.new(env: env, agent: agent).call(*args)
+      end
+    end
+  end
+end

data/lib/expedite/client/base.rb

@@ -106,7 +106,9 @@ module Expedite
       def boot_server
         env.socket_path.unlink if env.socket_path.exist?
 
-        pid     = Process.spawn(gem_env, env.server_command, out: File::NULL)
+        pid = Bundler.with_original_env do
+          Process.spawn(gem_env, env.server_command, out: File::NULL, chdir: env.root)
+        end
         timeout = Time.now + BOOT_TIMEOUT
 
         @server_booted = true
@@ -118,9 +120,9 @@ module Expedite
             # Server did not start
             raise ArgumentError, "Server exited: #{status.exitstatus}"
           elsif Time.now > timeout
-            $stderr.puts "Starting Expedite server with `#{env.server_command}` " \
-                         "timed out after #{BOOT_TIMEOUT} seconds"
-            exit 1
+            raise "Starting Expedite server with `#{env.server_command}` " \
+                  "timed out after #{BOOT_TIMEOUT} seconds. Was waiting for #{env.socket_path} to appear."
+            #exit 1
           end
 
           sleep 0.1

data/lib/expedite/env.rb

@@ -6,19 +6,31 @@ require 'expedite/server/application_manager'
 module Expedite
   class Env
     attr_accessor :root
-    attr_accessor :application_id, :app_name, :log_file
+    attr_accessor :application_id, :app_name, :log_file, :bundler
     attr_reader :applications
 
-    def initialize(root: nil, app_name: nil, log_file: nil)
-      @root = root || Dir.pwd
+    ##
+    # The environment containing the target application.
+    #
+    # The root and app_name are used to derive the socket.
+    # @param root [String] Path to the root directory.
+    # @param app_name [String] The name of the application.
+    # @param log_file [IO] Path to log file. If nil, logs are discarded.
+    # @param bundler [Boolean] If true, `bundle exec` will be added in front
+    #                          of the server command. Defaults to true.
+    def initialize(root: nil, app_name: nil, log_file: nil, bundler: true)
+      # Use realpath so that directories that are symlinked end up with
+      # the same root. This is important for getting the correct socket.
+      @root = File.realpath(root || Dir.pwd)
       @app_name = app_name || File.basename(@root)
       @log_file = log_file || File.open(File::NULL, "a")
-      @tmp_path = nil
+      @bundler = bundler
 
-      @application_id = Digest::SHA1.hexdigest(@root)
+      @application_id = Digest::SHA1.hexdigest(@root + "|" + @app_name)
+      @tmp_path = nil
 
-      env = self
-      @applications = Server::ApplicationManager.new(env)
+      # TODO: @applications should only be available in the server
+      @applications = Server::ApplicationManager.new(self)
     end
 
     def version
@@ -49,7 +61,13 @@ module Expedite
     end
 
     def server_command
-      "#{File.expand_path("../../../bin/expedite", __FILE__)} server --background"
+      bin_expedite = File.expand_path("../../../bin/expedite", __FILE__)
+      cmd = if bundler
+        "bundle exec #{bin_expedite}"
+      else
+        bin_expedite
+      end
+      "#{cmd} server --background"
     end
 
     def graceful_termination_timeout

data/lib/expedite/errors.rb

@@ -11,4 +11,10 @@ module Expedite
 
   class AgentNotFoundError < Error
   end
+
+  ##
+  # Wraps exceptions from client calls.
+  #
+  class InvokeError < Error
+  end
 end

data/lib/expedite/protocol.rb

@@ -10,6 +10,25 @@ module Expedite
       self.write data
     end
 
+    ##
+    # Result is an exception
+    #
+    def send_exception(e, env)
+      if !e.is_a?(Expedite::Error)
+        ie = Expedite::InvokeError.new("#{e.class}: #{e.message}")
+        ie.set_backtrace(e.backtrace)
+        e = ie
+      end
+      self.send_object({"exception" => e}, env)
+    end
+
+    ##
+    # Result is a normal return value
+    #
+    def send_return(obj, env)
+      self.send_object({"return" => obj}, env)
+    end
+
     def recv_object
       len = self.gets.to_i
       data = self.read(len)
@@ -18,4 +37,6 @@ module Expedite
   end
 end
 
+module ActiveRecord
+end
 IO.include ::Expedite::Protocol

data/lib/expedite/server/agent.rb

@@ -223,9 +223,9 @@ module Expedite
           begin
             ret = action.call(*args)
           rescue => e
-            client.send_object({"exception" => e}, self.env)
+            client.send_exception(e, self.env)
           else
-            client.send_object({"return" => ret}, self.env)
+            client.send_return(ret, self.env)
           end
         end
       end

data/lib/expedite/server/controller.rb

@@ -7,6 +7,9 @@ require "expedite/signals"
 
 module Expedite
   module Server
+    ##
+    # Controls the `expedite server`.
+    #
     class Controller
       include Signals
 
@@ -150,7 +153,7 @@ module Expedite
             # boot only
             #@child_socket = client.recv_io
             #@log_file = client.recv_io
-            unix_socket.send_object({"exception" => e}, env)
+            unix_socket.send_exception(e, env)
 
             unix_socket.close
             client.close

data/lib/expedite/version.rb

@@ -1,3 +1,3 @@
 module Expedite
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/expedite.rb

@@ -1,33 +1,14 @@
-require 'expedite/client/exec'
-require 'expedite/client/invoke'
+require 'expedite/client/agent_proxy'
 require 'expedite/syntax'
 
-module Expedite
-  class AgentProxy
-    attr_accessor :env, :agent
-
-    def initialize(env:, agent:)
-      self.env = env
-      self.agent = agent
-    end
-
-    def exec(*args)
-      Client::Exec.new(env: env, agent: agent).call(*args)
-    end
-
-    def invoke(*args)
-      Client::Invoke.new(env: env, agent: agent).call(*args)
-    end
-  end
-end
 
 module Expedite
   ##
   # Returns a client to dispatch actions to the specified agent
-  def self.agent(agent)
-    @clients ||= Hash.new do |h, k|
-      AgentProxy.new(env: Env.new, agent: agent)
-    end
-    @clients[agent]
+  # @param name [String] Name of the agent that we want to talk to
+  # @param env [Expedite::Env] Defaults to an environment pointing to the
+  #                            current directory
+  def self.agent(name, env: Env.new)
+    Client::AgentProxy.new(env: env, agent: name)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expedite
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Bing-Chang Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies: []
 description: Manages Ruby processes that can be used to spawn child processes faster.
 email: johnny.lai@me.com
@@ -29,6 +29,7 @@ files:
 - lib/expedite/cli/server.rb
 - lib/expedite/cli/status.rb
 - lib/expedite/cli/stop.rb
+- lib/expedite/client/agent_proxy.rb
 - lib/expedite/client/base.rb
 - lib/expedite/client/exec.rb
 - lib/expedite/client/invoke.rb
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Expedite startup of Ruby process