From 11102d5f87fb80e9d169f7437da750f25d094d4e Mon Sep 17 00:00:00 2001 From: EarldridgeJazzedPineda <110967307+EarldridgeJazzedPineda@users.noreply.github.com> Date: Thu, 27 Apr 2023 20:51:41 +0800 Subject: [PATCH 1/6] Fixed the Gemfile to work on Windows (+ other general changes) --- Gemfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 97cfeffb..2a53b51a 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'activeadmin' gem 'devise' gem 'figaro' gem 'jbuilder', '~> 2.0' -gem 'pg', '~> 0.21' +gem 'pg', '~> 1.4' gem "puma", ">= 3.12.4" gem 'rails', '~> 5.2.5' gem 'redis' @@ -45,7 +45,7 @@ gem 'httparty' # for api pagination gem 'kaminari' -gem 'mini_racer' +gem 'mini_racer' if RUBY_PLATFORM !~ "mingw32" # Too many problems, is it even needed? group :development do gem 'letter_opener' @@ -66,8 +66,13 @@ group :development, :test do gem 'rack-mini-profiler' gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' - gem 'stackprof' + gem 'stackprof' if RUBY_PLATFORM !~ "mingw32" # Not supported on Microsoft Windows end gem "sentry-ruby" -gem "sentry-rails" \ No newline at end of file +gem "sentry-rails" + +gem 'sys-proctable' +gem 'fast_stack' +gem 'wdm', '>= 0.1.0' if Gem.win_platform? +gem 'tzinfo-data' From 9efdbb9414656669c54c5a8d3de5b035d0b5b349 Mon Sep 17 00:00:00 2001 From: EarldridgeJazzedPineda <110967307+EarldridgeJazzedPineda@users.noreply.github.com> Date: Sun, 30 Apr 2023 16:42:03 +0800 Subject: [PATCH 2/6] Update QUICKSTART.md Added information for Microsoft Windows --- QUICKSTART.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/QUICKSTART.md b/QUICKSTART.md index 143fbcfc..b299091e 100644 --- a/QUICKSTART.md +++ b/QUICKSTART.md @@ -12,6 +12,8 @@ macOS run `sh INSTALL_mac.sh`. ## Manual environment setup +If you are using Microsoft Windows, download Ruby [here](https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.2-1/rubyinstaller-devkit-2.7.2-1-x64.exe). + ### Install Ruby with [Rbenv](https://github.com/rbenv/rbenv) (shamelessly copied from Rbenv doc) @@ -82,7 +84,9 @@ Install Rails, Postgres, Yarn, etc echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list sudo apt update && sudo apt install yarn -In your code directory run: +If you are using Windows, install node.js [here](https://nodejs.org/dist/v18.16.0/node-v18.16.0-x64.msi) (comes with Yarn) and PostgreSQL [here](https://sbp.enterprisedb.com/getfile.jsp?fileid=1258422). Install Ruby on Rails by running `gem install rails` on the command line. + +In your code directory run (if you are using Windows, do not run the `rbenv` commands): git clone https://github.com/tosdr/edit.tosdr.org cd edit.tosdr.org From 6434be4dbb86133cd82437f51376a35fc2aa523a Mon Sep 17 00:00:00 2001 From: EarldridgeJazzedPineda <110967307+EarldridgeJazzedPineda@users.noreply.github.com> Date: Fri, 19 May 2023 09:46:14 +0800 Subject: [PATCH 3/6] Update Gemfile As per PR #1113 --- Gemfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 2a53b51a..5de0a2b9 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,8 @@ gem 'activeadmin' gem 'devise' gem 'figaro' gem 'jbuilder', '~> 2.0' -gem 'pg', '~> 1.4' +gem 'pg', '~> 0.21' if RUBY_PLATFORM !~ /mingw32/ +gem 'pg', '~> 1.4' if RUBY_PLATFORM =~ /mingw32/ gem "puma", ">= 3.12.4" gem 'rails', '~> 5.2.5' gem 'redis' @@ -45,7 +46,7 @@ gem 'httparty' # for api pagination gem 'kaminari' -gem 'mini_racer' if RUBY_PLATFORM !~ "mingw32" # Too many problems, is it even needed? +gem 'mini_racer' if RUBY_PLATFORM !~ /mingw32/ # Too many problems, is it even needed? group :development do gem 'letter_opener' @@ -66,13 +67,19 @@ group :development, :test do gem 'rack-mini-profiler' gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' - gem 'stackprof' if RUBY_PLATFORM !~ "mingw32" # Not supported on Microsoft Windows + gem 'stackprof' if RUBY_PLATFORM !~ /mingw32/ # Not supported on Microsoft Windows end gem "sentry-ruby" gem "sentry-rails" - -gem 'sys-proctable' -gem 'fast_stack' +gem 'grape', '~> 1.7' +gem 'grape-entity' +gem 'grape_on_rails_routes' +gem 'rack-cors' +gem 'uuidtools', '~> 2.1', '>= 2.1.5' + +# For Windows only +gem 'sys-proctable' if RUBY_PLATFORM =~ /mingw32/ +gem 'fast_stack' if RUBY_PLATFORM =~ /mingw32/ gem 'wdm', '>= 0.1.0' if Gem.win_platform? -gem 'tzinfo-data' +gem 'tzinfo-data' if RUBY_PLATFORM =~ /mingw32/ From 757d54d1128d690d7fccd3a98edd21d490d3b5e6 Mon Sep 17 00:00:00 2001 From: EarldridgeJazzedPineda <110967307+EarldridgeJazzedPineda@users.noreply.github.com> Date: Sat, 27 May 2023 12:44:23 +0800 Subject: [PATCH 4/6] Update Gemfile Removing unnecessary changes --- Gemfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Gemfile b/Gemfile index 5de0a2b9..331a44cd 100644 --- a/Gemfile +++ b/Gemfile @@ -72,11 +72,6 @@ end gem "sentry-ruby" gem "sentry-rails" -gem 'grape', '~> 1.7' -gem 'grape-entity' -gem 'grape_on_rails_routes' -gem 'rack-cors' -gem 'uuidtools', '~> 2.1', '>= 2.1.5' # For Windows only gem 'sys-proctable' if RUBY_PLATFORM =~ /mingw32/ From af68827a1bc3068252a65ea074435fb541ed1bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20Ren=C3=A9=20Back?= Date: Thu, 8 Jun 2023 00:37:16 +0200 Subject: [PATCH 5/6] Rerun Pipeline From 421134a97190f195bb0df63cbe0847aad9791f4a Mon Sep 17 00:00:00 2001 From: EarldridgeJazzedPineda <110967307+EarldridgeJazzedPineda@users.noreply.github.com> Date: Thu, 22 Jun 2023 12:03:20 +0800 Subject: [PATCH 6/6] Update Gemfile Recommended by @madoleary on #1113 --- Gemfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 32897df5..206bf0c4 100644 --- a/Gemfile +++ b/Gemfile @@ -87,8 +87,7 @@ gem 'grape_on_rails_routes' gem 'rack-cors' gem 'uuidtools', '~> 2.1', '>= 2.1.5' -# For Windows only -gem 'sys-proctable' if RUBY_PLATFORM =~ /mingw32/ -gem 'fast_stack' if RUBY_PLATFORM =~ /mingw32/ -gem 'wdm', '>= 0.1.0' if Gem.win_platform? -gem 'tzinfo-data' if RUBY_PLATFORM =~ /mingw32/ \ No newline at end of file +gem 'sys-proctable', :platforms => :mswin +gem 'fast_stack', :platforms => :mswin +gem 'wdm', '>= 0.1.0', :platforms => :mswin +gem 'tzinfo-data', :platforms => :mswin