strelka 0.0.1.pre.185 → 0.0.1.pre.187

data/ChangeLog

@@ -1,5 +1,30 @@
+2012-04-11  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/app/auth.rb, lib/strelka/app/errors.rb,
+	lib/strelka/app/filters.rb, lib/strelka/app/negotiation.rb,
+	lib/strelka/app/plugins.rb, lib/strelka/app/restresources.rb,
+	lib/strelka/app/sessions.rb, lib/strelka/app/templating.rb,
+	lib/strelka/mixins.rb, spec/strelka/app/auth_spec.rb,
+	spec/strelka/app/errors_spec.rb, spec/strelka/app/filters_spec.rb,
+	spec/strelka/app/negotiation_spec.rb,
+	spec/strelka/app/parameters_spec.rb,
+	spec/strelka/app/restresources_spec.rb,
+	spec/strelka/app/sessions_spec.rb,
+	spec/strelka/app/templating_spec.rb, spec/strelka/mixins_spec.rb:
+	Add inheritance support to plugins.
+
+	Currently, this is done manually by defining an inherited hook in
+	each plugin's ClassMethods, but we'll likely try to find some way to
+	automate it or at least refacter it into a declarative or two.
+	[4217deb1952c] [tip]
+
 2012-04-11  Michael Granger  <ged@FaerieMUD.org>
 
+	* IDEAS.rdoc, Manifest.txt, bin/leash, bin/strelka, lib/strelka.rb,
+	lib/strelka/app.rb, lib/strelka/constants.rb:
+	Rename bin/leash to bin/strelka and allow overriding the DATADIR.
+	[195b7937f42a]
+
 	* Rakefile, lib/strelka/app.rb, lib/strelka/app/auth.rb,
 	lib/strelka/app/errors.rb, lib/strelka/app/filters.rb,
 	lib/strelka/app/negotiation.rb, lib/strelka/app/parameters.rb,
@@ -10,21 +35,23 @@
 	spec/strelka/app/restresources_spec.rb,
 	spec/strelka/app/routing_spec.rb:
 	Fixing specs broken by the deferred plugins change. Ugh, I suck.
-	[d762ebcce3a6] [tip]
+	[d762ebcce3a6]
 
 	* 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,
@@ -35,7 +62,7 @@
 	spec/strelka/paramvalidator_spec.rb:
 	Rework the paramvalidator and parameters plugin to allow per-request
 	overrides
-	[e7393474988b]
+	[e7393474988b] [github/master]
 
 	* bin/leash, examples/apps/auth-demo, examples/apps/auth-demo2,
 	examples/apps/sessions-demo, examples/auth-demo.rb, examples/auth-
@@ -95,22 +122,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,
@@ -128,6 +139,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:
@@ -183,7 +212,7 @@
 	* examples/auth-demo.rb, lib/strelka/app/auth.rb,
 	lib/strelka/authprovider.rb, spec/strelka/app/auth_spec.rb:
 	Merging with accidentally-committed auth patch on Github
-	[3025b5711352] [github/master]
+	[3025b5711352]
 
 2012-03-20  Michael Granger  <ged@FaerieMUD.org>
 

data/Rakefile

@@ -49,19 +49,6 @@ ENV['VERSION'] ||= hoespec.spec.version.to_s
 # Ensure the specs pass before checking in
 task 'hg:precheckin' => [ :check_history, :check_manifest, :spec ]
 
-### Make the ChangeLog update if the repo has changed since it was last built
-file '.hg/branch'
-file 'ChangeLog' => '.hg/branch' do |task|
-	$stderr.puts "Updating the changelog..."
-	content = make_changelog()
-	File.open( task.name, 'w', 0644 ) do |fh|
-		fh.print( content )
-	end
-end
-
-# Rebuild the ChangeLog immediately before release
-task :prerelease => 'ChangeLog'
-
 
 desc "Build a coverage report"
 task :coverage do

data/lib/strelka/app/auth.rb

@@ -253,7 +253,7 @@ module Strelka::App::Auth
 	module ClassMethods
 
 		@auth_provider          = nil
-		@authz_callback          = nil
+		@authz_callback         = nil
 		@positive_auth_criteria = {}
 		@negative_auth_criteria = {}
 
@@ -262,14 +262,25 @@ module Strelka::App::Auth
 		attr_reader :positive_auth_criteria, :negative_auth_criteria
 
 
