Merge remote-tracking branch 'origin/beta' into pull_request_issues

.rubocop.yml

@@ -8,6 +8,7 @@ AllCops:
     - 'lib/**/*'
     - 'public/**/*'
     - 'vendor/**/*'
+    - 'Dangerfile'
 Rails:
   Enabled: true
 
@@ -99,4 +100,4 @@ Style/Documentation:
 
 # Style preference
 Style/MethodDefParentheses:
-  Enabled: false
+  Enabled: false

.travis.yml

@@ -19,6 +19,7 @@ rvm:
 branches:
   only:
     - master
+    - beta
 before_install:
   - uname -a
   - lsb_release -a

app/controllers/response_controller.rb

@@ -57,7 +57,8 @@ def delete
   # Prepare the parameters when student clicks "Edit"
   def edit
     assign_instance_vars
-    get_all_responses
+    @prev = Response.where(map_id: @map.id)
+    @review_scores = @prev.to_a
     if @prev.present?
       @sorted = @review_scores.sort {|m1, m2| m1.version_num.to_i && m2.version_num.to_i ? m2.version_num.to_i <=> m1.version_num.to_i : (m1.version_num ? -1 : 1) }
       @largest_version_num = @sorted[0]
@@ -142,7 +143,6 @@ def create
     map_id = params[:id]
     map_id = params[:map_id] unless params[:map_id].nil? # pass map_id as a hidden field in the review form
     @map = ResponseMap.find(map_id)
-    get_all_responses
     if params[:review][:questionnaire_id]
       @questionnaire = Questionnaire.find(params[:review][:questionnaire_id])
       @round = params[:review][:round]
@@ -370,13 +370,4 @@ def init_answers(questions)
       Answer.create(response_id: @response.id, question_id: q.id, answer: nil, comments: '') if a.nil?
     end
   end
-
-  def get_all_responses
-    # get all previous versions of responses for the response map.
-    # I guess if we're in the middle of creating a new response, this would be
-    # all 'previous' responses to this new one (which is not yet saved)?
-    @prev = Response.where(map_id: @map.id)
-    # not sure what this is about
-    @review_scores = @prev.to_a
-  end
 end

devops/docker/docker-compose.yml.blue_green_deployment

@@ -0,0 +1,41 @@
+version: '3'
+
+services:
+  expertiza_blue:
+    image: expertiza:blue
+    ports:
+      - '3000:3000'
+    depends_on:
+      - scrubbed_db
+      - redis
+    links:
+      - scrubbed_db
+      - redis
+    command: bundle exec thin start -p 3000
+    environment:
+      REDIS_HOST: redis
+
+  expertiza_green:
+    image: expertiza:green
+    ports:
+      - '3001:3001'
+    depends_on:
+      - scrubbed_db
+      - redis
+    links:
+      - scrubbed_db
+      - redis
+    command: bundle exec thin start -p 3001
+    environment:
+      REDIS_HOST: redis
+
+  scrubbed_db:
+    image: mysql:5.7
+    volumes:
+      # https://stackoverflow.com/questions/25920029/setting-up-mysql-and-importing-dump-within-dockerfile
+      - './docker/scrubbed_db:/docker-entrypoint-initdb.d'
+    environment:
+      MYSQL_ROOT_PASSWORD: expertiza
+
+  redis:
+    image: redis:alpine

devops/docker/docker-compose.yml.example

@@ -1,41 +1,30 @@
 version: '3'
 
 services:
-  expertiza_blue:
-    image: expertiza:blue
+  expertiza:
+    image: winbobob/expertiza:ruby-2.2.7
     ports:
       - '3000:3000'
+    volumes:
+      - '.:/root/expertiza'
     depends_on:
       - scrubbed_db
       - redis
     links:
       - scrubbed_db
       - redis
+    working_dir: /root/expertiza
     command: bundle exec thin start -p 3000
     environment:
       REDIS_HOST: redis
 
-  expertiza_green:
-    image: expertiza:green
-    ports:
-      - '3001:3001'
-    depends_on:
-      - scrubbed_db
-      - redis
-    links:
-      - scrubbed_db
-      - redis
-    command: bundle exec thin start -p 3001
-    environment:
-      REDIS_HOST: redis
-
   scrubbed_db:
     image: mysql:5.7
     volumes:
       # https://stackoverflow.com/questions/25920029/setting-up-mysql-and-importing-dump-within-dockerfile
-      - './docker/scrubbed_db:/docker-entrypoint-initdb.d'
+      - './devops/docker/scrubbed_db:/docker-entrypoint-initdb.d'
     environment:
-      MYSQL_ROOT_PASSWORD: expertiza
+      MYSQL_ROOT_PASSWORD: [YOUR PASSWORD]
 
   redis:
-    image: redis:alpine
+    image: redis:alpine

devops/docker/setup_linux.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
-cd ..
+cd ../..
 
 DIR=`pwd`
 
 # Setup the environment
 bash setup.sh
 
 # Go back to docker folder
-cd $DIR/docker/scrubbed_db
+cd $DIR/devops/docker/scrubbed_db
 
 # Checking the scrubbed_db
 
@@ -29,7 +29,7 @@ tar -xzf expertiza_scrubbed_db.sql.tar.gz
 cd $DIR
 
 # Get the docker-compose file
-cp ./docker/docker-compose.yml.example docker-compose.yml
+cp ./devops/docker/docker-compose.yml.example docker-compose.yml
 
 # Get the MYSQL_ROOT_PASSWORD
 read -p "Please enter your MYSQL ROOT PASSWORD: " MYSQL_ROOT_PASSWORD

devops/docker/setup_mac.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
-cd ..
+cd ../..
 
 DIR=`pwd`
 
 # Setup the environment
 bash setup.sh
 
 # Go back to docker folder
-cd $DIR/docker/scrubbed_db
+cd $DIR/devops/docker/scrubbed_db
 
 # Checking the scrubbed_db
 
@@ -28,7 +28,7 @@ tar -xzf expertiza_scrubbed_db.sql.tar.gz
 cd $DIR
 
 # Get the docker-compose file
-cp ./docker/docker-compose.yml.example docker-compose.yml
+cp ./devops/docker/docker-compose.yml.example docker-compose.yml
 
 # Get the MYSQL_ROOT_PASSWORD
 read -p "Please enter your MYSQL ROOT PASSWORD: " MYSQL_ROOT_PASSWORD