symphony 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e56f49638e5786e9f84f0411f4065d2766582ea1
-  data.tar.gz: 2fd2aed4198733e2a6295a758eca506daa60f5db
+  metadata.gz: edb7810dc562110768235353536ec4a000b02828
+  data.tar.gz: c0a047b0115a9a865ce90606478091e814ab23f5
 SHA512:
-  metadata.gz: 9d382c108292a680028806b3807a24475cee35d7d48b79eccba152eb27adb62136b68c0a99f5622668f44ffaf332048f4418a6140bf2d020525acf3f2df2f872
-  data.tar.gz: 90bee202f40bf9791f81775df6879adff6b2e07ed19101286f4eb3c47b2628306e80a5dd0678f0cb93b9662a3fef92d36159a0e4c2596707bb33c80bb81947c7
+  metadata.gz: 26eeea9cdd2546eeb51cf3f6f936e59a69886c0f83d431e8c770ce758564df01153cb710ff73abbb36fd9525f1234f3912f0fc74cb6bc0c01e14df1af437a854
+  data.tar.gz: ab8aa95349260ee6782133c5d151ad4e749cd77d906616c48c06cd7b7bdb84b4c94b89126c67032fe469e56ec342d5e0eecac82cf3b82da6330200d1f329d771

data/ChangeLog

@@ -1,3 +1,72 @@
+2014-04-14  Mahlon E. Smith  <mahlon@laika.com>
+
+	* Manifest.txt, Rakefile, lib/symphony/tasks/ssh.rb,
+	lib/symphony/tasks/sshscript.rb:
+	Branch merge from 221b25852ba6.
+	[3673b0e7202d] [tip]
+
+	* .hoerc, Manifest.txt, spec/symphony/mixins_spec.rb:
+	Complete the intervalexpression backout.
+	[ab1e59fc5ef8]
+
+2014-04-14  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* .hgignore, Manifest.txt, Rakefile,
+	lib/symphony/intervalexpression.rl, lib/symphony/mixins.rb,
+	spec/symphony/intervalexpression_spec.rb,
+	spec/symphony/mixins_spec.rb:
+	After some further consideration, the intervalexpression pieces
+	aren't necessarily dependent upon symphony core -- breaking the
+	scheduling components out.
+	[9ec6a4b61674]
+
+2014-04-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt, lib/symphony/daemon.rb, lib/symphony/queue.rb,
+	lib/symphony/task.rb:
+	Allow a task to declare its queue as persistant.
+	[221b25852ba6]
+
+	* Rakefile:
+	Make the gemspec task a little smarter
+	[03efe7b2c206]
+
+2014-04-11  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/symphony/tasks/ssh.rb, lib/symphony/tasks/sshscript.rb:
+	Break out SSH tasks into their own gem
+	[a3c5dd11f642]
+
+2014-04-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.5.0 for changeset f8e6883990fc
+	[41fc4926342b] [github/master]
+
+	* .hgsigs:
+	Added signature for changeset 369353a62297
+	[f8e6883990fc] [v0.5.0]
+
+	* History.rdoc, lib/symphony.rb:
+	Bump minor version, update history.
+	[369353a62297]
+
+	* lib/symphony/task.rb:
+	Don't set up default signal handlers for WINCH and CHLD for Tasks.
+	[d42c7aa57e0b]
+
+2014-04-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hoerc, Manifest.txt, Rakefile, lib/symphony/intervalexpression.rl,
+	lib/symphony/mixins.rb, spec/symphony/intervalexpression_spec.rb,
+	spec/symphony/mixins_spec.rb:
+	Make time-math stuff in IntervalExpression a little safer.
+
+	- Use refinements to avoid polluting core modules
+	- Use an explicit function instead of #send for interval calulation.
+	- Fix manifest, add ragel files to the manifest-exclude pattern.
+	[466b8bd312b4]
+
 2014-04-04  Mahlon E. Smith  <mahlon@laika.com>
 
 	* .hgignore, Manifest.txt, Rakefile,
@@ -6,13 +75,13 @@
 	spec/symphony/mixins_spec.rb:
 	Add an interval expression parsing library in preparation for
 	Symphony scheduling.
