mongrel2 0.29.0 → 0.30.0

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.30.0 [2012-07-27] Michael Granger <ged@FaerieMUD.org>
+
+- Add a static index page to the quickstart Dir directory.
+- Make the failure to find a mongrel2 binary friendlier.
+- Fix parameter name of ::by_send_ident for auto-mapping by the rest
+  service.
+
+
 == v0.29.0 [2012-07-13] Michael Granger <ged@FaerieMUD.org>
 
 - Make m2sh.rb write audit log events for modifying actions

data/Manifest.txt

@@ -11,6 +11,7 @@ data/mongrel2/bootstrap.html
 data/mongrel2/config.rb.in
 data/mongrel2/config.sql
 data/mongrel2/css/master.css
+data/mongrel2/index.html.in
 data/mongrel2/js/websock-test.js
 data/mongrel2/mimetypes.sql
 data/mongrel2/websock-test.html

data/Rakefile

@@ -27,7 +27,6 @@ hoespec = Hoe.spec 'mongrel2' do
 
 	self.dependency 'nokogiri',   '~> 1.5'
 	self.dependency 'sequel',     '~> 3.34'
-	self.dependency 'amalgalite', '~> 1.1'
 	self.dependency 'tnetstring', '~> 0.3'
 	self.dependency 'yajl-ruby',  '~> 1.0'
 	self.dependency 'trollop',    '~> 1.16'

data/bin/m2sh.rb

@@ -49,7 +49,7 @@ class Mongrel2::M2SHCommand
 	extend ::Sysexits,
 	       Loggability
 	include Sysexits,
-	        Mongrel2::Constants
+			Mongrel2::Constants
 
 	# Loggability API -- set up logging under the 'strelka' log host
 	log_to :mongrel2
@@ -431,7 +431,7 @@ class Mongrel2::M2SHCommand
 	### The 'start' command
 	def start_command( *args )
 		server = find_server( args.shift )
-		mongrel2 = ENV['MONGREL2'] || 'mongrel2'
+		mongrel2 = find_mongrel2()
 
 		if options.port
 			message "Resetting %s server's port to %d" % [ server.name, options.port ]
@@ -439,7 +439,7 @@ class Mongrel2::M2SHCommand
 			server.save
 		end
 
-		cmd = [ mongrel2, Mongrel2::Config.dbname.to_s, server.uuid ]
+		cmd = [ mongrel2.to_s, Mongrel2::Config.dbname.to_s, server.uuid ]
 		cmd.unshift( 'sudo' ) if self.options.sudo
 
 		url = "http%s://%s:%d" % [
@@ -449,7 +449,9 @@ class Mongrel2::M2SHCommand
 		]
 
 		Mongrel2::Config.log_action( "Starting server: #{server}", self.options.why )
+		message '*' * 70
 		header "Starting mongrel2 at: #{url}"
+		message '*' * 70
 		exec( *cmd )
 	end
 	help :start, "Starts a server."
@@ -524,12 +526,14 @@ class Mongrel2::M2SHCommand
 
 	### The 'bootstrap' command.
 	def bootstrap_command( *args )
-		scriptname = args.shift || DEFAULT_CONFIG_SCRIPT
-		template   = Mongrel2::DATA_DIR + 'config.rb.in'
-		data       = template.read
+		scriptname   = args.shift || DEFAULT_CONFIG_SCRIPT
+		template     = Mongrel2::DATA_DIR + 'config.rb.in'
 
+		# Read the config DSL template
+		data = template.read
 		data.gsub!( /%% PWD %%/, Dir.pwd )
 
+		# Write it out
 		header "Writing a config-generation script to %s" % [ scriptname ]
 		File.open( scriptname, File::WRONLY|File::EXCL|File::CREAT, 0755, encoding: 'utf-8' ) do |fh|
 			fh.print( data )
@@ -542,12 +546,34 @@ class Mongrel2::M2SHCommand
 
 	### The 'quickstart' command.
 	def quickstart_command( *args )
+		idx_template = Mongrel2::DATA_DIR + 'index.html.in'
 		configfile = 'config.rb'
 
 		header "Quickstart!"
 		self.bootstrap_command( configfile )
 		edit( configfile )
 		self.load_command( configfile )
