mongrel2 0.50.2 → 0.51.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: cbc357c3b733b0ae6f356134a6c555c2a66548fe2663993c299d6c1a7abc059a
4
- data.tar.gz: f7f6049f1bbc3832caab481dc059497ec1a46bc480a7e0509dd59516653fb5f5
2
+ SHA1:
3
+ metadata.gz: 8df9f187481c62410559366443e0a498a75858cc
4
+ data.tar.gz: d0b13dcd1f94d0835230fd2998c73aed4fbce747
5
5
  SHA512:
6
- metadata.gz: 257aa4f6d84751c1432b070d31091a370a6e09dfda474d9c11e413381c34d7d52d70a2cac385ea2a76e0e5520da07060d020e02901f0d56c2419fe28ba31a6bc
7
- data.tar.gz: 3df06b46b2ca54b674afcb3e0c043b4e73308ae316b4bf6ceb541ecc250d985678a3b1aceffcacfd6ae215bc6840326eab29009f173a4c29e64bfc259a71c8fd
6
+ metadata.gz: 3a4149170b70e911f33b9e743d806138b1a48523298956c733cbc264cfb1cd0e20da45aae8985e302e1ef6648fd46f7c8f655894f338205e31c6e9777f22cdd8
7
+ data.tar.gz: fa5ca2d024561d07898f15e2da168e2db884722780a75231998d9269ac990a63279dfa00e4055f870bb72e39ff0a5981ffe0d828611575b602ea86a1dec71b45
Binary file
data.tar.gz.sig CHANGED
Binary file
@@ -1,3 +1,15 @@
1
+ == v0.51.0 [2017-11-15] Michael Granger <ged@FaerieMUD.org>
2
+
3
+ Enhancements:
4
+
5
+ - Support (require) Sequel 5
6
+ - Update libxml-ruby dependency to the latest
7
+
8
+ Bugfixes:
9
+
10
+ - Add missing config input file for the bootstrap command
11
+
12
+
1
13
  == v0.50.2 [2017-07-05] Michael Granger <ged@FaerieMUD.org>
2
14
 
3
15
  Bugfixes:
@@ -8,6 +8,7 @@ Manifest.txt
8
8
  README.rdoc
9
9
  Rakefile
10
10
  bin/m2sh.rb
11
+ data/mongrel2/config.rb.in
11
12
  data/mongrel2/config.sql
12
13
  data/mongrel2/mimetypes.sql
13
14
  lib/mongrel2.rb
data/Rakefile CHANGED
@@ -25,15 +25,15 @@ hoespec = Hoe.spec 'mongrel2' do
25
25
 
26
26
  self.developer 'Michael Granger', 'ged@FaerieMUD.org'
27
27
 
28
- self.dependency 'cztop', '~> 0.11'
29
- self.dependency 'libxml-ruby', '~> 2.7'
30
- self.dependency 'loggability', '~> 0.12'
31
- self.dependency 'sequel', '= 4.45'
32
- self.dependency 'sqlite3', '~> 1.3'
33
- self.dependency 'sysexits', '~> 1.1'
34
- self.dependency 'tnetstring', '~> 0.3'
35
- self.dependency 'trollop', '~> 2.0'
36
- self.dependency 'yajl-ruby', '~> 1.0'
28
+ self.dependency 'cztop', '~> 0.11'
29
+ self.dependency 'libxml-ruby', '~> 3.0'
30
+ self.dependency 'loggability', '~> 0.12'
31
+ self.dependency 'sequel', '~> 5.2'
32
+ self.dependency 'sqlite3', '~> 1.3'
33
+ self.dependency 'sysexits', '~> 1.1'
34
+ self.dependency 'tnetstring', '~> 0.3'
35
+ self.dependency 'trollop', '~> 2.0'
36
+ self.dependency 'yajl-ruby', '~> 1.0'
37
37
 
38
38
  self.dependency 'amalgalite', '~> 1.5', :developer
39
39
  self.dependency 'configurability', '~> 3.1', :developer
