mongrel2 0.53.0 → 0.54.0

data/lib/mongrel2/cli/access.rb

@@ -0,0 +1,29 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 access command
+module Mongrel2::CLI::AccessCommand
+	extend Mongrel2::CLI::Subcommand
+
+	desc "Dump the access log. The LOGFILE defaults to logs/access.log"
+	arg :LOGFILE, :optional
+	command :access do |accesscmd|
+
+		accesscmd.action do |globals, options, args|
+			logfile = args.shift || 'logs/access.log'
+
+			IO.foreach( logfile ) do |line|
+				row, _ = TNetstring.parse( line )
+				message %{[%4$d] %2$s:%3$d %1$s "%5$s %6$s %7$s" %8$03d %9$d} % row
+			end
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::AccessCommand

data/lib/mongrel2/cli/bootstrap.rb

@@ -0,0 +1,39 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'pathname'
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+require 'mongrel2/constants'
+
+
+# Mongrel2 bootstrap command
+module Mongrel2::CLI::BootstrapCommand
+	extend Mongrel2::CLI::Subcommand
+
+
+	desc "Generate a basic config-generation script."
+	arg :CONFIG_SCRIPT, :optional
+	command :bootstrap do |bootstrapcmd|
+
+		bootstrapcmd.action do |globals, options, args|
+			scriptpath = Pathname( args.shift || Mongrel2::Constants::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
+			prompt.say( hl.header "Writing a config-generation script to %s" % [scriptpath] )
+			scriptpath.open( File::WRONLY|File::EXCL|File::CREAT, 0755, encoding: 'utf-8' ) do |fh|
+				fh.print( data )
+			end
+			prompt.say "Done."
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::BootstrapCommand

data/lib/mongrel2/cli/commit.rb

@@ -0,0 +1,34 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 commit command
+module Mongrel2::CLI::CommitCommand
+	extend Mongrel2::CLI::Subcommand
+
+	desc "Add a message to the commit log."
+	arg :WHAT, :optional
+	arg :WHERE, :optional
+	arg :WHY, :optional
+	arg :HOW, :optional
+	command :commit do |commitcmd|
+
+		commitcmd.action do |globals, options, args|
+			what, where, why, how = *args
+			what ||= '- mark -'
+			why ||= globals.why
+
+			log = Mongrel2::Config::Log.log_action( what, where, why, how )
+
+			prompt.say( hl.header "Okay, logged." )
+			prompt.say( log.to_s )
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::CommitCommand

data/lib/mongrel2/cli/hosts.rb

@@ -0,0 +1,51 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 hosts command
+module Mongrel2::CLI::HostsCommand
+	extend Mongrel2::CLI::Subcommand
+
+	desc "Lists the hosts in a server, or in all servers if none is specified."
+	arg :SERVERNAME, :optional
+	command :hosts do |hostscmd|
+
+		hostscmd.action do |globals, options, args|
+			servername = args.shift
+
+			# Start with all servers, then narrow it down if they specified a server name.
+			servers = Mongrel2::Config::Server.dataset
+			servers = servers.filter( name: servername ) if servername
+
+
+			# Output a section for each server
+			servers.each do |server|
+				hosts_table = TTY::Table.new( header: ['Id', 'Name', 'Matching'] )
+
+				prompt.say( hl.header %{HOSTS for server %s:} % [hl.key(server.name)] )
+				server.hosts.each do |host|
+					hosts_table << [
+						host.id,
+						host.name,
+						host.matching == host.name ? '*' : 'host.matching'
+					]
+				end
+
+				if hosts_table.empty?
+					prompt.say "No hosts."
+				else
+					prompt.say( hosts_table.render(:unicode) )
+				end
+
+				prompt.say( "\n" )
+			end
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::HostsCommand

data/lib/mongrel2/cli/init.rb

@@ -0,0 +1,29 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 init command
+module Mongrel2::CLI::InitCommand
+	extend Mongrel2::CLI::Subcommand
+
+	desc "Initialize a new empty config database."
+	command :init do |initcmd|
+
+		initcmd.action do |globals, options, args|
+			if Mongrel2::Config.database_initialized?
+				exit_now! "Okay, aborting." unless
+					prompt.yes?( "Are you sure you want to destroy the current config? " )
+			end
+
+			prompt.say( headline_string "Initializing #{globals.config}" )
+			Mongrel2::Config.init_database!
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::InitCommand

data/lib/mongrel2/cli/load.rb

@@ -0,0 +1,41 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'fileutils'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 load command
+module Mongrel2::CLI::LoadCommand
+	extend Mongrel2::CLI::Subcommand
+
+	desc "Overwrite the config database with the values from the specified CONFIGFILE."
+	long_desc <<~END_DESC
+	Note: the CONFIGFILE should contain a configuration described using the
+	Ruby config DSL, not a Python-ish normal one. m2sh already works perfectly
+	fine for loading those.
+	END_DESC
+	arg :CONFIGFILE
+	command :load do |loadcmd|
+
+		loadcmd.action do |globals, options, args|
+			configfile = args.shift or
+				exit_now! "No configfile specified."
+
+			runspace = Module.new
+			runspace.extend( Mongrel2::Config::DSL )
+			runspace.extend( FileUtils::Verbose )
+
+			prompt.say( headline_string "Loading config from #{configfile}" )
+			source = File.read( configfile )
+
+			runspace.module_eval( source, configfile, 1 )
+			Mongrel2::Config.log_action( "Loaded config from #{configfile}", globals.why )
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::LoadCommand
+

data/lib/mongrel2/cli/log.rb

@@ -0,0 +1,27 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 log command
+module Mongrel2::CLI::LogCommand
+	extend Mongrel2::CLI::Subcommand
+
+	desc "Prints the commit log."
+	command :log do |logcmd|
+
+		logcmd.action do |globals, options, args|
+			prompt.say( hl.header "Log Messages" )
+
+			Mongrel2::Config::Log.order_by( :happened_at ).each do |log|
+				prompt.say( log.to_s )
+			end
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::LogCommand

data/lib/mongrel2/cli/quickstart.rb

@@ -0,0 +1,52 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 quickstart command
+module Mongrel2::CLI::QuickstartCommand
+	extend Mongrel2::CLI::Subcommand
+
+
+	desc "Set up a basic mongrel2 server and run it."
+	command :quickstart do |quickstartcmd|
+
+		quickstartcmd.action do |globals, options, 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
+
+	end
+
+
+end # module Mongrel2::CLI::QuickstartCommand

data/lib/mongrel2/cli/reload.rb

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

data/lib/mongrel2/cli/routes.rb

@@ -0,0 +1,51 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 routes command
+module Mongrel2::CLI::RoutesCommand
+	extend Mongrel2::CLI::Subcommand
+
+
+	desc "Show the routes under a host."
+	arg :SERVERNAME, :optional
+	arg :HOSTNAME, :optional
+	command :routes do |routescmd|
+
+		routescmd.action do |globals, options, args|
+			servername = args.shift
+			hostname = args.shift
+
+			# Start with all hosts, then narrow it down if a server and/or host was given.
+			if servername
+				server = Mongrel2::Config::Server[ servername ] or
+					exit_now! "No such server '#{servername}'"
+				hosts = server.hosts_dataset
+			else
+				hosts = Mongrel2::Config::Host.dataset
+			end
+			hosts = hosts.where( name: hostname ) if hostname
+
+			# Output a section for each host
+			hosts.each do |host|
+				header = "ROUTES for host %s/%s:" % [ hl.key(host.server.name), hl.key(host.name) ]
+				prompt.say( hl.header(header)  )
+
+				routes_table = TTY::Table.new( header: ['Id', 'Path', 'Target'] )
+				host.routes.each do |route|
+					routes_table << [ route.id, route.path, route.target ]
+				end
+
+				prompt.say( routes_table.render(:unicode) )
+				prompt.say( "\n" )
+			end
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::RoutesCommand

data/lib/mongrel2/cli/running.rb

@@ -0,0 +1,44 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 running command
+module Mongrel2::CLI::RunningCommand
+	extend Mongrel2::CLI::Subcommand
+
+
+	desc "Show the status of a server."
+	arg :SERVER
+	command :running do |runningcmd|
+
+		runningcmd.action do |globals, options, args|
+			server = find_server( args.shift )
+			pidfile = server.pid_file_path
+
+			prompt.say( hl.header "Checking the status of the '%s' server." % [ server.name ] )
+			unless pidfile.exist?
+				prompt.say( hl.error "Not running: PID file (%s) doesn't exist." % [ pidfile ] )
+				exit
+			end
+
+			pid = Integer( pidfile.read )
+			begin
+				Process.kill( 0, pid )
+			rescue Errno::ESRCH
+				prompt.say( hl.error "  mongrel2 at PID %d is NOT running" % [ pid ] )
+				exit
+			rescue => err
+				prompt.say( hl.error "  %p while signalling PID %d: %s" % [ err.class, pid, err.message ] )
+			end
+
+			prompt.say( hl.success "  mongrel2 at PID %d is running." % [ pid ] )
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::RunningCommand

data/lib/mongrel2/cli/servers.rb

@@ -0,0 +1,34 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'mongrel2/config'
+
+require 'mongrel2/cli' unless defined?( Mongrel2::CLI )
+
+
+# Mongrel2 servers command
+module Mongrel2::CLI::ServersCommand
+	extend Mongrel2::CLI::Subcommand
+
+	desc "Lists the servers in a config database."
+	command :servers do |serverscmd|
+
+		serverscmd.action do |globals, options, args|
+			prompt.say( hl.header 'SERVERS:' )
+
+			table = TTY::Table.new( header: ['Name', 'Default Host', 'Identifier'] )
+			Mongrel2::Config.servers.each do |server|
+				table << [
+					hl.key( server.name ),
+					server.default_host,
+					server.uuid,
+				]
+			end
+
+			prompt.say( table.render(:unicode) )
+		end
+
+	end
+
+
+end # module Mongrel2::CLI::ServersCommand