symphony 0.12.5 → 0.14.0

data/lib/symphony/task_group.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'set'
 require 'pluggability'

data/lib/symphony/task_group/longlived.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'set'
 require 'symphony/task_group' unless defined?( Symphony::TaskGroup )
@@ -96,7 +96,7 @@ class Symphony::TaskGroup::LongLived < Symphony::TaskGroup
 		end
 
 		return @queue
-	rescue Bunny::NotFound, Bunny::ChannelAlreadyClosed => err
+	rescue Bunny::NotFound, Bunny::ChannelAlreadyClosed
 		self.log.info "Child hasn't created the queue yet; deferring"
 		Symphony::Queue.reset
 

data/lib/symphony/task_group/oneshot.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'symphony/task_group' unless defined?( Symphony::TaskGroup )
 

data/spec/helpers.rb

@@ -48,6 +48,10 @@ module Symphony::SpecHelpers
 			def initialize
 				@queue = nil
 				@exchange = nil
+				@open = true
+			end
+			def open?
+				return @open
 			end
 			def queue( name, opts={} )
 				return @queue ||= DummySession::Queue.new( self )
@@ -60,7 +64,9 @@ module Symphony::SpecHelpers
 			def number
 				return 1
 			end
-			def close; end
+			def close
+				@open = false
+			end
 		end
 
 		class Exchange
@@ -86,14 +92,24 @@ end
 
 ### Mock with RSpec
 RSpec.configure do |config|
-	config.run_all_when_everything_filtered = true
-	config.filter_run :focus
-	config.order = 'random'
-	config.expect_with( :rspec )
-	config.mock_with( :rspec ) do |mock|
-		mock.syntax = :expect
+	config.expect_with :rspec do |expectations|
+		expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+		expectations.syntax = :expect
+	end
+
+	config.mock_with :rspec do |mocks|
+		mocks.verify_partial_doubles = true
 	end
 
+	config.run_all_when_everything_filtered = true
+	config.filter_run_when_matching :focus
+	config.order = :random
+	config.example_status_persistence_file_path = 'spec/.state'
+	config.disable_monkey_patching!
+	config.warnings = true
+	config.profile_examples = 5
+
+
 	config.include( Loggability::SpecHelpers )
 	config.include( Symphony::SpecHelpers )
 end

data/spec/symphony/daemon_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 
@@ -19,7 +19,7 @@ class Test3Task < Symphony::Task
 end
 
 
-describe Symphony::Daemon do
+RSpec.describe Symphony::Daemon do
 
 	before( :all ) do
 		@pids = ( 200..65534 ).cycle

data/spec/symphony/mixins_spec.rb

@@ -5,12 +5,16 @@ require_relative '../helpers'
 require 'symphony/mixins'
 
 
-describe Symphony, 'mixins' do
+RSpec.describe Symphony, 'mixins' do
 
 	describe Symphony::MethodUtilities, 'used to extend a class' do
 
 		let!( :extended_class ) do
-			klass = Class.new
+			klass = Class.new do
+				def initialize
+					@foo = nil
+				end
+			end
 			klass.extend( Symphony::MethodUtilities )
 			klass
 		end

data/spec/symphony/queue_spec.rb

@@ -4,7 +4,7 @@ require_relative '../helpers'
 
 require 'symphony/queue'
 
-describe Symphony::Queue do
+RSpec.describe Symphony::Queue do
 
 
 	before( :each ) do
@@ -128,7 +128,33 @@ describe Symphony::Queue do
 			expect( new_channel ).to receive( :prefetch ).
 				with( Symphony::Queue::DEFAULT_PREFETCH )
 			expect( new_channel ).to receive( :queue ).
-				with( queue.name, auto_delete: true ).
+				with( queue.name, auto_delete: true, arguments: {} ).
+				and_return( amqp_queue )
+			expect( amqp_queue ).to receive( :bind ).
+				with( described_class.amqp_exchange, routing_key: 'floppy.rabbit.#' )
+
+			expect( queue.create_amqp_queue ).to be( amqp_queue )
+		end
+
+
+		it "can declare the queue's x-queue-type" do
+			testing_task_class.subscribe_to( 'floppy.rabbit.#' )
+			testing_task_class.queue_type( 'classic' )
+			expect( described_class.amqp_channel ).to receive( :queue ).
+				with( queue.name, passive: true ).
+				and_raise( Bunny::NotFound.new("no such queue", described_class.amqp_channel, true) )
+			expect( described_class.amqp_channel ).to receive( :open? ).
+				and_return( false )
+
+			# Channel is reset after queue creation fails
+			new_channel = double( "New AMQP channel" )
+			amqp_queue = double( "AMQP queue" )
+			allow( described_class.amqp_session ).to receive( :create_channel ).
+				and_return( new_channel )
+			expect( new_channel ).to receive( :prefetch ).
+				with( Symphony::Queue::DEFAULT_PREFETCH )
+			expect( new_channel ).to receive( :queue ).
+				with( queue.name, auto_delete: true, arguments: { 'x-queue-type' => 'classic' } ).
 				and_return( amqp_queue )
 			expect( amqp_queue ).to receive( :bind ).
 				with( described_class.amqp_exchange, routing_key: 'floppy.rabbit.#' )

