symphony 0.12.5 → 0.13.0.pre.20200309182558

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b574d82a0376c4f397afddcd8eef820cd089d22e4c2cc09e6374cf0e9227ff5
-  data.tar.gz: 291e18181eaf8bf4484e8dc438123a28bd5bd07af506adff81235f3a98224861
+  metadata.gz: 692186739c647bd3b2e8432fa790a7a7de05fd23457ecb1377b0ab659477ff48
+  data.tar.gz: d42b13e3b7c1b49c3c25c5b238c81d3f8e8f585b700180971dd75733440dab88
 SHA512:
-  metadata.gz: 20f2a6bf4785239e01b82b05b2ea7c252aeaf8553656a170c738bc32965f9a62c65a8a374969420cb00a3c58ecefa90b0214b828dcdfe95c827f73ba4a3749be
-  data.tar.gz: 5c162e6316d2f10ce7e5c416c60a2c88275ac38f6186fe90c3e48536f1dc86d8b806699dafa74873be39335a6ccb706d5b2a597a7e252aa1c2560816c12f6e85
+  metadata.gz: 37c090c9ac2067ad330122835f29c5c99cb9f5766090f8e402afb9fc19db02458c14bd0e60e4969abf1b6f1b154407e475714b750704b2618b026aebdb86b7be
+  data.tar.gz: 32125c9739cf2aa3fce83b128b22b1af19eeac054d20df45edf593756c488b82d144634e8dba533585559583d6d5a1d7cfcbbfa9a21a2c28fb16dc347d52689c

data/History.rdoc

@@ -1,3 +1,19 @@
+= Release History for symphony
+
+---
+
+== v0.13.0 [2020-03-09] Michael Granger <ged@faeriemud.org>
+
+Improvements:
+
+- Remove Yajl dependency in favor of stdlib json.
+- Update for Ruby 2.7
+
+Changes:
+
+- Requires Ruby 2.6+
+
+
 == v0.12.5 [2019-07-16] Michael Granger <ged@FaerieMUD.org>
 
 Improvements:

data/Manifest.txt

@@ -1,8 +1,7 @@
 .simplecov
-ChangeLog
 History.rdoc
 Manifest.txt
-README.rdoc
+README.md
 Rakefile
 UPGRADING.md
 USAGE.rdoc

data/{README.rdoc → README.md}

@@ -1,10 +1,16 @@
-= symphony
+# symphony
 
-wiki:: http://bitbucket.org/ged/symphony
-docs:: http://deveiate.org/code/symphony
+home
+: https://hg.sr.ht/~ged/symphony
 
+docs
+: https://deveiate.org/code/symphony
 
-== Description
+github
+: https://github.com/ged/symphony
+
+
+## Description
 
 Symphony is a subscription-based asynchronous job system. It
 allows you to define jobs that watch for lightweight events from a
@@ -21,7 +27,7 @@ symphony-task::
   require the process management that the symphony daemon provides.
 
 
-== Synopsis
+## Synopsis
 
 	class WorkerTask < Symphony::Task
 		# Process all events
@@ -37,28 +43,33 @@ symphony-task::
 For a more detailed description of usage, please refer to the USAGE document.
 
 
-== Installation
+## Installation
 
     gem install symphony
 
 
-== Contributing
+## Contributing
 
 You can check out the current development source with Mercurial via its
