symphony 0.8.0 → 0.9.0

data/spec/symphony/task_group/oneshot_spec.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../../helpers'
+
+require 'symphony/task_group/oneshot'
+
+
+describe Symphony::TaskGroup::Oneshot do
+
+	let( :task ) do
+		Class.new( Symphony::Task ) do
+			extend Symphony::MethodUtilities
+
+			singleton_attr_accessor :has_before_forked, :has_after_forked, :has_run
+
+			def self::before_fork
+				self.has_before_forked = true
+			end
+			def self::after_fork
+				self.has_after_forked = true
+			end
+			def self::run
+				self.has_run = true
+			end
+		end
+	end
+
+	let( :task_group ) do
+		described_class.new( task, 2 )
+	end
+
+
+	it "starts workers for each of its worker slots" do
+		allow( Process ).to receive( :setpgid )
+		expect( Process ).to receive( :fork ).and_return( 11, 22 )
+		expect( task_group.adjust_workers ).to eq([ 11, 22 ])
+	end
+
+
+	it "doesn't start workers if the max number of workers are already started" do
+		expect( Process ).to_not receive( :fork )
+		task_group.workers << 11 << 22
+		expect( task_group.adjust_workers ).to be_nil
+	end
+
+
+	it "doesn't start anything if it's throttled" do
+		# Simulate a child starting up and failing
+		task_group.instance_variable_set( :@last_child_started, Time.now )
+		task_group.adjust_throttle( 5 )
+
+		expect( Process ).to_not receive( :fork )
+		expect( task_group.adjust_workers ).to be_nil
+	end
+end
+

data/spec/symphony/task_group_spec.rb

@@ -0,0 +1,93 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../helpers'
+
+describe Symphony::TaskGroup do
+
+	let( :task ) do
+		Class.new( Symphony::Task ) do
+			extend Symphony::MethodUtilities
+
+			singleton_attr_accessor :has_before_forked, :has_after_forked, :has_run
+
+			def self::before_fork
+				self.has_before_forked = true
+			end
+			def self::after_fork
+				self.has_after_forked = true
+			end
+			def self::run( * )
+				self.has_run = true
+			end
+		end
+	end
+
+	let( :task_group ) { described_class.new(task, 2) }
+
+
+	it "can start and stop workers for its task" do
+		pid = 17
+
+		expect( task_group.workers ).to be_empty
+
+		expect( Process ).to receive( :fork ) do |*args, &block|
+			block.call
+			pid
+		end
+		expect( Process ).to receive( :setpgid ).with( pid, 0 )
+		task_group.start_worker
+
+		expect( task_group.workers ).to_not be_empty
+		expect( task_group.workers.size ).to eq( 1 )
+		expect( task_group.workers.first ).to eq( pid )
+
+		expect( Process ).to receive( :kill ).with( :TERM, task_group.workers.first )
+		task_group.stop_worker
+
+		status = double( Process::Status, :success? => true )
+		task_group.on_child_exit( pid, status )
+		expect( task_group.workers ).to be_empty
+	end
+
+
+	it "can stop all of its workers" do
+		task_group.workers << 11 << 22 << 33 << 44
+		expect( Process ).to receive( :kill ).with( :TERM, 11 )
+		expect( Process ).to receive( :kill ).with( :TERM, 22 )
+		expect( Process ).to receive( :kill ).with( :TERM, 33 )
+		expect( Process ).to receive( :kill ).with( :TERM, 44 )
+		task_group.stop_all_workers
+	end
+
+
+	it "can restart all of its workers" do
+		task_group.workers << 11 << 22 << 33 << 44
+		expect( Process ).to receive( :kill ).with( :HUP, 11 )
+		expect( Process ).to receive( :kill ).with( :HUP, 22 )
+		expect( Process ).to receive( :kill ).with( :HUP, 33 )
+		expect( Process ).to receive( :kill ).with( :HUP, 44 )
+		task_group.restart_workers
+	end
+
+
+	it "requires its concrete derivatives to overload #adjust_workers" do
+		expect {
+			task_group.adjust_workers
+		}.to raise_error( NotImplementedError, /needs to provide/i )
+	end
+
+
+	it "provides a mechanism for throttling task startups" do
+		expect( task_group ).to_not be_throttled
+		expect( task_group.throttle_seconds ).to eq( 0 )
+
+		# Simulate a child starting up and failing
+		task_group.instance_variable_set( :@last_child_started, Time.now )
+		task_group.adjust_throttle( 5 )
+
+		expect( task_group ).to be_throttled
+		expect( task_group.throttle_seconds ).to be > 0
+	end
+
+end
+