data/spec/symphony/routing_spec.rb

@@ -7,7 +7,7 @@ require 'symphony'
 require 'symphony/routing'
 
 
-describe Symphony::Routing do
+RSpec.describe Symphony::Routing do
 
 	let( :task_class ) do
 		Class.new( Symphony::Task ) do

data/spec/symphony/statistics_spec.rb

@@ -5,7 +5,7 @@ require_relative '../helpers'
 require 'symphony/statistics'
 
 
-describe Symphony::Statistics do
+RSpec.describe Symphony::Statistics do
 
 
 	let( :including_class ) do

data/spec/symphony/task_group/longlived_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../helpers'
 
 require 'symphony/task_group/longlived'
 
-describe Symphony::TaskGroup::LongLived do
+RSpec.describe Symphony::TaskGroup::LongLived do
 
 	FIRST_PID = 414
 

data/spec/symphony/task_group/oneshot_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 require 'symphony/task_group/oneshot'
 
 
-describe Symphony::TaskGroup::Oneshot do
+RSpec.describe Symphony::TaskGroup::Oneshot do
 
 	let( :task ) do
 		Class.new( Symphony::Task ) do

data/spec/symphony/task_group_spec.rb

@@ -2,7 +2,7 @@
 
 require_relative '../helpers'
 
-describe Symphony::TaskGroup do
+RSpec.describe Symphony::TaskGroup do
 
 	let( :task ) do
 		Class.new( Symphony::Task ) do

data/spec/symphony/task_spec.rb

@@ -4,7 +4,7 @@ require_relative '../helpers'
 
 require 'symphony/task'
 
-describe Symphony::Task do
+RSpec.describe Symphony::Task do
 
 	before( :all ) do
 		Symphony::Queue.configure
@@ -70,7 +70,7 @@ describe Symphony::Task do
 			end
 		end
 		let( :payload ) {{ "the" => "payload" }}
-		let( :serialized_payload ) { Yajl.dump(payload) }
+		let( :serialized_payload ) { JSON.generate(payload) }
 		let( :metadata ) {{ :content_type => 'application/json' }}
 		let( :queue ) do
 			obj = Symphony::Queue.for_task( task_class )
@@ -99,6 +99,23 @@ describe Symphony::Task do
 		end
 
 
+		it "can set the x-queue-type for the queue" do
+			task = Class.new( described_class ) do
+				queue_name 'wascally.wabbit'
+				queue_type 'classic'
+			end
+			expect( task.queue_type ).to eq( 'classic' )
+		end
+
+
+		it "has a queue type of nil if unspecified" do
+			task = Class.new( described_class ) do
+				queue_name 'wascally.wabbit'
+			end
+			expect( task.queue_type ).to eq( nil )
+		end
+
+
 		it "can set the number of messages to prefetch" do
 			task_class.prefetch( 10 )
 			expect( task_class.prefetch ).to eq( 10 )

data/spec/symphony_spec.rb

@@ -6,7 +6,7 @@ require 'rspec'
 require 'symphony'
 
 
-describe Symphony do
+RSpec.describe Symphony do
 
 	before( :each ) do
 		ENV.delete( 'SYMPHONY_CONFIG' )

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: symphony
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.14.0
 platform: ruby
 authors:
 - Michael Granger
 - Mahlon E. Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xODExMjAxODI5NTlaFw0xOTExMjAxODI5
-  NTlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEwMDkwMDM2NTdaFw0yMDEwMDgwMDM2
+  NTdaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
   hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
   L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
   M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -25,32 +25,38 @@ cert_chain:
   N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
   VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
   FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
