cosmonats 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faaf7e9f0c3b86375099ee43d1125ec1545251d121fedbf8d7596bb0ca8f2461
-  data.tar.gz: 97fd56077b64673e02af110dfab8edbeea424114b1a54f89b240a54d308bbcdc
+  metadata.gz: c0995753e33b278f5a0d2d6455faf07f5c3c604595fa93c6a40260c68b69c160
+  data.tar.gz: c78c109d014f863079c3ee53171a852241b5a0b3082f9a29b1438b5708782436
 SHA512:
-  metadata.gz: db91195e38a240f5091ca616e1cb916707b6943e12fe61b173282a438381b6d258946a59e99445c9f5c26519515c7ea8ba57b95cdfd004ff396ec36c2067002b
-  data.tar.gz: 76eb8aa63116623cdfe1bf1d0ce07a57148f473b9818cc2ab6097501740668d3f3b1f5202f6f83eb91340d13cb713a0836d42db01e70f0f921a9f617fed8b19d
+  metadata.gz: 7947f18a6ab2830fa726d9903eb8ee926bf4bbf897ee71e28c262adc4aa664828c1ad758776aa61caac2964e52c83370cd4d4090c3ce05f399988c79917676e6
+  data.tar.gz: 12a7f6f7e3a715bdda711fa29acbba7db822d17cd4441b008942d7cac0eb66581f2412a4df16811580792af0913c0ffbe1370b0465478e577a6a3a45b714364b

data/bin/cosmo

@@ -4,4 +4,6 @@
 require "bundler/setup"
 require "cosmonats"
 
+Process.setproctitle("cosmo")
+
 Cosmo::CLI.run

data/lib/cosmo/cli.rb

@@ -14,11 +14,12 @@ module Cosmo
     end
 
     def run
-      flags, command, _options = parse
+      flags, command, options = parse
       load_config(flags[:config_file])
       puts self.class.banner
-      require_files(flags[:require])
-      Engine.run(command)
+      boot_application
+      require_path(flags[:require])
+      Engine.run(command, options)
     end
 
     private
@@ -48,15 +49,23 @@ module Cosmo
       Config.load(path)
     end
 
-    def require_files(path)
-      return unless path
+    def boot_application
+      boot_path = File.expand_path("config/boot.rb")
+      require boot_path if File.exist?(boot_path)
 
-      if File.directory?(path)
-        files = Dir[File.expand_path("#{path}/*.rb")]
-        files.each { |f| require f }
-      else
-        require File.expand_path(path)
+      environment_path = File.expand_path("config/environment.rb")
+      require environment_path if File.exist?(environment_path)
+    end
+
+    def require_path(path)
+      if path
+        require_files(path)
+        return # If a path is provided don't load default dirs.
       end
+
+      # Load files from app/streams if they exist.
+      # Streams are always eagerly loaded since they register classes to process events.
+      require_files("app/streams") if File.directory?("app/streams")
     end
 
     def flags_parser(flags) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
@@ -128,20 +137,28 @@ module Cosmo
       when "streams"
         OptionParser.new do |o|
           o.banner = "Usage: cosmo streams [options]"
+          o.separator ""
+          o.separator "  [m] many processors can be specified, in that case single options [1] are ignored"
+          o.separator "  [1] options work only for a single processor"
+          o.separator ""
+
+          o.on "--processors NAMES", "[m] Specify processors names with comma" do |arg|
+            options[:processors] = arg.split(",")
+          end
 
-          o.on "--stream NAME", "Specify stream name" do |arg|
+          o.on "--stream NAME", "[1] Specify stream name" do |arg|
             options[:stream] = arg
           end
 
-          o.on "--subject NAME", "Specify subject name" do |arg|
+          o.on "--subject NAME", "[1] Specify subject name" do |arg|
             options[:subject] = arg
           end
 
-          o.on "--consumer_name NAME", "Specify consumer name" do |arg|
+          o.on "--consumer_name NAME", "[1] Specify consumer name" do |arg|
             options[:consumer_name] = arg
           end
 
-          o.on "--batch_size NUM", Integer, "Number of messages in the batch" do |arg|
+          o.on "--batch_size NUM", Integer, "[1] Number of messages in the batch" do |arg|
             options[:batch_size] = arg
           end
         end
@@ -156,6 +173,18 @@ module Cosmo
       end
     end
 
+    def require_files(path)
+      path = File.expand_path(path)
+
+      if File.directory?(path)
+        files = Dir["#{path}/**/*.rb"]
+        files.each { |f| require f }
+        return
+      end
+
+      require path
+    end
+
     # rubocop:disable Layout/TrailingWhitespace,Lint/IneffectiveAccessModifier
     def self.banner
       <<-TEXT

data/lib/cosmo/engine.rb

@@ -23,12 +23,16 @@ module Cosmo
       @running = Concurrent::AtomicBoolean.new
     end
 
