Skip to content

merging some main updates from multiplication test #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: winter-2023
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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"
}
24 changes: 20 additions & 4 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,32 @@
image: jelaniwoods/appdev2022-ruby-chapters
image: firstdraft/appdev-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 /home/student
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
41 changes: 26 additions & 15 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
"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,
"editor.minimap.enabled": false,
"editor.smoothScrolling": false,
"editor.wordBasedSuggestionsMode": "allDocuments",
"editor.wordWrap": "on",
"editor.wrappingIndent": "deepIndent",
"workbench.editor.closeOnFileDelete": true,
Expand All @@ -17,31 +16,43 @@
"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,
"[erb]": {
"editor.formatOnSave": true
},
"[ruby]": {
"editor.formatOnSave": 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,
"editor.autoClosingBrackets": "beforeWhitespace"
},
"files.associations": {
"*.html.erb": "erb"
}
}
28 changes: 23 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 bit of provided code does this for you!), capitalizes it, and then says "Hello, Alice!"

Should work similarly to the following:
```
Expand Down
Loading