From dc709140b4ededc507dec17c2e1836d5f09f3754 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Fri, 3 Feb 2023 23:13:07 +0000 Subject: [PATCH 01/14] merge multiplication counter test --- spec/scripts/string_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec/scripts/string_spec.rb b/spec/scripts/string_spec.rb index 719df70..4000397 100644 --- a/spec/scripts/string_spec.rb +++ b/spec/scripts/string_spec.rb @@ -8,6 +8,18 @@ "Expected 'string_multiplication.rb' to NOT print the String literal 'HoHoHo', but did." end end + + multiplication_counter = 0 + File.foreach(multiplication_file).with_index do |line, line_num| + if line.include?("*") + unless line.include?("#") + multiplication_counter += 1 + end + end + end + expect(multiplication_counter).to be >= 1, + "Expected 'string_addition.rb' to use the * multiplication method, but only #{multiplication_counter} '*' found." + output = with_captured_stdout { require_relative('../../string_multiplication')} output = "empty" if output.empty? expect(output.match?(/HoHoHo/)).to be(true), "Expected output to be 'HoHoHo', but was #{output}" From 630ba80bbd4e1125f2cca8df86ff6c8d5f0d4a42 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Mon, 6 Feb 2023 18:51:40 +0000 Subject: [PATCH 02/14] drop only --- spec/scripts/string_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/scripts/string_spec.rb b/spec/scripts/string_spec.rb index 4000397..911e5cc 100644 --- a/spec/scripts/string_spec.rb +++ b/spec/scripts/string_spec.rb @@ -18,7 +18,7 @@ end end expect(multiplication_counter).to be >= 1, - "Expected 'string_addition.rb' to use the * multiplication method, but only #{multiplication_counter} '*' found." + "Expected 'string_addition.rb' to use the * multiplication method, but #{multiplication_counter} '*' found." output = with_captured_stdout { require_relative('../../string_multiplication')} output = "empty" if output.empty? From 039a1c93b41ac39c38c7c9f4ecf727bc71c5d06a Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Fri, 17 Feb 2023 15:44:35 -0900 Subject: [PATCH 03/14] update readme with provided code note for gets --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 088ed1f..c9179ef 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Should output exactly using the given starting variable. ### string_gets.rb -Write a program that gets a name (e.g. "alice") from the user, capitalizes it, and then says "Hello, Alice!" +Write a program that gets a name (e.g. "alice") from the user (the first two lines of provided code does this for you!), capitalizes it, and then says "Hello, Alice!" Should work similarly to the following: ``` From 0bbfefbec742fa2347e4b7e802c84da9792e9cbb Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Fri, 17 Feb 2023 15:46:25 -0900 Subject: [PATCH 04/14] update readme with provided code note for gets --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c9179ef..76f6b5b 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Should output exactly using the given starting variable. ### string_gets.rb -Write a program that gets a name (e.g. "alice") from the user (the first two lines of provided code does this for you!), capitalizes it, and then says "Hello, Alice!" +Write a program that gets a name (e.g. "alice") from the user (the first bit of provided code does this for you!), capitalizes it, and then says "Hello, Alice!" Should work similarly to the following: ``` From c4327eeace38e25870e5d794677bec747147b755 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 22 Feb 2023 17:05:43 -0900 Subject: [PATCH 05/14] update settings --- .vscode/settings.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 6c50f84..32cb62a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "editor.tabSize": 2, "editor.acceptSuggestionOnEnter": "off", "editor.bracketPairColorization.enabled": false, - "editor.cursorSurroundingLines": 8, + "editor.cursorSurroundingLines": 4, "editor.dragAndDrop": false, "editor.guides.bracketPairs": true, "editor.linkedEditing": true, @@ -19,7 +19,7 @@ "files.exclude": { "**/.git": true, ".vscode": true, - ".bundle": true, + ".bundle": true }, "files.insertFinalNewline": true, "files.trimFinalNewlines": true, @@ -31,17 +31,11 @@ "html.format.preserveNewLines": true, "html.format.templating": true, "terminal.integrated.altClickMovesCursor": true, - "[erb]": { - "editor.formatOnSave": true - }, - "[ruby]": { - "editor.formatOnSave": true - }, "vscode-erb-beautify.keepBlankLines": 1, "ruby.intellisense": false, "gitpod.openInStable.neverPrompt": true, "redhat.telemetry.enabled": false, "emmet.includeLanguages": { "erb": "html" - }, + } } From c403bf85339f97d31feebbdf06eecd80846a5e21 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Sat, 1 Apr 2023 04:30:39 -0800 Subject: [PATCH 06/14] replace dockerfile for codespaces --- Dockerfile | 106 +++++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2de8860..f96f337 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,12 @@ FROM buildpack-deps:focal -COPY install-packages /usr/bin - ### base ### -ARG DEBIAN_FRONTEND=noninteractive - RUN yes | unminimize \ - && install-packages \ + && apt-get install -yq \ zip \ unzip \ bash-completion \ build-essential \ - ninja-build \ htop \ jq \ less \ @@ -24,39 +19,39 @@ RUN yes | unminimize \ vim \ multitail \ lsof \ - ssl-cert \ - fish \ - zsh \ - && locale-gen en_US.UTF-8 + && locale-gen en_US.UTF-8 \ + && mkdir /var/lib/apt/dazzle-marks \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* ENV LANG=en_US.UTF-8 ### Git ### RUN add-apt-repository -y ppa:git-core/ppa \ - && install-packages git + && apt-get install -yq git \ + && rm -rf /var/lib/apt/lists/* -### Gitpod user ### +### Codespace user ### # '-l': see https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#user -RUN useradd -l -u 33333 -G sudo -md /home/gitpod -s /bin/bash -p gitpod gitpod \ +RUN useradd -l -u 33333 -G sudo -md /home/codespace -s /bin/bash -p codespace codespace \ # passwordless sudo for users in the 'sudo' group && sed -i.bkp -e 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers -ENV HOME=/home/gitpod +ENV HOME=/home/codespace WORKDIR $HOME # custom Bash prompt RUN { echo && echo "PS1='\[\e]0;\u \w\a\]\[\033[01;32m\]\u\[\033[00m\] \[\033[01;34m\]\w\[\033[00m\] \\\$ '" ; } >> .bashrc -### Gitpod user (2) ### -USER gitpod +### Codespace user (2) ### +USER codespace # use sudo so that user does not get sudo usage info on (the first) login -RUN sudo echo "Running 'sudo' for Gitpod: success" && \ +RUN sudo echo "Running 'sudo' for Codespace: success" && \ # create .bashrc.d folder and source it in the bashrc - mkdir /home/gitpod/.bashrc.d && \ - (echo; echo "for i in \$(ls \$HOME/.bashrc.d/*); do source \$i; done"; echo) >> /home/gitpod/.bashrc + mkdir /home/codespace/.bashrc.d && \ + (echo; echo "for i in \$(ls \$HOME/.bashrc.d/*); do source \$i; done"; echo) >> /home/codespace/.bashrc ### Ruby ### LABEL dazzle/layer=lang-ruby LABEL dazzle/test=tests/lang-ruby.yaml -USER gitpod +USER codespace RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - \ && curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - \ && curl -fsSL https://get.rvm.io | bash -s stable \ @@ -66,12 +61,13 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - \ && rvm use 2.7.3 --default \ && rvm rubygems current \ && gem install bundler --no-document" \ - && echo '[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*' >> /home/gitpod/.bashrc.d/70-ruby -RUN echo "rvm_gems_path=/home/gitpod/.rvm" > ~/.rvmrc + && echo '[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*' >> /home/codespace/.bashrc.d/70-ruby +RUN echo "rvm_gems_path=/home/codespace/.rvm" > ~/.rvmrc -USER gitpod +USER codespace # AppDev stuff -RUN /bin/bash -l -c "gem install htmlbeautifier rufo -N" + +WORKDIR /base-rails # Install Google Chrome RUN sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | \ @@ -83,31 +79,49 @@ RUN sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ st # Install Chromedriver (compatable with Google Chrome version) # See https://gerg.dev/2021/06/making-chromedriver-and-chrome-versions-match-in-a-docker-image/ -RUN BROWSER_MAJOR=$(google-chrome --version | sed 's/Google Chrome \([0-9]*\).*/\1/g') && \ - wget https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${BROWSER_MAJOR} -O chrome_version && \ - wget https://chromedriver.storage.googleapis.com/`cat chrome_version`/chromedriver_linux64.zip && \ - unzip chromedriver_linux64.zip && \ - sudo mv chromedriver /usr/local/bin/ && \ - DRIVER_MAJOR=$(chromedriver --version | sed 's/ChromeDriver \([0-9]*\).*/\1/g') && \ - echo "chrome version: $BROWSER_MAJOR" && \ - echo "chromedriver version: $DRIVER_MAJOR" && \ - if [ $BROWSER_MAJOR != $DRIVER_MAJOR ]; then echo "VERSION MISMATCH"; exit 1; fi +# RUN BROWSER_MAJOR=$(google-chrome --version | sed 's/Google Chrome \([0-9]*\).*/\1/g') && \ +# wget https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${BROWSER_MAJOR} -O chrome_version && \ +# wget https://chromedriver.storage.googleapis.com/`cat chrome_version`/chromedriver_linux64.zip && \ +# unzip chromedriver_linux64.zip && \ +# sudo mv chromedriver /usr/local/bin/ && \ +# DRIVER_MAJOR=$(chromedriver --version | sed 's/ChromeDriver \([0-9]*\).*/\1/g') && \ +# echo "chrome version: $BROWSER_MAJOR" && \ +# echo "chromedriver version: $DRIVER_MAJOR" && \ +# if [ $BROWSER_MAJOR != $DRIVER_MAJOR ]; then echo "VERSION MISMATCH"; exit 1; fi -WORKDIR /base-rails + +# Install Google Chrome +RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - +RUN sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' +RUN sudo apt-get -y update +RUN sudo apt-get -y install google-chrome-stable +# Install Chromedriver +# RUN sudo apt-get -y install google-chrome-stable +RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip +RUN unzip chromedriver_linux64.zip + +RUN sudo mv chromedriver /usr/bin/chromedriver +RUN sudo chown root:root /usr/bin/chromedriver +RUN sudo chmod +x /usr/bin/chromedriver + +# Pre-install gems into /base-rails/gems/ COPY Gemfile /base-rails/Gemfile -COPY Gemfile.lock /base-rails/Gemfile.lock -# For some reason, the copied files were owned by root so bundle could not succeed -RUN /bin/bash -l -c "sudo chown -R $(whoami):$(whoami) Gemfile Gemfile.lock" +COPY --chown=codespace:codespace Gemfile.lock /base-rails/Gemfile.lock RUN /bin/bash -l -c "gem install bundler:2.1.4" - +RUN /bin/bash -l -c "mkdir gems && bundle config set --local path 'gems'" RUN /bin/bash -l -c "bundle install" -# Install fuser -RUN sudo apt install -y libpq-dev psmisc lsof +# Install fuser (bin/server) and expect (web_git) +RUN sudo apt install -y libpq-dev psmisc lsof expect # Install heroku-cli RUN /bin/bash -l -c "curl https://cli-assets.heroku.com/install.sh | sh" +# Install JS Dependencies +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - \ + && echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list \ + && sudo apt-get update && sudo apt-get install -y nodejs yarn + # Git global configuration RUN git config --global push.default upstream \ && git config --global merge.ff only \ @@ -119,7 +133,7 @@ RUN git config --global push.default upstream \ && git config --global alias.cob 'checkout -b' # Alias 'git' to 'g' -RUN echo 'export PATH="$PATH:$GITPOD_REPO_ROOT/bin"' >> ~/.bashrc +RUN echo 'export PATH="$PATH:$PWD/bin"' >> ~/.bashrc RUN echo "# No arguments: 'git status'\n\ # With arguments: acts like 'git'\n\ g() {\n\ @@ -132,16 +146,6 @@ g() {\n\ source /usr/share/bash-completion/completions/git\n\ __git_complete g __git_main" >> ~/.bash_aliases -# Add current git branch to bash prompt -RUN echo "# Add current git branch to prompt\n\ -parse_git_branch() {\n\ - git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \\\(.*\\\)/:(\\\1)/'\n\ -}\n\ -\n\ -PS1='\[]0;\u \w\]\[\]\u\[\] \[\]\w\[\]\[\e[0;38;5;197m\]\$(parse_git_branch)\[\e[0m\] \\\$ '" >> ~/.bashrc - # Hack to pre-install bundled gems RUN echo "rvm use 2.7.3" >> ~/.bashrc RUN echo "rvm_silence_path_mismatch_check_flag=1" >> ~/.rvmrc -# Hack to add `rails grade` as a command -RUN echo 'export PATH="$PATH:$GITPOD_REPO_ROOT/bin"' >> ~/.bashrc From e23936932c17b0742e52c595252e29c8d8d97868 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Sat, 1 Apr 2023 04:36:17 -0800 Subject: [PATCH 07/14] added devcontainer --- .devcontainer/devcontainer.json | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..ca7f905 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,35 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/universal +{ + "name": "Container", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "bpurinton/string-chapter-codespace-march2023", + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [3000], + + "portsAttributes": { + "3000": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, + + // Use 'postCreateCommand' to run commands after the container is created. + "postCreateCommand": "bin/setup", + + // Configure tool-specific properties. + "customizations": { + "vscode": { + "extensions": ["vortizhe.simple-ruby-erb", + "mbessey.vscode-rufo", + "aliariff.vscode-erb-beautify"] + } + } + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} From c6db61a467bfbd3761e94df133658442b2141a5f Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Tue, 4 Apr 2023 09:59:20 -0800 Subject: [PATCH 08/14] Dockerfile rename to appdev.Dockerfile --- Dockerfile => appdev.Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => appdev.Dockerfile (100%) diff --git a/Dockerfile b/appdev.Dockerfile similarity index 100% rename from Dockerfile rename to appdev.Dockerfile From 196495ce34ab8a75ae45e29d799a76da3c52a4f3 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Thu, 2 Nov 2023 14:49:40 -0400 Subject: [PATCH 09/14] update gitpod.yml --- .gitpod.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index ed37f33..eb497cd 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,16 +1,32 @@ -image: jelaniwoods/appdev2022-ruby-chapters +image: jelaniwoods/appdev2023-rails-template tasks: - - init: bin/setup + - before: | + sudo cp -r /home/student /home/gitpod + (cd /home/gitpod/student; sudo find . -maxdepth 1 -exec mv {} .. \;) + source ~/.bashrc + sudo chmod 777 /home/gitpod && sudo chown -R gitpod /home/gitpod + export GEM_HOME=/workspace/.rvm + export GEM_PATH=$GEM_HOME:$GEM_PATH + export PATH=/workspace/.rvm/bin:$PATH + bin/setup ports: - port: 3000 onOpen: open-preview - - port: 9515 + visibility: public + - port: 4567 + onOpen: open-preview + visibility: public + - port: 9292 + onOpen: open-preview + visibility: public + - port: 5432 onOpen: ignore - vscode: extensions: - vortizhe.simple-ruby-erb - mbessey.vscode-rufo - aliariff.vscode-erb-beautify + - eamodio.gitlens + - setobiralo.erb-commenter From 3bb127c36f6bd6302f2732073d7e3a3298b5b2e9 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Tue, 7 Nov 2023 15:03:27 -0800 Subject: [PATCH 10/14] Fix Gitpod permissions issue --- .gitpod.yml | 2 +- .vscode/settings.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index eb497cd..9deaa84 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -5,7 +5,7 @@ tasks: sudo cp -r /home/student /home/gitpod (cd /home/gitpod/student; sudo find . -maxdepth 1 -exec mv {} .. \;) source ~/.bashrc - sudo chmod 777 /home/gitpod && sudo chown -R gitpod /home/gitpod + sudo chmod 777 /home/gitpod && sudo chown -R gitpod /home/gitpod /home/student export GEM_HOME=/workspace/.rvm export GEM_PATH=$GEM_HOME:$GEM_PATH export PATH=/workspace/.rvm/bin:$PATH diff --git a/.vscode/settings.json b/.vscode/settings.json index 32cb62a..4f96caf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -31,6 +31,7 @@ "html.format.preserveNewLines": true, "html.format.templating": true, "terminal.integrated.altClickMovesCursor": true, + "terminal.integrated.defaultProfile.linux": "bash", "vscode-erb-beautify.keepBlankLines": 1, "ruby.intellisense": false, "gitpod.openInStable.neverPrompt": true, From 580c279e77e5af7e616120d7dfe19a81fbb580e2 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Mon, 20 Nov 2023 09:13:31 -0900 Subject: [PATCH 11/14] bundle update for grade_runner --- Gemfile.lock | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8cd47d0..5c15804 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,15 @@ GIT remote: https://github.com/firstdraft/ruby_grade_runner.git - revision: 883e5c0ab16c4a7a2d19ea3ab0df8b12dce4e7c4 + revision: 9aa4fd9e4db8fbcd0fd9ac0f306f572696c54d81 specs: - ruby_grade_runner (0.0.5.1) - oj + ruby_grade_runner (0.0.6) + faraday-retry (~> 1.0.3) + octokit (~> 5.0) + oj (~> 3.10.6) GIT remote: https://github.com/firstdraft/web_git.git - revision: 934e081e566dc25e6510b4c8780330e7198b6e5e + revision: d1d7d2d70cb66ec233229e53f2ec578df0c585b0 specs: web_git (0.1.0) actionview @@ -31,13 +33,22 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) ansispan (0.0.1) + base64 (0.2.0) builder (3.2.4) concurrent-ruby (1.1.10) crass (1.0.6) diff-lcs (1.5.0) diffy (3.4.0) erubi (1.10.0) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + faraday-retry (1.0.3) git (1.10.2) rchardet (~> 1.8) i18n (1.10.0) @@ -52,7 +63,11 @@ GEM nokogiri (1.13.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) - oj (3.13.11) + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + oj (3.10.18) + public_suffix (5.0.4) racc (1.6.0) rack (2.2.3) rack-protection (2.2.0) @@ -79,6 +94,9 @@ GEM rspec-support (3.10.3) ruby2_keywords (0.0.5) rufo (0.13.0) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) sinatra (2.2.0) mustermann (~> 1.0) rack (~> 2.2) From 6bbe24367bf740c188147237a6cac5b100045124 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Fri, 24 May 2024 13:31:04 -0700 Subject: [PATCH 12/14] update docker image --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 9deaa84..d6762e9 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: jelaniwoods/appdev2023-rails-template +image: firstdraft/appdev-rails-template tasks: - before: | From 5ac94b378ce17798df39fa1ff1d7ce70615d7768 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 29 May 2024 09:06:42 -0700 Subject: [PATCH 13/14] update vscode settings --- .vscode/settings.json | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4f96caf..bc0935b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,7 +8,6 @@ "editor.linkedEditing": true, "editor.minimap.enabled": false, "editor.smoothScrolling": false, - "editor.wordBasedSuggestionsMode": "allDocuments", "editor.wordWrap": "on", "editor.wrappingIndent": "deepIndent", "workbench.editor.closeOnFileDelete": true, @@ -17,26 +16,42 @@ "workbench.tree.renderIndentGuides": "always", "files.autoSaveDelay": 500, "files.exclude": { - "**/.git": true, - ".vscode": true, - ".bundle": true + "**/.git": true, + ".vscode": true, + ".bundle": true, }, "files.insertFinalNewline": true, "files.trimFinalNewlines": true, - "screencastMode.onlyKeyboardShortcuts": true, + "screencastMode.keyboardOptions": { + "showKeys": false, + "showKeybindings": true, + "showCommands": false, + "showCommandGroups": false, + "showSingleEditorCursorMoves": true + }, "screencastMode.verticalOffset": 10, "explorer.compactFolders": false, "explorer.incrementalNaming": "smart", - "html.format.endWithNewline": true, "html.format.preserveNewLines": true, "html.format.templating": true, "terminal.integrated.altClickMovesCursor": true, "terminal.integrated.defaultProfile.linux": "bash", "vscode-erb-beautify.keepBlankLines": 1, - "ruby.intellisense": false, "gitpod.openInStable.neverPrompt": true, - "redhat.telemetry.enabled": false, + "gitlens.showWelcomeOnInstall": false, + "gitlens.currentLine.enabled": false, "emmet.includeLanguages": { "erb": "html" + }, + "[ruby]": { + "editor.defaultFormatter": "mbessey.vscode-rufo", + "editor.formatOnSave": false + }, + "[erb]": { + "editor.defaultFormatter": "aliariff.vscode-erb-beautify", + "editor.formatOnSave": false + }, + "files.associations": { + "*.html.erb": "erb" } } From 77215ca9f6e675ea0a25353d9ff51638d4fa656e Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 12 Jun 2024 08:09:59 -0700 Subject: [PATCH 14/14] update vscode settings --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bc0935b..74cffd2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -49,7 +49,8 @@ }, "[erb]": { "editor.defaultFormatter": "aliariff.vscode-erb-beautify", - "editor.formatOnSave": false + "editor.formatOnSave": false, + "editor.autoClosingBrackets": "beforeWhitespace" }, "files.associations": { "*.html.erb": "erb"