DTL (Test > Levelbuilder): b35badba

.circleci/Dockerfile

@@ -46,15 +46,15 @@ RUN apt-get update && \
 		  python python-dev
 
 # install ruby
-RUN wget https://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.3.tar.gz && \
-    tar -xzvf ruby-2.2.3.tar.gz && \
-    rm ruby-2.2.3.tar.gz && \
-    cd ruby-2.2.3 && \
+RUN wget https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.0.tar.gz && \
+    tar -xzvf ruby-2.5.0.tar.gz && \
+    rm ruby-2.5.0.tar.gz && \
+    cd ruby-2.5.0 && \
     ./configure && \
     make -j"$(nproc)" && \
     make install && \
     cd .. && \
-    rm -r ruby-2.2.3
+    rm -r ruby-2.5.0
 
 # install bundler
 RUN gem install bundler && \
@@ -79,7 +79,7 @@ RUN apt-get install -y unzip
 RUN curl --output /tmp/firefox.deb https://s3.amazonaws.com/circle-downloads/firefox-mozilla-build_47.0.1-0ubuntu1_amd64.deb \
   && echo 'ef016febe5ec4eaf7d455a34579834bcde7703cb0818c80044f4d148df8473bb  /tmp/firefox.deb' | sha256sum -c \
   && sudo dpkg -i /tmp/firefox.deb || sudo apt-get -f install  \
-  && sudo apt-get install -y libgtk3.0-cil-dev \
+  && apt-get update && apt-get install -y libgtk3.0-cil-dev \
   && rm -rf /tmp/firefox.deb
 
 # install chrome
