mongrel2 0.20.1 → 0.20.2

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.20.2 [2012-04-10] Michael Granger <ged@FaerieMUD.org>
+
+- Fix Mongrel2::Config.dbname.
+
+
 == v0.20.1 [2012-03-28] Michael Granger <ged@FaerieMUD.org>
 
 - Fix dependencies and the spec that fails when you run against the

data/bin/m2sh.rb

@@ -500,7 +500,7 @@ class Mongrel2::M2SHCommand
 
 		# Run the command, waiting for it to finish if invoked from shell mode, or
 		# execing it if not.
-		cmd = [ mongrel2, Mongrel2::Config.pathname.to_s, server.uuid ]
+		cmd = [ mongrel2, Mongrel2::Config.dbname.to_s, server.uuid ]
 		cmd.unshift( 'sudo' ) if self.options.sudo
 
 		if @shellmode

data/lib/mongrel2.rb

@@ -4,20 +4,20 @@ require 'zmq'
 
 #
 # A Mongrel2 connector and configuration library for Ruby.
-# 
+#
 # == Author/s
-# 
+#
 # * Michael Granger <ged@FaerieMUD.org>
-# 
+#
 module Mongrel2
 
 	abort "\n\n>>> Mongrel2 requires Ruby 1.9.2 or later. <<<\n\n" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.20.1'
+	VERSION = '0.20.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 55a458211cb9 $
+	REVISION = %q$Revision: 7417a035001a $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config.rb

@@ -198,9 +198,8 @@ module Mongrel2
 		### Return the name of the current config database, or nil if the current
 		### database is an in-memory one.
 		def self::dbname
-			Mongrel2.log.warn "Returning dbname from: %p" % [ self.db.opts ]
-			if self.db.opts[:dbname]
-				return self.db.opts[:dbname]
+			if self.db.opts[:database]
+				return self.db.opts[:database]
 			elsif self.db.uri
 				return URI( self.db.uri )
 			else

data/spec/mongrel2/config_spec.rb

@@ -31,6 +31,7 @@ describe Mongrel2::Config do
 
 	after( :all ) do
 		reset_logging()
+		File.delete( 'config-spec.sqlite' ) if File.exist?( 'config.spec.sqlite' )
 	end
 
 
@@ -97,8 +98,8 @@ describe Mongrel2::Config do
 	end
 
 	it "can return the path to the config DB as a Pathname if it's pointing at a file" do
-		Mongrel2::Config.db =
-			Sequel.connect( adapter: Mongrel2::Config.sqlite_adapter, dbname: 'config-spec.sqlite' )
+		Mongrel2::Config.db = Sequel.
+			connect( adapter: Mongrel2::Config.sqlite_adapter, database: 'config-spec.sqlite' )
 		Mongrel2::Config.dbname.should == 'config-spec.sqlite'
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70237984767300 !ruby/object:Gem::Requirement
+  requirement: &70312588292440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70237984767300
+  version_requirements: *70312588292440
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70237984766360 !ruby/object:Gem::Requirement
+  requirement: &70312588291920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: '3.34'
   type: :runtime
   prerelease: false
-  version_requirements: *70237984766360
+  version_requirements: *70312588291920
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70237984765540 !ruby/object:Gem::Requirement
+  requirement: &70312588291220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70237984765540
+  version_requirements: *70312588291220
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70237984764780 !ruby/object:Gem::Requirement
+  requirement: &70312588290540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70237984764780
+  version_requirements: *70312588290540
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70237984780340 !ruby/object:Gem::Requirement
+  requirement: &70312588289960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237984780340
+  version_requirements: *70312588289960
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70237984779460 !ruby/object:Gem::Requirement
+  requirement: &70312588289420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70237984779460
+  version_requirements: *70312588289420
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70237984778420 !ruby/object:Gem::Requirement
+  requirement: &70312588288860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237984778420
+  version_requirements: *70312588288860
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70237984777480 !ruby/object:Gem::Requirement
+  requirement: &70312588288320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70237984777480
+  version_requirements: *70312588288320
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70237984776400 !ruby/object:Gem::Requirement
+  requirement: &70312588287720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,21 +136,21 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70237984776400
+  version_requirements: *70312588287720
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70237984775700 !ruby/object:Gem::Requirement
+  requirement: &70312588287120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70237984775700
+  version_requirements: *70312588287120
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70237984774680 !ruby/object:Gem::Requirement
+  requirement: &70312588302800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70237984774680
+  version_requirements: *70312588302800
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70237984773560 !ruby/object:Gem::Requirement
+  requirement: &70312588302000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70237984773560
+  version_requirements: *70312588302000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70237984772600 !ruby/object:Gem::Requirement
+  requirement: &70312588300680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70237984772600
+  version_requirements: *70312588300680
 - !ruby/object:Gem::Dependency
   name: hoe-deveiate
-  requirement: &70237984787820 !ruby/object:Gem::Requirement
+  requirement: &70312588299900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,10 +191,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70237984787820
+  version_requirements: *70312588299900
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70237984786680 !ruby/object:Gem::Requirement
+  requirement: &70312588299400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -202,7 +202,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70237984786680
+  version_requirements: *70312588299400
 description: ! 'Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for
 
   Mongrel2[http://mongrel2.org/].