@@ -0,0 +1,71 @@
1
+ #!/usr/bin/env ruby
2
+ #encoding: utf-8
3
+
4
+ require 'pathname'
5
+ require 'tmpdir'
6
+
7
+ # This is a Ruby script that will *generate* the SQLite database
8
+ # that Mongrel2 uses for its configuration. You can just as easily
9
+ # use Mongrel2's 'm2sh' and the Pythonish config syntax described
10
+ # in the manual if you prefer that.
11
+ #
12
+ # See the "Mongrel2 Config DSL" section of the API docs, and the "How A
13
+ # Config Is Structured" section of the manual for details
14
+ # on specific items:
15
+ #
16
+ # Mongrel2 Config DSL::
17
+ # http://deveiate.org/code/mongrel2/DSL_rdoc.html
18
+ #
19
+ # How A Config Is Structured::
20
+ # http://mongrel2.org/static/book-finalch4.html#x6-260003.4
21
+ #
22
+ # You can load this via the 'm2sh.rb' tool that comes with the 'mongrel2'
23
+ # gem:
24
+ #
25
+ # m2sh.rb -c config.sqlite load config.rb
26
+
27
+ # Establish some directories
28
+ base_dir = Pathname( '%% PWD %%' )
29
+ upload_dir = Pathname( Dir.tmpdir ) + 'm2spool'
30
+
31
+ # Main Mongrel2 server config
32
+ main = server 'main' do
33
+
34
+ name 'Main'
35
+ default_host 'localhost'
36
+ chroot base_dir
37
+
38
+ # All of these values are relative to the 'chroot' value if Mongrel2
39
+ # is started as root. If it's not, they're relative to the directory
40
+ # it's started in.
41
+ access_log '/logs/access.log'
42
+ error_log '/logs/error.log'
43
+ pid_file '/var/run/mongrel2.pid'
44
+
45
+ # This the address and port the server will listen on. You can
46
+ # use '0.0.0.0' as the bind_addr to listen on all interfaces/IPs.
47
+ bind_addr '127.0.0.1'
48
+ port 8113
49
+
50
+ host 'localhost' do
51
+
52
+ # Serve static content out of a 'public' subdirectory
53
+ route '/', directory( "public/", 'index.html', 'text/html' )
54
+
55
+ # Dynamic content is served via handler routes
56
+ route '/hello', handler( 'tcp://127.0.0.1:9999', 'helloworld' )
57
+
58
+ end
59
+
60
+ end
61
+
62
+ setting 'limits.content_length', 512 * 1024
63
+ setting 'control_port', 'ipc://var/run/mongrel2.sock'
64
+ setting 'upload.temp_store', upload_dir + 'mongrel2.upload.XXXXXX'
65
+
66
+ # Make relative directories so that starting as a regular user works
67
+ (base_dir + "./#{main.access_log}").dirname.mkpath
68
+ (base_dir + "./#{main.error_log}").dirname.mkpath
69
+ (base_dir + "./#{main.pid_file}").dirname.mkpath
70
+ mkdir_p( upload_dir )
71
+
@@ -22,10 +22,10 @@ module Mongrel2
22
22
  abort "\n\n>>> Mongrel2 requires Ruby 2.2 or later. <<<\n\n" if RUBY_VERSION < '2.2.0'
23
23
 
24
24
  # Library version constant
25
- VERSION = '0.50.2'
25
+ VERSION = '0.51.0'
26
26
 
27
27
  # Version-control revision constant
28
- REVISION = %q$Revision: 99ce0d32ae15 $
28
+ REVISION = %q$Revision: 1a66a960918d $
29
29
 
30
30
 
31
31
  require 'mongrel2/constants'
@@ -37,6 +37,7 @@ module Mongrel2
37
37
  # `models`, and makes inheriting it more straightforward.
38
38
  # Thanks to Jeremy Evans for the suggestion.
39
39
  Config = Class.new( Sequel::Model )
40
+ Config.require_valid_table = false
40
41
 
41
42
  # The base Mongrel2 database-backed configuration class. It's a subclass of Sequel::Model, so
42
43
  # you'll first need to be familiar with Sequel (http://sequel.rubyforge.org/) and
@@ -130,8 +131,11 @@ module Mongrel2
130
131
  ### Reset the database connection that all model objects will use to +newdb+, which should
131
132
  ### be a Sequel::Database.
132
133
  def self::db=( newdb )
133
- self.without_sql_logging( newdb ) do
134
- super
134
+ @db = newdb
135
+ if @dataset
136
+ Loggability.for_logger( self ).with_level( :fatal ) do
137
+ set_dataset( newdb.dataset.clone(@dataset.opts) )
138
+ end
135
139
  end
136
140
 
137
141
  if self == Mongrel2::Config
@@ -11,7 +11,7 @@ module Mongrel2::Constants
11
11
  # The Pathname of the data directory
12
12
  DATA_DIR = if ENV['MONGREL2_DATADIR']
13
13
  Pathname( ENV['MONGREL2_DATADIR'] )
