From d70e30ec93016212d17ef1b30fed79dc60bddc00 Mon Sep 17 00:00:00 2001 From: Jared Cosulich Date: Thu, 23 Feb 2017 14:09:22 -0500 Subject: [PATCH] revised gems and database.yml --- Gemfile | 32 ++++++++++++-- Gemfile.lock | 105 ++++++++++++++++++++++++++++++++++++++++++-- config/database.yml | 19 ++++---- 3 files changed, 139 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 8d7b3eb3..b7fdbb19 100644 --- a/Gemfile +++ b/Gemfile @@ -8,8 +8,9 @@ end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.0.1' -# Use sqlite3 as the database for Active Record -gem 'sqlite3' + +gem 'pg' + # Use Puma as the app server gem 'puma', '~> 3.0' # Use SCSS for stylesheets @@ -35,6 +36,21 @@ gem 'jbuilder', '~> 2.5' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development + +gem 'haml' + +gem "therubyracer" +gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS +gem "twitter-bootstrap-rails" + +gem 'jquery-ui-rails' +gem 'friendly_id', '~> 5.1.0' + +gem 'newrelic_rpm' + +gem 'devise' +gem 'omniauth' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platform: :mri @@ -42,11 +58,21 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. - gem 'web-console', '>= 3.3.0' + gem 'web-console' gem 'listen', '~> 3.0.5' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' + gem 'seed_dump' +end + +group 'test' do + gem 'rspec-rails', '~> 3.5' + gem 'capybara' + gem 'phantomjs', require: 'phantomjs/poltergeist' + gem 'poltergeist' + gem 'launchy' + gem 'database_cleaner' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 177477c1..4945192d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,9 +38,20 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) arel (7.1.4) + bcrypt (3.1.11) builder (3.2.3) byebug (9.0.6) + capybara (2.8.1) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + cliver (0.3.2) coffee-rails (4.2.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.2.x) @@ -48,13 +59,27 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) + commonjs (0.2.7) concurrent-ruby (1.0.4) + database_cleaner (1.5.3) debug_inspector (0.0.2) + devise (4.2.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) + diff-lcs (1.2.5) erubis (2.7.0) execjs (2.7.0) ffi (1.9.17) + friendly_id (5.1.0) + activerecord (>= 4.0.0) globalid (0.3.6) activesupport (>= 4.1.0) + haml (4.0.7) + tilt + hashie (3.4.4) i18n (0.8.1) jbuilder (2.5.0) activesupport (>= 3.0.0, < 5.1) @@ -63,6 +88,18 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + launchy (2.4.3) + addressable (~> 2.3) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (2.7.1) + actionpack (>= 4.0) + less (~> 2.6.0) + sprockets (> 2, < 4) + tilt + libv8 (3.16.14.17) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -77,11 +114,23 @@ GEM mini_portile2 (2.1.0) minitest (5.10.1) multi_json (1.12.1) + newrelic_rpm (3.17.1.326) nio4r (1.2.1) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + orm_adapter (0.5.0) + pg (0.19.0) + phantomjs (2.1.1.0) pkg-config (1.1.7) + poltergeist (1.10.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + websocket-driver (>= 0.2.0) + public_suffix (2.0.4) puma (3.7.1) rack (2.0.1) rack-test (0.6.3) @@ -113,6 +162,26 @@ GEM rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) + ref (2.0.0) + responders (2.2.0) + railties (>= 4.2.0, < 5.1) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) sass (3.4.23) sass-rails (5.0.5) railties (>= 4.0.0, < 6) @@ -120,6 +189,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + seed_dump (3.2.4) + activerecord (>= 4) + activesupport (>= 4) spring (1.7.2) spring-watcher-listen (2.0.0) listen (>= 2.7, < 4.0) @@ -131,17 +203,26 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) + therubyracer (0.12.2) + libv8 (~> 3.16.14.0) + ref thor (0.19.4) thread_safe (0.3.6) tilt (2.0.6) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.0) + twitter-bootstrap-rails (3.2.2) + actionpack (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) + railties (>= 3.1) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (3.0.4) execjs (>= 0.3.0, < 3) + warden (1.2.6) + rack (>= 1.0) web-console (3.3.1) actionview (>= 5.0) activemodel (>= 5.0) @@ -150,26 +231,44 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES byebug + capybara coffee-rails (~> 4.2) + database_cleaner + devise + friendly_id (~> 5.1.0) + haml jbuilder (~> 2.5) jquery-rails + jquery-ui-rails + launchy + less-rails listen (~> 3.0.5) + newrelic_rpm + omniauth + pg + phantomjs + poltergeist puma (~> 3.0) rails (~> 5.0.1) + rspec-rails (~> 3.5) sass-rails (~> 5.0) + seed_dump spring spring-watcher-listen (~> 2.0.0) - sqlite3 + therubyracer turbolinks (~> 5) + twitter-bootstrap-rails tzinfo-data uglifier (>= 1.3.0) - web-console (>= 3.3.0) + web-console BUNDLED WITH 1.12.5 diff --git a/config/database.yml b/config/database.yml index 1c1a37ca..0dc71b59 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,25 +1,22 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# default: &default - adapter: sqlite3 + adapter: postgresql + encoding: unicode + host: localhost pool: 5 - timeout: 5000 development: <<: *default - database: db/development.sqlite3 + database: edcontext_development # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: <<: *default - database: db/test.sqlite3 + database: edcontext_test production: <<: *default - database: db/production.sqlite3 + database: edcontext_production + username: edcontext + password: <%= ENV['EDCONTEXT_DATABASE_PASSWORD'] %>