From b0c4d22723d647bf7456a5c4011752214971abfc Mon Sep 17 00:00:00 2001 From: Ignacio Galindo Date: Tue, 26 Jul 2016 19:45:56 -0500 Subject: [PATCH 1/4] Add basic development setup instructions --- Gemfile | 1 + Gemfile.lock | 3 +++ README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/Gemfile b/Gemfile index ac92c32..7b2f09c 100644 --- a/Gemfile +++ b/Gemfile @@ -34,6 +34,7 @@ end group :development do gem 'dotenv-rails', '~> 2.0.0' + gem 'powder', '~> 0.3.0' gem 'rails_best_practices', '~> 1.16.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 9e96e0c..ac6d8c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,6 +154,8 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) + powder (0.3.0) + thor (>= 0.11.5) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -292,6 +294,7 @@ DEPENDENCIES omniauth-github (~> 1.1.2) pg (~> 0.18.4) poltergeist (~> 1.6.0) + powder (~> 0.3.0) pry-byebug (~> 3.3.0) puma (~> 3.1.0) rails (~> 4.2.6) diff --git a/README.md b/README.md index 73b11aa..53d99be 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,50 @@ # About [![travis](https://img.shields.io/travis/webdevtalks/www.svg)](https://travis-ci.org/webdevtalks/www) + [![codecov](https://img.shields.io/codecov/c/github/webdevtalks/www.svg)](https://codecov.io/github/webdevtalks/www) + +# Setup + +## Dependencies + +- PostgreSQL +- Ruby >= 2.3 +- Pow + +### Pow + +Install pow by: + + $ curl get.pow.cx | sh + +## Configure + +### Pow + +In order to use a http://wwww.webdevtalks.dev testing domain (required to ease oauth login), proceed to: + +- Rename directory app as www.webdevtalks +- Run the following: + + $ powder link + +This will create a symlink in `~/.pow` pointing to the app. + +### App + +For installing ruby gem dependencies run: + + $ bundle install + +Then, copy `.env.example` and ensure github and google tokens. + +Now run: + + $ rake db:setup + +You should be ready to go. + +Start the app by running: + + $ powder up From fcff3d25ad61ff85fc278eace43484b27a4f84f2 Mon Sep 17 00:00:00 2001 From: Ignacio Galindo Date: Tue, 26 Jul 2016 20:00:17 -0500 Subject: [PATCH 2/4] Update ruby version in travis config file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 047a937..bfe01e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: -- 2.2.3 +- 2.3.0 bundler_args: "--without development production" before_script: - psql -c 'create database wdt_test;' -U postgres From 45ea2a6d9a5924cff89aab0756a110e1b851ae03 Mon Sep 17 00:00:00 2001 From: Ignacio Galindo Date: Tue, 26 Jul 2016 22:12:32 -0500 Subject: [PATCH 3/4] Replace codecov with coveralls --- Gemfile | 4 ++-- Gemfile.lock | 26 +++++++++++++++----------- spec/spec_helper.rb | 11 ++++++----- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 7b2f09c..f764564 100644 --- a/Gemfile +++ b/Gemfile @@ -43,8 +43,8 @@ group :production do end group :test do - gem 'codecov', '~> 0.0.2', require: false + gem 'coveralls', '~> 0.8.14', require: false gem 'fakeweb', '~> 1.3.0' gem 'poltergeist', '~> 1.6.0' - gem 'simplecov', '~> 0.9.2', require: false + gem 'simplecov', '~> 0.12.0', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index ac6d8c0..0fd9940 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,10 +67,6 @@ GEM cliver (0.3.2) code_analyzer (0.4.5) sexp_processor - codecov (0.0.2) - json - simplecov - url coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -82,6 +78,12 @@ GEM concurrent-ruby (1.0.1) countries (0.9.3) currencies (~> 0.4.2) + coveralls (0.8.14) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) + tins (~> 1.6.0) currencies (0.4.2) date_validator (0.7.1) activemodel @@ -232,11 +234,11 @@ GEM sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) sexp_processor (4.7.0) - simplecov (0.9.2) + simplecov (0.12.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) slim (3.0.3) temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) @@ -255,15 +257,17 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) temple (0.7.5) + term-ansicolor (1.3.2) + tins (~> 1.0) thor (0.19.1) thread_safe (0.3.5) tilt (2.0.2) + tins (1.6.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) - url (0.3.2) websocket-driver (0.5.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -281,8 +285,8 @@ DEPENDENCIES bootstrap-sass (~> 3.3.3) capybara (~> 2.4.4) capybara-webkit (~> 1.4.1) - codecov (~> 0.0.2) coffee-rails (~> 4.1.1) + coveralls (~> 0.8.14) dotenv-rails (~> 2.0.0) fabrication (~> 2.12.2) faker (~> 1.4.3) @@ -302,7 +306,7 @@ DEPENDENCIES rails_best_practices (~> 1.16.0) rspec-rails (~> 3.2.1) sass-rails (~> 5.0.4) - simplecov (~> 0.9.2) + simplecov (~> 0.12.0) slim-rails (~> 3.0.1) uglifier (>= 2.7.1) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 05af4e0..5abcebf 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,14 +1,15 @@ require 'fakeweb' -FakeWeb.allow_net_connect = %r[^https?://codecov.io] -if ENV['COVER'] || ENV['CI'] +if ENV['COVER'] require 'simplecov' - SimpleCov.start 'rails' + SimpleCov.start('rails') end if ENV['CI'] - require 'codecov' - SimpleCov.formatter = SimpleCov::Formatter::Codecov + require 'coveralls' + FakeWeb.allow_net_connect = %r[^https?://coveralls.io] + Coveralls.wear!('rails') + SimpleCov.formatter = Coveralls::SimpleCov::Formatter end RSpec.configure do |config| From c56ecf4755f0361439310ca19104c0cbd8303ef2 Mon Sep 17 00:00:00 2001 From: Ignacio Galindo Date: Tue, 26 Jul 2016 22:33:58 -0500 Subject: [PATCH 4/4] Add coveralls badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 53d99be..4ec520f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # About [![travis](https://img.shields.io/travis/webdevtalks/www.svg)](https://travis-ci.org/webdevtalks/www) - +[![coveralls](https://img.shields.io/coveralls/webdevtalks/www.svg?maxAge=2592000)](https://coveralls.io/github/webdevtalks/www) [![codecov](https://img.shields.io/codecov/c/github/webdevtalks/www.svg)](https://codecov.io/github/webdevtalks/www) # Setup