Update a template again

template/.eslintrc.yaml

@@ -23,7 +23,7 @@ rules:
     - avoidEscape: true
   semi:
     - error
-    - always
+    - never
   no-multi-spaces:
     - error
   keyword-spacing:
@@ -61,6 +61,8 @@ rules:
     - allow:
       - error
       - warn
+  no-var:
+    - error
   arrow-body-style:
     - warn
   arrow-parens:

template/.remarkrc.yaml

@@ -0,0 +1,2 @@
+plugins:
+  - remark-preset-lint-recommended

template/.stylelintrc.yml → template/.stylelintrc.yaml

@@ -9,7 +9,7 @@ rules:
     - tab
 
   max-line-length:
-    - 80
+    - 100
     - ignorePattern: /// https?:///
 
   at-rule-no-unknown:

template/.toys/.toys.rb.erb

@@ -2,19 +2,21 @@
 
 include :bundler, static: true
 
-config_dir = "#{__dir__}/../config"
-
-require "#{config_dir}/base"
+root_dir = "#{__dir__}/.."
+config_dir = "#{root_dir}/config"
+require "#{root_dir}/constants"
 
 require 'benchmark_toys'
 expand BenchmarkToys::Template
 alias_tool :b, :benchmark
 
 application_proc = proc do
-	require_relative '../application'
+	require "#{config_dir}/main"
 	<%= @short_module_name %>::Application
 end
 
+config_proc = proc { application_proc.call.config }
+
 require 'config_toys'
 expand ConfigToys::Template, config_dir: config_dir
 
@@ -27,10 +29,7 @@ expand SequelMigrationsToys::Template, db_connection_proc: db_connection_proc
 
 require 'psql_toys'
 expand PSQLToys::Template,
-	db_config_proc: (proc do
-		## For full config, not base
-		application_proc.call.config[:database]
-	end),
+	db_config_proc: proc { config_proc.call[:database] },
 	db_connection_proc: db_connection_proc,
 	db_extensions: %w[citext pgcrypto].freeze
 
@@ -46,10 +45,7 @@ require 'flame_routes_toys'
 expand FlameRoutesToys::Template, application_proc: application_proc
 
 require 'flame_server_toys'
-expand FlameServerToys::Template,
-	config_proc: (proc do
-		<%= @short_module_name %>::Config::Base.new
-	end)
+expand FlameServerToys::Template, config_proc: config_proc
 
 require 'locales_toys'
 expand LocalesToys::Template

template/application.rb.erb

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'config/base'
-config = <%= @module_name %>::Config::Base.new
-
 ## Require gems
 require 'bundler/setup'
 Bundler.require(
-	:system, :server, :database,
-	:translations, :forms, :views, :assets, :mails, :others,
-	config[:environment]
+	:system, :server, :database, :translations, :forms, :views, :assets, :mails, :others
 )
 
 require 'erubi/capture_end'
@@ -27,9 +22,7 @@ require 'pp'
 
 # require 'money/bank/google_currency'
 
-## Load full application config, with dependencies from Bundler
-require_relative 'config/full'
-<%= @module_name %>.complete_config config
+require_relative 'constants'
 
 module <%= @module_name %>
 	## Class for application
@@ -74,5 +67,3 @@ module <%= @module_name %>
 		end
 	end
 end
-
-<%= @short_module_name %>::Application.config = config

template/assets/scripts/.eslintrc.yaml

@@ -7,7 +7,3 @@ parserOptions:
   ## Libs:
   # google: true
   # Cccombo: true
-
-rules:
-  no-var:
-    - error

template/browserslist

@@ -0,0 +1,2 @@
+> 1%
+not IE 11

template/config/main.rb.erb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require_relative '../application'
+
+config = <%= @short_module_name %>::Application.config
+
+class << config
+	private
+
+	def find_config_file(filename, required:)
+		file_path = nil
+
+		loop do
+			file_path = super
+			break
+		rescue Flame::Errors::ConfigFileNotFoundError => e
+			puts e.message
+
+			next if ask_to_check_config_files
+
+			required ? abort : break
+		end
+
+		file_path
+	end
+
+	def ask_to_check_config_files
+		highline.choose do |menu|
+			menu.layout = :one_line
+
+			menu.prompt = 'Do you want to check config files? '
+
+			menu.choice(:yes) do
+				system 'toys config check'
+				true
+			end
+
+			menu.choice(:no) { false }
+		end
+	end
+
+	def highline
+		@highline ||= begin
+			require 'highline'
+			HighLine.new
+		end
+	end
+end
+
+using GorillaPatch::Inflections
+
+config.instance_exec do
+	self[:root_dir] = File.realpath "#{__dir__}/.."
+
+	self[:pids_dir] = "#{self[:tmp_dir]}/pids"
+
+	self[:stdout_file] = "#{self[:log_dir]}/out"
+	self[:stderr_file] = "#{self[:log_dir]}/err"
+
+	%i[session site].each do |config_name|
+		load_yaml config_name, required: true
+	end
+
+	%w[Server Sentry R18n Mail Sequel Shrine].each do |processor_name|
+		require_relative "processors/#{processor_name.underscore}"
+		<%= @short_module_name %>::Config::Processors.const_get(processor_name).new self
+	end
+end

template/config/processors/sentry.rb.erb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'raven'
+require_relative '../../lib/flame/raven_context'
 
 module <%= @module_name %>
 	module Config

template/config/processors/server.rb.erb

@@ -11,6 +11,8 @@ module <%= @module_name %>
 					environment = config[:environment] =
 						ENV['RACK_ENV'] ||= server_config[:environment] || 'development'
 
+					Bundler.require environment
+
 					server_config = config[:server] = server_config[environment]
 
 					server_config[:puma_pid_file] = "#{config[:pids_dir]}/#{server_config[:puma_pid_file]}"

template/config/puma.rb.erb

@@ -3,17 +3,19 @@
 require 'fileutils'
 require 'etc'
 
-require_relative 'base'
+require_relative 'main'
 
-config = <%= @module_name %>::Config::Base.new
+config = <%= @module_name %>::Application.config
 
 server_config = config[:server]
 
 environment config[:environment]
 
 directory config[:root_dir]
 
-prune_bundler
+## Don't call phase-restart
+## https://github.com/puma/puma/issues/2319
+# prune_bundler
 
 rackup 'config.ru'
 
@@ -24,7 +26,7 @@ FileUtils.mkdir_p pids_dir
 pidfile File.join pids_dir, 'puma.pid'
 state_path File.join pids_dir, 'puma.state'
 
-FileUtils.mkdir_p config[:logs_dir]
+FileUtils.mkdir_p config[:log_dir]
 
 if server_config[:daemonize]
 	stdout_redirect(

template/constants.rb.erb

@@ -0,0 +1,16 @@
+module <%= @module_name %>
+	::<%= @short_module_name %> = ::<%= @module_name %>
+
+	APP_DIRS = [
+		'lib',
+		'config',
+		'models',
+		# 'policies',
+		'helpers',
+		'mailers',
+		# 'actions',
+		'forms',
+		# 'view_objects',
+		'controllers'
+	].freeze
+end