Don't establish database connection without models

Useful for CI: https://cirrus-ci.com/task/4975995981660160
AlexWayfer · Nov 19, 2020 · d29f8b8 · d29f8b8
1 parent c9eaf59
commit d29f8b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/flame-cli.gemspec b/flame-cli.gemspec
@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency 'rspec', '~> 3.9'
 	spec.add_development_dependency 'simplecov', '~> 0.18.0'
 
+	spec.add_development_dependency 'example_file', '~> 0.2.0'
 	spec.add_development_dependency 'rubocop', '~> 0.90.0'
 	spec.add_development_dependency 'rubocop-performance', '~> 1.0'
 	spec.add_development_dependency 'rubocop-rspec', '~> 1.0'

diff --git a/spec/flame/cli/new/app_spec.rb b/spec/flame/cli/new/app_spec.rb
@@ -3,6 +3,8 @@
 require 'pathname'
 require 'net/http'
 
+require 'example_file'
+
 describe 'Flame::CLI::New::App' do
 	subject(:execute_command) do
 		`#{FLAME_CLI} new app #{options} #{app_name}`
@@ -883,7 +885,9 @@
 					)
 
 					Dir['config/**/*.example.{yaml,conf}'].each do |config_example_file_name|
-						FileUtils.cp config_example_file_name, config_example_file_name.sub('.example', '')
+						FileUtils.cp(
+							config_example_file_name, config_example_file_name.sub(ExampleFile::SUFFIX, '')
+						)
 					end
 
 					## HACK for testing while some server is running

diff --git a/template/application.rb.erb b/template/application.rb.erb
@@ -61,7 +61,8 @@ module <%= @module_name %>
 
 			def setup
 				## Initialize Sequel connection before models requiring
-				db_connection
+				## https://cirrus-ci.com/task/4975995981660160
+				db_connection if Dir["#{__dir__}/models/**/*"].any?
 
 				## Require dirs
 				require_dirs APP_DIRS, ignore: [%r{config/puma.rb}, %r{lib/\w+/spec/}]