mongrel2 0.50.2 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: cbc357c3b733b0ae6f356134a6c555c2a66548fe2663993c299d6c1a7abc059a
-  data.tar.gz: f7f6049f1bbc3832caab481dc059497ec1a46bc480a7e0509dd59516653fb5f5
+SHA1:
+  metadata.gz: 8df9f187481c62410559366443e0a498a75858cc
+  data.tar.gz: d0b13dcd1f94d0835230fd2998c73aed4fbce747
 SHA512:
-  metadata.gz: 257aa4f6d84751c1432b070d31091a370a6e09dfda474d9c11e413381c34d7d52d70a2cac385ea2a76e0e5520da07060d020e02901f0d56c2419fe28ba31a6bc
-  data.tar.gz: 3df06b46b2ca54b674afcb3e0c043b4e73308ae316b4bf6ceb541ecc250d985678a3b1aceffcacfd6ae215bc6840326eab29009f173a4c29e64bfc259a71c8fd
+  metadata.gz: 3a4149170b70e911f33b9e743d806138b1a48523298956c733cbc264cfb1cd0e20da45aae8985e302e1ef6648fd46f7c8f655894f338205e31c6e9777f22cdd8
+  data.tar.gz: fa5ca2d024561d07898f15e2da168e2db884722780a75231998d9269ac990a63279dfa00e4055f870bb72e39ff0a5981ffe0d828611575b602ea86a1dec71b45

data/History.rdoc

@@ -1,3 +1,15 @@
+==  v0.51.0 [2017-11-15] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Support (require) Sequel 5
+- Update libxml-ruby dependency to the latest
+
+Bugfixes:
+
+- Add missing config input file for the bootstrap command
+
+
 == v0.50.2 [2017-07-05] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/Manifest.txt

@@ -8,6 +8,7 @@ Manifest.txt
 README.rdoc
 Rakefile
 bin/m2sh.rb
+data/mongrel2/config.rb.in
 data/mongrel2/config.sql
 data/mongrel2/mimetypes.sql
 lib/mongrel2.rb

data/Rakefile

@@ -25,15 +25,15 @@ hoespec = Hoe.spec 'mongrel2' do
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'cztop',       '~> 0.11'
-	self.dependency 'libxml-ruby', '~> 2.7'
-	self.dependency 'loggability', '~> 0.12'
-	self.dependency 'sequel',      '= 4.45'
-	self.dependency 'sqlite3',     '~> 1.3'
-	self.dependency 'sysexits',    '~> 1.1'
-	self.dependency 'tnetstring',  '~> 0.3'
-	self.dependency 'trollop',     '~> 2.0'
-	self.dependency 'yajl-ruby',   '~> 1.0'
+	self.dependency 'cztop',                '~> 0.11'
+	self.dependency 'libxml-ruby',          '~> 3.0'
+	self.dependency 'loggability',          '~> 0.12'
+	self.dependency 'sequel',               '~> 5.2'
+	self.dependency 'sqlite3',              '~> 1.3'
+	self.dependency 'sysexits',             '~> 1.1'
+	self.dependency 'tnetstring',           '~> 0.3'
+	self.dependency 'trollop',              '~> 2.0'
+	self.dependency 'yajl-ruby',            '~> 1.0'
 
 	self.dependency 'amalgalite',      '~> 1.5', :developer
 	self.dependency 'configurability', '~> 3.1', :developer

data/data/mongrel2/config.rb.in

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+#encoding: utf-8
+
+require 'pathname'
+require 'tmpdir'
+
+# This is a Ruby script that will *generate* the SQLite database
+# that Mongrel2 uses for its configuration. You can just as easily
+# use Mongrel2's 'm2sh' and the Pythonish config syntax described
+# in the manual if you prefer that.
+#
+# See the "Mongrel2 Config DSL" section of the API docs, and the "How A
+# Config Is Structured" section of the manual for details
+# on specific items:
+#
+# Mongrel2 Config DSL::
+#   http://deveiate.org/code/mongrel2/DSL_rdoc.html
+#
+# How A Config Is Structured::
+#   http://mongrel2.org/static/book-finalch4.html#x6-260003.4
+#
+# You can load this via the 'm2sh.rb' tool that comes with the 'mongrel2'
+# gem:
+#
+#   m2sh.rb -c config.sqlite load config.rb
+
+# Establish some directories
+base_dir   = Pathname( '%% PWD %%' )
+upload_dir = Pathname( Dir.tmpdir ) + 'm2spool'
+
+# Main Mongrel2 server config
+main = server 'main' do
+
+	name         'Main'
+	default_host 'localhost'
+	chroot       base_dir
+
+	# All of these values are relative to the 'chroot' value if Mongrel2
+	# is started as root. If it's not, they're relative to the directory
+	# it's started in.
+	access_log   '/logs/access.log'
+	error_log    '/logs/error.log'
+	pid_file     '/var/run/mongrel2.pid'
+
+	# This the address and port the server will listen on. You can
+	# use '0.0.0.0' as the bind_addr to listen on all interfaces/IPs.
+	bind_addr    '127.0.0.1'
+	port         8113
+
+	host 'localhost' do
+
+		# Serve static content out of a 'public' subdirectory
+		route '/', directory( "public/", 'index.html', 'text/html' )
+
+		# Dynamic content is served via handler routes
+		route '/hello', handler( 'tcp://127.0.0.1:9999',  'helloworld' )
+
+	end
+
+end
+
+setting 'limits.content_length', 512 * 1024
+setting 'control_port', 'ipc://var/run/mongrel2.sock'
+setting 'upload.temp_store', upload_dir + 'mongrel2.upload.XXXXXX'
+
+# Make relative directories so that starting as a regular user works
+(base_dir + "./#{main.access_log}").dirname.mkpath
+(base_dir + "./#{main.error_log}").dirname.mkpath
+(base_dir + "./#{main.pid_file}").dirname.mkpath
+mkdir_p( upload_dir )
+

