more prep for Rails 6

dashboard.yml

@@ -8,6 +8,8 @@ book:
 - '4':
     web:  AWDwR4
     env:
+    - rails: '6.0'
+      ruby:  '2.6.1'
     - rails: '5.2'
       ruby:  '2.4.1'
     - rails: '5.1'

environment.rb

@@ -80,6 +80,7 @@ def self.dependencies(rails, ruby)
     end
 
     # grab app dependencies
+    template += '.tt' if not File.exist? template
     if File.exist? template
       gemfile = File.read(template)
       if File.exist? base # Rails 3.1

setup.rb

@@ -10,6 +10,8 @@
   nodejs: 'nodejs'
 }
 
+prereq[mysql].sub(/\s*mysql-server/, '') if File.exist? '/.dockerenv'
+
 # accept node as an alias for nodejs; not absolutely required on Mac OS/X
 prereqs.delete :nodejs unless `which node`.empty?
 prereqs.delete :nodejs if RUBY_PLATFORM.include? 'darwin'

setup/Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update -y && \
     locale-gen $LANG
 
 RUN apt-get install -y \
-  git \
+  git vim ruby \
   libgmp3-dev \
   libmysqlclient-dev \
   libpq-dev \

setup/Rakefile

@@ -1,6 +1,6 @@
 namespace :mysql do
   task :setup do
-    next if `docker container ls`.include? 'awdwr-mysql'
+    next if `docker container ls -a`.include? 'awdwr-mysql'
     sh "docker run --network host --name awdwr-mysql " +
       "-e MYSQL_ROOT_PASSWORD=root -d mysql/mysql-server"
 
@@ -23,7 +23,7 @@ namespace :mysql do
     end
   end
 
-  task :clobber do
+  task :clobber => :stop do
     next unless `docker container ls`.include? 'awdwr-mysql'
     system "docker stop awdwr-mysql"
     system "docker container rm awdwr-mysql"
@@ -36,6 +36,20 @@ namespace :mysql do
   task :ssh => :setup do
     system "docker exec -it awdwr-mysql mysql --user=root --password=root"
   end
+
+  task :start => :setup
+
+  task :restart => :start do
+    next if `docker ps`.include? 'awdwr-mysql'
+    container=`docker ps -q -a --filter name=awdwr-mysql`.chomp
+    system "docker start #{container}" unless container.empty?
+  end
+
+  task :stop do
+    next unless `docker ps`.include? 'awdwr-mysql'
+    container=`docker ps -q --filter name=awdwr-mysql`.chomp
+    system "docker stop #{container}" unless container.empty?
+  end
 end
 
 namespace :awdwr do
@@ -56,6 +70,12 @@ namespace :awdwr do
     end
   end
 
+  task :kill do
+    next unless `docker ps`.include? 'awdwr-main'
+    container=`docker ps -q --filter name=awdwr-main`.chomp
+    system "docker container kill #{container}" unless container.empty?
+  end
+
   task :clobber do
     next unless `docker image ls`.include? 'awdwr-main'
     system "docker image rm awdwr-main"

setup/common-setup

@@ -1,20 +1,26 @@
 bash_reload=false
 
+if [[ "$HOME" = "/home/awdwr" ]]; then
+  awdwr='/home/awdwr/git/awdwr'
+else
+  awdwr=$HOME
+fi
+
 # testrails alias
 if ! grep -q 'alias testrails=' ~/.bashrc ; then
-  echo "alias testrails='ruby `pwd`/testrails.rb'" >> ~/.bashrc
+  echo "alias testrails='ruby $awdwr/testrails.rb'" >> ~/.bashrc
   bash_reload=true
 fi
 
 # work alias
 if ! grep -q 'alias work=' ~/.bashrc ; then
-  echo "alias work='source `pwd`/vagrant/bin/work'" >> ~/.bashrc
+  echo "alias work='source $awdwr/vagrant/bin/work'" >> ~/.bashrc
   bash_reload=true
 fi
 
 # depot alias
 if ! grep -q 'alias depot=' ~/.bashrc ; then
-  echo "alias depot='bash `pwd`/vagrant/bin/depot'" >> ~/.bashrc
+  echo "alias depot='bash $awdwr/vagrant/bin/depot'" >> ~/.bashrc
   bash_reload=true
 fi
 

testrails.yml

@@ -7,7 +7,7 @@ default:
   output:  []
   message: []
   rvm:
-    bin:   ruby-2.4.1
+    bin:   ruby-2.6.1
 
 226:
   output:  2.2.6
@@ -22,8 +22,20 @@ default:
     bin:   ruby-2.3.3
 
 250:
-  output:  2.5.0
-  message: 'Ruby 2.5.0'
+  output:  2.5.5
+  message: 'Ruby 2.5.5'
+  rvm:
+    bin:   ruby-2.5.5
+
+261:
+  output:  2.6.1
+  message: 'Ruby 2.6.1'
+  rvm:
+    bin:   ruby-2.6.1
+
+270:
+  output:  2.7.0
+  message: 'Ruby 2.7.0'
   rvm:
     src:   trunk
     bin:   ruby-head-n*
@@ -53,6 +65,9 @@ default:
   branch:  5-0-stable
   message: '5-0-stable'
 
+60:
+  branch:  master
+
 3:
   source:  /home/rubys/git/awdwr/edition3
   destdir: AWDwR3