mongrel2 0.31.1 → 0.32.0

data/ChangeLog

@@ -1,8 +1,26 @@
+2012-08-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.31.1 for changeset 54464cda5795
+	[933a499629d1] [tip]
+
+	* .hgsigs:
+	Added signature for changeset a66bb80de490
+	[54464cda5795] [v0.31.1]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the patch version.
+	[a66bb80de490]
+
+	* bin/m2sh.rb:
+	Fix an error message in m2sh.rb.
+	[ad92bd336353]
+
 2012-07-30  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.31.0 for changeset b58221438f3a
-	[c268a5309eee] [tip]
+	[c268a5309eee]
 
 	* .hgsigs:
 	Added signature for changeset 6e11a9a95c81
@@ -27,7 +45,7 @@
 
 	* .hgtags:
 	Added tag v0.30.1 for changeset 01750f74082c
-	[8208fbbc6641] [github/master]
+	[8208fbbc6641]
 
 	* .hgsigs:
 	Added signature for changeset 4ebef57dc78c
@@ -321,7 +339,7 @@
 	examples/config.rb, lib/mongrel2/config.rb,
 	lib/mongrel2/httprequest.rb, spec/mongrel2/config_spec.rb:
 	Change Config.settings to a Table, small fixups for async upload.
-	[e2384875455d] [github/master@default]
+	[e2384875455d]
 
 	* .tm_properties, data/mongrel2/bootstrap.html, examples/.env,
 	examples/Procfile, examples/async-upload.rb, examples/config.rb,

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.32.0 [2012-09-18] Michael Granger <ged@FaerieMUD.org>
+
+- Add a settings command for showing "expert" settings to m2sh.rb.
+- Updating dependencies
+
+
 == v0.31.1 [2012-08-20] Michael Granger <ged@FaerieMUD.org>
 
 - Fix an error message in m2sh.rb.

data/Rakefile

@@ -26,16 +26,16 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'nokogiri',   '~> 1.5'
-	self.dependency 'sequel',     '~> 3.34'
+	self.dependency 'sequel',     '~> 3.39'
 	self.dependency 'tnetstring', '~> 0.3'
 	self.dependency 'yajl-ruby',  '~> 1.0'
-	self.dependency 'trollop',    '~> 1.16'
-	self.dependency 'sysexits',   '~> 1.0'
+	self.dependency 'trollop',    '~> 2.0'
+	self.dependency 'sysexits',   '~> 1.1'
 	self.dependency 'zmq',        '~> 2.1'
-	self.dependency 'loggability','~> 0.2'
+	self.dependency 'loggability','~> 0.5'
 	self.dependency 'sqlite3',    '~> 1.3'
 
-	self.dependency 'configurability', '~> 1.0', :developer
+	self.dependency 'configurability', '~> 1.2', :developer
 	self.dependency 'simplecov',       '~> 0.6', :developer
 	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
 

data/bin/m2sh.rb

@@ -5,6 +5,7 @@ require 'pathname'
 require 'fileutils'
 require 'tnetstring'
 require 'loggability'
+require 'shellwords'
 
 require 'trollop'
 require 'highline'
@@ -450,9 +451,12 @@ class Mongrel2::M2SHCommand
 
 		# Change into the server's chroot directory so paths line up whether or not
 		# it's started as root
+
+		header "Starting mongrel2 at: #{url}."
 		Dir.chdir( server.chroot ) do
+			message "  changed PWD to: #{Dir.pwd}"
 			Mongrel2::Config.log_action( "Starting server: #{server}", self.options.why )
-			header "Starting mongrel2 at: #{url}"
+			self.log.debug "  command is: #{Shellwords.shelljoin(cmd)}"
 			exec( *cmd )
 		end
 
@@ -588,6 +592,17 @@ class Mongrel2::M2SHCommand
 	usage :quickstart
 
 
+	### The 'settings' command
+	def settings_command( *args )
+		header "Advanced Server Settings"
+		Mongrel2::Config.settings.each do |key,val|
+			message( %{<%= color "#{key}:", :subheader %> #{val}} )
+		end
+	end
+	help :settings, "Show the 'advanced' server settings."
+	usage :settings
+
+
 	### The 'version' command
 	def version_command( *args )
 		message( "<%= color 'Version:', :header %> " + Mongrel2.version_string(true) )

data/lib/mongrel2.rb

@@ -20,10 +20,10 @@ 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.31.1'
+	VERSION = '0.32.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: a66bb80de490 $
+	REVISION = %q$Revision: ebfb060e8c65 $
 
 
 	require 'mongrel2/constants'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -61,7 +61,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.34'
+        version: '3.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.34'
+        version: '3.39'
 - !ruby/object:Gem::Dependency
   name: tnetstring
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: zmq
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -237,7 +237,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -245,7 +245,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement