From 17d546c8d99ac06cb5cf285c7964b79d9bc8fc9c Mon Sep 17 00:00:00 2001 From: Gustavo Cunha Date: Fri, 25 Mar 2016 14:31:54 +0000 Subject: [PATCH] Update rails Change production server to puma (heroku) --- .gitignore | 2 +- Gemfile | 6 +- Gemfile.lock | 152 +++++++++++++++++---------------- config/locales/about.en.yml | 2 +- config/locales/about.pt-BR.yml | 2 +- config/secrets.yml | 22 +++++ 6 files changed, 108 insertions(+), 78 deletions(-) create mode 100644 config/secrets.yml diff --git a/.gitignore b/.gitignore index 69c434b9..84697d98 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ pickle-email-*.html # TODO Comment out these rules if you are OK with secrets being uploaded to the repo config/initializers/secret_token.rb -config/secrets.yml +#config/secrets.yml config/database.yml ## Environment normalisation: diff --git a/Gemfile b/Gemfile index 489d2b0f..2f90d11f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.2.3' +gem 'rails', '~> 4.2.6' # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.3' # Use Uglifier as compressor for JavaScript assets @@ -35,6 +35,8 @@ gem 'capistrano-rails', group: :development gem 'capistrano-rvm', group: :development gem 'capistrano-bundler', group: :development +gem 'puma', group: :production + # Use debugger # gem 'debugger', group: [:development, :test] @@ -42,7 +44,7 @@ gem 'capistrano-bundler', group: :development gem 'brakeman', group: :development # Use passenger -gem 'passenger' +gem 'passenger', group: :development # User quiet_assets on development gem 'quiet_assets', group: :development diff --git a/Gemfile.lock b/Gemfile.lock index 6ad8dbff..8b9140e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,52 +1,52 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.3) - actionpack (= 4.2.3) - actionview (= 4.2.3) - activejob (= 4.2.3) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.3) - actionview (= 4.2.3) - activesupport (= 4.2.3) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) 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.3) - activesupport (= 4.2.3) + actionview (4.2.6) + activesupport (= 4.2.6) 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.3) - activesupport (= 4.2.3) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.3) - activesupport (= 4.2.3) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.3) - activemodel (= 4.2.3) - activesupport (= 4.2.3) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) - activesupport (4.2.3) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.2) - bcrypt (3.1.10) - brakeman (3.0.5) + arel (6.0.3) + bcrypt (3.1.11) + brakeman (3.2.1) erubis (~> 2.6) - fastercsv (~> 1.5) haml (>= 3.0, < 5.0) - highline (~> 1.6.20) - multi_json (~> 1.2) - ruby2ruby (~> 2.1.1) - ruby_parser (~> 3.7.0) + highline (>= 1.6.20, < 2.0) + ruby2ruby (~> 2.3.0) + ruby_parser (~> 3.8.1) + safe_yaml (>= 1.0) sass (~> 3.0) + slim (>= 1.3.6, < 4.0) terminal-table (~> 1.4) builder (3.2.2) capistrano (3.4.0) @@ -56,7 +56,7 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.3) + capistrano-rails (1.1.6) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) @@ -68,78 +68,81 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - colorize (0.7.7) + coffee-script-source (1.10.0) erubis (2.7.0) - execjs (2.5.2) - fastercsv (1.5.5) + execjs (2.6.0) figaro (1.1.1) thor (~> 0.14) - globalid (0.3.5) + globalid (0.3.6) activesupport (>= 4.1.0) - haml (4.0.6) + haml (4.0.7) tilt - highline (1.6.21) + highline (1.7.8) hike (1.2.3) i18n (0.7.0) - jquery-rails (4.0.4) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) - loofah (2.0.2) + loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.1) - mini_portile (0.6.2) - minitest (5.7.0) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) + mini_portile2 (2.0.0) + minitest (5.8.4) multi_json (1.11.2) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - newrelic_rpm (3.12.1.298) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - passenger (5.0.14) + net-ssh (3.1.1) + newrelic_rpm (3.15.1.316) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + passenger (5.0.26) rack rake (>= 0.8.1) + puma (3.2.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.3) - actionmailer (= 4.2.3) - actionpack (= 4.2.3) - actionview (= 4.2.3) - activejob (= 4.2.3) - activemodel (= 4.2.3) - activerecord (= 4.2.3) - activesupport (= 4.2.3) + 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) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.3) + railties (= 4.2.6) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.3) - actionpack (= 4.2.3) - activesupport (= 4.2.3) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) - rdoc (4.2.0) - ruby2ruby (2.1.4) + rake (11.1.1) + rdoc (4.2.2) + json (~> 1.4) + ruby2ruby (2.3.0) ruby_parser (~> 3.1) sexp_processor (~> 4.0) - ruby_parser (3.7.0) + ruby_parser (3.8.1) sexp_processor (~> 4.1) + safe_yaml (1.0.4) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -149,21 +152,24 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sexp_processor (4.6.0) - spring (1.3.6) + sexp_processor (4.7.0) + slim (3.0.6) + temple (~> 0.7.3) + tilt (>= 1.3.3, < 2.1) + spring (1.6.4) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.2) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sshkit (1.7.1) - colorize (>= 0.7.0) + sshkit (1.9.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + temple (0.7.6) terminal-table (1.5.2) thor (0.19.1) thread_safe (0.3.5) @@ -172,9 +178,8 @@ GEM coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.1) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) PLATFORMS ruby @@ -191,8 +196,9 @@ DEPENDENCIES jquery-rails newrelic_rpm passenger + puma quiet_assets - rails (~> 4.2.3) + rails (~> 4.2.6) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) spring diff --git a/config/locales/about.en.yml b/config/locales/about.en.yml index 84ed78c1..9b0822eb 100644 --- a/config/locales/about.en.yml +++ b/config/locales/about.en.yml @@ -2,6 +2,6 @@ en: about: title: "About Me" job_title: "Software Engineer in Lisbon / LX - Portugal" - text: "