-	[cddc160bc76f] [tip]
+	[cddc160bc76f]
 
 2014-04-01  Michael Granger  <ged@FaerieMUD.org>
 
 	* Rakefile:
 	Add direct dependency on loggability
-	[3afd6890a914] [github/master]
+	[3afd6890a914]
 
 	* TODO.md:
 	Update TODO list

data/History.rdoc

@@ -1,3 +1,12 @@
+== v0.6.0 [2014-04-14] Michael Granger <ged@FaerieMUD.org>
+
+- Set cancel-on-failover flag in the queue consumer
+- Allow a task to declare its queue as persistant.
+- Break out SSH tasks into their own gem
+- Remove the interval expression parser; scheduling will
+  be part of an separate library if we decide to release it.
+
+
 == v0.5.0 [2014-04-08] Michael Granger <ged@FaerieMUD.org>
 
 - Don't set up default signal handlers for WINCH and CHLD for Tasks.

data/Manifest.txt

@@ -11,7 +11,6 @@ bin/symphony-task
 etc/config.yml.example
 lib/symphony.rb
 lib/symphony/daemon.rb
-lib/symphony/intervalexpression.rb
 lib/symphony/metrics.rb
 lib/symphony/mixins.rb
 lib/symphony/queue.rb
@@ -21,11 +20,8 @@ lib/symphony/task.rb
 lib/symphony/tasks/auditor.rb
 lib/symphony/tasks/failure_logger.rb
 lib/symphony/tasks/simulator.rb
-lib/symphony/tasks/ssh.rb
-lib/symphony/tasks/sshscript.rb
 spec/helpers.rb
 spec/symphony/daemon_spec.rb
-spec/symphony/intervalexpression_spec.rb
 spec/symphony/mixins_spec.rb
 spec/symphony/queue_spec.rb
 spec/symphony/task_spec.rb

data/Rakefile

@@ -1,22 +1,12 @@
 #!/usr/bin/env rake
 
-require 'pathname'
-
 begin
 	require 'hoe'
 rescue LoadError
 	abort "This Rakefile requires hoe (gem install hoe)"
 end
 
-
-BASEDIR         = Pathname( __FILE__ ).dirname.relative_path_from( Pathname.pwd )
-
-LIBDIR          = BASEDIR + 'lib'
-SYMPHONY_LIBDIR = LIBDIR + 'symphony'
-
-GEMSPEC         = BASEDIR + 'symphony.gemspec'
-EXPRESSION_RL   = SYMPHONY_LIBDIR + 'intervalexpression.rl'
-EXPRESSION_RB   = SYMPHONY_LIBDIR + 'intervalexpression.rb'
+GEMSPEC = 'symphony.gemspec'
 
 
 Hoe.plugin :mercurial
@@ -47,29 +37,25 @@ hoespec = Hoe.spec 'symphony' do |spec|
 	spec.dependency 'rusage', '~> 0.2'
 
 	spec.dependency 'rspec', '~> 3.0', :developer
-	spec.dependency 'net-ssh', '~> 2.8', :developer
-	spec.dependency 'net-sftp', '~> 2.1', :developer
 	spec.dependency 'simplecov', '~> 0.8', :developer
 
 	spec.require_ruby_version( '>=2.0.0' )
 	spec.hg_sign_tags = true if spec.respond_to?( :hg_sign_tags= )
-	spec.quality_check_whitelist.include( EXPRESSION_RB.to_s ) if
-		spec.respond_to?( :quality_check_whitelist )
 
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 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, :spec ]
 
-
 # Rebuild the ChangeLog immediately before release
 task :prerelease => 'ChangeLog'
 CLOBBER.include( 'ChangeLog' )
 
-
 desc "Build a coverage report"
 task :coverage do
 	ENV["COVERAGE"] = 'yes'
@@ -77,24 +63,16 @@ task :coverage do
 end
 
 
