async-service 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d808be31f6c38a51c562d5fbe62e9d0e00b2442f0da6396da3730c68952659b
-  data.tar.gz: 26a493d2be8d2f30008d91a468cd0c5910c9fbd3dd8a2d06a06062c7e7f7b108
+  metadata.gz: 6d3363e029c4a990a1c3aebe2f246e55996dfdccc8c5a49b7d15c37222ee0334
+  data.tar.gz: cad8af3bf066578fafbcc38f9dd1a0f34800e79c6392811948a99a89dd0b1402
 SHA512:
-  metadata.gz: 69d5030849df8fbbbda0b24174a305d34f21eb28f5d1af7c21c0f94143882bf6526331279d5b72d118bc8cad3e8a179882c34e36cc0fd84d2d4f61e5004ae50e
-  data.tar.gz: a674262d6cee230b8897e3fd7fa58234e57be40b0ac2b1b2932013ea069d9b39d2e349722645d524a9cedabf2ee7d10e6d64d56bd16d7d875cf012eb68661c04
+  metadata.gz: 3ad2bbecc7ecf2598b7ebb103055eb15d773e163cf72b606e8d9c40762afb063ad03567cbc7ccc320934abf391b80e29b3cfeb418e3dc9ea32a6bcdd80d3702e
+  data.tar.gz: 67b80153901e82d6d46961beae562a47162aa236d230fd4ed9f4d7edebe19fd55c7b631928e99061d01e9f06265e270147ad2e84d301978d2cbac76540747888

data/bin/async-service

@@ -2,26 +2,5 @@
 
 require 'async/service'
 
-configuration = Async::Service::Configuration.new
-
-ARGV.each do |path|
-	configuration.load_file(path)
-end
-
-controller = Async::Service::Controller.new(configuration.services)
-
-begin
-	require 'bundler'
-	Bundler.require(:preload)
-rescue Bundler::GemfileNotFound, LoadError
-	# Ignore.
-end
-
-if Process.respond_to?(:warmup)
-	Process.warmup
-elsif GC.respond_to?(:compact)
-	3.times{GC.start}
-	GC.compact
-end
-
-controller.run
+configuration = Async::Service::Configuration.load
+Async::Service::Controller.run(configuration)

data/lib/async/service/configuration.rb

@@ -12,6 +12,16 @@ module Async
 		#
 		# Environments are key-value maps with lazy value resolution. An environment can inherit from a parent environment, which can provide defaults
 		class Configuration
+			def self.load(paths = ARGV)
+				configuration = self.new
+				
+				paths.each do |path|
+					configuration.load_file(path)
+				end
+				
+				return configuration
+			end
+			
 			# Initialize an empty configuration.
 			def initialize
 				@environments = []

data/lib/async/service/controller.rb

@@ -8,6 +8,30 @@ require 'async/container/controller'
 module Async
 	module Service
 		class Controller < Async::Container::Controller
+			def self.warmup
+				begin
+					require 'bundler'
+					Bundler.require(:preload)
+				rescue Bundler::GemfileNotFound, LoadError
+					# Ignore.
+				end
+				
+				if Process.respond_to?(:warmup)
+					Process.warmup
+				elsif GC.respond_to?(:compact)
+					3.times{GC.start}
+					GC.compact
+				end
+			end
+			
+			def self.run(configuration)
+				controller = Async::Service::Controller.new(configuration.services.to_a)
+				
+				self.warmup
+				
+				controller.run
+			end
+			
 			def initialize(services, **options)
 				super(**options)
 				
@@ -23,7 +47,7 @@ module Async
 				super
 			end
 			
-			# Setup all named services into the given container.
+			# Setup all services into the given container.
 			#
 			# @parameter container [Async::Container::Generic]
 			def setup(container)

data/lib/async/service/environment.rb

@@ -37,7 +37,7 @@ module Async
 					elsif target.respond_to?(:included)
 						target.included(@facet)
 					else
-						raise ::ArgumentError, "Cannot include #{target.inspect} into #{@facet}"
+						::Kernel.raise ::ArgumentError, "Cannot include #{target.inspect} into #{@facet.inspect}!"
 					end
 				end
 				

data/lib/async/service/generic.rb

@@ -14,16 +14,17 @@ module Async
 			# @parameter environment [Build::Environment] The environment to use to construct the service.
 			def self.wrap(environment)
 				evaluator = environment.evaluator
-				service_class = evaluator.service_class || self
 				
-				return service_class.new(environment)
+				if service_class = evaluator.service_class || self
+					return service_class.new(environment, evaluator)
+				end
 			end
 			
 			# Initialize the service from the given environment.
 			# @parameter environment [Build::Environment]
-			def initialize(environment)
+			def initialize(environment, evaluator = environment.evaluator)
 				@environment = environment
-				@evaluator = @environment.evaluator
+				@evaluator = evaluator
 			end
 			
 			def to_h

data/lib/async/service/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Service
-		VERSION = "0.3.0"
+		VERSION = "0.4.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-service
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async