-    def run(type)
+    def run(type, options)
       handler = Utils::Signal.trap(:INT, :TERM)
       Logger.info "Starting processing, hit Ctrl-C to stop"
 
-      @processors = type && PROCESSORS.key?(type.to_sym) ? [PROCESSORS[type.to_sym]] : PROCESSORS.values
-      @processors = @processors.map { _1.run(@pool, @running) }
+      processor_classes = type && PROCESSORS.key?(type.to_sym) ? [PROCESSORS[type.to_sym]] : PROCESSORS.values
+      @processors = processor_classes.map { _1.run(@pool, @running, options) }
+      if @running.false?
+        Logger.warn "Shutting down... (No processors are running)"
+        return
+      end
 
       signal = handler.wait
       Logger.info "Shutting down... (#{signal} received)"

data/lib/cosmo/job/processor.rb

@@ -3,7 +3,7 @@
 module Cosmo
   module Job
     class Processor < ::Cosmo::Processor
-      def initialize(pool, running)
+      def initialize(pool, running, options)
         super
         @weights = []
       end

data/lib/cosmo/processor.rb

@@ -6,9 +6,10 @@ module Cosmo
       new(...).tap(&:run)
     end
 
-    def initialize(pool, running)
+    def initialize(pool, running, options)
       @pool = pool
       @running = running
+      @options = options
       @consumers = {}
     end
 

data/lib/cosmo/stream/processor.rb

@@ -3,7 +3,7 @@
 module Cosmo
   module Stream
     class Processor < ::Cosmo::Processor
-      def initialize(pool, running)
+      def initialize(pool, running, options)
         super
         @configs = {}
         @processors = {}
@@ -63,18 +63,10 @@ module Cosmo
         raise
       end
 
-      def setup_configs # rubocop:disable Metrics/AbcSize
-        @configs.merge!(
-          Config.dig(:consumers, :streams).to_h do |config|
-            klass = Utils::String.safe_constantize(config[:class])
-            [config[:stream].to_sym, klass ? config.merge(class: klass) : nil]
-          end.compact
-        )
-        @configs.merge!(
-          Config.system[:streams].to_h do |klass|
-            [klass.default_options[:stream].to_sym, klass.default_options.merge(class: klass)]
-          end
-        )
+      def setup_configs
+        configs = static_config.merge(dynamic_config)
+        configs = configs.select { |_, c| @options[:processors].include?(c[:class].name) } if @options[:processors]
+        @configs.merge!(configs)
       end
 
       def setup_processors
@@ -89,6 +81,20 @@ module Cosmo
           @consumers[stream_name] = client.subscribe(subjects, consumer_name, config.merge(deliver_policy))
         end
       end
+
+      def static_config
+        Config.dig(:consumers, :streams)&.filter_map do |config|
+          next unless (klass = Utils::String.safe_constantize(config[:class]))
+
+          [config[:stream].to_sym, config.merge(class: klass)]
+        end.to_h
+      end
+
+      def dynamic_config
+        Config.system[:streams].to_h do |klass|
+          [klass.default_options[:stream].to_sym, klass.default_options.merge(class: klass)]
+        end
+      end
     end
   end
 end

data/lib/cosmo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cosmo
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/sig/cosmo/cli.rbs

@@ -16,7 +16,11 @@ module Cosmo
 
     def load_config: (::String? path) -> void
 
-    def require_files: (::String? path) -> void
+    def boot_application: () -> void
+
+    def require_path: (::String? path) -> void
+
+    def require_files: (::String path) -> void
 
     def flags_parser: (Hash[Symbol, untyped] flags) -> untyped
 

data/sig/cosmo/engine.rbs

@@ -14,7 +14,7 @@ module Cosmo
 
     def initialize: () -> void
 
-    def run: (::String? type) -> void
+    def run: (::String? type, Hash[Symbol, untyped] options) -> void
 
     def shutdown: () -> void
   end

data/sig/cosmo/processor.rbs

@@ -3,10 +3,11 @@ module Cosmo
     @pool: Utils::ThreadPool
     @running: untyped
     @consumers: Hash[Symbol, untyped]
+    @options: Hash[Symbol, untyped]
 
     def self.run: (*untyped) -> Processor
 
-    def initialize: (Utils::ThreadPool pool, untyped running) -> void
+    def initialize: (Utils::ThreadPool pool, untyped running, Hash[Symbol, untyped] options) -> void
 
     def run: () -> void
 

data/sig/cosmo/stream/processor.rbs

@@ -21,6 +21,10 @@ module Cosmo
       def setup_processors: () -> void
 
       def setup_consumers: () -> void
+
+      def static_config: -> Hash[Symbol, untyped]
+
+      def dynamic_config: -> Hash[Symbol, untyped]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmonats
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dmitry Vorotilin