data/spec/symphony_spec.rb

@@ -10,6 +10,7 @@ describe Symphony do
 
 	before( :each ) do
 		ENV.delete( 'SYMPHONY_CONFIG' )
+		Symphony.configure( tasks: ['test', 'test'] )
 	end
 
 
@@ -65,5 +66,10 @@ describe Symphony do
 		described_class.load_config( 'a/different/configfile.yml', database: {dbname: 'test'} )
 	end
 
+	it "loads a task class for each configured task" do
+		expect( Symphony.tasks.size ).to eq( 1 )
+		expect( Symphony.tasks ).to include( Symphony::SpecHelpers::TestTask )
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphony
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Granger
@@ -13,7 +13,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTQwMzE5MDQzNTI2WhcNMTUwMzE5MDQzNTI2WjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
   +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
@@ -24,14 +24,14 @@ cert_chain:
   AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
   qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
   BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  TuL1Bzl6TBs1YEzEubFHb9XAPgehWzzUudjDKzTRd+uyZmxnomBqTCQjT5ucNRph
-  3jZ6bhLNooLQxTjIuHodeGcEMHZdt4Yi7SyPmw5Nry12z6wrDp+5aGps3HsE5WsQ
-  Zq2EuyEOc96g31uoIvjNdieKs+1kE+K+dJDjtw+wTH2i63P7r6N/NfPPXpxsFquo
-  wcYRRrHdR7GhdJeT+V8Q8Bi5bglCUGdx+8scMgkkePc98k9osQHypbACmzO+Bqkv
-  c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
-  ggcrPfcYeTwWlfZPu2LrBg==
+  lUKo3NXePpuvN3QGsOLJ6QhNd4+Q9Rz75GipuMrCl296V8QFkd2gg9EG44Pqtk+9
+  Zac8TkKc9bCSR0snakp+cCPplVvZF0/gMzkSTUJkDBHlNV16z73CyWpbQQa+iLJ4
+  uisI6gF2ZXK919MYLn2bFJfb7OsCvVfyTPqq8afPY+rq9vlf9ZPwU49AlD8bPRic
+  0LX0gO5ykvETIOv+WgGcqp96ceNi9XVuJMh20uWuw6pmv/Ub2RqAf82jQSbpz09G
+  G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
+  xn3DzOkDE6NYbk8gC9rTsA==
   -----END CERTIFICATE-----
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
@@ -81,14 +81,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement
@@ -243,20 +243,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 description: |-
   Symphony is a subscription-based asynchronous job system. It
   allows you to define jobs that watch for lightweight events from a
@@ -282,7 +296,7 @@ extra_rdoc_files:
 - History.rdoc
 - Manifest.txt
 - README.rdoc
-- TODO.md
+- UPGRADING.md
 - USAGE.rdoc
 files:
 - ".simplecov"
@@ -291,7 +305,7 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- TODO.md
+- UPGRADING.md
 - USAGE.rdoc
 - bin/symphony
 - bin/symphony-task
@@ -303,15 +317,24 @@ files:
 - lib/symphony/queue.rb
 - lib/symphony/routing.rb
 - lib/symphony/signal_handling.rb
+- lib/symphony/statistics.rb
 - lib/symphony/task.rb
+- lib/symphony/task_group.rb
+- lib/symphony/task_group/longlived.rb
+- lib/symphony/task_group/oneshot.rb
 - lib/symphony/tasks/auditor.rb
 - lib/symphony/tasks/failure_logger.rb
+- lib/symphony/tasks/oneshot_simulator.rb
 - lib/symphony/tasks/simulator.rb
 - spec/helpers.rb
 - spec/symphony/daemon_spec.rb
 - spec/symphony/mixins_spec.rb
 - spec/symphony/queue_spec.rb
 - spec/symphony/routing_spec.rb
+- spec/symphony/statistics_spec.rb
+- spec/symphony/task_group/longlived_spec.rb
+- spec/symphony/task_group/oneshot_spec.rb
+- spec/symphony/task_group_spec.rb
 - spec/symphony/task_spec.rb
 - spec/symphony_spec.rb
 homepage: http://bitbucket.org/ged/symphony
@@ -338,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.3
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Symphony is a subscription-based asynchronous job system

data/TODO.md

@@ -1,3 +0,0 @@
-
-[ ] Per Task throttling for daemon
-[ ] Task scaling (min/max settings), check queue backlog during received message