+		### Extension callback -- add instance variables to extending objects.
+		def inherited( subclass )
+			super
+			subclass.instance_variable_set( :@auth_provider, @auth_provider )
+			subclass.instance_variable_set( :@authz_callback, @authz_callback.dup ) if @authz_callback
+			subclass.instance_variable_set( :@positive_auth_criteria, @positive_auth_criteria.dup )
+			subclass.instance_variable_set( :@negative_auth_criteria, @negative_auth_criteria.dup )
+		end
+
+
 		### Get/set the authentication type.
 		def auth_provider( type=nil )
 			if type
 				@auth_provider = Strelka::AuthProvider.get_subclass( type )
-			elsif type.nil?
-				@auth_provider ||= Strelka::AuthProvider.get_subclass( DEFAULT_AUTH_PROVIDER )
 			end
 
+			Strelka.log.debug "Auth provider %p" % [ @auth_provider ]
+			@auth_provider ||= Strelka::AuthProvider.get_subclass( DEFAULT_AUTH_PROVIDER )
+			Strelka.log.debug "Auth provider %p" % [ @auth_provider ]
 			return @auth_provider
 		end
 

data/lib/strelka/app/errors.rb

@@ -53,6 +53,13 @@ module Strelka::App::Errors
 		attr_reader :status_handlers
 
 
+		### Extension callback -- add instance variables to extending objects.
+		def inherited( subclass )
+			super
+			subclass.instance_variable_set( :@status_handlers, @status_handlers.dup )
+		end
+
+
 		### Register a callback for responses whose status code is within the specified
 		### +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.

data/lib/strelka/app/filters.rb

@@ -23,6 +23,19 @@ module Strelka::App::Filters
 		attr_reader :filters
 
 
+		### Extension callback -- add instance variables to extending objects.
+		def inherited( subclass )
+			super
+
+			sub_filters = {
+				:request  => self.filters[:request].dup,
+				:response => self.filters[:response].dup,
+				:both     => self.filters[:both].dup
+			}
+			subclass.instance_variable_set( :@filters, sub_filters )
+		end
+
+
 		### Get/set the router class to use for mapping requests to handlers to +newclass.
 		def filter( which=:both, &block )
 			which = which.to_sym

data/lib/strelka/app/negotiation.rb

@@ -58,6 +58,14 @@ module Strelka::App::Negotiation
 		attr_reader :transform_names
 
 
+		### Extension callback -- add instance variables to extending objects.
+		def inherited( subclass )
+			super
+			subclass.instance_variable_set( :@content_type_transforms, @content_type_transforms.dup )
+			subclass.instance_variable_set( :@transform_names, @transform_names.dup )
+		end
+
+
 		### Define a new media-type associated with the specified +name+ and +mimetype+. Responses
 		### whose requests accept content of the given +mimetype+ will pass their response to the
 		### specified +transform_block+, which should re-write the response's entity body if it can

data/lib/strelka/app/plugins.rb

@@ -203,12 +203,7 @@ class Strelka::App
 						ival = cm_mod.instance_variable_get( ivar )
 
 						# Don't duplicate modules/classes or immediates
-						case ival
-						when Module, TrueClass, FalseClass, Symbol, Numeric, NilClass
-							instance_variable_set( ivar, ival )
-						else
-							instance_variable_set( ivar, ival.dup )
-						end
+						instance_variable_set( ivar, Strelka::DataUtilities.deep_copy(ival) )
 					end
 				end
 			end

data/lib/strelka/app/restresources.rb

@@ -70,13 +70,13 @@ module Strelka::App::RestResources
 		@resource_verbs = Hash.new {|h,k| h[k] = Set.new }
 
 		# Global options
-		@global_options = DEFAULTS.dup
+		@service_options = DEFAULTS.dup
 
 		# The list of REST routes assigned to Sequel::Model objects
 		attr_reader :resource_verbs
 
-		# The global resource options hash
-		attr_reader :global_options
+		# The global service options hash
+		attr_reader :service_options
 
 
 		### Extension callback -- overridden to also install dependencies.
@@ -96,9 +96,21 @@ module Strelka::App::RestResources
 		end
 
 
