Merge pull request #45 from gmmcal/heroku

Update Rails and start heroku config
gmmcal · Mar 27, 2017 · cab66e6 · cab66e6
2 parents 18edb39 + 7b4886d
commit cab66e6
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 247 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,6 @@ rerun.txt
 pickle-email-*.html
 
 config/initializers/secret_token.rb
-config/secrets.yml
 config/database.yml
 
 /.bundle

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.0
+  - 2.4.0
 before_script:
   - cp config/secrets.yml.travis config/secrets.yml
 

diff --git a/Capfile b/Capfile
diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,15 @@
 source 'https://rubygems.org'
 
+ruby '2.4.0'
+
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 4.2.7.1'
+gem 'rails', '~> 5.0.2'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
+gem 'sass-rails', '~> 5.0.6'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '~> 3.1.10'
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.2.1'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer',  platforms: :ruby
 
@@ -32,21 +34,12 @@ gem 'bcrypt', '~> 3.1.7'
 # Use puma as the app server
 gem 'puma'
 
-# Use Capistrano for deployment
-gem 'capistrano', group: :development
-gem 'capistrano-rails', group: :development
-gem 'capistrano-bundler', group: :development
-gem 'capistrano3-puma', group: :development
-
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 
 # Use brakeman
 gem 'brakeman', group: :development
 
-# User quiet_assets on development
-gem 'quiet_assets', group: :development
-
 # Environment variables
 gem 'figaro'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,187 +1,163 @@
 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)
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
       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)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
       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)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
+      globalid (>= 0.3.6)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
+      arel (~> 7.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    airbrussh (1.1.2)
-      sshkit (>= 1.6.1, != 1.7.0)
-    arel (6.0.4)
+    arel (7.1.4)
     bcrypt (3.1.11)
-    brakeman (3.4.1)
-    builder (3.2.2)
-    capistrano (3.7.1)
-      airbrussh (>= 1.0.0)
-      capistrano-harrow
-      i18n
-      rake (>= 10.0.0)
-      sshkit (>= 1.9.0)
-    capistrano-bundler (1.2.0)
-      capistrano (~> 3.1)
-      sshkit (~> 1.2)
-    capistrano-harrow (0.5.3)
-    capistrano-rails (1.2.1)
-      capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
-    capistrano3-puma (1.2.1)
-      capistrano (~> 3.0)
-      puma (>= 2.6)
-    coffee-rails (4.0.1)
+    brakeman (3.6.1)
+    builder (3.2.3)
+    coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.2.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
     erubis (2.7.0)
     execjs (2.7.0)
     figaro (1.1.1)
       thor (~> 0.14)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    jquery-rails (4.2.2)
+    i18n (0.8.1)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    json (1.8.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    multi_json (1.12.1)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.0.0)
-    newrelic_rpm (3.17.2.327)
-    nokogiri (1.7.0.1)
+    newrelic_rpm (4.0.0.332)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-    puma (3.6.2)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
-    rack (1.6.5)
+    puma (3.8.2)
+    rack (2.0.1)
     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 (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.2)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     rdoc (4.3.0)
-    sass (3.2.19)
-    sass-rails (4.0.5)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    spring (2.0.0)
+    spring (2.0.1)
       activesupport (>= 4.2)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sshkit (1.11.5)
-      net-scp (>= 1.1.2)
-      net-ssh (>= 2.8.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (3.0.4)
+    uglifier (3.1.10)
       execjs (>= 0.3.0, < 3)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bcrypt (~> 3.1.7)
   brakeman
-  capistrano
-  capistrano-bundler
-  capistrano-rails
-  capistrano3-puma
-  coffee-rails (~> 4.0.0)
+  coffee-rails (~> 4.2.1)
   figaro
   jquery-rails
   newrelic_rpm
   puma
-  quiet_assets
-  rails (~> 4.2.7.1)
-  sass-rails (~> 4.0.3)
+  rails (~> 5.0.2)
+  sass-rails (~> 5.0.6)
   sdoc (~> 0.4.0)
   spring
   turbolinks
-  uglifier (>= 1.3.0)
+  uglifier (~> 3.1.10)
+
+RUBY VERSION
+   ruby 2.4.0p0
 
 BUNDLED WITH
-   1.11.2
+   1.14.6
diff --git a/README.md b/README.md
@@ -11,17 +11,17 @@ My personal website code
 
 # Requirements
 
-This app was built using ruby 2.3.x.
+This app was built using ruby 2.4.x.
 
 # Installing
 
 After cloning this app, run the following commands:
 
-If you use RVM, make sure you have ruby 2.3.x installed. If so, when in the app folder, run (change .x for the minor version of your ruby. I.E.: 2.3.0)
+If you use RVM, make sure you have ruby 2.4.x installed. If so, when in the app folder, run (change .x for the minor version of your ruby. I.E.: 2.4.0)
 
 ```
-rvm rvmrc create ruby-2.3[email protected] --ruby-version
-rvm use ruby-2.3[email protected]
+rvm rvmrc create ruby-2.4[email protected] --ruby-version
+rvm use ruby-2.4[email protected]
 bundle install
 cp config/secrets-example.yml config/secrets.yml
 ```

diff --git a/config/application.example.yml b/config/application.example.yml