+
+		# Now load the new config DB and fetch the configured server
+		host = Mongrel2::Config.servers.first.hosts.first
+		hello_route = host.routes_dataset.filter( target_type: 'handler' ).first
+
+		# Read the index page template
+		data = idx_template.read
+		data.gsub!( /%% VERSION %%/, Mongrel2.version_string(true) )
+		data.gsub!( /%% HELLOWORLD_SEND_SPEC %%/, hello_route.target.send_spec )
+		data.gsub!( /%% HELLOWORLD_RECV_SPEC %%/, hello_route.target.recv_spec )
+		data.gsub!( /%% HELLOWORLD_URI %%/, hello_route.path[ /([^\(]*)/ ] )
+
+		# Write it out to the public directory
+		header "Writing an index file to public/index.html"
+		Dir.mkdir( 'public' ) unless File.directory?( 'public' )
+		File.open( 'public/index.html', File::WRONLY|File::EXCL|File::CREAT, 0755,
+		           encoding: 'utf-8' ) do |fh|
+			fh.print( data )
+		end
+		message "Done."
+
 		self.start_command()
 	end
 	help :quickstart, "Set up a basic mongrel2 server and run it."
@@ -658,6 +684,36 @@ class Mongrel2::M2SHCommand
 	end
 
 
+	### Search the PATH for a mongrel2 binary, returning the absolute Pathname to it if found, and
+	### outputting a warning and describing how to set ENV['MONGREL2'] if not.
+	def find_mongrel2
+		if ENV['MONGREL2']
+			m2 = Pathname( ENV['MONGREL2'] )
+			error = nil
+			if !m2.file?
+				error = "but it isn't a plain file."
+			elsif !m2.executable?
+				error = "but it isn't executable."
+			end
+
+			raise "MONGREL2 was set to %p, #{error}" if error
+			
+			return m2
+		else
+			m2 = ENV['PATH'].split( File::PATH_SEPARATOR ).
+				map {|dir| Pathname(dir) + 'mongrel2' }.
+				find {|path| path.executable? }
+
+			return m2 if m2
+
+			raise "The 'mongrel2' binary doesn't seem to be in your PATH. Either " +
+				"add the appropriate directory to your PATH or set the MONGREL2 " +
+				"environment variable to the full path."
+		end
+
+	end
+
+
 
 end # class Mongrel2::M2SHCommand
 

data/data/mongrel2/index.html.in

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Ruby-Mongrel2 QuickStart</title>
+	<style type="text/css" media="screen" title="no title" charset="utf-8">
+	html {
+		margin: 0;
+	}
+
+	body {
+		background: rgb(206,220,231); /* Old browsers */
+		background: linear-gradient(to bottom,  rgba(206,220,231,1) 0%,rgba(89,106,114,1) 100%); /* W3C */
+		color: #333;
+		margin: 0;
+		padding: 4em;
+		font-family: Menlo, Monaco, monospace;
+		font-size: 76%;
+		min-width: 785px;
+	}
+
+	footer {
+		position: absolute;
+		bottom: 5px;
+		font-size: 9px;
+		color: #666;
+	}
+
+	</style>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<header>
+		<hgroup>
+			<h1>Ruby-Mongrel2 Quickstart</h1>
+		</hgroup>
+	</header>
+
+	<section>
+		<p>It Works!&trade;</p>
+
+		<p>If you have a Hello World application connected to <tt>%% HELLOWORLD_SEND_SPEC %%</tt> / 
+			<tt>%% HELLOWORLD_RECV_SPEC %%</tt>, you can 
+			<a href="%% HELLOWORLD_URI %%">run it here</a>. You should also try killing
+			the application, clicking the link, then restarting the app. Neat!</p>
+	</section>
+
+	<footer>
+		<p>Brought to you by %% VERSION %%.</p>
+	</footer>
+</body>
+</html>

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.29.0'
+	VERSION = '0.30.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: cc6fcfdf3335 $
+	REVISION = %q$Revision: 560f4524ebb0 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config/handler.rb

@@ -42,8 +42,8 @@ class Mongrel2::Config::Handler < Mongrel2::Config( :handler )
 	# :method: by_send_ident( uuid )
 	#
 	# Look up a Handler by its send_ident, which should be a +uuid+ or similar String.
-	def_dataset_method( :by_send_ident ) do |ident|
-		filter( :send_ident => ident )
+	def_dataset_method( :by_send_ident ) do |send_ident|
+		filter( :send_ident => send_ident )
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -70,22 +70,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.34'
-- !ruby/object:Gem::Dependency
-  name: amalgalite
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: tnetstring
   requirement: !ruby/object:Gem::Requirement
@@ -331,6 +315,7 @@ files:
 - data/mongrel2/config.rb.in
 - data/mongrel2/config.sql
 - data/mongrel2/css/master.css
+- data/mongrel2/index.html.in
 - data/mongrel2/js/websock-test.js
 - data/mongrel2/mimetypes.sql
 - data/mongrel2/websock-test.html