-# Generate the expression parser with Ragel
-file EXPRESSION_RL
-file EXPRESSION_RB
-task EXPRESSION_RB => EXPRESSION_RL do |task|
-	 sh 'ragel', '-R', '-T1', '-Ls', task.prerequisites.first
-end
-task :spec => EXPRESSION_RB
-
-
-# Generate a .gemspec file for integration with systems that read it
 task :gemspec => GEMSPEC
-file GEMSPEC => __FILE__ do |task|
+file GEMSPEC => hoespec.spec.files do |task|
 	spec = $hoespec.spec
-	spec.files.delete( '.gemtest' )
 	spec.version = "#{spec.version}.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/TODO.md

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

data/lib/symphony/daemon.rb

@@ -29,7 +29,7 @@ class Symphony::Daemon
 	CONFIG_DEFAULTS = {
 		throttle_max:    16,
 		throttle_factor: 1,
-		tasks: []
+		tasks:           []
 	}
 
 	# Signals we understand

data/lib/symphony/mixins.rb

@@ -71,151 +71,5 @@ module Symphony
 	end # module MethodUtilities
 
 
-	# Functions for time calculations
-	module TimeFunctions
-
-		###############
-		module_function
-		###############
-
-		### Calculate the (approximate) number of seconds that are in +count+ of the
-		### given +unit+ of time.
-		def calculate_seconds( count, unit )
-			return case unit
-				when :seconds, :second
-					count
-				when :minutes, :minute
-					count * 60
-				when :hours, :hour
-					count * 3600
-				when :days, :day
-					count * 86400
-				when :weeks, :week
-					count * 604800
-				when :fortnights, :fortnight
-					count * 1209600
-				when :months, :month
-					count * 2592000
-				when :years, :year
-					count * 31557600
-				else
-					raise ArgumentError, "don't know how to calculate seconds in a %p" % [ unit ]
-				end
-		end
-
-	end # module TimeFunctions
-
-
-	# Refinements to Numeric to add time-related convenience methods
-	module TimeRefinements
-		refine Numeric do
-
-			### Number of seconds (returns receiver unmodified)
-			def seconds
-				return self
-			end
-			alias_method :second, :seconds
-
-			### Returns number of seconds in <receiver> minutes
-			def minutes
-				return TimeFunctions.calculate_seconds( self, :minutes )
-			end
-			alias_method :minute, :minutes
-
-			### Returns the number of seconds in <receiver> hours
-			def hours
-				return TimeFunctions.calculate_seconds( self, :hours )
-			end
-			alias_method :hour, :hours
-
-			### Returns the number of seconds in <receiver> days
-			def days
-				return TimeFunctions.calculate_seconds( self, :day )
-			end
-			alias_method :day, :days
-
-			### Return the number of seconds in <receiver> weeks
-			def weeks
-				return TimeFunctions.calculate_seconds( self, :weeks )
-			end
-			alias_method :week, :weeks
-
-			### Returns the number of seconds in <receiver> fortnights
-			def fortnights
-				return TimeFunctions.calculate_seconds( self, :fortnights )
-			end
-			alias_method :fortnight, :fortnights
-
-			### Returns the number of seconds in <receiver> months (approximate)
-			def months
-				return TimeFunctions.calculate_seconds( self, :months )
-			end
-			alias_method :month, :months
-
-			### Returns the number of seconds in <receiver> years (approximate)
-			def years
-				return TimeFunctions.calculate_seconds( self, :years )
-			end
-			alias_method :year, :years
-
-
-			### Returns the Time <receiver> number of seconds before the
-			### specified +time+. E.g., 2.hours.before( header.expiration )
-			def before( time )
-				return time - self
-			end
-
-
-			### Returns the Time <receiver> number of seconds ago. (e.g.,
-			### expiration > 2.hours.ago )
-			def ago
-				return self.before( ::Time.now )
-			end
-
-
-			### Returns the Time <receiver> number of seconds after the given +time+.
-			### E.g., 10.minutes.after( header.expiration )
-			def after( time )
-				return time + self
-			end
-
-
-			### Return a new Time <receiver> number of seconds from now.
-			def from_now
-				return self.after( ::Time.now )
-			end
-
-
-			### Return a string describing approximately the amount of time in
-			### <receiver> number of seconds.
-			def timeperiod
-				return case
-					when self < 1.minute
-						'less than a minute'
-					when self < 50.minutes
-						'%d minutes' % [ (self.to_f / 1.minute).ceil ]
-					when self < 90.minutes
-						'about an hour'
-					when self < 18.hours
-						"%d hours" % [ (self.to_f / 1.hour).ceil ]
-					when self < 30.hours
-						'about a day'
-					when self < 1.week
-						"%d days" % [ (self.to_f / 1.day).ceil ]
-					when self < 2.weeks
-						'about one week'
-					when self < 3.months
-						"%d weeks" % [ (self.to_f / 1.week).ceil ]
-					when self < 18.months
-						"%d months" % [ (self.to_f / 1.month).ceil ]
-					else
-						"%d years" % [ (self.to_f / 1.year).ceil ]
-					end
-			end
-
-		end # refine Numeric
-	end # module TimeRefinements
 
 end # module Symphony