14
- elsif Gem.datadir( 'mongrel2' )
14
+ elsif Gem.datadir( 'mongrel2' ) && File.directory?( Gem.datadir('mongrel2') )
15
15
  Pathname( Gem.datadir('mongrel2') )
16
16
  else
17
17
  Pathname( __FILE__ ).dirname.parent.parent + 'data/mongrel2'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mongrel2
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.50.2
4
+ version: 0.51.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Granger
@@ -10,9 +10,9 @@ bindir: bin
10
10
  cert_chain:
11
11
  - |
12
12
  -----BEGIN CERTIFICATE-----
13
- MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
13
+ MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
14
14
  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
15
- HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
15
+ HhcNMTcwOTI3MDAzMDQ0WhcNMTgwOTI3MDAzMDQ0WjA+MQwwCgYDVQQDDANnZWQx
16
16
  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
17
17
  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
18
18
  83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
@@ -25,17 +25,17 @@ cert_chain:
25
25
  /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
26
26
  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
27
27
  MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
28
- YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
29
- FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
30
- db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
31
- inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
32
- DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
33
- PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
34
- 6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
35
- w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
36
- p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
28
+ YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBBQUAA4IBgQB/qyi5pCjK8ceoKalfVAjS
29
+ vG64FEnLnD1bm39T5UaFIRmo+abZtfpg2QhwKvPbPjOicau2+m+MDQ2Cc3tgyaC3
30
+ dZxcP6w8APFg4AId09uWAZKf0xajvBMS2aOz8Bbmag6fwqRRkTMqsNYnmqcF7aRT
31
+ DuEzbEMfaOUYjU9RuB48vr4q8yRft0ww+3jq5iwNkrX1buL2pwBbyvgms6D/BV41
32
+ MaTVMjsHqJUwU2xVfhGtxGAWAer5S1HGYHkbio6mGVtiie0uWjmnzi7ppIlMr48a
33
+ 7BNTsoZ+/JRk3iQWmmNsyFT7xfqBKye7cH11BX8V8P4MeGB5YWlMI+Myj5DZY3fQ
34
+ st2AGD4rb1l0ia7PfubcBThSIdz61eCb8gRi/RiZZwb3/7+eyEncLJzt2Ob9fGSF
35
+ X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
36
+ OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
37
37
  -----END CERTIFICATE-----
38
- date: 2017-07-05 00:00:00.000000000 Z
38
+ date: 2017-11-15 00:00:00.000000000 Z
39
39
  dependencies:
40
40
  - !ruby/object:Gem::Dependency
41
41
  name: cztop
@@ -57,14 +57,14 @@ dependencies:
57
57
  requirements:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
- version: '2.7'
60
+ version: '3.0'
61
61
  type: :runtime
62
62
  prerelease: false
63
63
  version_requirements: !ruby/object:Gem::Requirement
64
64
  requirements:
65
65
  - - "~>"
66
66
  - !ruby/object:Gem::Version
67
- version: '2.7'
67
+ version: '3.0'
68
68
  - !ruby/object:Gem::Dependency
69
69
  name: loggability
70
70
  requirement: !ruby/object:Gem::Requirement
@@ -83,16 +83,16 @@ dependencies:
83
83
  name: sequel
84
84
  requirement: !ruby/object:Gem::Requirement
85
85
  requirements:
86
- - - '='
86
+ - - "~>"
87
87
  - !ruby/object:Gem::Version
88
- version: '4.45'
88
+ version: '5.2'
89
89
  type: :runtime
90
90
  prerelease: false
91
91
  version_requirements: !ruby/object:Gem::Requirement
92
92
  requirements:
93
- - - '='
93
+ - - "~>"
94
94
  - !ruby/object:Gem::Version
95
- version: '4.45'
95
+ version: '5.2'
96
96
  - !ruby/object:Gem::Dependency
97
97
  name: sqlite3
98
98
  requirement: !ruby/object:Gem::Requirement
@@ -317,6 +317,7 @@ files:
317
317
  - README.rdoc
318
318
  - Rakefile
319
319
  - bin/m2sh.rb
320
+ - data/mongrel2/config.rb.in
320
321
  - data/mongrel2/config.sql
321
322
  - data/mongrel2/mimetypes.sql
322
323
  - lib/mongrel2.rb
@@ -398,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
398
399
  version: '0'
399
400
  requirements: []
400
401
  rubyforge_project:
401
- rubygems_version: 2.6.12
402
+ rubygems_version: 2.6.13
402
403
  signing_key:
403
404
  specification_version: 4
404
405
  summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]
metadata.gz.sig CHANGED
Binary file