From cc2147289e2946139e98b11535de013394299e56 Mon Sep 17 00:00:00 2001
From: Harpo <ryan_harbert@wgbh.org>
Date: Tue, 29 Nov 2022 13:47:51 -0800
Subject: [PATCH] Add ./aapb test and format commands

---
 Dockerfile |  2 --
 aapb       | 32 ++++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 67613f0daa..e5c3f8ff47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,6 @@ COPY Gemfile Gemfile.lock ./
 
 RUN bundle install
 
-# COPY . .
-
 EXPOSE 3000
 
 CMD rake jetty:clean && rake jetty:config && rake jetty:start && bundle exec rake db:migrate RAILS_ENV=development && bundle exec rails s -b 0.0.0.0
diff --git a/aapb b/aapb
index 8779af0ae4..77ba435fb3 100755
--- a/aapb
+++ b/aapb
@@ -12,10 +12,15 @@ COMMANDS:\n\n
 \t  b | build \t  build the docker image\n
 \t  c | cmd \t    run a bash command with the docker image\n
 \t  d | dev \t    start a development server\n
+\t  f | format \t run the rubocop formatter\n
 \t  h | help \t   prints this help text\n
+\t  t | test \t   run the test suite\n
 "
 
-DEV_CMD="docker run -it -p 3000:3000 -v $(pwd):/usr/src/app/ aapb"
+DOCKER_RUN="docker run -it --rm --name aapb"
+DOCKER_EXEC="docker exec -it"
+VOLUME_MOUNT="-v $(pwd):/usr/src/app/"
+PORT_MOUNT="-p 3000:3000"
 
 if [ -z $1 ]; then
   echo -e $HELP
@@ -25,16 +30,27 @@ elif [ $1 = "build" -o $1 = "b" ]; then
     docker build -t aapb . "$@"
 
 elif [ $1 = "cmd" -o $1 = "c" ]; then
-    shift
-    if [ -z $1 ]; then
-      $DEV_CMD bash
-    else $DEV_CMD "$@"
-    fi
+  shift
+  CMD="$DOCKER_EXEC aapb"
+  if [ -z $1 ]; then
+    $CMD bash
+  else $CMD "$@"
+  fi
 
 elif [ $1 = "dev" -o $1 = "d" ]; then
   shift
-  $DEV_CMD "$@"
+  $DOCKER_RUN $PORT_MOUNT $VOLUME_MOUNT aapb "$@"
+
+elif [ $1 = "test" -o $1 = "t" ]; then
+  shift
+  $DOCKER_EXEC aapb bundle exec rspec "$@"
 
-else echo -e $HELP
+elif [ $1 = "format" -o $1 = "f" ]; then
+  shift
+  $DOCKER_EXEC aapb rubocop --auto-correct "$@"
+
+else 
+  echo "Unrecognezed command: $@"
+  echo -e $HELP
 
 fi