strelka 0.0.1.pre.194 → 0.0.1.pre.199

data/ChangeLog

@@ -1,5 +1,24 @@
+2012-04-19  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/websocketserver.rb:
+	Adding a websocket service base class
+	[149dae18de58] [qbase, qtip, tip, websocketservice.patch]
+
+	* lib/strelka/plugins.rb:
+	Moving application stack dump function to the PluginLoader mixin
+	[3c35f0dd2089] [qparent]
+
 2012-04-18  Michael Granger  <ged@FaerieMUD.org>
 
+	* examples/gen-config.rb, lib/strelka/plugins.rb,
+	spec/strelka/plugins_spec.rb:
+	Fix plugin loading, add a spec for coverage.
+	[0b6ed1f75d7b]
+
+	* Manifest.txt:
+	Updated the manifest
+	[0233fbbfabd9]
+
 	* examples/apps/ws-echo, experiments/reflective-module.rb,
 	lib/strelka/app.rb, lib/strelka/app/auth.rb,
 	lib/strelka/app/errors.rb, lib/strelka/app/filters.rb,
@@ -29,7 +48,7 @@
 
 	* Strelka::App::Plugin is now Strelka::Plugin
 	* Strelka::App::Plugins is now Strelka::PluginLoader
-	[ea4c4358a943] [tip]
+	[ea4c4358a943] [github/master]
 
 2012-04-16  Mahlon E. Smith  <mahlon@martini.nu>
 
@@ -64,7 +83,7 @@
 	spec/strelka/app/routing_spec.rb:
 	Add Router#routerclass to subclasses. nil guard for
 	layout_templates.
-	[279f2399ad4a] [github/master]
+	[279f2399ad4a]
 
 	* Rakefile:
 	Remove outdated Rakefile cruft.
@@ -112,16 +131,18 @@
 	* Merging with ssh://hg@deveiate.org/Strelka@8f1c27819e70
 	[5fcd76455aad]
 
-	* Manifest.txt:
-	Updating the manifest
-	[35165b3d01cc]
-
 2012-04-11  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/strelka/session/default.rb:
 	Use the built-in securerandom method for obtaining a hex value.
 	[8f1c27819e70]
 
+2012-04-11  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt:
+	Updating the manifest
+	[35165b3d01cc]
+
 2012-04-10  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/strelka/app/auth.rb, lib/strelka/app/parameters.rb,
@@ -192,22 +213,6 @@
 	Add the ChangeLog to the ignorefile
 	[cc8c30d38652]
 
-	* lib/strelka/app/templating.rb:
-	Add API docs to the :templating plugin module
-	[3c160d996320]
-
-	* README.rdoc:
-	Add more URLs
-	[060962556bd1]
-
-	* Rakefile:
-	Oops. Fix typo
-	[5a8aa207860b]
-
-	* .rvm.gems, Rakefile:
-	Update dependencies
-	[787e523777d1]
-
 2012-04-06  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/strelka/app/sessions.rb, lib/strelka/cookie.rb,
@@ -225,6 +230,24 @@
 	Add a persistent DB session store, using sequel.
 	[99f3c3f5d6ca]
 
+2012-04-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/templating.rb:
+	Add API docs to the :templating plugin module
+	[3c160d996320]
+
+	* README.rdoc:
+	Add more URLs
+	[060962556bd1]
+
+	* Rakefile:
+	Oops. Fix typo
+	[5a8aa207860b]
+
+	* .rvm.gems, Rakefile:
+	Update dependencies
+	[787e523777d1]
+
 2012-04-04  Michael Granger  <ged@FaerieMUD.org>
 
 	* manual/src/tutorial.page:

data/bin/strelka

@@ -197,8 +197,18 @@ class Strelka::CLICommand
 		cmd_method = nil
 
 		# Set the datadir override if it's given
-		Strelka.datadir = Pathname( options.datadir ) if self.options.datadir
+		if self.options.datadir
+			self.log.debug "Using data dir option: %s" % [ self.options.datadir ]
+			Strelka.datadir = Pathname( self.options.datadir )
+		elsif File.directory?( 'data' ) && subdir = Dir[ 'data/*' ].first
+			self.log.debug "Using local data dir: %s" % [ subdir ]
+			Strelka.datadir = subdir
+		end
+
+		# Include a 'lib' directory if there is one
+		$LOAD_PATH.unshift( 'lib' ) if File.directory?( 'lib' )
 
