mongrel2 0.9.2 → 0.10.0

data/ChangeLog

@@ -1,8 +1,159 @@
+2012-02-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.10.0 for changeset 1e9885cbcafd
+	[d3f06f6344ad] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 948877fd6c9d
+	[1e9885cbcafd] [v0.10.0]
+
+	* Manifest.txt:
+	Updating the manifest
+	[948877fd6c9d]
+
+	* .hgsigs:
+	Added signature for changeset 2fcffa9c789b
+	[457375acdf50]
+
+	* History.rdoc:
+	Updated the date in the History file
+	[2fcffa9c789b]
+
+2012-01-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* .tm_properties, History.rdoc, data/mongrel2/config.sql,
+	examples/config.rb, lib/mongrel2/config.rb,
+	lib/mongrel2/config/dsl.rb, lib/mongrel2/config/filter.rb,
+	lib/mongrel2/config/server.rb, spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/filter_spec.rb,
+	spec/mongrel2/config/route_spec.rb:
+	Updating config database schema/classes for Mongrel 1.8.
+	[6d2608b23873] [github/master]
+
+	* examples/config.rb:
+	Move the example server back to port 8113
+	[05d301010931]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bumped minor version, updated history.
+	[b3ed6f931afa]
+
+	* .rvm.gems, .rvmrc, Rakefile, bin/m2sh.rb, lib/mongrel2/config.rb,
+	lib/mongrel2/config/server.rb, lib/mongrel2/constants.rb,
+	spec/mongrel2/config/server_spec.rb, spec/mongrel2/config_spec.rb:
+	Adding the rest of the m2sh commands to the ruby analog
+	[23ec891231d3]
+
+2012-01-11  Michael Granger  <ged@FaerieMUD.org>
+
+	* .pryrc:
+	Adding a .pryrc
+	[08d0aad8c902]
+
+2012-01-09  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bumped patch version; updated history file
+	[e05d8ed6d64b]
+
+	* bin/m2sh.rb:
+	Adding a "sudo" option to m2sh.rb to start the server as root
+	[a03146c94124]
+
+2012-01-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Add rvm gemset, update dependencies.
+	[492faafc9c10]
+
+2011-12-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* examples/config.rb:
+	Modified values to be a bit more like the Mongrel2 example
+	[12866b0f1910]
+
+	* .tm_properties:
+	Adding my TextMate2 properties file
+	[7ad85509639e]
+
+2011-12-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvmrc:
+	Use a gemset in the .rvmrc.
+	[0faddd8ecca1]
+
+2011-11-21  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2/config.rb:
+	Enable the json_serializer plugin for the config ORM classes
+	[95702dafbe39]
+
+2011-10-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc, lib/mongrel2/httpresponse.rb, lib/mongrel2/response.rb,
+	lib/mongrel2/table.rb:
+	Backing out the change to HTTPResponse to use the @body ivar:
+	changed the negotiation plugin to use the #to_s method instead.
+	[989199eb3731]
+
 2011-10-12  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.9.2 for changeset 4b86af172b1c
