From 0abb37d5aafe1829ed5b7ddf9144fec6c177375d Mon Sep 17 00:00:00 2001 From: Jelani Woods Date: Thu, 14 Jul 2022 10:00:10 -0500 Subject: [PATCH] Summer '22 Updates --- .gitignore | 4 +- .gitpod.yml | 9 +-- .vscode/settings.json | 46 ++++++++++- Gemfile | 7 +- Gemfile.lock | 177 +++++++++++++++++++++--------------------- bin/setup | 6 +- vendor/bundle/.keep | 0 7 files changed, 145 insertions(+), 104 deletions(-) create mode 100644 vendor/bundle/.keep diff --git a/.gitignore b/.gitignore index d9488b0..79e4510 100644 --- a/.gitignore +++ b/.gitignore @@ -47,5 +47,5 @@ appdev/ node_modules package-lock.json core.chrome* -!vendor/ -.theia/.ltici_apitoken.yml +vendor/bundle/* +!vendor/bundle/.keep diff --git a/.gitpod.yml b/.gitpod.yml index 021335d..91430c5 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,17 +1,16 @@ -image: patrickmckernin/verybestdebug2022winter +image: patrickmckernin/photogram-associations-2022-spring tasks: - - init: bin/setup + - before: | + bin/setup ports: - port: 3000 onOpen: open-preview - - port: 9515 + - port: 9500-9999 onOpen: ignore - vscode: extensions: - vortizhe.simple-ruby-erb - mbessey.vscode-rufo - aliariff.vscode-erb-beautify - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 947e84c..d68e8cd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,9 +1,47 @@ { "editor.tabSize": 2, + "editor.acceptSuggestionOnEnter": "off", + "editor.bracketPairColorization.enabled": false, + "editor.cursorSurroundingLines": 8, + "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, + "workbench.fontAliasing": "auto", + "workbench.startupEditor": "none", + "workbench.tree.renderIndentGuides": "always", + "files.autoSaveDelay": 500, + "files.exclude": { + "**/.git": true, + ".vscode": true, + ".bundle": true, + }, + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "screencastMode.onlyKeyboardShortcuts": 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 + }, + "vscode-erb-beautify.keepBlankLines": 1, + "ruby.intellisense": false, + "gitpod.openInStable.neverPrompt": true, + "redhat.telemetry.enabled": false, "emmet.includeLanguages": { "erb": "html" }, - "files.associations": { - "*.erb": "erb" - } -} +} \ No newline at end of file diff --git a/Gemfile b/Gemfile index 04ec877..a1a94b4 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'rails', '~> 6.0.3', '>= 6.0.3.2' # Use Puma as the app server gem 'puma', '~> 4.1' -gem "faker" + # Use Active Model has_secure_password gem 'bcrypt' @@ -30,6 +30,9 @@ group :development do gem 'spring-watcher-listen', '~> 2.0.0' end +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + gem 'rack-timeout', require: 'rack/timeout/base' gem 'sprockets', '< 4' gem 'sassc-rails' @@ -43,7 +46,7 @@ group :development, :test do gem 'pry-rails' gem 'sqlite3', '~> 1.4.1' gem 'table_print' - gem 'web_git', github: 'firstdraft/web_git', branch: 'spring2020' + gem 'web_git', github: 'firstdraft/web_git' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index a7a1ff9..aaa64e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/firstdraft/draft_generators.git - revision: bbbf1a7475db166813fc25fbecd78dd83605eb40 + revision: 2635764769e293ef79d8183392cd4e8ae17cc2c4 branch: winter-2020 specs: draft_generators (0.0.3) @@ -16,8 +16,7 @@ GIT GIT remote: https://github.com/firstdraft/web_git.git - revision: a2be64e762eb0d79a204ab8cf941e99c1b2a2a8d - branch: spring2020 + revision: 614ba241422a5516f5a0a02ff75557640e87a855 specs: web_git (0.1.0) actionview @@ -30,56 +29,56 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.0.4.6) - actionpack (= 6.0.4.6) + actioncable (6.0.4.8) + actionpack (= 6.0.4.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.4.6) - actionpack (= 6.0.4.6) - activejob (= 6.0.4.6) - activerecord (= 6.0.4.6) - activestorage (= 6.0.4.6) - activesupport (= 6.0.4.6) + actionmailbox (6.0.4.8) + actionpack (= 6.0.4.8) + activejob (= 6.0.4.8) + activerecord (= 6.0.4.8) + activestorage (= 6.0.4.8) + activesupport (= 6.0.4.8) mail (>= 2.7.1) - actionmailer (6.0.4.6) - actionpack (= 6.0.4.6) - actionview (= 6.0.4.6) - activejob (= 6.0.4.6) + actionmailer (6.0.4.8) + actionpack (= 6.0.4.8) + actionview (= 6.0.4.8) + activejob (= 6.0.4.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.4.6) - actionview (= 6.0.4.6) - activesupport (= 6.0.4.6) + actionpack (6.0.4.8) + actionview (= 6.0.4.8) + activesupport (= 6.0.4.8) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.4.6) - actionpack (= 6.0.4.6) - activerecord (= 6.0.4.6) - activestorage (= 6.0.4.6) - activesupport (= 6.0.4.6) + actiontext (6.0.4.8) + actionpack (= 6.0.4.8) + activerecord (= 6.0.4.8) + activestorage (= 6.0.4.8) + activesupport (= 6.0.4.8) nokogiri (>= 1.8.5) - actionview (6.0.4.6) - activesupport (= 6.0.4.6) + actionview (6.0.4.8) + activesupport (= 6.0.4.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.4.6) - activesupport (= 6.0.4.6) + activejob (6.0.4.8) + activesupport (= 6.0.4.8) globalid (>= 0.3.6) - activemodel (6.0.4.6) - activesupport (= 6.0.4.6) - activerecord (6.0.4.6) - activemodel (= 6.0.4.6) - activesupport (= 6.0.4.6) - activestorage (6.0.4.6) - actionpack (= 6.0.4.6) - activejob (= 6.0.4.6) - activerecord (= 6.0.4.6) + activemodel (6.0.4.8) + activesupport (= 6.0.4.8) + activerecord (6.0.4.8) + activemodel (= 6.0.4.8) + activesupport (= 6.0.4.8) + activestorage (6.0.4.8) + actionpack (= 6.0.4.8) + activejob (= 6.0.4.8) + activerecord (= 6.0.4.8) marcel (~> 1.0.0) - activesupport (6.0.4.6) + activesupport (6.0.4.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -92,8 +91,8 @@ GEM activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) ansispan (0.0.1) - bcrypt (3.1.16) - bcrypt (3.1.16-java) + bcrypt (3.1.17) + bcrypt (3.1.17-java) better_errors (2.6.0) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -101,7 +100,7 @@ GEM bindex (0.8.1) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.10.3) + bootsnap (1.11.1) msgpack (~> 1.2) builder (3.2.4) byebug (11.1.3) @@ -116,7 +115,7 @@ GEM xpath (~> 3.2) childprocess (4.1.0) coderay (1.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) crack (0.4.5) rexml crass (1.0.6) @@ -128,33 +127,31 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.5.0) - diffy (3.4.0) + diffy (3.4.2) dotenv (2.7.6) dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) erubi (1.10.0) execjs (2.8.1) - factory_bot (6.2.0) + factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (2.19.0) - i18n (>= 1.6, < 2) ffi (1.15.5) ffi (1.15.5-java) ffi (1.15.5-x64-mingw32) ffi (1.15.5-x86-mingw32) - git (1.10.2) + git (1.11.0) rchardet (~> 1.8) globalid (1.0.0) activesupport (>= 5.0) hashdiff (1.0.1) - htmlbeautifier (1.4.1) - i18n (1.10.0) + htmlbeautifier (1.4.2) + i18n (1.11.0) concurrent-ruby (~> 1.0) - indefinite_article (0.2.4) + indefinite_article (0.2.5) activesupport kaminari (1.2.2) activesupport (>= 4.1.0) @@ -172,7 +169,7 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.14.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -182,27 +179,27 @@ GEM method_source (1.0.0) mini_mime (1.1.2) mini_portile2 (2.8.0) - minitest (5.15.0) - msgpack (1.4.5) - msgpack (1.4.5-java) + minitest (5.16.2) + msgpack (1.5.1) + msgpack (1.5.1-java) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) nio4r (2.5.8) nio4r (2.5.8-java) - nokogiri (1.13.2) + nokogiri (1.13.7) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.2-java) + nokogiri (1.13.7-java) racc (~> 1.4) - nokogiri (1.13.2-x64-mingw32) + nokogiri (1.13.7-x64-mingw32) racc (~> 1.4) - nokogiri (1.13.2-x86-mingw32) + nokogiri (1.13.7-x86-mingw32) racc (~> 1.4) oj (3.13.11) orm_adapter (0.5.0) - pg (1.3.2) - pg (1.3.2-x64-mingw32) - pg (1.3.2-x86-mingw32) + pg (1.3.5) + pg (1.3.5-x64-mingw32) + pg (1.3.5-x86-mingw32) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) @@ -212,38 +209,38 @@ GEM spoon (~> 0.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.6) - puma (4.3.11) + public_suffix (4.0.7) + puma (4.3.12) nio4r (~> 2.0) - puma (4.3.11-java) + puma (4.3.12-java) nio4r (~> 2.0) racc (1.6.0) racc (1.6.0-java) - rack (2.2.3) + rack (2.2.4) rack-protection (2.2.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.6.0) - rails (6.0.4.6) - actioncable (= 6.0.4.6) - actionmailbox (= 6.0.4.6) - actionmailer (= 6.0.4.6) - actionpack (= 6.0.4.6) - actiontext (= 6.0.4.6) - actionview (= 6.0.4.6) - activejob (= 6.0.4.6) - activemodel (= 6.0.4.6) - activerecord (= 6.0.4.6) - activestorage (= 6.0.4.6) - activesupport (= 6.0.4.6) + rails (6.0.4.8) + actioncable (= 6.0.4.8) + actionmailbox (= 6.0.4.8) + actionmailer (= 6.0.4.8) + actionpack (= 6.0.4.8) + actiontext (= 6.0.4.8) + actionview (= 6.0.4.8) + activejob (= 6.0.4.8) + activemodel (= 6.0.4.8) + activerecord (= 6.0.4.8) + activestorage (= 6.0.4.8) + activesupport (= 6.0.4.8) bundler (>= 1.3.0) - railties (= 6.0.4.6) + railties (= 6.0.4.8) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails_db (2.3.1) activerecord @@ -252,23 +249,23 @@ GEM ransack (>= 2.3.2) simple_form (>= 5.0.1) terminal-table - railties (6.0.4.6) - actionpack (= 6.0.4.6) - activesupport (= 6.0.4.6) + railties (6.0.4.8) + actionpack (= 6.0.4.8) + activesupport (= 6.0.4.8) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rake (13.0.6) - ransack (2.5.0) - activerecord (>= 5.2.4) - activesupport (>= 5.2.4) + ransack (3.1.0) + activerecord (>= 6.0.4) + activesupport (>= 6.0.4) i18n rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) rchardet (1.8.0) ref (2.0.0) - regexp_parser (2.2.1) + regexp_parser (2.3.1) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) @@ -285,10 +282,10 @@ GEM rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-rails (5.1.0) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -348,7 +345,7 @@ GEM tilt (2.0.10) tzinfo (1.2.9) thread_safe (~> 0.1) - tzinfo-data (1.2021.5) + tzinfo-data (1.2022.1) tzinfo (>= 1.0.0) unicode-display_width (2.1.0) warden (1.2.9) @@ -369,7 +366,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS java @@ -391,7 +388,6 @@ DEPENDENCIES draft_generators! execjs factory_bot_rails - faker grade_runner! htmlbeautifier listen (~> 3.2) @@ -412,6 +408,7 @@ DEPENDENCIES sqlite3 (~> 1.4.1) table_print therubyracer + tzinfo-data web-console (>= 3.3.0) web_git! webmock diff --git a/bin/setup b/bin/setup index d995af4..5a08586 100755 --- a/bin/setup +++ b/bin/setup @@ -14,8 +14,12 @@ chdir APP_ROOT do # This script is a starting point to setup your application. # Add necessary setup steps to this file. puts "== Installing dependencies ==" + if !Dir.exist?("vendor/bundle/ruby") && Dir.exist?("/base-rails/gems/ruby") + FileUtils.cp_r("/base-rails/gems/ruby", "vendor/bundle") + system! "bundle config set --local path 'vendor/bundle'" + end system! "bundle install" - system! "gem install rufo htmlbeautifier" + system! "gem install rufo htmlbeautifier --no-document" # system! "yarn install --check-files" # Install JavaScript dependencies if using Yarn # system("bin/yarn") diff --git a/vendor/bundle/.keep b/vendor/bundle/.keep new file mode 100644 index 0000000..e69de29