-
-

data/lib/symphony/queue.rb

@@ -22,6 +22,11 @@ class Symphony::Queue
 		heartbeat:   'server',
 	}
 
+	# Arguments to use when creating the consumer
+	CONSUMER_ARGS = {
+		'x-cancel-on-ha-failover' => true,
+	}
+
 	# The default number of messages to prefetch
 	DEFAULT_PREFETCH = 10
 
@@ -139,7 +144,8 @@ class Symphony::Queue
 			task_class.acknowledge,
 			task_class.consumer_tag,
 			task_class.routing_keys,
-			task_class.prefetch
+			task_class.prefetch,
+			task_class.persistent
 		]
 		return new( *args )
 	end
@@ -147,12 +153,13 @@ class Symphony::Queue
 
 
 	### Create a new Queue with the specified configuration.
-	def initialize( name, acknowledge, consumer_tag, routing_keys, prefetch )
+	def initialize( name, acknowledge, consumer_tag, routing_keys, prefetch, persistent )
 		@name          = name
 		@acknowledge   = acknowledge
 		@consumer_tag  = consumer_tag
 		@routing_keys  = routing_keys
 		@prefetch      = prefetch
+		@persistent    = persistent
 
 		@amqp_queue    = nil
 		@shutting_down = false
@@ -178,6 +185,12 @@ class Symphony::Queue
 	# The maximum number of un-acked messages to prefetch
 	attr_reader :prefetch
 
+	# Whether or not to create a persistent queue
+	attr_reader :persistent
+
+	# The underlying Bunny::Queue this object manages
+	attr_reader :amqp_queue
+
 	# The Bunny::Consumer that is dispatching messages for the queue.
 	attr_accessor :consumer
 
@@ -211,7 +224,7 @@ class Symphony::Queue
 		# Last argument is *no_ack*, so need to invert the logic
 		self.log.debug "Creating consumer for the '%s' queue with tag: %s" %
 			[ amqp_queue.name, tag ]
-		cons = Bunny::Consumer.new( amqp_queue.channel, amqp_queue, tag, !ackmode )
+		cons = Bunny::Consumer.new( amqp_queue.channel, amqp_queue, tag, !ackmode, false, CONSUMER_ARGS )
 
 		cons.on_delivery do |delivery_info, properties, payload|
 			rval = self.handle_message( delivery_info, properties, payload, &work_callback )
@@ -244,7 +257,7 @@ class Symphony::Queue
 			channel = self.class.reset_amqp_channel
 			channel.prefetch( prefetch_count )
 
-			queue = channel.queue( self.name, auto_delete: true )
+			queue = channel.queue( self.name, auto_delete: !self.persistent )
 			self.routing_keys.each do |key|
 				self.log.info "  binding queue %s to the %s exchange with topic key: %s" %
 					[ self.name, exchange.name, key ]

data/lib/symphony/task.rb

@@ -68,6 +68,7 @@ class Symphony::Task
 		subclass.instance_variable_set( :@work_model, :longlived )
 		subclass.instance_variable_set( :@prefetch, 10 )
 		subclass.instance_variable_set( :@timeout_action, :reject )
