Fix Rakefile to not modify ENV

Instead of modifying ENV and running code inside the rake process,
run a ruby process with the environment set correctly.  This fixes:

  rake test_up dev_up

which previously would migrate the test database up and not the
development database up. Have the specs test that this and similar
task combinations work.

Since I had to modify it anyway, make the annotate task use the
test environment and not the development environment.  It's generally
problem-free to rebuild a test environment by migrating down and up,
while there are cases where that isn't great in a development
environment.

Update the stack specs to use separate databases for the development,
test, and production environments, and test that each of them work
as expected. Also test that the annotation is actually applied to the
model file.

Author: jeremyevans

Rakefile

@@ -1,12 +1,11 @@
 # Migrate
 
 migrate = lambda do |env, version|
-  ENV['RACK_ENV'] = env
-  require_relative 'db'
-  require 'logger'
-  Sequel.extension :migration
-  DB.loggers << Logger.new($stdout) if DB.loggers.empty?
-  Sequel::Migrator.apply(DB, 'migrate', version)
+  sh({'RACK_ENV' => env}, FileUtils::RUBY, "-r", "./db", "-r", "logger", "-e", <<~RUBY)
+    Sequel.extension :migration
+    DB.loggers << Logger.new($stdout) if DB.loggers.empty?
+    Sequel::Migrator.apply(DB, 'migrate', #{version.inspect})
+  RUBY
 end
 
 desc "Migrate test database to latest version"
@@ -22,7 +21,7 @@ end
 desc "Migrate test database all the way down and then back up"
 task :test_bounce do
   migrate.call('test', 0)
-  Sequel::Migrator.apply(DB, 'migrate')
+  migrate.call('test', nil)
 end
 
 desc "Migrate development database to latest version"
@@ -38,7 +37,7 @@ end
 desc "Migrate development database all the way down and then back up"
 task :dev_bounce do
   migrate.call('development', 0)
-  Sequel::Migrator.apply(DB, 'migrate')
+  migrate.call('development', nil)
 end
 
 desc "Migrate production database to latest version"
@@ -49,15 +48,16 @@ end
 # Shell
 
 irb = proc do |env|
-  ENV['RACK_ENV'] = env
   trap('INT', "IGNORE")
   dir, base = File.split(FileUtils::RUBY)
   cmd = if base.sub!(/\Aruby/, 'irb')
-    File.join(dir, base)
+    [File.join(dir, base)]
   else
-    "#{FileUtils::RUBY} -S irb"
+    [FileUtils::RUBY, "-S", "irb"]
   end
-  sh "#{cmd} -r ./models"
+  cmd.unshift({"RACK_ENV" => env})
+  cmd << "-r" << "./models"
+  sh(*cmd)
 end
 
 desc "Open irb shell in test mode"
@@ -85,9 +85,7 @@ spec = proc do |type|
 
   desc "Run #{type} specs with coverage"
   task :"#{type}_spec_cov" do
-    ENV['COVERAGE'] = type
-    sh "#{FileUtils::RUBY} spec/#{type}.rb"
-    ENV.delete('COVERAGE')
+    sh({"COVERAGE" => type, "RODA_RENDER_COMPILED_METHOD_SUPPORT" => "no"}, FileUtils::RUBY, "spec/#{type}.rb")
   end
 end
 spec.call('model')
@@ -98,7 +96,6 @@ task default: [:model_spec, :web_spec]
 
 desc "Run all specs with coverage"
 task :spec_cov do
-  ENV['RODA_RENDER_COMPILED_METHOD_SUPPORT'] = 'no'
   FileUtils.rm_r('coverage') if File.directory?('coverage')
   Dir.mkdir('coverage')
   Rake::Task['_spec_cov'].invoke
@@ -109,11 +106,10 @@ task _spec_cov: [:model_spec_cov, :web_spec_cov]
 
 desc "Annotate Sequel models"
 task "annotate" do
-  ENV['RACK_ENV'] = 'development'
-  require_relative 'models'
-  DB.loggers.clear
-  require 'sequel/annotate'
-  Sequel::Annotate.annotate(Dir['models/**/*.rb'])
+  sh({'RACK_ENV' => "test"}, FileUtils::RUBY, "-r", "./models", "-r", "sequel/annotate", "-e", <<~RUBY)
+    DB.loggers.clear
+    Sequel::Annotate.annotate(Dir['models/**/*.rb'])
+  RUBY
 end
 
 last_line = __LINE__
@@ -166,6 +162,5 @@ end
 
 desc "Run specs to make sure stack works properly, with debugging enabled"
 task :stack_spec_debug do
-  ENV['DEBUG'] = '1'
-  sh "#{FileUtils::RUBY} -w stack-spec/stack_spec.rb"
+  sh({"DEBUG" => '1'}, FileUtils::RUBY, "-w", "stack-spec/stack_spec.rb")
 end

stack-spec/stack_spec.rb

@@ -70,7 +70,9 @@ def run_puma(*args)
 
   # Run command capturing stderr/stdout
   def run_cmd(*cmds)
+    env = cmds.shift if cmds.first.is_a?(Hash)
     command(cmds)
+    cmds.unshift(env) if env
     read, write = IO.pipe
     system(*cmds, out: write, err: write).tap{|x| unless x; write.close; p cmds; puts read.read; end}.must_equal true
     write.close
@@ -87,7 +89,10 @@ def rewrite(filename)
 
     Dir.chdir(TEST_STACK_DIR) do
       run_cmd(RAKE, 'setup[FooBarApp]')
-      ENV['FOO_BAR_APP_DATABASE_URL'] = db_url
+      environments = %w[development test production].freeze
+      rewrite(".env.rb") do |content|
+        content.gsub(%r"postgres:///foo_bar_app_(\w+)\?user=foo_bar_app", "#{db_url}_\\1")
+      end
 
       files = []
       directories = []
@@ -118,24 +123,29 @@ def rewrite(filename)
       end
 
       # Test migrations
-      run_cmd(RAKE, 'test_up')
-      run_cmd(RAKE, 'test_down')
-      run_cmd(RAKE, 'test_bounce')
-      run_cmd(RAKE, 'dev_up')
-      run_cmd(RAKE, 'dev_down')
-      run_cmd(RAKE, 'dev_bounce')
+      run_cmd(RAKE, 'test_up', 'dev_up')
+      run_cmd(RAKE, 'test_down', 'dev_down')
+      run_cmd(RAKE, 'test_bounce', 'dev_bounce')
       run_cmd(RAKE, 'prod_up')
+
+      environments.each do |env|
+        run_cmd({"RACK_ENV"=>env}, RUBY, "-r", "./db", "-e", "raise \"migration rake tasks not successful for #{env} environment, tables: \#{DB.tables.sort.join(', ')}\" unless DB.tables.sort == [:model1s, :schema_info]")
+      end
 
       Dir.mkdir('views/prefix1')
       File.binwrite('views/prefix1/p1.erb', "<p>Model1: <%= Model1.first.name %></p>")
       rewrite('routes/prefix1.rb'){|s| s.sub("# /prefix1 branch handling", "r.get{view 'p1'}")}
-      run_cmd(SEQUEL, db_url, '-c', "DB[:model1s].insert(name: 'M1')")
+      environments.each do |env|
+        run_cmd(SEQUEL, "#{db_url}_#{env}", '-c', "DB[:model1s].insert(name: 'M1')")
+        run_cmd(SEQUEL, "#{db_url}_#{env}", '-c', "raise \"invalid count for models in #{env} environment\" unless DB[:model1s].count == 1")
+      end
 
       # Test running in development mode
       run_puma
 
       # Test annotation
       run_cmd(RAKE, 'annotate')
+      File.read("models/model1.rb").must_include "# Table: model1s"
 
       # Test running with refrigerator
       rewrite('config.ru') do |s|