+		# Run the command
 		begin
 			cmd_method = self.method( "#{command}_command" )
 		rescue NameError => err
@@ -252,7 +262,12 @@ class Strelka::CLICommand
 			paths.each do |gemname, paths|
 				message "\n"
 
-				subheader "#{gemname}:"
+				if gemname == ''
+					subheader "Local: "
+				else
+					subheader "Gem: #{gemname}"
+				end
+
 				filenames = paths.map {|path| path.basename.to_s }
 				list( filenames )
 			end
@@ -271,7 +286,10 @@ class Strelka::CLICommand
 	def start_command( *args )
 		path, appname, gemname = self.find_specified_app( *args )
 
-		header "Starting the %s app from the %s gem" % [ appname, gemname ]
+		header "Starting the %s app%s" % [
+			appname,
+			gemname == '' ? '' : " the #{gemname} gem"
+		]
 		fork do
 			self.log.debug "  in the child."
 			Strelka.load_config( self.options.config ) if self.options.config

data/lib/strelka/app/errors.rb

@@ -8,15 +8,50 @@ require 'strelka/app' unless defined?( Strelka::App )
 
 # Custom error-handling plugin for Strelka::App.
 #
-# == Examples
+#   plugin :errors
 #
-# Handle statuses via a callback:
+#   # Handle only status 400 errors
+#   on_status HTTP::BAD_REQUEST do |res, status_info|
+#       # Do something on 400 errors
+#   end
+#
+#   # Handle any other error in the 4xx range
+#   on_status 400..499 do |res, status_info|
+#       # Do something on 4xx errors
+#   end
+#
+# If you have the <tt>:templating</tt> plugin loaded, you can substitute a
+# Symbol that corresponds with one of the declared templates instead:
+#
+#   class MyApp < Strelka::App
+#       plugins :errors, :templating
+#
+#       layout 'layout.tmpl'
+#       templates :missing => 'errors/missing.tmpl'
+#
+#       # Load the 'missing' template, wrap it up in the layout
+#       # template and render that as the body of the 404
+#       # response
+#       on_status HTTP::NOT_FOUND, :missing
+#
+#   end # class MyApp
+#
+# The template can access the status info hash via the +:status_info+ note
+# on the request or response object:
+#
+#   <!-- error.tmpl -->
+#   Sorry, there was a <?call request.notes[:status_info][:status] ?> error:
+#   <?escape request.notes[:status_info][:message] ?>.
+#
+# If you want to do something application-specific for an error, but still use
+# the default error-handling, just call finish_with again with the status info
+# from your status handler:
 #
 #    class MyApp < Strelka::App
 #        plugins :errors
 #
 #        # Send an email when an app is going to return a 500 error
-#        on_status HTTP::SERVER_ERROR do |res, status|
+#        on_status HTTP::SERVER_ERROR do |res, info|
 #            require 'mail'
 #            Mail.deliver do
 #                from    'app@example.com'
@@ -26,15 +61,20 @@ require 'strelka/app' unless defined?( Strelka::App )
 #                body    "Server error while running %p [%s]: %s" %
 #                        [ self.class, self.conn, status.message ]
 #            end
+#
+#            # Finish the transaction
+#            finish_with( info )
 #        end
 #
 #        def handle( req )
-#            finish_with( HTTP::SERVER_ERROR, "Oops, that doesn't exist on this server." )
+#            finish_with( HTTP::SERVER_ERROR, "Ack! Something bad happened." )
 #        end
 #
 #    end # class MyApp
 #
-# See the documentation for ClassMethods.on_status for more details.
+# See the documentation for ClassMethods.on_status for more details on the
+# status-handler block.
+#
 module Strelka::App::Errors
 	extend Strelka::Plugin
 
@@ -64,16 +104,6 @@ module Strelka::App::Errors
 		### +range+. Range can either be a single integer HTTP status code, or a Range
 		### of the same (e.g., 400..499) for all statuses with that range.
 		###
-		###   # Handle only status 400 errors
-		###   on_status HTTP::BAD_REQUEST do |res, status|
-		###       # Do something on 400 errors
-		###   end
-		###
-		###   # Handle any other error in the 4xx range
-		###   on_status 400..499 do |res, status|
-		###       # Do something on 4xx errors
-		###   end
-		###
 		### If no +range+ is specified, any of the HTTP error statuses will invoke
 		### the callback.
 		###