Bachelor's degree in Computer Science and Specialist in Computer Software Engineering, I've being working with Web Development since 2003 and currently I'm a Software Engineer at Quimbik, Inc. Since 2010, I'm an enthusiast of Mobile Development and iOS certified developer since 2012 by IDS Tecnologia, first Apple Authorized Training Center in Latin America.

I like to work in group, research new things, come with solutions to solve problems, especially the tough ones. I enjoy challenges.

" + text: "

Bachelor's degree in Computer Science and Specialist in Computer Software Engineering, I've being working with Web Development since 2003 and currently I'm a Software Engineer at Landing.jobs. Since 2010, I'm an enthusiast of Mobile Development and iOS certified developer since 2012 by IDS Tecnologia, first Apple Authorized Training Center in Latin America.

I like to work in group, research new things, come with solutions to solve problems, especially the tough ones. I enjoy challenges.

" file_title: "PDF Download" file: "gmmcal.en.pdf" diff --git a/config/locales/about.pt-BR.yml b/config/locales/about.pt-BR.yml index adcad681..a659af2a 100644 --- a/config/locales/about.pt-BR.yml +++ b/config/locales/about.pt-BR.yml @@ -2,6 +2,6 @@ pt-BR: about: title: "Sobre mim" job_title: "Engenheiro de Software em Lisboa / LX - Portugal" - text: "

Bacharel em Ciência da Computação e especialista em Engenharia de Software, trabalho com desenvolvimento web desde 2003 e atualmente sou Engenheiro de Software na Quimbik, Inc. Entusiasta de desenvolvimento mobile desde 2010, sou certificado em desenvolvimento para iOS pela IDS Tecnologia, primeira Apple Authorized Training Center na América Latina, desde 2012.

Gosto de trabalhar em grupo, pesquisar coisas novas, propor soluções, resolver problemas, principalmente os mais difíceis. Sou movido a desafios.

" + text: "

Bacharel em Ciência da Computação e especialista em Engenharia de Software, trabalho com desenvolvimento web desde 2003 e atualmente sou Engenheiro de Software na Landing.jobs. Entusiasta de desenvolvimento mobile desde 2010, sou certificado em desenvolvimento para iOS pela IDS Tecnologia, primeira Apple Authorized Training Center na América Latina, desde 2012.

Gosto de trabalhar em grupo, pesquisar coisas novas, propor soluções, resolver problemas, principalmente os mais difíceis. Sou movido a desafios.

" file_title: "Download em PDF" file: "gmmcal.br.pdf" diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 00000000..ae40b55e --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rake secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 98406526b3df1209b709e60fc3e8bf3ec7fe12d0bfae1ee91cf092d8fa1645084974e4ee3d85c786beac1359ca103c05b21071a47675abf7613d4be8c149752e + +test: + secret_key_base: c14c6e6aef2cda16e4256319bd521fd331056cbe131eb70f75b4b96a68c6fb34aa19b115a957fd070981d66f0da3e9d6c853f68dff8e0f9f4a0963819b67653b + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>