+		subclass.instance_variable_set( :@persistent, false )
 	end
 
 
@@ -188,6 +189,19 @@ class Symphony::Task
 	end
 
 
+	### Create the queue the task consumes from as a persistent queue, so it
+	### will continue to receive events even if the task is no longer consuming them.
+	### This only effects queues which are not already declared, so if the
+	### bindings for the queue change you'll need to delete the existing queue
+	### before starting up to have them take effect.
+	def self::persistent( new_setting=nil )
+		if new_setting
+			@persistent = new_setting
+		end
+		return @persistent
+	end
+
+
 	#
 	# Instance Methods
 	#

data/lib/symphony.rb

@@ -12,10 +12,10 @@ module Symphony
 	       Configurability
 
 	# Library version constant
-	VERSION = '0.5.0'
+	VERSION = '0.6.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 369353a62297 $
+	REVISION = %q$Revision: fa6a367872f4 $
 
 
 	# The name of the environment variable to check for config file overrides

data/spec/symphony/mixins_spec.rb

@@ -1,11 +1,9 @@
 #!/usr/bin/env rspec -wfd
-# vim: set nosta noet ts=4 sw=4:
 
 require_relative '../helpers'
 
 require 'symphony/mixins'
 
-using Symphony::TimeRefinements
 
 describe Symphony, 'mixins' do
 
@@ -77,53 +75,4 @@ describe Symphony, 'mixins' do
 
 	end
 
-
-	describe "numeric constant methods" do
-
-		SECONDS_IN_A_MINUTE    = 60
-		SECONDS_IN_AN_HOUR     = SECONDS_IN_A_MINUTE * 60
-		SECONDS_IN_A_DAY       = SECONDS_IN_AN_HOUR * 24
-		SECONDS_IN_A_WEEK      = SECONDS_IN_A_DAY * 7
-		SECONDS_IN_A_FORTNIGHT = SECONDS_IN_A_WEEK * 2
-		SECONDS_IN_A_MONTH     = SECONDS_IN_A_DAY * 30
-		SECONDS_IN_A_YEAR      = Integer( SECONDS_IN_A_DAY * 365.25 )
-
-		it "can calculate the number of seconds for various units of time" do
-			expect( 1.second ).to eq( 1 )
-			expect( 14.seconds ).to eq( 14 )
-
-			expect( 1.minute ).to eq( SECONDS_IN_A_MINUTE )
-			expect( 18.minutes ).to eq( SECONDS_IN_A_MINUTE * 18 )
-
-			expect( 1.hour ).to eq( SECONDS_IN_AN_HOUR )
-			expect( 723.hours ).to eq( SECONDS_IN_AN_HOUR * 723 )
-
-			expect( 1.day ).to eq( SECONDS_IN_A_DAY )
-			expect( 3.days ).to eq( SECONDS_IN_A_DAY * 3 )
-
-			expect( 1.week ).to eq( SECONDS_IN_A_WEEK )
-			expect( 28.weeks ).to eq( SECONDS_IN_A_WEEK * 28 )
-
-			expect( 1.fortnight ).to eq( SECONDS_IN_A_FORTNIGHT )
-			expect( 31.fortnights ).to eq( SECONDS_IN_A_FORTNIGHT * 31 )
-
-			expect( 1.month ).to eq( SECONDS_IN_A_MONTH )
-			expect( 67.months ).to eq( SECONDS_IN_A_MONTH * 67 )
-
-			expect( 1.year ).to eq( SECONDS_IN_A_YEAR )
-			expect( 13.years ).to eq( SECONDS_IN_A_YEAR * 13 )
-		end
-
-
-		it "can calculate various time offsets" do
-			starttime = Time.now
-
-			expect( 1.second.after( starttime ) ).to eq( starttime + 1 )
-			expect( 18.seconds.from_now ).to be_within( 10.seconds ).of( starttime + 18 )
-
-			expect( 1.second.before( starttime ) ).to eq( starttime - 1 )
-			expect( 3.hours.ago ).to be_within( 10.seconds ).of( starttime - 10800 )
-		end
-	end
 end
-