@@ -84,20 +114,6 @@ module Strelka::App::Errors
 		### [+:status+]   the HTTP status code that was passed to Strelka::App#finish_with
 		### [+:message+]  the message string that was passed to Strelka::App#finish_with
 		###
-		### If you have the <tt>:templating</tt> plugin loaded, you can substitute a
-		### Symbol that corresponds with one of the declared templates instead:
-		#### With the templating plugin, you can also handle it via a custom template.
-		###
-		###   class MyApp < Strelka::App
-		###       plugins :errors, :templating
-		###
-		###       layout 'layout.tmpl'
-		###       templates :missing => 'errors/missing.tmpl'
-		###
-		###       on_status HTTP::NOT_FOUND, :missing
-		###
-		###   end # class MyApp
-		###
 		def on_status( range=DEFAULT_HANDLER_STATUS_RANGE, template=nil, &block )
 			range = Range.new( range, range ) unless range.is_a?( Range )
 			methodname = "for_status_%s" % [ range.begin, range.end ].uniq.join('_to_')

data/lib/strelka/app.rb

@@ -79,8 +79,10 @@ class Strelka::App < Mongrel2::Handler
 	### Return a Hash of Strelka app files as Pathname objects from installed gems,
 	### keyed by gemspec name .
 	def self::discover_paths
+		Strelka.log.debug "Local paths: %s" % [ Strelka.datadir + APP_GLOB_PATTERN ]
+
 		appfiles = {
-			'strelka' => Pathname.glob( Strelka.datadir + APP_GLOB_PATTERN )
+			'' => Pathname.glob( Strelka.datadir + APP_GLOB_PATTERN )
 		}
 
 		# Find all the gems that depend on Strelka
@@ -117,7 +119,7 @@ class Strelka::App < Mongrel2::Handler
 		Strelka.log.debug "Loading apps from %d discovered paths" % [ app_paths.length ]
 		app_paths.each do |gemname, paths|
 			Strelka.log.debug "  loading gem %s" % [ gemname ]
-			gem( gemname ) unless gemname == 'strelka'
+			gem( gemname ) unless gemname == ''
 
 			Strelka.log.debug "  loading apps from %s: %d handlers" % [ gemname, paths.length ]
 			paths.each do |path|

data/lib/strelka/httprequest.rb

@@ -10,12 +10,14 @@ require 'mongrel2/httprequest'
 require 'strelka' unless defined?( Strelka )
 require 'strelka/httpresponse'
 require 'strelka/cookieset'
+require 'strelka/mixins'
 
 # An HTTP request class.
 class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	include Strelka::Loggable,
 	        Strelka::Constants,
-	        Strelka::ResponseHelpers
+	        Strelka::ResponseHelpers,
+			Strelka::DataUtilities
 
 	# Set Mongrel2 to use Strelka's request class for HTTP requests
 	register_request_type( self, *HTTP::RFC2616_VERBS )
@@ -53,7 +55,8 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	attr_writer :params
 
 	# A Hash that plugins can use to pass data amongst themselves. The missing-key
-	# callback is set to auto-create nested sub-hashes.
+	# callback is set to auto-create nested sub-hashes. If you create an HTTPResponse
+	# via #response, the response's notes will be shared with its request.
 	attr_reader :notes
 
 
@@ -206,10 +209,4 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	end
 
 
-	### Create and return a Hash that will auto-vivify any values it is missing with
-	### another auto-vivifying Hash.
-	def autovivify( hash, key )
-		hash[ key ] = Hash.new( &method(:autovivify) )
-	end
-
 end # class Strelka::HTTPRequest

data/lib/strelka/httpresponse.rb

@@ -9,7 +9,8 @@ require 'strelka/cookieset'
 # An HTTP response class.
 class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 	include Strelka::Loggable,
-	        Strelka::Constants
+	        Strelka::Constants,
+			Strelka::DataUtilities
 
 
 	# Pattern for matching a 'charset' parameter in a media-type string, such as the
@@ -22,6 +23,7 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 		@charset   = nil
 		@languages = []
 		@encodings = []
+		@notes     = Hash.new( &method(:autovivify) )
 		@cookies   = nil
 
 		super
@@ -53,6 +55,11 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 	# client. Defaults to the empty Array.
 	attr_accessor :languages
 
