mongrel2 0.53.0 → 0.54.0

data/lib/mongrel2/cli/settings.rb

@@ -0,0 +1,26 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 settings command
+module Mongrel2::CLI::SettingsCommand
+	extend Mongrel2::CLI::Subcommand
+
+
+	desc "Show the 'advanced' server settings."
+	command :settings do |settingscmd|
+
+		settingscmd.action do |globals, options, args|
+			prompt.say( hl.headline "Advanced Server Settings" )
+			Mongrel2::Config.settings.each do |key,val|
+				prompt.say( "%s %s" % [ hl.key("#{key}:"), val] )
+			end
+		end
+
+	end
+
+end # module Mongrel2::CLI::SettingsCommand

data/lib/mongrel2/cli/start.rb

@@ -0,0 +1,72 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'shellwords'
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 start command
+module Mongrel2::CLI::StartCommand
+	extend Mongrel2::CLI::Subcommand
+
+
+	desc "Starts a server."
+	long_desc <<~END_USAGE
+	[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
+	arg :SERVER, :optional
+	command :start do |startcmd|
+
+		startcmd.switch [:sudo, :s], desc: "Start the server with `sudo`"
+
+		startcmd.arg_name :PORT
+		startcmd.flag [:port, :p], desc: "Reset the configured PORT to bind to",
+			type: Integer
+
+		startcmd.action do |globals, options, args|
+			server = find_server( args.shift )
+			mongrel2 = find_mongrel2()
+
+			if options.port
+				prompt.say "Resetting %s server's port to %d" % [ server.name, options.port ]
+				server.port = options.port
+				server.save
+			end
+
+			cmd = [ mongrel2.to_s, Mongrel2::Config.dbname.to_s, server.uuid ]
+			cmd.unshift( 'sudo' ) if options.sudo
+
+			url = "http%s://%s:%d" % [
+				server.use_ssl? ? 's' : '',
+				server.bind_addr,
+				server.port,
+			]
+
+			# Change into the server's chroot directory so paths line up whether or not
+			# it's started as root
+
+			prompt.say( hl.header '*' * 70 )
+			prompt.say( hl.headline "Starting mongrel2 at: %s" % [ hl.key(url) ] )
+			prompt.say( hl.header '*' * 70 )
+
+			if server.chroot && server.chroot != '' && server.chroot != '.'
+				Dir.chdir( server.chroot )
+				prompt.say "  changed PWD to: #{Dir.pwd}"
+			end
+
+			Mongrel2::Config.log_action( "Starting server: #{server}", options.why )
+			self.log.debug "  command is: #{Shellwords.shelljoin(cmd)}"
+			exec( *cmd )
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::StartCommand

data/lib/mongrel2/cli/stop.rb

@@ -0,0 +1,33 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 stop command
+module Mongrel2::CLI::StopCommand
+	extend Mongrel2::CLI::Subcommand
+
+
+	desc "Stop the specified server gracefully"
+	arg :SERVER
+	command :stop do |stopcmd|
+
+		stopcmd.action do |globals, options, args|
+			server = find_server( args.shift )
+			control = server.control_socket
+
+			prompt.say( hl.header "Stopping '%s' gracefully." % [ server.name ] )
+			control.stop
+			control.close
+			prompt.say( "done." )
+
+			Mongrel2::Config.log_action( "Stopped server #{server}", globals.why )
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::StopCommand

data/lib/mongrel2/config.rb

@@ -65,6 +65,7 @@ module Mongrel2
 		plugin :subclasses
 		plugin :json_serializer
 		plugin :serialization
+		plugin :update_or_create
 
 
 		# Configuration defaults

data/lib/mongrel2/config/directory.rb

@@ -23,6 +23,17 @@ class Mongrel2::Config::Directory < Mongrel2::Config( :directory )
 	end
 
 
+	### Return a description of the directory.
+	def to_s
+		return "Directory %s(%s) {%s} [cache %ds]" % [
+			self.base,
+			self.index_file,
+			self.default_ctype,
+			self.cache_ttl
+		]
+	end
+
+
 	#########
 	protected
 	#########

data/lib/mongrel2/config/dsl.rb

@@ -22,17 +22,11 @@ module Mongrel2::Config::DSL
 		### Create an instance of the specified +targetclass+ using the specified +opts+
 		### as initial values. The first pair of +opts+ will be used in the filter to
 		### find any previous instance and delete it.
-		def initialize( targetclass, opts={} )
+		def initialize( targetclass, opts={}, &block )
 			self.log.debug "Wrapping a %p" % [ targetclass ]
 			@targetclass = targetclass
 
-			# Use the first pair as the primary key
-			unless opts.empty?
-				first_pair = Hash[ *opts.first ]
-				@targetclass.filter( first_pair ).destroy
-			end
-
-			@target = @targetclass.new( opts )
+			@target = @targetclass.find_or_new( opts, &block )
 			self.decorate_with_column_declaratives( @target )
 			self.decorate_with_custom_declaratives( @targetclass )
 		end
@@ -98,19 +92,18 @@ module Mongrel2::Config::DSL
 		Mongrel2.log.info "Entering transaction for server %p" % [ uuid ]
 		Mongrel2::Config.db.transaction do
 
-			# Set up the options hash with the UUID and reasonable defaults
-			# for everything else
-			server_opts = {
-				uuid:         uuid,
-			    access_log:   "/logs/access.log",
-			    error_log:    "/logs/error.log",
-			    pid_file:     "/run/mongrel2.pid",
-			    default_host: "localhost",
-			    port:         8888,
-			}
-
 			Mongrel2.log.debug "Server [%s] (block: %p)" % [ uuid, block ]
-			adapter = Adapter.new( Mongrel2::Config::Server, server_opts )
+			adapter = Adapter.new( Mongrel2::Config::Server, uuid: uuid ) do |server|
+			    server.access_log   ||= "/logs/access.log"
+			    server.error_log    ||= "/logs/error.log"
+			    server.pid_file     ||= "/run/mongrel2.pid"
+			    server.default_host ||= "localhost"
+			    server.port         ||= 8888
+
+				server.hosts.each( &:destroy )
+				server.filters.each( &:destroy )
+				server.xrequests.each( &:destroy )
+			end
 			adapter.instance_eval( &block ) if block
 
 			Mongrel2.log.info "  saving server %p..." % [ uuid ]

data/lib/mongrel2/config/handler.rb

@@ -59,6 +59,18 @@ class Mongrel2::Config::Handler < Mongrel2::Config( :handler )
 	end
 
 
+	### Return a description of the handler.
+	def to_s
+		return "Handler `%s' %s <-> %s {%s}%s" % [
+			self.send_ident,
+			self.recv_spec,
+			self.send_spec,
+			self.protocol,
+			self.raw_payload.nonzero? ? ' (raw)' : '',
+		]
+	end
+
+
 	#########
 	protected
 	#########

data/lib/mongrel2/config/host.rb

@@ -51,7 +51,7 @@ class Mongrel2::Config::Host < Mongrel2::Config( :host )
 			self.target.save
 			self.log.debug "Route %s -> %p [%p]" % [ path, target, opts ]
 
-			args = { :path => path, :target => target }
+			args = { path: path, target: target }
 			args.merge!( opts )
 			route = Mongrel2::Config::Route.new( args )
 

data/lib/mongrel2/config/proxy.rb

@@ -12,5 +12,11 @@ class Mongrel2::Config::Proxy < Mongrel2::Config( :proxy )
 	#     addr TEXT,
 	#     port INTEGER);
 
+
+	### Return a description of the proxy.
+	def to_s
+		return "Proxy to %s:%d" % [ self.addr, self.port ]
+	end
+
 end # class Mongrel2::Config::Proxy
 

data/lib/mongrel2/config/server.rb

@@ -197,10 +197,11 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 			self.target.save( :validate => false )
 
 			self.log.debug "Host [%s] (block: %p)" % [ name, block ]
-			adapter = Mongrel2::Config::DSL::Adapter.new( Mongrel2::Config::Host, name: name )
+			adapter = Mongrel2::Config::DSL::Adapter.
+				new( Mongrel2::Config::Host, name: name, server_id: self.target.id )
 			adapter.target.matching = name
 			adapter.instance_eval( &block ) if block
-			self.target.add_host( adapter.target )
+			adapter.target.save
 		end
 
 

data/spec/mongrel2/config/dsl_spec.rb

@@ -56,6 +56,8 @@ describe Mongrel2::Config::DSL, :db do
 
 			end
 
+			result.refresh
+
 			expect( result ).to be_a( Mongrel2::Config::Server )
 			expect( result.hosts.size ).to eq(  1  )
 			host = result.hosts.first
@@ -95,6 +97,8 @@ describe Mongrel2::Config::DSL, :db do
 
 			end
 
+			result.refresh
+
 			expect( result ).to be_a( Mongrel2::Config::Server )
 			expect( result.hosts.size ).to eq(  2  )
 			host1, host2 = result.hosts
@@ -232,6 +236,7 @@ describe Mongrel2::Config::DSL, :db do
 					min_size: 1000
 			end
 
+			result.refresh
 			expect( result.filters.size ).to eq(  1  )
 			expect( result.filters.first ).to be_a( Mongrel2::Config::Filter )
 			expect( result.filters.first.settings ).
@@ -261,6 +266,7 @@ describe Mongrel2::Config::DSL, :db do
 					min_size: 1000
 			end
 
+			result.refresh
 			expect( result.xrequests.size ).to eq(  1  )
 			expect( result.xrequests.first ).to be_a( Mongrel2::Config::XRequest )
 			expect( result.xrequests.first.settings ).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.0
 platform: ruby
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR
   JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
   -----END CERTIFICATE-----
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cztop
@@ -64,34 +64,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.19'
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -149,33 +177,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -238,14 +280,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -339,7 +381,24 @@ files:
 - data/mongrel2/config.rb.in
 - data/mongrel2/config.sql
 - data/mongrel2/mimetypes.sql
+- gem.deps.rb
 - lib/mongrel2.rb
+- lib/mongrel2/cli.rb
+- lib/mongrel2/cli/access.rb
+- lib/mongrel2/cli/bootstrap.rb
+- lib/mongrel2/cli/commit.rb
+- lib/mongrel2/cli/hosts.rb
+- lib/mongrel2/cli/init.rb
+- lib/mongrel2/cli/load.rb
+- lib/mongrel2/cli/log.rb
+- lib/mongrel2/cli/quickstart.rb
+- lib/mongrel2/cli/reload.rb
+- lib/mongrel2/cli/routes.rb
+- lib/mongrel2/cli/running.rb
+- lib/mongrel2/cli/servers.rb
+- lib/mongrel2/cli/settings.rb
+- lib/mongrel2/cli/start.rb
+- lib/mongrel2/cli/stop.rb
 - lib/mongrel2/config.rb
 - lib/mongrel2/config/directory.rb
 - lib/mongrel2/config/dsl.rb
@@ -411,7 +470,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="