data/spec/symphony/queue_spec.rb

@@ -160,7 +160,8 @@ describe Symphony::Queue do
 				with( Symphony::Queue::DEFAULT_PREFETCH )
 
 			expect( Bunny::Consumer ).to receive( :new ).
-				with( described_class.amqp_channel, amqp_queue, queue.consumer_tag, false ).
+				with( described_class.amqp_channel, amqp_queue, queue.consumer_tag, false, false,
+				      Symphony::Queue::CONSUMER_ARGS ).
 				and_return( consumer )
 
 			# Set up an artificial method to call the delivery callback that we can later
@@ -211,7 +212,8 @@ describe Symphony::Queue do
 			expect( described_class.amqp_channel ).to receive( :prefetch ).with( 1 )
 
 			expect( Bunny::Consumer ).to receive( :new ).
-				with( described_class.amqp_channel, amqp_queue, queue.consumer_tag, false ).
+				with( described_class.amqp_channel, amqp_queue, queue.consumer_tag, false, false,
+				      Symphony::Queue::CONSUMER_ARGS ).
 				and_return( consumer )
 
 			expect( consumer ).to receive( :on_delivery ) do |&block|
@@ -253,7 +255,8 @@ describe Symphony::Queue do
 				with( Symphony::Queue::DEFAULT_PREFETCH )
 
 			expect( Bunny::Consumer ).to receive( :new ).
-				with( described_class.amqp_channel, amqp_queue, queue.consumer_tag, false ).
+				with( described_class.amqp_channel, amqp_queue, queue.consumer_tag, false, false,
+				      Symphony::Queue::CONSUMER_ARGS ).
 				and_return( consumer )
 
 			expect( consumer ).to receive( :on_delivery )
@@ -282,7 +285,8 @@ describe Symphony::Queue do
 
 			# Ackmode argument is actually 'no_ack'
 			expect( Bunny::Consumer ).to receive( :new ).
-				with( amqp_channel, amqp_queue, queue.consumer_tag, false ).
+				with( amqp_channel, amqp_queue, queue.consumer_tag, false, false,
+				      Symphony::Queue::CONSUMER_ARGS ).
 				and_return( consumer )
 			expect( consumer ).to receive( :on_delivery )
 			expect( consumer ).to receive( :on_cancellation )
@@ -299,7 +303,8 @@ describe Symphony::Queue do
 			# Ackmode argument is actually 'no_ack'
 			queue.instance_variable_set( :@acknowledge, false )
 			expect( Bunny::Consumer ).to receive( :new ).
-				with( amqp_channel, amqp_queue, queue.consumer_tag, true ).
+				with( amqp_channel, amqp_queue, queue.consumer_tag, true, false,
+				      Symphony::Queue::CONSUMER_ARGS ).
 				and_return( consumer )
 			expect( consumer ).to receive( :on_delivery )
 			expect( consumer ).to receive( :on_cancellation )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphony
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Granger
@@ -31,7 +31,7 @@ cert_chain:
   c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
   ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -215,34 +215,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +271,6 @@ extra_rdoc_files:
 - TODO.md
 - USAGE.rdoc
 files:
-- .gemtest
 - .simplecov
 - ChangeLog
 - History.rdoc
@@ -313,7 +284,6 @@ files:
 - etc/config.yml.example
 - lib/symphony.rb
 - lib/symphony/daemon.rb
-- lib/symphony/intervalexpression.rb
 - lib/symphony/metrics.rb
 - lib/symphony/mixins.rb
 - lib/symphony/queue.rb
@@ -323,11 +293,8 @@ files:
 - lib/symphony/tasks/auditor.rb
 - lib/symphony/tasks/failure_logger.rb
 - lib/symphony/tasks/simulator.rb
-- lib/symphony/tasks/ssh.rb
-- lib/symphony/tasks/sshscript.rb
 - spec/helpers.rb
 - spec/symphony/daemon_spec.rb
-- spec/symphony/intervalexpression_spec.rb
 - spec/symphony/mixins_spec.rb
 - spec/symphony/queue_spec.rb
 - spec/symphony/task_spec.rb