+	# A auto-vivifying nested Hash that plugins can use to pass data amongst themselves.
+	# The notes hash is shared between the request and response objects if
+	# the request is set on the response with #request=.
+	attr_reader :notes
+
 
 	### Overridden to add charset, encodings, and languages to outgoing
 	### headers if any of them are set.
@@ -86,6 +93,12 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 	end
 
 
+	### Set the request object associated with this response to +request+.
+	def request=( request )
+		super
+		@notes = request.notes
+	end
+
 
 	#########
 	protected

data/lib/strelka/mixins.rb

@@ -289,6 +289,13 @@ module Strelka
 				end
 		end
 
+
+		### Create and return a Hash that will auto-vivify any values it is missing with
+		### another auto-vivifying Hash.
+		def autovivify( hash, key )
+			hash[ key ] = Hash.new( &Strelka::DataUtilities.method(:autovivify) )
+		end
+
 	end # module DataUtilities
 
 
@@ -341,8 +348,18 @@ module Strelka
 		### http_status code immediately. The specified +message+ will be logged,
 		### and will be included in any message that is returned as part of the
 		### response. The +headers+ hash will be used to set response headers.
-		def finish_with( http_status, message, headers={} )
-			status_info = { :status => http_status, :message => message, :headers => headers }
+		### As a shortcut, you can call #finish_with again with the Hash that it
+		### builds to re-throw it.
+		def finish_with( http_status, message=nil, headers={} )
+			status_info = nil
+
+			if http_status.is_a?( Hash ) && http_status.key?(:status)
+				status_info = http_status
+			else
+				message ||= HTTP::STATUS_NAME[ http_status ]
+				status_info = { :status => http_status, :message => message, :headers => headers }
+			end
+
 			throw :finish, status_info
 		end
 

data/lib/strelka/plugins.rb

@@ -257,6 +257,20 @@ module Strelka
 			self.plugins_installed_from = caller( 1 ).first
 		end
 
+
+
+		### Output the application stack into the logfile.
+		def dump_application_stack
+			stack = self.class.ancestors.
+				reverse.
+				drop_while {|mod| mod != Strelka::PluginLoader }.
+				select {|mod| mod.respond_to?(:plugin_name) }.
+				collect {|mod| mod.plugin_name }.
+				reverse
+
+			self.log.info "Application stack: request -> %s" % [ stack.join(" -> ") ]
+		end
+
 	end # module PluginLoader
 
 end # class Strelka

data/lib/strelka.rb

@@ -21,7 +21,7 @@ module Strelka
 	VERSION = '0.0.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 195b7937f42a $
+	REVISION = %q$Revision: c3e9ce4035b6 $
 
 
 	require 'strelka/logging'
@@ -51,9 +51,15 @@ module Strelka
 	##
 	# The Pathname of the directory that will be searched for default applications,
 	# config, etc.
-	singleton_attr_accessor :datadir
+	singleton_attr_reader :datadir
+
+	### Set the local data directory to +dir+.
+	def self::datadir=( dir )
+		@datadir = Pathname( dir )
+	end
 	self.datadir = DEFAULT_DATADIR
 
+
 	require 'strelka/app'
 	require 'strelka/httprequest'
 	require 'strelka/httpresponse'

data/spec/strelka/app/filters_spec.rb

@@ -88,10 +88,10 @@ describe Strelka::App::Filters do
 			before( :each ) do
 				@app.class_eval do
 					filter do |reqres|
-						if reqres.respond_to?( :notes )
-							reqres.notes[:test] = 'filtered notes'
+						if reqres.is_a?( Strelka::HTTPRequest )
+							reqres.notes[:saw][:request] = true
 						else
-							reqres.body = 'filtered body'
+							reqres.notes[:saw][:response] = true
 						end
 					end
 				end
@@ -117,8 +117,8 @@ describe Strelka::App::Filters do
 
 				res = @app.new.handle( req )
 
-				req.notes[:test].should == 'filtered notes'
-				res.body.should == 'filtered body'
+				req.notes[:saw][:request].should be_true()
+				res.notes[:saw][:response].should be_true()
 			end
 
 		end
@@ -128,10 +128,10 @@ describe Strelka::App::Filters do
 			before( :each ) do
 				@app.class_eval do
 					filter( :request ) do |reqres|
-						if reqres.respond_to?( :notes )
-							reqres.notes[:test] = 'filtered notes'
+						if reqres.is_a?( Strelka::HTTPRequest )
+							reqres.notes[:saw][:request] = true
 						else
