Upgrades and locks gem versions

This also adds .ruby-version and .ruby-gemset, pry-byebug, and dotenv.
openjournals · Oct 24, 2017 · 0140bf599a97e91ac85ffc9391f359bf9e86eef0 · 0140bf5
1 parent 86fc903
commit 0140bf599a97e91ac85ffc9391f359bf9e86eef0
Unified Split

Showing with 114 additions and 105 deletions.

+2 −0 .gitignore

+4 −0 .pryrc

+1 −1 .rspec

+1 −0 .ruby-gemset

+1 −1 .ruby-version

+18 −19 Gemfile

+86 −84 Gemfile.lock

+1 −0 config/initializers/env.rb
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@
 /log/*
 !/log/.keep
 /tmp
+/.env
+.DS_Store
diff --git a/.pryrc b/.pryrc
@@ -0,0 +1,4 @@
+Pry.commands.alias_command 'c', 'continue'
+Pry.commands.alias_command 's', 'step'
+Pry.commands.alias_command 'n', 'next'
+Pry.commands.alias_command 'f', 'finish'
diff --git a/.rspec b/.rspec
@@ -1,2 +1,2 @@
 --color
---require spec_helper
+--require rails_helper
diff --git a/.ruby-gemset b/.ruby-gemset
@@ -0,0 +1 @@
+joss
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.2.2
+2.3.1
diff --git a/Gemfile b/Gemfile
@@ -1,30 +1,31 @@
 source 'https://rubygems.org'
 
-gem 'aasm'
-gem 'github-markdown'
-gem 'honeybadger'
-gem 'html-pipeline'
-gem 'omniauth-orcid'
-gem 'octokit'
-gem 'pg'
-gem 'will_paginate', '~> 3.1'
-gem 'rails', '4.2.6'
-gem 'newrelic_rpm'
-gem 'sanitize'
-gem 'sass-rails', '~> 5.0'
-gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails', '~> 4.1.0'
+gem 'aasm', '~> 4.1.0'
+gem 'dotenv', '~> 2.2.1'
+gem 'github-markdown', '~> 0.6.9'
+gem 'honeybadger', '~> 2.6.0'
+gem 'html-pipeline', '~> 2.4.0'
+gem 'omniauth-orcid', '~> 1.0.38'
+gem 'octokit', '~> 4.3.0'
+gem 'pg', '~> 0.18.3'
+gem 'will_paginate', '~> 3.1.0'
+gem 'rails', '4.2.10'
+gem 'newrelic_rpm', '~> 3.15.0'
+gem 'sanitize', '~> 4.0.1'
+gem 'sass-rails', '~> 5.0.4'
+gem 'uglifier', '2.7.2'
+gem 'coffee-rails', '~> 4.1.1'
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 4.1.0'
 
 gem 'custom_error_message', '~> 1.1', '>= 1.1.1'
 # Use Unicorn as the app server
-gem 'unicorn'
+gem 'unicorn', '~> 5.3.1'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug'
+  gem 'pry-byebug'
   gem 'capybara', '~> 2.4.4'
   gem 'factory_girl_rails', '~> 4.4.1'
   gem 'mocha', '~> 1.1.0'
@@ -39,8 +40,6 @@ end
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> in views
   gem 'web-console', '~> 2.0'
-
-  gem 'pry'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,68 +2,68 @@ GEM
   remote: https://rubygems.org/
   specs:
     aasm (4.1.0)
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    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.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    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.6)
-      activesupport (= 4.2.6)
+    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.6)
-      activesupport (= 4.2.6)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.6)
+    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)
     addressable (2.4.0)
-    arel (6.0.3)
+    arel (6.0.4)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    builder (3.2.2)
+    builder (3.2.3)
     byebug (8.2.1)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    coderay (1.1.0)
+    coderay (1.1.2)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
     custom_error_message (1.1.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    dotenv (2.2.1)
     erubis (2.7.0)
     execjs (2.6.0)
     factory_girl (4.4.0)
@@ -74,40 +74,42 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     github-markdown (0.6.9)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     hashie (3.4.3)
     honeybadger (2.6.0)
     html-pipeline (2.4.0)
       activesupport (>= 2, < 5)
       nokogiri (>= 1.4)
-    i18n (0.7.0)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
     jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    json (2.1.0)
     jwt (1.5.2)
-    kgio (2.10.0)
-    loofah (2.0.3)
+    kgio (2.11.0)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (3.0)
+    method_source (0.9.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.0.0)
-    minitest (5.9.0)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     newrelic_rpm (3.15.0.314)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     nokogumbo (1.4.7)
       nokogiri
     oauth2 (1.0.0)
@@ -127,39 +129,41 @@ GEM
     omniauth-orcid (1.0.38)
       omniauth-oauth2 (~> 1.3.1)
     pg (0.18.3)
-    pry (0.10.3)
+    pry (0.11.1)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
+      method_source (~> 0.9.0)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
+      pry (~> 0.10)
+    rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    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.6)
+      railties (= 4.2.10)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.15.0)
-    rake (11.1.2)
+    raindrops (0.19.0)
+    rake (12.1.0)
     rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
@@ -194,26 +198,24 @@ GEM
       faraday (~> 0.8, < 0.10)
     shoulda-matchers (2.7.0)
       activesupport (>= 3.0.0)
-    slop (3.6.0)
     spring (1.6.2)
-    sprockets (3.6.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
+    thor (0.20.0)
+    thread_safe (0.3.6)
     tilt (2.0.2)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicorn (5.0.1)
+    unicorn (5.3.1)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
     web-console (2.2.1)
       activemodel (>= 4.0)
@@ -231,33 +233,33 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aasm
-  byebug
+  aasm (~> 4.1.0)
   capybara (~> 2.4.4)
-  coffee-rails (~> 4.1.0)
+  coffee-rails (~> 4.1.1)
   custom_error_message (~> 1.1, >= 1.1.1)
+  dotenv (~> 2.2.1)
   factory_girl_rails (~> 4.4.1)
-  github-markdown
-  honeybadger
-  html-pipeline
-  jquery-rails
+  github-markdown (~> 0.6.9)
+  honeybadger (~> 2.6.0)
+  html-pipeline (~> 2.4.0)
+  jquery-rails (~> 4.1.0)
   mocha (~> 1.1.0)
-  newrelic_rpm
-  octokit
-  omniauth-orcid
-  pg
-  pry
-  rails (= 4.2.6)
+  newrelic_rpm (~> 3.15.0)
+  octokit (~> 4.3.0)
+  omniauth-orcid (~> 1.0.38)
+  pg (~> 0.18.3)
+  pry-byebug
+  rails (= 4.2.10)
   rspec-rails (~> 3.4.2)
-  sanitize
-  sass-rails (~> 5.0)
+  sanitize (~> 4.0.1)
+  sass-rails (~> 5.0.4)
   shoulda-matchers (~> 2.7.0)
   spring
-  uglifier (>= 1.3.0)
-  unicorn
+  uglifier (= 2.7.2)
+  unicorn (~> 5.3.1)
   web-console (~> 2.0)
   webmock (~> 1.19.0)
-  will_paginate (~> 3.1)
+  will_paginate (~> 3.1.0)
 
 BUNDLED WITH
-   1.13.6
+   1.15.4
diff --git a/config/initializers/env.rb b/config/initializers/env.rb
@@ -0,0 +1 @@
+Dotenv.load if Rails.env.development?