+		### Inheritance callback -- copy plugin data to inheriting subclasses.
+		def inherited( subclass )
+			super
+
+			verbs_copy = Strelka::DataUtilities.deep_copy( self.resource_verbs )
+			subclass.instance_variable_set( :@resource_verbs, verbs_copy )
+
+			opts_copy = Strelka::DataUtilities.deep_copy( self.service_options )
+			subclass.instance_variable_set( :@service_options, opts_copy )
+		end
+
+
 		### Set the prefix for all following resource routes to +route+.
 		def resource_prefix( route )
-			self.global_options[ :prefix ] = route
+			self.service_options[ :prefix ] = route
 		end
 
 
@@ -106,7 +118,7 @@ module Strelka::App::RestResources
 		### and returns a Sequel::Dataset)
 		def resource( rsrcobj, options={} )
 			Strelka.log.debug "Adding REST resource for %p" % [ rsrcobj ]
-			options = self.global_options.merge( options )
+			options = self.service_options.merge( options )
 
 			# Figure out what the resource name is, and make the route from it
 			name = options[:name] || rsrcobj.implicit_table_name

data/lib/strelka/app/sessions.rb

@@ -106,6 +106,14 @@ module Strelka::App::Sessions
 		# application
 		@session_namespace = nil
 
+
+		### Extension callback -- add instance variables to extending objects.
+		def inherited( subclass )
+			super
+			subclass.instance_variable_set( :@session_namespace, @session_namespace )
+		end
+
+
 		### Get/set the key that will determine which namespace in the session object
 		### the application will see.
 		def session_namespace( new_namespace=nil )

data/lib/strelka/app/templating.rb

@@ -105,6 +105,14 @@ module Strelka::App::Templating
 		attr_accessor :layout_template
 
 
+		### Extension callback -- add instance variables to extending objects.
+		def inherited( subclass )
+			super
+			subclass.instance_variable_set( :@template_map, @template_map.dup )
+			subclass.instance_variable_set( :@layout_template, @layout_template.dup )
+		end
+
+
 		### Get/set the templates declared for the App.
 		def templates( newhash=nil )
 			if newhash

data/lib/strelka/mixins.rb

@@ -278,6 +278,7 @@ module Strelka
 
 				when Hash
 					newhash = {}
+					newhash.default_proc = obj.default_proc if obj.default_proc
 					obj.each do |k,v|
 						newhash[ deep_copy(k) ] = deep_copy( v )
 					end

data/spec/strelka/app/auth_spec.rb

@@ -116,6 +116,22 @@ describe Strelka::App::Auth do
 			req.authenticated_user.should == 'anonymous'
 		end
 
+		it "has its auth config inherited by subclasses" do
+			@app.class_eval do
+				auth_provider :hostaccess
+				authz_callback { true }
+			end
+			subclass = Class.new( @app )
+
+			subclass.auth_provider.should == @app.auth_provider
+			subclass.authz_callback.should == @app.authz_callback
+			subclass.positive_auth_criteria.should == @app.positive_auth_criteria
+			subclass.positive_auth_criteria.should_not equal( @app.positive_auth_criteria )
+			subclass.negative_auth_criteria.should == @app.negative_auth_criteria
+			subclass.negative_auth_criteria.should_not equal( @app.negative_auth_criteria )
+		end
+
+
 		context "that has negative auth criteria for the root" do
 
 			before( :each ) do

data/spec/strelka/app/errors_spec.rb

@@ -50,6 +50,15 @@ describe Strelka::App::Errors do
 			end
 		end
 
+		it "has its auth config inherited by subclasses" do
+			@app.on_status HTTP::OK do
+				'blap'
+			end
+			subclass = Class.new( @app )
+			subclass.status_handlers.should == @app.status_handlers
+			subclass.status_handlers.should_not equal( @app.status_handlers )
+		end
+
 		it "doesn't alter normal responses" do
 			@app.class_eval do
 				get do |req|

data/spec/strelka/app/filters_spec.rb

@@ -52,6 +52,18 @@ describe Strelka::App::Filters do
 				[ @app, @app.filters.object_id * 2 ]
 		end
 
+		it "has its filters config inherited by subclasses" do
+			@app.filter :request do |req|
+				req.notes['blap'] = true
+			end
+			subclass = Class.new( @app )
+
+			subclass.filters.should == @app.filters
+			subclass.filters.should_not equal( @app.filters )
+			subclass.filters[:request].should_not equal( @app.filters[:request] )
+			subclass.filters[:response].should_not equal( @app.filters[:response] )
+			subclass.filters[:both].should_not equal( @app.filters[:both] )
+		end
 
 		it "has a Hash of filters" do
 			@app.filters.should be_a( Hash )

