From 6441385e569b309dc8f2af87136d14f105f8fafc Mon Sep 17 00:00:00 2001 From: nicholasnadel Date: Fri, 27 Jul 2018 12:48:50 -0700 Subject: [PATCH 1/8] replaced Gemfile.lock & added Troubleshooting section to README --- Gemfile.lock | 270 ++++++++++++++++++++++++++------------------------- README.md | 8 ++ 2 files changed, 144 insertions(+), 134 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0e8b2b9..318170e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,78 +36,77 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) - airbrussh (1.0.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + airbrussh (1.3.0) sshkit (>= 1.6.1, != 1.7.0) ansi (1.5.0) arel (6.0.4) - awesome_print (1.6.1) - bcrypt (3.1.10) - better_errors (2.1.1) + awesome_print (1.8.0) + bcrypt (3.1.12) + better_errors (2.4.0) coderay (>= 1.0.0) - erubis (>= 2.6.6) + erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bitters (1.0.0) - bourbon (>= 3.2) - sass (>= 3.2) - thor - bourbon (4.2.3) + bitters (1.8.0) + bourbon (~> 5.0) sass (~> 3.4) - thor + thor (~> 0.19) + bourbon (5.1.0) + sass (~> 3.4) + thor (~> 0.19) bugsnag (2.8.12) json (~> 1.7, >= 1.7.7) builder (3.2.3) - byebug (5.0.0) - columnize (= 0.9.0) + byebug (10.0.2) cancancan (1.12.0) - capistrano (3.4.0) + capistrano (3.11.0) + airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) - sshkit (~> 1.3) - capistrano-bundler (1.1.4) + sshkit (>= 1.9.0) + capistrano-bundler (1.3.0) capistrano (~> 3.1) sshkit (~> 1.2) capistrano-passenger (0.1.1) capistrano (~> 3.0) - capistrano-rails (1.1.3) + capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capybara (2.6.2) + capybara (2.18.0) addressable - mime-types (>= 1.16) - nokogiri (>= 1.8.1) + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) carrierwave (0.10.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - childprocess (0.5.9) + childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) cliver (0.3.2) - coderay (1.1.0) - coffee-rails (4.1.0) + coderay (1.1.2) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - colorize (0.7.7) - columnize (0.9.0) + coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - crack (0.4.2) + crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.3) - debug_inspector (0.0.2) + crass (1.0.4) + debug_inspector (0.0.3) devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -115,48 +114,50 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - docile (1.1.5) - domain_name (0.5.24) + docile (1.3.1) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - dotenv (2.0.2) - dotenv-rails (2.0.2) - dotenv (= 2.0.2) - railties (~> 4.0) + dotenv (2.5.0) + dotenv-rails (2.5.0) + dotenv (= 2.5.0) + railties (>= 3.2, < 6.0) + erubi (1.7.1) erubis (2.7.0) - execjs (2.5.2) - ffi (1.9.10) + execjs (2.7.0) + ffi (1.9.25) formatador (0.2.5) friendly_id (5.1.0) activerecord (>= 4.0.0) globalid (0.4.1) activesupport (>= 4.2.0) - guard (2.12.9) + guard (2.14.2) formatador (>= 0.2.4) - listen (>= 2.7, <= 4.0) - lumberjack (~> 1.0) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) pry (>= 0.9.12) shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-minitest (2.4.4) + guard-minitest (2.4.6) guard-compat (~> 1.2) minitest (>= 3.0) has_many_prevent_dups (0.0.3) rails (>= 4.2.3) - http-cookie (1.0.2) + hashdiff (0.3.7) + http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.9.1) + i18n (0.9.5) concurrent-ruby (~> 1.0) inline_svg (1.3.1) activesupport (>= 3.0) - nokogiri (>= 1.8.1) - jbuilder (2.3.1) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) - jquery-rails (4.0.4) - rails-dom-testing (~> 1.0) + nokogiri (>= 1.6) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) @@ -167,81 +168,81 @@ GEM activesupport (>= 3.0.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.1) + letter_opener (1.6.0) launchy (~> 2.2) - letter_opener_web (1.3.1) + letter_opener_web (1.3.4) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - listen (3.0.3) + listen (3.1.1) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - loofah (2.2.1) + rb-inotify (>= 0.9.7) + loofah (2.2.2) crass (~> 1.0.2) - nokogiri (>= 1.8.1) - lumberjack (1.0.9) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) mail (2.7.0) mini_mime (>= 0.1.1) materialize-sass (0.98.2) sass (~> 3.3) - method_source (0.8.2) + method_source (0.9.0) mime-types (2.99.3) - mini_magick (4.3.6) + mini_magick (4.8.0) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.11.1) - minitest-capybara (0.7.2) + minitest (5.11.3) + minitest-capybara (0.8.2) capybara (~> 2.2) minitest (~> 5.0) rake - minitest-metadata (0.5.3) + minitest-metadata (0.6.0) minitest (>= 4.7, < 6.0) - minitest-rails (2.2.0) + minitest-rails (2.2.1) minitest (~> 5.7) railties (~> 4.1) - minitest-rails-capybara (2.1.1) - capybara (~> 2.0) - minitest-capybara (~> 0.7.0) - minitest-metadata (~> 0.5.0) + minitest-rails-capybara (2.1.2) + capybara (~> 2.7) + minitest-capybara (~> 0.8) + minitest-metadata (~> 0.6) minitest-rails (~> 2.1) - minitest-reporters (1.0.19) + minitest-reporters (1.3.1) ansi builder minitest (>= 5.0) ruby-progressbar - minitest-stub_any_instance (1.0.1) - multi_json (1.11.2) - neat (1.7.2) - bourbon (>= 4.0) - sass (>= 3.3) - nenv (0.2.0) + minitest-stub_any_instance (1.0.2) + multi_json (1.13.1) + neat (3.0.0) + sass (~> 3.4) + thor (~> 0.19) + nenv (0.3.0) net-ldap (0.16.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - netrc (0.10.3) - nokogiri (1.8.1) + net-ssh (4.2.0) + netrc (0.11.0) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) - notiffany (0.0.6) + notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) pg (0.18.2) - phantomjs (1.9.8.0) - poltergeist (1.10.0) - capybara (~> 2.1) + phantomjs (2.1.1.0) + poltergeist (1.18.1) + capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - pry (0.10.1) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) + method_source (~> 0.9.0) public_activity (1.4.2) actionpack (>= 3.0.0) activerecord (>= 3.0) i18n (>= 0.5.0) railties (>= 3.0.0) - rack (1.6.8) + public_suffix (3.0.2) + rack (1.6.10) rack-test (0.6.3) rack (>= 1.0) rails (4.2.7.1) @@ -259,10 +260,10 @@ GEM activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.8.1) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails4-autocomplete (1.1.1) rails (>= 3.0) railties (4.2.7.1) @@ -270,23 +271,28 @@ GEM activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.0) - rb-fsevent (0.9.5) - rb-inotify (0.9.5) - ffi (>= 0.5.0) - rdoc (4.2.0) - refills (0.1.0) - remotipart (1.2.1) - responders (2.1.0) - railties (>= 4.2.0, < 5) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rdoc (4.3.0) + refills (0.2.0) + remotipart (1.4.2) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - ruby-progressbar (1.7.5) + ruby-progressbar (1.9.0) rubyzip (1.2.1) safe_yaml (1.0.4) - sass (3.4.25) + sass (3.5.7) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -295,69 +301,65 @@ GEM tilt (>= 1.1, < 3) screencap (0.1.4) phantomjs - sdoc (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) selectize-rails (0.12.1) - selenium-webdriver (2.50.0) + selenium-webdriver (3.13.1) childprocess (~> 0.5) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0) + rubyzip (~> 1.2) shellany (0.0.1) - simplecov (0.11.1) - docile (~> 1.1.0) - json (~> 1.8) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - slop (3.6.0) - spring (1.3.6) - sprockets (3.7.1) + simplecov-html (0.10.2) + spring (2.0.2) + activesupport (>= 4.2) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.7.1) - colorize (>= 0.7.0) + sshkit (1.17.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - switch_user (1.4.0) + switch_user (1.5.0) thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) - trix (0.9.0) - rails + trix (0.11.1) + rails (> 4.1, < 5.2) turbolinks (2.5.3) coffee-rails - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (2.7.1) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.1.16) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) - vcr (2.9.3) - warden (1.2.3) + unf_ext (0.0.7.5) + vcr (4.0.0) + warden (1.2.7) rack (>= 1.0) - web-console (2.2.1) + web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) + webmock (3.4.2) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket (1.2.2) - websocket-driver (0.6.4) + hashdiff + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) whenever (0.9.4) chronic (>= 0.6.3) - xpath (2.0.0) - nokogiri (~> 1.8.1) + xpath (3.1.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -421,4 +423,4 @@ DEPENDENCIES whenever (= 0.9.4) BUNDLED WITH - 1.16.1 + 1.16.2 diff --git a/README.md b/README.md index fa3f664..bae9b88 100644 --- a/README.md +++ b/README.md @@ -68,3 +68,11 @@ See team lead or Passpack for server authentication information. - Production Server: signage.chapman.edu - Staging Server: dev-signage.chapman.edu + +### Troubleshooting +For issues installing pg, try `which pg_config` to find pg_config's path + +Then `bundle config build.pg --with-pg-config=THE_PATH` + +Finally `bundle install` + From 628cb29eabd52904aa6a51d8f07fb55eed042e76 Mon Sep 17 00:00:00 2001 From: nicholasnadel Date: Fri, 27 Jul 2018 16:25:52 -0700 Subject: [PATCH 2/8] Fix Gemfile deadlock & update .gitignore --- .gitignore | 2 ++ Gemfile | 66 ++++++++++++++++++------------------ Gemfile.lock | 96 ++++++++++++++++++++++++++-------------------------- 3 files changed, 83 insertions(+), 81 deletions(-) diff --git a/.gitignore b/.gitignore index fa8c229..b1f1b08 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ # or operating system, you probably want to add a global ignore instead: # git config --global core.excludesfile '~/.gitignore_global' +config/secrets.yml + # Ignore bundler config. /.bundle diff --git a/Gemfile b/Gemfile index e5178b4..8b17980 100644 --- a/Gemfile +++ b/Gemfile @@ -1,26 +1,26 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.7.1' +gem 'rails', '~> 4.2.7.1' # Use postgresql as the database for Active Record -gem 'pg', '0.18.2' +gem 'pg', '~> 0.18.4' # Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0.6' +gem 'sass-rails', '~> 5.0.7' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' +gem 'uglifier', '~> 4.1.16' # Use CoffeeScript for .coffee assets and views -gem 'coffee-rails', '~> 4.1.0' +gem 'coffee-rails', '~> 4.1.1' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks', '2.5.3' +gem 'turbolinks', '~> 2.5.4' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' +gem 'jbuilder', '~> 2.7.0' # bundle exec rake doc:rails generates the API under doc/api. -gem 'sdoc', '~> 0.4.0', group: :doc +gem 'sdoc', '~> 0.4.2', group: :doc # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' @@ -31,30 +31,30 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Other gems... # TODO: add comment for each gem (or group of related gems) explaining why it was included. gem "airbrussh", :require => false -gem 'has_many_prevent_dups', '0.0.3' -gem 'public_activity', '1.4.2' -gem 'rails4-autocomplete', '1.1.1' +gem 'has_many_prevent_dups', '~> 0.0.3' +gem 'public_activity', '~> 1.4.3' +gem 'rails4-autocomplete', '~> 1.1.1' gem 'mini_magick' -gem 'inline_svg', '1.3.1' -gem 'screencap', '0.1.4' -gem 'materialize-sass', '0.98.2' -gem 'selectize-rails', '0.12.1' -gem 'cancancan', '1.12.0' -gem 'net-ldap', '0.16.0' -gem 'devise', '3.5.2' -gem 'bugsnag', '2.8.12' -gem 'whenever', '0.9.4', :require => false -gem 'jquery-ui-rails', '5.0.5' -gem 'kaminari', '0.16.3' -gem 'remotipart', '~> 1.2' -gem 'carrierwave', '0.10.0' +gem 'inline_svg', '~> 1.3.1' +gem 'screencap', '~> 0.1.4' +gem 'materialize-sass', '~> 0.98.2' +gem 'selectize-rails', '~> 0.12.5' +gem 'cancancan', '~> 1.12.0' +gem 'net-ldap', '~> 0.16.1' +gem 'devise', '~> 3.5.10' +gem 'bugsnag', '~> 2.8.13' +gem 'whenever', '~> 0.9.7', :require => false +gem 'jquery-ui-rails', '~> 5.0.5' +gem 'kaminari', '~> 0.16.3' +gem 'remotipart', '~> 1.4.2' +gem 'carrierwave', '~> 0.10.0' gem 'friendly_id', '~> 5.1.0' gem 'trix' -gem 'bourbon' -gem 'neat' -gem 'bitters' +gem 'bourbon', '~> 4.2.3' +gem 'neat', '~> 1.8.0' +gem 'bitters', '~> 1.0.0' gem 'refills' -gem 'rest-client', '1.8.0' +gem 'rest-client', '~> 1.8.0' gem 'awesome_print' # Allow user to easily switch users in dev @@ -65,10 +65,10 @@ gem "switch_user", group: :development gem "letter_opener_web", group: :development # Use Capistrano for deployment -gem 'capistrano', '~> 3.1', group: :development -gem 'capistrano-rails', '~> 1.1', group: :development -gem 'capistrano-rvm', '0.1.2', group: :development -gem 'capistrano-passenger', '0.1.1', group: :development +gem 'capistrano', '~> 3.11.0', group: :development +gem 'capistrano-rails', '~> 1.4.0', group: :development +gem 'capistrano-rvm', '~> 0.1.2', group: :development +gem 'capistrano-passenger', '~> 0.1.1', group: :development group :development, :test do gem 'dotenv-rails' @@ -80,7 +80,7 @@ group :development, :test do gem 'byebug' # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 2.0' + gem 'web-console', '~> 2.3.0' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' diff --git a/Gemfile.lock b/Gemfile.lock index 318170e..95982c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,14 +50,14 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bitters (1.8.0) - bourbon (~> 5.0) + bitters (1.0.0) + bourbon (>= 3.2) + sass (>= 3.2) + thor + bourbon (4.2.7) sass (~> 3.4) thor (~> 0.19) - bourbon (5.1.0) - sass (~> 3.4) - thor (~> 0.19) - bugsnag (2.8.12) + bugsnag (2.8.13) json (~> 1.7, >= 1.7.7) builder (3.2.3) byebug (10.0.2) @@ -107,7 +107,7 @@ GEM safe_yaml (~> 1.0.0) crass (1.0.4) debug_inspector (0.0.3) - devise (3.5.2) + devise (3.5.10) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -212,11 +212,11 @@ GEM ruby-progressbar minitest-stub_any_instance (1.0.2) multi_json (1.13.1) - neat (3.0.0) - sass (~> 3.4) + neat (1.8.0) + sass (>= 3.3) thor (~> 0.19) nenv (0.3.0) - net-ldap (0.16.0) + net-ldap (0.16.1) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (4.2.0) @@ -227,7 +227,7 @@ GEM nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - pg (0.18.2) + pg (0.18.4) phantomjs (2.1.1.0) poltergeist (1.18.1) capybara (>= 2.1, < 4) @@ -236,7 +236,7 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_activity (1.4.2) + public_activity (1.4.3) actionpack (>= 3.0.0) activerecord (>= 3.0) i18n (>= 0.5.0) @@ -304,7 +304,7 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - selectize-rails (0.12.1) + selectize-rails (0.12.5) selenium-webdriver (3.13.1) childprocess (~> 0.5) rubyzip (~> 1.2) @@ -332,7 +332,7 @@ GEM tilt (2.0.8) trix (0.11.1) rails (> 4.1, < 5.2) - turbolinks (2.5.3) + turbolinks (2.5.4) coffee-rails tzinfo (1.2.5) thread_safe (~> 0.1) @@ -356,7 +356,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - whenever (0.9.4) + whenever (0.9.7) chronic (>= 0.6.3) xpath (3.1.0) nokogiri (~> 1.8) @@ -368,59 +368,59 @@ DEPENDENCIES airbrussh awesome_print better_errors - bitters - bourbon - bugsnag (= 2.8.12) + bitters (~> 1.0.0) + bourbon (~> 4.2.3) + bugsnag (~> 2.8.13) byebug - cancancan (= 1.12.0) - capistrano (~> 3.1) - capistrano-passenger (= 0.1.1) - capistrano-rails (~> 1.1) - capistrano-rvm (= 0.1.2) - carrierwave (= 0.10.0) - coffee-rails (~> 4.1.0) - devise (= 3.5.2) + cancancan (~> 1.12.0) + capistrano (~> 3.11.0) + capistrano-passenger (~> 0.1.1) + capistrano-rails (~> 1.4.0) + capistrano-rvm (~> 0.1.2) + carrierwave (~> 0.10.0) + coffee-rails (~> 4.1.1) + devise (~> 3.5.10) dotenv-rails friendly_id (~> 5.1.0) guard guard-minitest - has_many_prevent_dups (= 0.0.3) - inline_svg (= 1.3.1) - jbuilder (~> 2.0) + has_many_prevent_dups (~> 0.0.3) + inline_svg (~> 1.3.1) + jbuilder (~> 2.7.0) jquery-rails - jquery-ui-rails (= 5.0.5) - kaminari (= 0.16.3) + jquery-ui-rails (~> 5.0.5) + kaminari (~> 0.16.3) letter_opener_web - materialize-sass (= 0.98.2) + materialize-sass (~> 0.98.2) mini_magick minitest-rails-capybara minitest-reporters minitest-stub_any_instance - neat - net-ldap (= 0.16.0) - pg (= 0.18.2) + neat (~> 1.8.0) + net-ldap (~> 0.16.1) + pg (~> 0.18.4) poltergeist - public_activity (= 1.4.2) - rails (= 4.2.7.1) - rails4-autocomplete (= 1.1.1) + public_activity (~> 1.4.3) + rails (~> 4.2.7.1) + rails4-autocomplete (~> 1.1.1) refills - remotipart (~> 1.2) - rest-client (= 1.8.0) - sass-rails (~> 5.0.6) - screencap (= 0.1.4) - sdoc (~> 0.4.0) - selectize-rails (= 0.12.1) + remotipart (~> 1.4.2) + rest-client (~> 1.8.0) + sass-rails (~> 5.0.7) + screencap (~> 0.1.4) + sdoc (~> 0.4.2) + selectize-rails (~> 0.12.5) selenium-webdriver simplecov spring switch_user trix - turbolinks (= 2.5.3) - uglifier (>= 1.3.0) + turbolinks (~> 2.5.4) + uglifier (~> 4.1.16) vcr - web-console (~> 2.0) + web-console (~> 2.3.0) webmock - whenever (= 0.9.4) + whenever (~> 0.9.7) BUNDLED WITH 1.16.2 From e86c4ecfe71b8928e77bbce37f4114e1a856dc92 Mon Sep 17 00:00:00 2001 From: nicholasnadel Date: Mon, 30 Jul 2018 10:45:26 -0700 Subject: [PATCH 3/8] Address Gemfile deadlock & gem security vulnerabilities --- Gemfile | 9 +- Gemfile.lock | 82 ++++++++++--------- app/assets/stylesheets/admin.scss | 1 + .../stylesheets/base/_grid-settings.scss | 2 +- app/assets/stylesheets/base/_typography.scss | 2 +- app/assets/stylesheets/base/_variables.scss | 7 ++ 6 files changed, 57 insertions(+), 46 deletions(-) diff --git a/Gemfile b/Gemfile index 8b17980..3e6e558 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,8 @@ source 'https://rubygems.org' +ruby '2.2.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.2.7.1' +gem 'rails', '~> 4.2.8' # Use postgresql as the database for Active Record gem 'pg', '~> 0.18.4' # Use SCSS for stylesheets @@ -50,9 +51,9 @@ gem 'remotipart', '~> 1.4.2' gem 'carrierwave', '~> 0.10.0' gem 'friendly_id', '~> 5.1.0' gem 'trix' -gem 'bourbon', '~> 4.2.3' -gem 'neat', '~> 1.8.0' -gem 'bitters', '~> 1.0.0' +gem 'bourbon', '< 5.0.0' +gem 'neat', '~> 1.8' +gem 'bitters', '< 1.0.0' gem 'refills' gem 'rest-client', '~> 1.8.0' gem 'awesome_print' diff --git a/Gemfile.lock b/Gemfile.lock index 95982c8..237a7e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,37 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.7.1) - actionview (= 4.2.7.1) - activesupport (= 4.2.7.1) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.7.1) - activesupport (= 4.2.7.1) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.7.1) - activesupport (= 4.2.7.1) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.7.1) - activesupport (= 4.2.7.1) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.7.1) - activemodel (= 4.2.7.1) - activesupport (= 4.2.7.1) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.7.1) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) @@ -50,11 +49,11 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bitters (1.0.0) + bitters (0.10.1) bourbon (>= 3.2) sass (>= 3.2) thor - bourbon (4.2.7) + bourbon (4.3.4) sass (~> 3.4) thor (~> 0.19) bugsnag (2.8.13) @@ -212,7 +211,7 @@ GEM ruby-progressbar minitest-stub_any_instance (1.0.2) multi_json (1.13.1) - neat (1.8.0) + neat (1.9.0) sass (>= 3.3) thor (~> 0.19) nenv (0.3.0) @@ -245,16 +244,16 @@ GEM rack (1.6.10) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.7.1) - actionmailer (= 4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) - activemodel (= 4.2.7.1) - activerecord (= 4.2.7.1) - activesupport (= 4.2.7.1) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7.1) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -266,9 +265,9 @@ GEM loofah (~> 2.2, >= 2.2.2) rails4-autocomplete (1.1.1) rails (>= 3.0) - railties (4.2.7.1) - actionpack (= 4.2.7.1) - activesupport (= 4.2.7.1) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.1) @@ -336,7 +335,7 @@ GEM coffee-rails tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.16) + uglifier (4.1.17) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -368,8 +367,8 @@ DEPENDENCIES airbrussh awesome_print better_errors - bitters (~> 1.0.0) - bourbon (~> 4.2.3) + bitters (< 1.0.0) + bourbon (< 5.0.0) bugsnag (~> 2.8.13) byebug cancancan (~> 1.12.0) @@ -396,12 +395,12 @@ DEPENDENCIES minitest-rails-capybara minitest-reporters minitest-stub_any_instance - neat (~> 1.8.0) + neat (~> 1.8) net-ldap (~> 0.16.1) pg (~> 0.18.4) poltergeist public_activity (~> 1.4.3) - rails (~> 4.2.7.1) + rails (~> 4.2.8) rails4-autocomplete (~> 1.1.1) refills remotipart (~> 1.4.2) @@ -422,5 +421,8 @@ DEPENDENCIES webmock whenever (~> 0.9.7) +RUBY VERSION + ruby 2.2.1p85 + BUNDLED WITH - 1.16.2 + 1.16.3 diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 4199a82..64dc6b7 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -30,6 +30,7 @@ html, body { margin: 0; height: 100%; min-width: 1100px; + font-family: $base-font-family; } .outer-container { diff --git a/app/assets/stylesheets/base/_grid-settings.scss b/app/assets/stylesheets/base/_grid-settings.scss index 48d8a2c..a63ae6a 100644 --- a/app/assets/stylesheets/base/_grid-settings.scss +++ b/app/assets/stylesheets/base/_grid-settings.scss @@ -1,4 +1,4 @@ -@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails +@import "neat"; // or "../neat/neat-helpers" when not in Rails // Neat Overrides // $column: 90px; diff --git a/app/assets/stylesheets/base/_typography.scss b/app/assets/stylesheets/base/_typography.scss index 04d2378..7b25e79 100644 --- a/app/assets/stylesheets/base/_typography.scss +++ b/app/assets/stylesheets/base/_typography.scss @@ -1,5 +1,5 @@ body { - @include font-feature-settings("kern", "liga", "pnum"); + font-feature-settings: "kern", "liga", "pnum"; -webkit-font-smoothing: antialiased; color: $base-font-color; font-family: $base-font-family; diff --git a/app/assets/stylesheets/base/_variables.scss b/app/assets/stylesheets/base/_variables.scss index 0afe0df..30bfea9 100644 --- a/app/assets/stylesheets/base/_variables.scss +++ b/app/assets/stylesheets/base/_variables.scss @@ -2,6 +2,13 @@ $base-font-family: 'proxima-nova-soft', 'sans-serif'; $heading-font-family: 'proxima-nova', 'sans-serif'; +@base-font-family-2 { + font-family: 'proxima-nova-soft', 'sans-serif'; + src: url('Tungsten-Bold.otf') format("opentype"); + font-weight: normal; + font-style: normal; +} + // Font Sizes $base-font-size: 1em; From 2666aeaff70c37afcfddd98e3191021d004b9649 Mon Sep 17 00:00:00 2001 From: nicholasnadel Date: Mon, 30 Jul 2018 10:48:43 -0700 Subject: [PATCH 4/8] Remove test variable --- app/assets/stylesheets/base/_variables.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/assets/stylesheets/base/_variables.scss b/app/assets/stylesheets/base/_variables.scss index 30bfea9..0afe0df 100644 --- a/app/assets/stylesheets/base/_variables.scss +++ b/app/assets/stylesheets/base/_variables.scss @@ -2,13 +2,6 @@ $base-font-family: 'proxima-nova-soft', 'sans-serif'; $heading-font-family: 'proxima-nova', 'sans-serif'; -@base-font-family-2 { - font-family: 'proxima-nova-soft', 'sans-serif'; - src: url('Tungsten-Bold.otf') format("opentype"); - font-weight: normal; - font-style: normal; -} - // Font Sizes $base-font-size: 1em; From 5793d231ed77f0c8884f6a7d773b72d36d064231 Mon Sep 17 00:00:00 2001 From: nicholasnadel Date: Mon, 30 Jul 2018 13:54:16 -0700 Subject: [PATCH 5/8] Update README and allow web-console in testing --- README.md | 10 ++++++++++ config/environments/test.rb | 1 + 2 files changed, 11 insertions(+) diff --git a/README.md b/README.md index bae9b88..e55307e 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,8 @@ Single test: bundle exec rake test test/models/sign_test.rb +See Troubleshooting + #### Local Server To start the the local server on port 3000: @@ -70,9 +72,17 @@ See team lead or Passpack for server authentication information. - Staging Server: dev-signage.chapman.edu ### Troubleshooting +#### PostgreSQL Bundle Install Issues For issues installing pg, try `which pg_config` to find pg_config's path Then `bundle config build.pg --with-pg-config=THE_PATH` Finally `bundle install` + +#### Testing Issues +`ActiveRecord::StatementInvalid: PG::UndefinedColumn: ERROR: column "increment_by" does not exist` may be thrown with older versions of Rails (< 5.0.2) + newer versions of PostgreSQL (10). One workaround is to use PostgreSQL 9.5. [Read more](http://ugisozols.com/running-multiple-versions-of-postgresql-on-mac) + +`Web Console is activated in the test environment, which is +usually a mistake. To ensure it's only activated in development +mode, move it to the development group of your Gemfile:` Resolved by adding `config.web_console.development_only = false` to `Test.rb` diff --git a/config/environments/test.rb b/config/environments/test.rb index 6e484d8..305d076 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -42,6 +42,7 @@ # Public Safety alert configuration. config.x.public_safety.feed = 'https://www.getrave.com/rss/chapman/channel1' + config.web_console.development_only = false end Rails.application.routes.default_url_options[:host] = 'localhost:3000' From 51c4f698c5dd0bb942777dc385a5de0a32f1e24d Mon Sep 17 00:00:00 2001 From: nicholasnadel Date: Mon, 30 Jul 2018 14:39:09 -0700 Subject: [PATCH 6/8] Update README --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e55307e..761441a 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,5 @@ Finally `bundle install` #### Testing Issues `ActiveRecord::StatementInvalid: PG::UndefinedColumn: ERROR: column "increment_by" does not exist` may be thrown with older versions of Rails (< 5.0.2) + newer versions of PostgreSQL (10). One workaround is to use PostgreSQL 9.5. [Read more](http://ugisozols.com/running-multiple-versions-of-postgresql-on-mac) -`Web Console is activated in the test environment, which is -usually a mistake. To ensure it's only activated in development -mode, move it to the development group of your Gemfile:` Resolved by adding `config.web_console.development_only = false` to `Test.rb` + +`Web Console is activated in the test environment, which is usually a mistake. To ensure it's only activated in development mode, move it to the development group of your Gemfile:` Resolved by adding `config.web_console.development_only = false` to `test.rb` From a91f512a7ed8768cb279e60771178cd83812565a Mon Sep 17 00:00:00 2001 From: nicholasnadel Date: Mon, 30 Jul 2018 14:51:53 -0700 Subject: [PATCH 7/8] Update Rave feeds --- config/application.rb | 2 +- config/environments/test.rb | 2 +- test/support/mock_public_safety_feed.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/application.rb b/config/application.rb index bcfd68e..98ba7d1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -52,6 +52,6 @@ class Application < Rails::Application end # Public Safety alert configuration. - config.x.public_safety.feed = 'https://www.getrave.com/rss/chapman/channel1' + config.x.public_safety.feed = 'https://content.getrave.com/rss/chapman/channel1' end end diff --git a/config/environments/test.rb b/config/environments/test.rb index 305d076..43acec8 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -41,7 +41,7 @@ # config.action_view.raise_on_missing_translations = true # Public Safety alert configuration. - config.x.public_safety.feed = 'https://www.getrave.com/rss/chapman/channel1' + config.x.public_safety.feed = 'https://content.getrave.com/rss/chapman/channel1' config.web_console.development_only = false end diff --git a/test/support/mock_public_safety_feed.rb b/test/support/mock_public_safety_feed.rb index 2a96c02..4593b80 100644 --- a/test/support/mock_public_safety_feed.rb +++ b/test/support/mock_public_safety_feed.rb @@ -1,18 +1,18 @@ module MockPublicSafetyFeed - # Based on http://www.getrave.com/rss/chapman/channel1 + # Based on https://content.getrave.com/rss/chapman/channel1 XML_TEMPLATE = <<-xml Mock Chapman Panther Alerts - http://www.getrave.com/rss/chapman/channel1 + https://content.getrave.com/rss/chapman/channel1 Welcome to Panther-Alert, Chapman University’s Emergency Notification system. Panther-Alert sends emergency messages to your mobile or fixed device of choice so you get emergency messages quickly wherever you are. Panther Alerts Panther Alerts Mock Chapman Panther Alerts http://www.chapman.edu/campus-services/public-safety/_files/Panther-Alert-Logo-Web.jpg - http://www.getrave.com/rss/chapman/channel1 + https://content.getrave.com/rss/chapman/channel1 %s From 466fd0404d3777e6290da3bad63fe04408b7f399 Mon Sep 17 00:00:00 2001 From: nicholasnadel Date: Mon, 30 Jul 2018 14:59:30 -0700 Subject: [PATCH 8/8] Clarify test.rb addendum --- config/environments/test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/environments/test.rb b/config/environments/test.rb index 43acec8..932a1e0 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -42,6 +42,8 @@ # Public Safety alert configuration. config.x.public_safety.feed = 'https://content.getrave.com/rss/chapman/channel1' + + # Allows web_console in testing config.web_console.development_only = false end