-							reqres.body = 'filtered body'
+							reqres.notes[:saw][:response] = true
 						end
 					end
 				end
@@ -157,8 +157,8 @@ describe Strelka::App::Filters do
 
 				res = @app.new.handle( req )
 
-				req.notes[:test].should == 'filtered notes'
-				res.body.should_not == 'filtered body'
+				req.notes[:saw][:request].should be_true()
+				res.notes[:saw][:response].should be_empty()
 			end
 
 		end
@@ -168,10 +168,10 @@ describe Strelka::App::Filters do
 			before( :each ) do
 				@app.class_eval do
 					filter( :response ) do |reqres|
-						if reqres.respond_to?( :notes )
-							reqres.notes[:test] = 'filtered notes'
+						if reqres.is_a?( Strelka::HTTPRequest )
+							reqres.notes[:saw][:request] = true
 						else
-							reqres.body = 'filtered body'
+							reqres.notes[:saw][:response] = true
 						end
 					end
 				end
@@ -197,8 +197,8 @@ describe Strelka::App::Filters do
 
 				res = @app.new.handle( req )
 
-				req.notes[:test].should == {}
-				res.body.should == 'filtered body'
+				req.notes[:saw][:request].should be_empty()
+				res.notes[:saw][:response].should be_true()
 			end
 
 		end

data/spec/strelka/httpresponse_spec.rb

@@ -25,7 +25,8 @@ describe Strelka::HTTPResponse do
 	end
 
 	before( :each ) do
-		@res = @request_factory.get( '/glossary/reduct' ).response
+		@req = @request_factory.get( '/glossary/reduct' )
+		@res = @req.response
 	end
 
 	after( :all ) do
@@ -116,12 +117,17 @@ describe Strelka::HTTPResponse do
 		@res.header_data.should =~ /set-cookie: foom=chuckufarly/i
 	end
 
-	it "allows cookies to appended" do
+	it "allows cookies to be appended" do
 		@res.cookies << Strelka::Cookie.new( 'session', '64a3a92eb7403a8199301e03e8b83810' )
 		@res.cookies << Strelka::Cookie.new( 'cn', '18', :expires => '+1d' )
 		@res.header_data.should =~ /set-cookie: session=64a3a92eb7403a8199301e03e8b83810/i
 		@res.header_data.should =~ /set-cookie: cn=18; expires=/i
 	end
 
+
+	it "shares a 'notes' Hash with its associated request" do
+		@res.notes.should be( @req.notes )
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.194
+  version: 0.0.1.pre.199
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346770348920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,15 +48,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.16'
+  version_requirements: *70346770348920
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346770348380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -64,15 +59,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
+  version_requirements: *70346770348380
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346770347880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,15 +70,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *70346770347880
 - !ruby/object:Gem::Dependency
   name: formvalidator
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346770347340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,15 +81,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+  version_requirements: *70346770347340
 - !ruby/object:Gem::Dependency
   name: inversion
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346770346760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,15 +92,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
+  version_requirements: *70346770346760
 - !ruby/object:Gem::Dependency
   name: mongrel2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346770346280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -128,15 +103,10 @@ dependencies:
         version: '0.20'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.20'
+  version_requirements: *70346770346280
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346770345820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,15 +114,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+  version_requirements: *70346770345820
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899262780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -160,15 +125,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *70346899262780
 - !ruby/object:Gem::Dependency
   name: pluginfactory
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899262200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,15 +136,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *70346899262200
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899261640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -192,15 +147,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
+  version_requirements: *70346899261640
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899261120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,15 +158,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+  version_requirements: *70346899261120
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899260640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -224,15 +169,10 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+  version_requirements: *70346899260640
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899260100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -240,15 +180,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+  version_requirements: *70346899260100
 - !ruby/object:Gem::Dependency
   name: hoe-deveiate
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899259600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -256,15 +191,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+  version_requirements: *70346899259600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899259040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -272,15 +202,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+  version_requirements: *70346899259040
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70346899258540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -288,12 +213,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *70346899258540
 description: ! 'Strelka is a framework for creating and deploying Mongrel2 web applications
 
   in Ruby, and for managing a Mongrel2 cluster.
@@ -444,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: strelka
-rubygems_version: 1.8.21
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Strelka is a framework for creating and deploying Mongrel2 web applications