run_rabbit_run 0.0.3 → 0.0.4

data/lib/run_rabbit_run/config/worker.rb

@@ -10,7 +10,7 @@ module RunRabbitRun
           processes:     1,
         }.merge(options)
 
-        @options[:processes] = 1 unless @options[:processes].to_i > 0
+        @options[:processes] = 1 unless @options[:processes].to_i >= 0 
 
         raise "File not exists: #{@options[:path]}" unless File.exists?(@options[:path])
       end
@@ -24,7 +24,7 @@ module RunRabbitRun
       end
 
       def processes value
-        options[:processes] = value > 0 ? value : 1
+        options[:processes] = value >= 0 ? value : 1
       end
 
       def log_to_master value

data/lib/run_rabbit_run/processes/worker.rb

@@ -26,7 +26,9 @@ module RunRabbitRun
             system_messages.publish(@name, :master, :message_processed, { queue: queue.name } ) if @options[:log_to_master]
           end 
 
-          rabbitmq.instance_eval File.read(@options[:path]), @options[:path]
+          add_timer 1 do
+            rabbitmq.instance_eval File.read(@options[:path]), @options[:path]
+          end
 
           before_exit do
             system_messages.publish(@name, :master, :process_quit)

data/lib/run_rabbit_run/version.rb

@@ -1,3 +1,3 @@
 module RunRabbitRun
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/run_rabbit_run/workers.rb

@@ -18,16 +18,32 @@ module RunRabbitRun
 
     def check
       @workers.each do | name, workers |
+        processes = RunRabbitRun.config[:workers][name][:processes]
+        
         workers.each do | guid, worker |
-          worker.run unless worker.running?
+          unless worker.running?
+            if processes == 0
+              @workers[name].delete(guid)
+            else
+              worker.run
+            end
+          end 
         end
-        diff = RunRabbitRun.config[:workers][name][:processes] - workers.size
+        diff = processes - workers.size
         diff.times{ run_new_worker name } if diff > 0
       end
     end
 
     def add name
-      run_new_worker name
+      if RunRabbitRun.config[:run].include? name.to_sym
+        run_new_worker name
+      else
+        if RunRabbitRun.config[:workers].keys.include? name.to_sym
+          RunRabbitRun.logger.error "[#{name}] worker is not included into [#{RunRabbitRun.config[:environment]}] profile"
+        else
+          RunRabbitRun.logger.error "No configuration found for [#{name}] worker"
+        end
+      end
     end
 
     def remove name

data/run_rabbit_run.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency "amqp"
 
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'pry-remote'
 end

data/spec/dummy/config/rrr.rb

@@ -13,3 +13,5 @@ worker :worker2, 'workers/worker_name_2.rb' do
 
   processes 1
 end
+
+worker :worker3, 'workers/worker_name_3.rb', processes: 0

data/spec/dummy/config/rrr/development.rb

@@ -1 +1 @@
-run :worker1, :worker2
+run :worker1, :worker2, :worker3

data/spec/dummy/workers/worker_name_3.rb

@@ -0,0 +1,5 @@
+RunRabbitRun.logger.info "run worker 3 for 20 seconds"
+
+sleep 20
+
+stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_rabbit_run
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -75,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-remote
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: RunRabbitRun gem lets to run and manage multiple ruby processes for RabbitMQ
 email:
 - arturs.kreipans@gmail.com
@@ -126,6 +110,7 @@ files:
 - spec/dummy/config/rrr/development.rb
 - spec/dummy/workers/worker_name_1.rb
 - spec/dummy/workers/worker_name_2.rb
+- spec/dummy/workers/worker_name_3.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -157,3 +142,4 @@ test_files:
 - spec/dummy/config/rrr/development.rb
 - spec/dummy/workers/worker_name_1.rb
 - spec/dummy/workers/worker_name_2.rb
+- spec/dummy/workers/worker_name_3.rb