-  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAP9Ffkvg4e8CjIWi8SykQ8oJSS8jbmbgF
-  abke3vXWLG6V9kFiObuJd5wZRBluJANu7bEtjgc3fFaGVP2XxVdCpVjNbmMDg4Qp
-  ovvczP53X6pQP2RSZgxF6Lblvy8y11RziUTVRG/Z2aJHsElo6gI7vQznE/OSDrhC
-  gEhr8uaIUt7D+HZWRbU0+MkKPpL5uMqaFuJbqXEvSwPTuUuYkDfNfsjQO7ruWBac
-  bxHCrvpZ6Tijc0nrlyXi6gPOCLeaqhau2xFnlvKgELwsGYSoKBJyDwqtQ5kwrOlU
-  tkSyLrfZ+RZcH535Hyvif7ZxB0v5OxXXoec+N2vrUsEUMRDL9dg4/WFdN8hIOixF
-  3IPKpZ1ho0Ya5q7yhygtBK9/NBFHw+nbJjcltfPDBXleRe8u73gnQo8AZIhStYSP
-  v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR
-  JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
+  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAFqsr6o0SvQRgjQVmhbQvExRnCMCoW1yb
+  FJiN7A5RA2Iy2E61OG1Ul5nGmaDmx/PNB/6JIbIV3B9Uq8aTZx4uOjK7r8vMl1/t
+  ZfY7r6HejJfXlcO2m6JDMbpdyEVv916LncBkzZRz6vnnNCx+31f15FKddxujpAFd
+  qpn3JRQY+oj7ZkoccL/IUiDpxQWeS3oOoz9qr2kVTp8R50InZimt79FqCl/1m66W
+  kdOuf+wM3DDx7Rt4IVNHrhGlyfMr7xjKW1Q3gll+pMN1DT6Ajx/t3JDSEg7BnnEW
+  r7AciSO6J4ApUdqyG+coLFlGdtgFTgRHv7ihbQtDI7Z/LV7A4Spn1j2PK3j0Omri
+  kSl1hPVigRytfgdVGiLXzvkkrkgj9EknCaj5UHbac7XvVBrljXj9hsnnqTANaKsg
+  jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
+  XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.99'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
@@ -107,20 +113,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -164,61 +156,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: hoe-mercurial
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: hoe-deveiate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: hoe-highline
+  name: rake-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -247,73 +211,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.17'
-description: |-
-  Symphony is a subscription-based asynchronous job system. It
-  allows you to define jobs that watch for lightweight events from a
-  distributed-messaging AMQP broker, and do work based on their payload.
-
-  It includes several executables under bin/:
-
-  symphony::
-    A daemon which manages startup and shutdown of one or more Workers
-    running Tasks as they are published from a queue.
-
-  symphony-task::
-    A wrapper that runs a single task, useful for testing, or if you don't
-    require the process management that the symphony daemon provides.
+description: Symphony is a subscription-based asynchronous job system. It allows you
+  to define jobs that watch for lightweight events from a distributed-messaging AMQP
+  broker, and do work based on their payload.
 email:
-- ged@FaerieMUD.org
+- ged@faeriemud.org
 - mahlon@martini.nu
 executables:
 - symphony
 - symphony-task
 extensions: []
-extra_rdoc_files:
-- History.rdoc
-- Manifest.txt
-- README.rdoc
-- UPGRADING.md
-- USAGE.rdoc
+extra_rdoc_files: []
 files:
 - ".simplecov"
-- ChangeLog
 - History.rdoc
 - Manifest.txt
-- README.rdoc
+- README.md
 - Rakefile
 - UPGRADING.md
 - USAGE.rdoc
@@ -347,31 +260,32 @@ files:
 - spec/symphony/task_group_spec.rb
 - spec/symphony/task_spec.rb
 - spec/symphony_spec.rb
-homepage: http://bitbucket.org/ged/symphony
+homepage: https://hg.sr.ht/~ged/Symphony
 licenses:
-- BSD
-metadata: {}
-post_install_message: 
-rdoc_options:
-- "-f"
-- fivefish
-- "-t"
-- Symphony
+- BSD-3-Clause
+metadata:
+  homepage_uri: https://hg.sr.ht/~ged/Symphony
+  documentation_uri: https://deveiate.org/code/symphony
+  changelog_uri: https://deveiate.org/code/symphony/History_md.html
+  source_uri: https://hg.sr.ht/~ged/Symphony/browse
+  bug_tracker_uri: https://todo.sr.ht/~ged/Symphony/browse
+post_install_message:
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.3
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
-summary: Symphony is a subscription-based asynchronous job system
+summary: Symphony is a subscription-based asynchronous job system.
 test_files: []