+	[cb02d92719e6]
+
+	* .hgsigs:
+	Added signature for changeset c0a5ad8a50f7
+	[4b86af172b1c] [v0.9.2]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the patch version, update history.
+	[c0a5ad8a50f7]
+
+	* lib/mongrel2/httpresponse.rb:
+	Bugfix: dup instead of clone to get rid of frozen status.
+	[d721f3550aa6]
+
+	* .hgtags:
+	Added tag v0.9.1 for changeset c4bcdadb0ea8
+	[a0fde2550745]
+
+	* .hgsigs:
+	Added signature for changeset f8aa9d64dbd4
+	[c4bcdadb0ea8] [v0.9.1]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the patch version, update history.
+	[f8aa9d64dbd4]
+
+	* lib/mongrel2/httpresponse.rb:
+	Bugfix: don't use the default content type string constant directly.
+	[d82673c8c1ae]
+
+	* .hgtags:
+	Added tag v0.9.0 for changeset 990255c9d9b2
+	[ef6f05d42f79]
+
+	* .hgsigs:
+	Added signature for changeset 180ebbaeb4a0
+	[990255c9d9b2] [v0.9.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bumped minor version, updated history.
+	[180ebbaeb4a0]
+
+	* lib/mongrel2/table.rb, spec/mongrel2/table_spec.rb:
+	Fix Mongrel2::Table not duping/cloning its internal values.
+	[34cb2a0bfee6]
+
+	* lib/mongrel2/httpresponse.rb, spec/mongrel2/httpresponse_spec.rb:
+	Set a default Content-type header in HTTP responses
+	[a9914061817c]
+
 	* .hgtags:
 	Added tag v0.8.0 for changeset 27d84902263b
-	[51ad37ddc1cd] [tip]
+	[51ad37ddc1cd]
 
 	* .hgsigs:
 	Added signature for changeset 986182bd469e
@@ -109,7 +260,7 @@
 
 	* .hgtags:
 	Added tag v0.4.0 for changeset 25f2272fc9f8
-	[0b4e011b72b4] [github/master]
+	[0b4e011b72b4]
 
 	* .hgsigs:
 	Added signature for changeset 3fb74e2ce308
@@ -357,6 +508,10 @@
 	* Automated merge with ssh://deveiate.org/Ruby-Mongrel2
 	[2da76acfb8db]
 
+	* History.rdoc:
+	Updating History
+	[3b013d4918c6]
+
 	* Rakefile:
 	Automated merge with ssh://deveiate.org/Ruby-Mongrel2
 	[e3908fd8e744]
@@ -365,10 +520,6 @@
 	Remove ChangeLog task, since hoe-deveiate already does it
 	[5f4982a32949]
 
-	* History.rdoc:
-	Updating History
-	[3b013d4918c6]
-
 	* .hgtags:
 	Added tag v0.1.1 for changeset 42da048fe158
 	[2489be2693d5]
@@ -538,18 +689,6 @@
 	* Merged with 6ea60b67e106
 	[6d5341f30cc4]
 
-	* Manifest.txt:
-	Updating the manifest for the first release
-	[916a79570cdc]
-
-	* examples/helloworld-handler.rb, lib/mongrel2/handler.rb:
-	More Handler API docs.
-	[47427db9b4fb]
-
-	* lib/mongrel2/handler.rb:
-	Adding some Mongrel2::Handler API docs.
-	[da95bfdf83da]
-
 	* lib/mongrel2/config/host.rb:
 	Adding a many_to_one association for the server belonging to a
 	Mongrel2::Config::Host
@@ -569,6 +708,18 @@
 	Adding a proftools dump of the requestdumper app
 	[00cbc1b89a61]
 
+	* Manifest.txt:
+	Updating the manifest for the first release
+	[916a79570cdc]
+
+	* examples/helloworld-handler.rb, lib/mongrel2/handler.rb:
+	More Handler API docs.
+	[47427db9b4fb]
+
+	* lib/mongrel2/handler.rb:
+	Adding some Mongrel2::Handler API docs.
+	[da95bfdf83da]
+
 2011-09-08  Michael Granger  <ged@FaerieMUD.org>
 
 	* README.rdoc, lib/mongrel2.rb, lib/mongrel2/config.rb,

data/History.rdoc

@@ -1,3 +1,24 @@
+== v0.10.0 [2012-02-06] Michael Granger <ged@FaerieMUD.org>
+
+This release includes updates for Mongrel 1.8 and finishes up the m2sh.rb tool.
+
+- New config class: Mongrel2::Config::Filter
+- New DSL directive inside a 'server' section: 'filter'
+- New methods:
+  * Mongrel2::Config.settings
+  * Mongrel2::Server
+    - #control_socket_uri
+	- #control_socket
+	- #pid_file_path
+- Added a new Mongrel2::Constants::DEFAULT_CONTROL_SOCKET constant
+- Finished implementation of the rest of the m2sh commands in the ruby
+  analog
+- Adding a "sudo" option to m2sh.rb to start the server as root
+- Enable the json_serializer plugin for the config ORM classes
+- Backing out the change to HTTPResponse to use the @body ivar: changed
+  the negotiation
+
+
 == v0.9.2 [2011-10-12] Michael Granger <ged@FaerieMUD.org>
 
 Bugfix: dup instead of clone to get rid of frozen status.

data/Manifest.txt

@@ -20,6 +20,7 @@ lib/mongrel2.rb
 lib/mongrel2/config.rb
 lib/mongrel2/config/directory.rb
 lib/mongrel2/config/dsl.rb
+lib/mongrel2/config/filter.rb
 lib/mongrel2/config/handler.rb
 lib/mongrel2/config/host.rb
 lib/mongrel2/config/log.rb
@@ -49,6 +50,7 @@ spec/lib/helpers.rb
 spec/lib/matchers.rb
 spec/mongrel2/config/directory_spec.rb
 spec/mongrel2/config/dsl_spec.rb
+spec/mongrel2/config/filter_spec.rb
 spec/mongrel2/config/handler_spec.rb
 spec/mongrel2/config/host_spec.rb
 spec/mongrel2/config/log_spec.rb

data/README.rdoc

@@ -1,4 +1,3 @@
-
 = Ruby-Mongrel2
 
 * http://deveiate.org/projects/Ruby-Mongrel2/

data/Rakefile

@@ -26,14 +26,16 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'nokogiri',   '~> 1.5'
-	self.dependency 'sequel',     '~> 3.26'
+	self.dependency 'sequel',     '~> 3.31'
 	self.dependency 'amalgalite', '~> 1.1'
 	self.dependency 'tnetstring', '~> 0.3'
-	self.dependency 'yajl-ruby',  '~> 0.8'
+	self.dependency 'yajl-ruby',  '~> 1.0'
+	self.dependency 'trollop',    '~> 1.16'
+	self.dependency 'sysexits',   '~> 1.0'
 	self.dependency 'zmq',        '~> 2.1.4'
 
 	self.dependency 'configurability', '~> 1.0', :developer
-	self.dependency 'rspec',           '~> 2.4', :developer
+	self.dependency 'rspec',           '~> 2.8', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.require_ruby_version( '>= 1.9.2' )
@@ -47,12 +49,13 @@ end
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
 # Ensure the specs pass before checking in
-task 'hg:precheckin' => [ :check_manifest, :check_history, :spec ]
-
+task 'hg:precheckin' => [:check_manifest, :check_history, :spec]
 
 # Rebuild the ChangeLog immediately before release
 task :prerelease => [:check_manifest, :check_history, 'ChangeLog']
 
+task :check_manifest => 'ChangeLog'
+
 
 desc "Build a coverage report"
 task :coverage do

data/bin/m2sh.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'pp'
+require 'uri'
+require 'pathname'
 require 'shellwords'
 require 'fileutils'
 require 'tnetstring'
@@ -29,18 +30,20 @@ require 'mongrel2/config'
 #   [√]  commit  Adds a message to the log.
 #   [√]     log  Prints the commit log.
 #   [√]   start  Starts a server.
-#   [ ]    stop  Stops a server.
-#   [ ]  reload  Reloads a server.
-#   [ ] running  Tells you what's running.
-#   [ ] control  Connects to the control port.
+#   [√]    stop  Stops a server.
+#   [√]  reload  Reloads a server.
+#   [√] running  Tells you what's running.
+#   [-] control  Connects to the control port.
 #   [√] version  Prints the Mongrel2 and m2sh version.
 #   [√]    help  Get help, lists commands.
 #   [-]    uuid  Prints out a randomly generated UUID.
 #
 # I just use 'uuidgen' to generate uuids (which is all m2sh does, as
-# well), so I don't plan to implement that. Everything else should
-# be pretty easy.
-# 
+# well), so I don't plan to implement that. The 'control' command is more-easily
+# accessed via pry+Mongrel2::Control, so I'm not going to implement that, either.
+# Everything else should be analagous to (or better than) the m2sh that comes with
+# mongrel2.
+#
 class Mongrel2::M2SHCommand
 	extend ::Sysexits
 	include Sysexits,
@@ -49,11 +52,11 @@ class Mongrel2::M2SHCommand
 
 	# Make a HighLine color scheme
 	COLOR_SCHEME = HighLine::ColorScheme.new do |scheme|
-		scheme[:header]	   = [ :bold, :yellow ]
+		scheme[:header]    = [ :bold, :yellow ]
 		scheme[:subheader] = [ :bold, :white ]
-		scheme[:key]	   = [ :white ]
-		scheme[:value]	   = [ :bold, :white ]
-		scheme[:error]	   = [ :red ]
+		scheme[:key]       = [ :white ]
+		scheme[:value]     = [ :bold, :white ]
+		scheme[:error]     = [ :red ]
 		scheme[:warning]   = [ :yellow ]
 		scheme[:message]   = [ :reset ]
 	end
@@ -101,7 +104,7 @@ class Mongrel2::M2SHCommand
 	def self::prompt
 		unless @prompt
 			@prompt = HighLine.new
-			@prompt.wrap_at = @prompt.output_cols - 10
+			# @prompt.wrap_at = @prompt.output_cols - 3
 		end
 
 		return @prompt
@@ -180,6 +183,7 @@ class Mongrel2::M2SHCommand
 				text 'Global Options'
 				opt :config, "Specify the configfile to use.",
 					:default => DEFAULT_CONFIG_URI
+				opt :sudo, "Use 'sudo' to run the mongrel2 server."
 				text ''
 
 				text 'Other Options:'
@@ -491,33 +495,14 @@ class Mongrel2::M2SHCommand
 
 	### The 'start' command
 	def start_command( *args )
-		serverspec = args.shift
-		servers = Mongrel2::Config.servers
-
-		raise "No servers are configured." if servers.empty?
-		server = nil
-
-		# If there's only one configured server, just make sure if a serverspec was given
-		# that it would have matched.
-		if servers.length == 1
-			server = servers.first if !serverspec ||
-				servers.first.values_at( :uuid, :default_host, :name ).include?( serverspec )
-
-		# Otherwise, require an argument and search for the desired server if there is one
-		else
-			raise "You must specify a server uuid/hostname/name when more " +
-			      "than one server is configured." if servers.length > 1 && !serverspec
-
-			server = servers.find {|s| s.uuid == serverspec } ||
-			         servers.find {|s| s.default_host == serverspec } ||
-			         servers.find {|s| s.name == serverspec }
-		end
-
-		raise "No servers match '#{serverspec}'" unless server
+		server = find_server( args.shift )
+		mongrel2 = ENV['MONGREL2'] || 'mongrel2'
 
 		# 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.pathname.to_s, server.uuid ]
+		cmd.unshift( 'sudo' ) if self.options.sudo
+
 		if @shellmode
 			system( *cmd )
 		else
@@ -529,12 +514,65 @@ class Mongrel2::M2SHCommand
 	[SERVER]
 	If not specified, SERVER is assumed to be the only server entry in the
 	current config. If there are more than one, you must specify a SERVER.
-	
+
 	The SERVER can be a uuid, hostname, or server name, and are searched for
 	in that order.
 	END_USAGE
 
 
+	### The 'reload' command
+	def reload_command( *args )
+		server = find_server( args.shift )
+		control = server.control_socket
+
+		header "Reloading '%s'" % [ server.name ]
+		control.reload
+		message "done."
+	end
+	help :reload, "Reload the specified server's configuration"
+	usage :reload, "[server]"
+
+
+	### The 'stop' command
+	def stop_command( *args )
+		server = find_server( args.shift )
+		control = server.control_socket
+
+		header "Stopping '%s' gracefully." % [ server.name ]
+		control.stop
+		message "done."
+	end
+	help :stop, "Stop the specified server gracefully"
+	usage :stop, "[server]"
+
+
+	### The 'running' command
+	def running_command( *args )
+		server = find_server( args.shift )
+		pidfile = server.pid_file_path
+
+		header "Checking the status of the '%s' server." % [ server.name ]
+		unless pidfile.exist?
+			message "Not running: PID file (%s) doesn't exist." % [ pidfile ]
+			exit :noinput
+		end
+
+		pid = Integer( pidfile.read )
+		begin
+			Process.kill( 0, pid )
+		rescue Errno::ESRCH
+			message "  mongrel2 at PID %d is NOT running" % [ pid ]
+			exit :unavailable
+		rescue => err
+			error "  %p while signalling PID %d: %s" % [ err.class, pid, err.message ]
+		end
+
+		message "  mongrel2 at PID %d is running." % [ pid ]
+	end
+	help :running, "Show the status of a server."
+	usage :running, "[server]"
+
+
 	### The 'version' command
 	def version_command( *args )
 		message( "<%= color 'Version:', :header %> " + Mongrel2.version_string(true) )
@@ -594,6 +632,35 @@ class Mongrel2::M2SHCommand
 	end
 
 
+	### Search the current mongrel2 config for a server matching +serverspec+ and
+	### return it as a Mongrel2::Config::Server object.
+	def find_server( serverspec=nil )
+		server = nil
+		servers = Mongrel2::Config.servers
+
+		raise "No servers are configured." if servers.empty?
+
+		# If there's only one configured server, just make sure if a serverspec was given
+		# that it would have matched.
+		if servers.length == 1
+			server = servers.first if !serverspec ||
+				servers.first.values_at( :uuid, :default_host, :name ).include?( serverspec )
+
+		# Otherwise, require an argument and search for the desired server if there is one
+		else
+			raise "You must specify a server uuid/hostname/name when more " +
+			      "than one server is configured." if servers.length > 1 && !serverspec
+
+			server = servers.find {|s| s.uuid == serverspec } ||
+			         servers.find {|s| s.default_host == serverspec } ||
+			         servers.find {|s| s.name == serverspec }
+		end
+
+		raise "No servers match '#{serverspec}'" unless server
+
+		return server
+	end
+
 end # class Mongrel2::M2SHCommand