data/lib/mongrel2.rb

@@ -22,10 +22,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 2.2 or later. <<<\n\n" if RUBY_VERSION < '2.2.0'
 
 	# Library version constant
-	VERSION = '0.50.2'
+	VERSION = '0.51.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 99ce0d32ae15 $
+	REVISION = %q$Revision: 1a66a960918d $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config.rb

@@ -37,6 +37,7 @@ module Mongrel2
 	# `models`, and makes inheriting it more straightforward.
 	# Thanks to Jeremy Evans for the suggestion.
 	Config = Class.new( Sequel::Model )
+	Config.require_valid_table = false
 
 	# The base Mongrel2 database-backed configuration class. It's a subclass of Sequel::Model, so
 	# you'll first need to be familiar with Sequel (http://sequel.rubyforge.org/) and
@@ -130,8 +131,11 @@ module Mongrel2
 		### Reset the database connection that all model objects will use to +newdb+, which should
 		### be a Sequel::Database.
 		def self::db=( newdb )
-			self.without_sql_logging( newdb ) do
-				super
+			@db = newdb
+			if @dataset
+				Loggability.for_logger( self ).with_level( :fatal ) do
+					set_dataset( newdb.dataset.clone(@dataset.opts) )
+				end
 			end
 
 			if self == Mongrel2::Config

data/lib/mongrel2/constants.rb

@@ -11,7 +11,7 @@ module Mongrel2::Constants
 	# The Pathname of the data directory
 	DATA_DIR = if ENV['MONGREL2_DATADIR']
 			Pathname( ENV['MONGREL2_DATADIR'] )
-		elsif Gem.datadir( 'mongrel2' )
+		elsif Gem.datadir( 'mongrel2' ) && File.directory?( Gem.datadir('mongrel2') )
 			Pathname( Gem.datadir('mongrel2') )
 		else
 			Pathname( __FILE__ ).dirname.parent.parent + 'data/mongrel2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.50.2
+  version: 0.51.0
 platform: ruby
 authors:
 - Michael Granger
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTcwOTI3MDAzMDQ0WhcNMTgwOTI3MDAzMDQ0WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
   83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
@@ -25,17 +25,17 @@ cert_chain:
   /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
   BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
   MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
-  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
-  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
-  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
-  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
-  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
-  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
-  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
-  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
-  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBBQUAA4IBgQB/qyi5pCjK8ceoKalfVAjS
+  vG64FEnLnD1bm39T5UaFIRmo+abZtfpg2QhwKvPbPjOicau2+m+MDQ2Cc3tgyaC3
+  dZxcP6w8APFg4AId09uWAZKf0xajvBMS2aOz8Bbmag6fwqRRkTMqsNYnmqcF7aRT
+  DuEzbEMfaOUYjU9RuB48vr4q8yRft0ww+3jq5iwNkrX1buL2pwBbyvgms6D/BV41
+  MaTVMjsHqJUwU2xVfhGtxGAWAer5S1HGYHkbio6mGVtiie0uWjmnzi7ppIlMr48a
+  7BNTsoZ+/JRk3iQWmmNsyFT7xfqBKye7cH11BX8V8P4MeGB5YWlMI+Myj5DZY3fQ
+  st2AGD4rb1l0ia7PfubcBThSIdz61eCb8gRi/RiZZwb3/7+eyEncLJzt2Ob9fGSF
+  X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
+  OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cztop
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
@@ -83,16 +83,16 @@ dependencies:
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.45'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.45'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +317,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/m2sh.rb
+- data/mongrel2/config.rb.in
 - data/mongrel2/config.sql
 - data/mongrel2/mimetypes.sql
 - lib/mongrel2.rb
@@ -398,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]