data/spec/strelka/app/negotiation_spec.rb

@@ -54,6 +54,18 @@ describe Strelka::App::Negotiation do
 		end
 
 
+		it "has its config inherited by subclasses" do
+			@app.add_content_type :text, 'text/plain' do
+				"It's all text now, baby"
+			end
+			subclass = Class.new( @app )
+
+			subclass.transform_names.should == @app.transform_names
+			subclass.transform_names.should_not equal( @app.transform_names )
+			subclass.content_type_transforms.should == @app.content_type_transforms
+			subclass.content_type_transforms.should_not equal( @app.content_type_transforms )
+		end
+
 		it "gets requests that have been extended with content-negotiation" do
 			req = @request_factory.get( '/service/user/estark' )
 			@app.new.handle( req )

data/spec/strelka/app/parameters_spec.rb

@@ -52,6 +52,14 @@ describe Strelka::App::Parameters do
 			@app = nil
 		end
 
+		it "has its config inherited by subclasses" do
+			@app.param :string
+			subclass = Class.new( @app )
+
+			subclass.paramvalidator.param_names.should == @app.paramvalidator.param_names
+			subclass.paramvalidator.should_not equal( @app.paramvalidator )
+		end
+
 		it "has a ParamValidator" do
 			@app.paramvalidator.should be_a( Strelka::ParamValidator )
 		end

data/spec/strelka/app/restresources_spec.rb

@@ -393,6 +393,29 @@ describe Strelka::App::RestResources do
 
 		end # route behaviors
 
+
+		describe "supports inheritance" do
+
+			subject do
+				@app.resource( Mongrel2::Config::Server )
+				Class.new( @app )
+			end
+
+
+			it "has its config inherited by subclass" do
+				subject.service_options.should == @app.service_options
+				subject.service_options.should_not be( @app.service_options )
+			end
+
+			it "has its metadata inherited by subclasses" do
+				subject.resource_verbs.should have( 1 ).member
+				subject.resource_verbs.should include( 'servers' )
+				subject.resource_verbs[ 'servers' ].
+					should include( :OPTIONS, :GET, :HEAD, :POST, :PUT, :DELETE )
+			end
+
+		end # supports inheritance
+
 	end
 
 end

data/spec/strelka/app/sessions_spec.rb

@@ -88,6 +88,12 @@ describe Strelka::App::Sessions do
 			end
 		end
 
+		it "has its config inherited by subclasses" do
+			@app.session_namespace :indian_gurbles
+			subclass = Class.new( @app )
+
+			subclass.session_namespace.should == @app.session_namespace
+		end
 
 		it "has a default session key that's the same as its appid" do
 			@app.session_namespace.should == @app.default_appid

data/spec/strelka/app/templating_spec.rb

@@ -54,6 +54,17 @@ describe Strelka::App::Templating do
 		end
 
 
+		it "has its config inherited by subclasses" do
+			@app.templates :text => '/tmp/blorp'
+			@app.layout 'layout.tmpl'
+			subclass = Class.new( @app )
+
+			subclass.template_map.should == @app.template_map
+			subclass.template_map.should_not equal( @app.template_map )
+			subclass.layout_template.should == @app.layout_template
+			subclass.layout_template.should_not equal( @app.layout_template )
+		end
+
 		it "has a Hash of templates" do
 			@app.templates.should be_a( Hash )
 		end

data/spec/strelka/mixins_spec.rb

@@ -8,6 +8,7 @@ BEGIN {
 	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 }
 
+require 'set'
 require 'rspec'
 require 'spec/lib/helpers'
 require 'strelka/mixins'
@@ -219,5 +220,117 @@ describe Strelka, "mixins" do
 
 	end
 