@@ -99,9 +99,9 @@ RUN export CHROMEDRIVER_RELEASE=$(curl http://chromedriver.storage.googleapis.co
       && sudo chmod +x /usr/local/bin/chromedriver
 
 # install mysql
-RUN apt-get install -y mysql-server-5.6
+RUN apt-get update && apt-get install -y mysql-server-5.6
 
 # install a couple more things from config.yml
-RUN apt-get -y install parallel libmagickwand-dev imagemagick
+RUN apt-get update && apt-get -y install parallel libmagickwand-dev imagemagick
 
 USER circleci

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     parallelism: 2
     docker:
-      - image: wjordan/code-dot-org:trusty
+      - image: wjordan/code-dot-org:ruby-2.5
         environment:
           RAILS_ENV: test
           RACK_ENV: test
@@ -102,13 +102,6 @@ jobs:
             " >> locals.yml
             yarn -V
 
-      - run:
-          name: fix weird gem issue
-          command: |
-            bundle exec gem install rmagick
-            bundle update rmagick
-            sudo ldconfig /usr/local/lib
-
       - run:
           name: rake install
           command: |

CONTRIBUTING.md

@@ -3,6 +3,7 @@
 We'd love to have you join our group of contributors! Please e-mail your areas of interest and your availability to contributing@code.org, and we’ll be happy to match you with a project.
 
 This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to honor this code.
+
 [code-of-conduct]: http://todogroup.org/opencodeofconduct/#Code.org/abuse@code.org
 
 You can start setting up with these next steps:

Gemfile

@@ -60,7 +60,13 @@ end
 gem 'rack-cache'
 
 group :development, :test do
-  gem 'rerun', '~> 0.10.0'
+  gem 'rerun'
+
+  # Ref: https://github.com/e2/ruby_dep/issues/24
+  # https://github.com/e2/ruby_dep/issues/25
+  # https://github.com/e2/ruby_dep/issues/30
+  gem 'ruby_dep', '~> 1.3.1'
+
   gem 'shotgun'
   # Use debugger
   #gem 'debugger' unless ENV['RM_INFO']
@@ -113,7 +119,8 @@ gem 'factory_girl_rails', group: [:development, :staging, :test, :adhoc]
 # For pegasus PDF generation.
 gem 'open_uri_redirections', require: false, group: [:development, :staging, :test]
 
-gem 'gctools'
+# Ref: https://github.com/tmm1/gctools/pull/17
+gem 'gctools', github: 'wjordan/gctools', ref: 'ruby-2.5'
 gem 'unicorn', '~> 5.1.0'
 
 gem 'chronic', '~> 0.10.2'
@@ -138,7 +145,7 @@ gem 'jbuilder', '~> 2.5'
 
 # Authentication and permissions.
 gem 'cancancan', '~> 1.15.0'
-gem 'devise', '~> 4.2.0'
+gem 'devise', '~> 4.4.0'
 gem 'devise_invitable', '~> 1.6.0'
 
 # Ref: https://github.com/instructure/ims-lti/pull/90
@@ -162,7 +169,7 @@ gem 'highline', '~> 1.6.21'
 
 gem 'honeybadger' # error monitoring
 
-gem 'newrelic_rpm', '~> 3.16.0', group: [:staging, :development, :production] # perf/error/etc monitoring
+gem 'newrelic_rpm', '~> 4.8.0', group: [:staging, :development, :production] # perf/error/etc monitoring
 
 gem 'redcarpet', '~> 3.3.4'
 

Gemfile.lock

@@ -48,6 +48,13 @@ GIT
     active_model_serializers (0.10.0.pre)
       activemodel (>= 4.0)
 
+GIT
+  remote: https://github.com/wjordan/gctools.git
+  revision: a318fede5cb519133a4d6bfa566b800c71c2e42c
+  ref: ruby-2.5
+  specs:
+    gctools (0.2.4)
+
 GIT
   remote: https://github.com/wjordan/geocoder.git
   revision: 2da20897188b57f777df89f90e45cf331c5b014f
@@ -223,7 +230,7 @@ GEM
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     bindata (2.3.1)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
@@ -236,8 +243,6 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
     childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (0.0.9)
@@ -275,17 +280,17 @@ GEM
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
     cucumber-wire (0.0.1)
-    daemons (1.2.3)
+    daemons (1.2.6)
     dalli (2.7.6)
     dalli-elasticache (0.2.0)
       dalli (>= 1.0.0)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     declarative (0.0.9)
     declarative-option (0.1.0)
-    devise (4.2.0)
+    devise (4.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
     devise_invitable (1.6.0)
@@ -296,7 +301,7 @@ GEM
     domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    eventmachine (1.2.0.1)
+    eventmachine (1.2.5)
     execjs (2.7.0)
     exifr (1.2.5)
     eyes_core (3.14.2)
@@ -321,15 +326,14 @@ GEM
       redis (~> 3.2)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.21)
     firebase (0.2.6)
       httpclient
       json
     firebase_token_generator (2.0.0)
     font-awesome-rails (4.6.3.1)
       railties (>= 3.2, < 5.1)
     fspath (3.1.0)
-    gctools (0.2.4)
     gemoji (2.1.0)
     gherkin (4.0.0)
     globalid (0.4.1)
@@ -369,11 +373,10 @@ GEM
       rake (>= 10, < 13)
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
-    hashdiff (0.3.0)
+    hashdiff (0.3.7)
     hashery (2.1.2)
     hashie (3.4.4)
     highline (1.6.21)
-    hitimes (1.2.4)
     honeybadger (2.6.0)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
@@ -387,7 +390,7 @@ GEM
       multi_xml (>= 0.5.2)
     httpclient (2.8.2.2)
     hurley (0.2)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     image_size (1.5.0)
     in_threads (1.4.0)
@@ -421,10 +424,10 @@ GEM
       addressable (~> 2.3)
     le (2.7.2)
     libv8 (3.16.14.15)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -433,7 +436,7 @@ GEM
       actionpack (>= 4, < 5.1)
       activesupport (>= 4, < 5.1)
       railties (>= 4, < 5.1)
-    loofah (2.1.1)
+    loofah (2.2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -470,7 +473,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
     netrc (0.11.0)
-    newrelic_rpm (3.16.0.318)
+    newrelic_rpm (4.8.0.341)
     nio4r (2.2.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
@@ -529,7 +532,7 @@ GEM
     phantomjs (1.9.7.1)
     powerpack (0.1.1)
     progress (3.3.1)
-    public_suffix (3.0.0)
+    public_suffix (3.0.2)
     pusher (1.3.1)
       httpclient (~> 2.7)
       multi_json (~> 1.0)
@@ -586,9 +589,9 @@ GEM
     raindrops (0.19.0)
     rake (11.3.0)
     rambling-trie (1.0.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rdoc (4.2.2)
       json (~> 1.4)
     recaptcha (4.6.3)
@@ -600,18 +603,19 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    rerun (0.10.0)
-      listen (~> 2.7, >= 2.7.3)
-    responders (2.2.0)
-      railties (>= 4.2.0, < 5.1)
+    rerun (0.13.0)
+      listen (~> 3.0)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.0.2)
     retryable (2.0.4)
     rinku (2.0.4)
-    rmagick (2.15.4)
+    rmagick (2.16.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -635,6 +639,7 @@ GEM
     ruby-prof (0.15.9)
     ruby-progressbar (1.9.0)
     ruby-rc4 (0.1.5)
+    ruby_dep (1.3.1)
     ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
     rubyzip (1.2.1)
@@ -695,22 +700,20 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thin (1.7.0)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
     timecop (0.8.1)
-    timers (4.0.4)
-      hitimes
     ttfunk (1.4.0)
     twilio-ruby (4.11.1)
       builder (>= 2.1.2)
       jwt (~> 1.0)
       multi_json (>= 1.3.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
     uglifier (3.0.0)
@@ -735,7 +738,7 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vcr (3.0.3)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
     watir (6.10.3)
       selenium-webdriver (~> 3.4, >= 3.4.1)
@@ -748,7 +751,7 @@ GEM
       activesupport
       httpclient (>= 2.4)
       multi_json
-    webmock (2.1.0)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -789,7 +792,7 @@ DEPENDENCIES
   daemons
   dalli
   dalli-elasticache
-  devise (~> 4.2.0)
+  devise (~> 4.4.0)
   devise_invitable (~> 1.6.0)
   execjs
   eyes_selenium (= 3.14.2)
@@ -800,7 +803,7 @@ DEPENDENCIES
   firebase_token_generator
   font-awesome-rails (~> 4.6.3)
   full-name-splitter!
-  gctools
+  gctools!
   gemoji
   geocoder!
   google-api-client
@@ -836,7 +839,7 @@ DEPENDENCIES
   net-http-persistent
   net-scp
   net-ssh
-  newrelic_rpm (~> 3.16.0)
+  newrelic_rpm (~> 4.8.0)
   nokogiri (~> 1.6.1)
   octokit
   oj
@@ -865,7 +868,7 @@ DEPENDENCIES
   redcarpet (~> 3.3.4)
   redis (~> 3.3.3)
   redis-slave-read!
-  rerun (~> 0.10.0)
+  rerun
   responders (~> 2.0)
   rest-client (~> 2.0)
   retryable
@@ -875,6 +878,7 @@ DEPENDENCIES
   rubocop (~> 0.52)
   ruby-prof
   ruby-progressbar
+  ruby_dep (~> 1.3.1)
   sass-rails!
   scss_lint
   sdoc