updates winter 2022

.gitpod.yml

@@ -1,16 +1,16 @@
-image: jelaniwoods/appdev2021-hash-chapter@sha256:c3fc3004689b5a36ae53c4d94181158f3f6b2bffb3f11f0f4d5e80aca2347287
+image: patrickmckernin/hashchapter22
 
 tasks:
-  - command: bundle install
   - init: bin/setup
 ports:
   - port: 3000
     onOpen: open-preview
+  - port: 9515
+    onOpen: ignore
+
 
 vscode:
   extensions:
-    - shd101wyy.markdown-preview-enhanced
     - vortizhe.simple-ruby-erb
-    - CraigMaslowski.erb
-    - Vense.rails-snippets
-    - wingrunr21.vscode-ruby
+    - mbessey.vscode-rufo
+

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "editor.tabSize": 2,
+    "emmet.includeLanguages": {
+      "erb": "html"
+    },
+    "files.associations": {
+      "*.erb": "erb"
+    }
+  }

Dockerfile

@@ -84,8 +84,6 @@ RUN sudo mv chromedriver /usr/bin/chromedriver
 RUN sudo chown root:root /usr/bin/chromedriver
 RUN sudo chmod +x /usr/bin/chromedriver
 
-RUN /bin/bash -l -c "gem install htmlbeautifier"
-RUN /bin/bash -l -c "gem install rufo"
 COPY Gemfile /base-rails/Gemfile
 COPY --chown=gitpod:gitpod Gemfile.lock /base-rails/Gemfile.lock
 RUN /bin/bash -l -c "gem install bundler:2.1.4"
@@ -102,9 +100,8 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/so
 RUN sudo apt-get update && sudo apt-get install -y nodejs yarn
 #  postgresql-client
 # RUN sudo apt-get update && sudo apt-get install -y yarn
-# RUN sudo apt install -y postgresql postgresql-contrib libpq-dev psmisc lsof expect
-RUN sudo apt install -y libpq-dev psmisc lsof expect
+RUN sudo apt install -y postgresql postgresql-contrib libpq-dev psmisc lsof expect
 USER gitpod
-RUN echo 'export PATH="$PATH:$GITPOD_REPO_ROOT/bin"' >> ~/.bashrc
 RUN echo "rvm use 2.7.3" >> ~/.bashrc
 RUN echo "rvm_silence_path_mismatch_check_flag=1" >> ~/.rvmrc
+RUN echo 'export PATH="$PATH:$GITPOD_REPO_ROOT/bin"' >> ~/.bashrc

Gemfile

@@ -10,3 +10,7 @@ gem "rake"
 group :test do
   gem 'rspec'
 end
+
+group :development do 
+  gem 'rufo'
+end

Gemfile.lock

@@ -1,17 +1,18 @@
 GIT
   remote: https://github.com/firstdraft/ruby_grade_runner.git
-  revision: e59261124de647ff09a7d95ac09fe26dbf4d93d8
+  revision: 95c8a133a9470ebd6a2324f5b6ea9610760466ad
   specs:
     ruby_grade_runner (0.0.5.1)
       oj
 
 GIT
   remote: https://github.com/firstdraft/web_git.git
-  revision: 4dbadc999d057f2bf0f9f74aec4deed79cf07350
+  revision: a2be64e762eb0d79a204ab8cf941e99c1b2a2a8d
   branch: spring2020
   specs:
     web_git (0.1.0)
       actionview
+      ansispan
       diffy
       git
       sinatra
@@ -20,64 +21,65 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (6.1.4)
-      activesupport (= 6.1.4)
+    actionview (7.0.1)
+      activesupport (= 7.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.4)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+    ansispan (0.0.1)
     builder (3.2.4)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     diffy (3.4.0)
     erubi (1.10.0)
-    git (1.8.1)
+    git (1.10.2)
       rchardet (~> 1.8)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    loofah (2.10.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
+    mini_portile2 (2.7.1)
+    minitest (5.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    oj (3.11.7)
-    racc (1.5.2)
+    oj (3.13.11)
+    racc (1.6.0)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    rake (13.0.3)
+    rake (13.0.6)
     rchardet (1.8.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
+    rspec-support (3.10.3)
+    ruby2_keywords (0.0.5)
+    rufo (0.13.0)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
@@ -86,9 +88,8 @@ GEM
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -97,6 +98,7 @@ DEPENDENCIES
   rake
   rspec
   ruby_grade_runner!
+  rufo
   web_git!
 
 RUBY VERSION