+
+	describe Strelka::DataUtilities do
+
+		it "doesn't try to dup immediate objects" do
+			Strelka::DataUtilities.deep_copy( nil ).should be( nil )
+			Strelka::DataUtilities.deep_copy( 112 ).should be( 112 )
+			Strelka::DataUtilities.deep_copy( true ).should be( true )
+			Strelka::DataUtilities.deep_copy( false ).should be( false )
+			Strelka::DataUtilities.deep_copy( :a_symbol ).should be( :a_symbol )
+		end
+
+		it "makes distinct copies of arrays and their members" do
+			original = [ 'foom', Set.new([ 1,2 ]), :a_symbol ]
+
+			copy = Strelka::DataUtilities.deep_copy( original )
+
+			copy.should == original
+			copy.should_not be( original )
+			copy[0].should == original[0]
+			copy[0].should_not be( original[0] )
+			copy[1].should == original[1]
+			copy[1].should_not be( original[1] )
+			copy[2].should == original[2]
+			copy[2].should be( original[2] ) # Immediate
+		end
+
+		it "makes recursive copies of deeply-nested Arrays" do
+			original = [ 1, [ 2, 3, [4], 5], 6, [7, [8, 9], 0] ]
+
+			copy = Strelka::DataUtilities.deep_copy( original )
+
+			copy.should == original
+			copy.should_not be( original )
+			copy[1].should_not be( original[1] )
+			copy[1][2].should_not be( original[1][2] )
+			copy[3].should_not be( original[3] )
+			copy[3][1].should_not be( original[3][1] )
+		end
+
+		it "makes distinct copies of Hashes and their members" do
+			original = {
+				:a => 1,
+				'b' => 2,
+				3 => 'c',
+			}
+
+			copy = Strelka::DataUtilities.deep_copy( original )
+
+			copy.should == original
+			copy.should_not be( original )
+			copy[:a].should == 1
+			copy.key( 2 ).should == 'b'
+			copy.key( 2 ).should_not be( original.key(2) )
+			copy[3].should == 'c'
+			copy[3].should_not be( original[3] )
+		end
+
+		it "makes distinct copies of deeply-nested Hashes" do
+			original = {
+				:a => {
+					:b => {
+						:c => 'd',
+						:e => 'f',
+					},
+					:g => 'h',
+				},
+				:i => 'j',
+			}
+
+			copy = Strelka::DataUtilities.deep_copy( original )
+
+			copy.should == original
+			copy[:a][:b][:c].should == 'd'
+			copy[:a][:b][:c].should_not be( original[:a][:b][:c] )
+			copy[:a][:b][:e].should == 'f'
+			copy[:a][:b][:e].should_not be( original[:a][:b][:e] )
+			copy[:a][:g].should == 'h'
+			copy[:a][:g].should_not be( original[:a][:g] )
+			copy[:i].should == 'j'
+			copy[:i].should_not be( original[:i] )
+		end
+
+		it "copies the default proc of copied Hashes" do
+			original = Hash.new {|h,k| h[ k ] = Set.new }
+
+			copy = Strelka::DataUtilities.deep_copy( original )
+
+			copy.default_proc.should == original.default_proc
+		end
+
+		it "preserves taintedness of copied objects" do
+			original = Object.new
+			original.taint
+
+			copy = Strelka::DataUtilities.deep_copy( original )
+
+			copy.should_not be( original )
+			copy.should be_tainted()
+		end
+
+		it "preserves frozen-ness of copied objects" do
+			original = Object.new
+			original.freeze
+
+			copy = Strelka::DataUtilities.deep_copy( original )
+
+			copy.should_not be( original )
+			copy.should be_frozen()
+		end
+
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.185
+  version: 0.0.1.pre.187
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412738440 !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: *70305412738440
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412737980 !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: *70305412737980
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412737520 !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: *70305412737520
 - !ruby/object:Gem::Dependency
   name: formvalidator
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412737060 !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: *70305412737060
 - !ruby/object:Gem::Dependency
   name: inversion
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412736540 !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: *70305412736540
 - !ruby/object:Gem::Dependency
   name: mongrel2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412736020 !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: *70305412736020
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412735580 !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: *70305412735580
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412734980 !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: *70305412734980
 - !ruby/object:Gem::Dependency
   name: pluginfactory
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412734060 !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: *70305412734060
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412733240 !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: *70305412733240
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412732720 !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: *70305412732720
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412732180 !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: *70305412732180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412731580 !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: *70305412731580
 - !ruby/object:Gem::Dependency
   name: hoe-deveiate
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412730800 !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: *70305412730800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412745860 !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: *70305412745860
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70305412745420 !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: *70305412745420
 description: ! 'Strelka is a framework for creating and deploying Mongrel2 web applications
 
   in Ruby, and for managing a Mongrel2 cluster.
@@ -442,7 +362,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