-{project page}[http://bitbucket.org/ged/symphony]. Or if you prefer Git, via 
-{its Github mirror}[https://github.com/ged/symphony].
+[project page](https://hg.sr.ht/~ged/symphony). Or if you prefer Git, via
+[its Github mirror](https://github.com/ged/symphony).
 
 After checking out the source, run:
 
-    $ rake newb
+    $ rake setup
+
+This task will install dependencies, and do any other necessary developer setup.
+
+
+## Authors
 
-This task will install any missing dependencies, run the tests/specs,
-and generate the API documentation.
+- Michael Granger <ged@faeriemud.org>
+- Mahlon E. Smith <mahlon@martini.nu>
 
 
-== License
+## License
 
-Copyright (c) 2011-2015, Michael Granger and Mahlon E. Smith
+Copyright (c) 2011-2020, Michael Granger and Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -1,79 +1,10 @@
-#!/usr/bin/env rake
+#!/usr/bin/env ruby -S rake
 
-begin
-	require 'hoe'
-rescue LoadError
-	abort "This Rakefile requires hoe (gem install hoe)"
-end
-
-GEMSPEC = 'symphony.gemspec'
-
-
-Hoe.plugin :mercurial
-Hoe.plugin :signing
-Hoe.plugin :deveiate
-
-Hoe.plugins.delete :rubyforge
-
-hoespec = Hoe.spec 'symphony' do |spec|
-	spec.readme_file = 'README.rdoc'
-	spec.history_file = 'History.rdoc'
-	spec.extra_rdoc_files = FileList[ '*.rdoc' ]
-	spec.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Symphony']
-	spec.spec_extras[:required_rubygems_version] = '>= 2.0.3'
-	spec.license 'BSD'
-
-	spec.developer 'Michael Granger', 'ged@FaerieMUD.org'
-	spec.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
-
-	spec.dependency 'configurability', '~> 3.1'
-	spec.dependency 'loggability', '~> 0.11'
-	spec.dependency 'pluggability', '~> 0.4'
-	spec.dependency 'bunny', '~> 2.0'
-	spec.dependency 'sysexits', '~> 1.1'
-	spec.dependency 'yajl-ruby', '~> 1.3'
-	spec.dependency 'msgpack', '~> 1.0'
-	spec.dependency 'metriks', '~> 0.9'
-	spec.dependency 'rusage', '~> 0.2'
-
-	spec.dependency 'rspec', '~> 3.0', :developer
-	spec.dependency 'simplecov', '~> 0.8', :developer
-	spec.dependency 'timecop', '~> 0.8', :developer
-
-	spec.require_ruby_version( '>=2.0.0' )
-	spec.hg_sign_tags = true if spec.respond_to?( :hg_sign_tags= )
+require 'rake/deveiate'
 
-	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
+Rake::DevEiate.setup( 'symphony' ) do |project|
+	project.publish_to = 'deveiate:/usr/local/www/public/code'
+	project.required_ruby_version = '~> 2.6'
 end
 
-# Fix some Hoe retardedness
-hoespec.spec.files.delete( '.gemtest' )
-ENV['VERSION'] ||= hoespec.spec.version.to_s
-
-# Run the tests before checking in
-task 'hg:precheckin' => [ :check_history, :check_manifest, :gemspec, :spec ]
-
-# Rebuild the ChangeLog immediately before release
-task :prerelease => 'ChangeLog'
-CLOBBER.include( 'ChangeLog' )
-
-desc "Build a coverage report"
-task :coverage do
-	ENV["COVERAGE"] = 'yes'
-	Rake::Task[:spec].invoke
-end
-
-
-task :gemspec => GEMSPEC
-file GEMSPEC => hoespec.spec.files do |task|
-	spec = $hoespec.spec
-	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
-	File.open( task.name, 'w' ) do |fh|
-		fh.write( spec.to_ruby )
-	end
-end
-
-task :default => :gemspec
-
-CLOBBER.include( GEMSPEC.to_s )
 

data/lib/symphony/daemon.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'configurability'
 require 'loggability'
@@ -248,7 +248,7 @@ class Symphony::Daemon
 		self.log.info "Restarting task group for %p" % [ task_class ]
 		group.max_workers = max
 		group.restart_workers
-		end
+	end
 
 
 	### Shut down the workers for the specified task group.

data/lib/symphony/metrics.rb

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

data/lib/symphony/mixins.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 
 module Symphony

data/lib/symphony/routing.rb

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

data/lib/symphony/signal_handling.rb

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

data/lib/symphony/statistics.rb

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

data/lib/symphony/task.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'set'
 require 'sysexits'
@@ -7,7 +7,7 @@ require 'pluggability'
 require 'loggability'
 
 require 'msgpack'
-require 'yajl'
+require 'json'
 require 'yaml'
 
 require 'symphony' unless defined?( Symphony )
@@ -47,6 +47,14 @@ class Symphony::Task
 	plugin_prefixes 'symphony/tasks'
 
 
+	@queue         = nil
+	@acknowledge   = true
+	@routing_keys  = Set.new
+	@prefetch      = 10
+	@persistent    = false
+	@always_rebind = false
+
+
 	### Create a new Task object and listen for work. Exits with the code returned
 	### by #start when it's done.
 	def self::run( exit_on_idle=false )
@@ -79,11 +87,14 @@ class Symphony::Task
 	def self::inherited( subclass )
 		super
 
+		subclass.instance_variable_set( :@queue, nil )
+		subclass.instance_variable_set( :@always_rebind, false )
 		subclass.instance_variable_set( :@routing_keys, Set.new )
 		subclass.instance_variable_set( :@acknowledge, true )
 		subclass.instance_variable_set( :@work_model, :longlived )
 		subclass.instance_variable_set( :@prefetch, 10 )
 		subclass.instance_variable_set( :@timeout_action, :reject )
+		subclass.instance_variable_set( :@timeout, nil )
 		subclass.instance_variable_set( :@persistent, false )
 		subclass.instance_variable_set( :@idle_timeout, DEFAULT_IDLE_TIMEOUT )
 	end
@@ -438,7 +449,7 @@ class Symphony::Task
 			when 'application/x-msgpack'
 				MessagePack.unpack( payload )
 			when 'application/json', 'text/javascript'
-				Yajl::Parser.parse( payload )
+				JSON.parse( payload )
 			when 'application/x-yaml', 'text/x-yaml'
 				YAML.load( payload )
 			else

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/lib/symphony/task_group.rb

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

data/lib/symphony.rb

@@ -12,7 +12,7 @@ module Symphony
 	       Configurability
 
 	# Library version constant
-	VERSION = '0.12.5'
+	VERSION = '0.13.0'
 
 	# Version-control revision constant
 	REVISION = %q$Revision$

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

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 )

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' )