Skip to content

R
rendezvous
Commit 015cbafe by tady
Options

update gem

parent 0fc8e845
Showing with 985 additions and 48 deletions
Gemfile
......@@ -6,13 +6,13 @@ ruby '2.1.0'
gem 'rails', '~> 4.0.2'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.0'
gem 'sass-rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
gem 'uglifier'
# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-rails'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
......@@ -24,7 +24,7 @@ gem 'coffee-rails', '~> 4.0.0'
# gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 1.2'
gem 'jbuilder'
group :doc do
# bundle exec rake doc:rails generates the API under doc/api.
......@@ -45,6 +45,9 @@ end
# gem 'bootstrap-sass-rails'
# activesupport bug?
gem 'minitest', '4.7.5'
gem 'devise'
gem 'omniauth-google-oauth2'
......@@ -67,6 +70,9 @@ group :development do
# gem 'capistrano', '~> 3.0.1'
gem 'pry-rails'
# profiler
gem 'rack-mini-profiler'
end
group :development, :test do
......@@ -77,23 +83,18 @@ group :development, :test do
gem 'spring'
end
group :test do
gem 'email_spec'
end
# group :test do
# gem 'email_spec'
# end
group :production do
gem 'rails_12factor'
gem 'pg'
end
# group :production do
# gem 'rails_12factor'
# gem 'pg'
# end
# tree structure
gem 'ancestry'
# profiler
gem 'rack-mini-profiler'
# Send mail via gmail oauth
# ref. https://github.com/popgiro/action-gmailer
gem 'mail'
......
Gemfile.lock
......@@ -47,7 +47,7 @@ GEM
arel (4.0.1)
atomic (1.1.14)
bcrypt-ruby (3.1.2)
better_errors (1.0.1)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
......@@ -81,9 +81,6 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.2.5)
docile (1.1.1)
email_spec (1.5.0)
launchy (~> 2.1)
mail (~> 2.2)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
......@@ -98,15 +95,15 @@ GEM
formatador (0.2.4)
gmail_xoauth (0.4.1)
oauth (>= 0.3.6)
guard (2.2.4)
guard (2.2.5)
formatador (>= 0.2.4)
listen (~> 2.1)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-rspec (4.0.4)
guard-rspec (4.2.0)
guard (>= 2.1.1)
rspec (~> 2.14)
rspec (>= 2.14, < 4.0)
guard-spring (0.0.4)
guard
spring
......@@ -115,15 +112,13 @@ GEM
htmlentities (4.3.1)
httpauth (0.2.0)
i18n (0.6.9)
jbuilder (1.5.3)
jbuilder (2.0.1)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
json (1.8.1)
jwt (0.1.8)
multi_json (>= 1.5)
launchy (2.4.2)
addressable (~> 2.3)
listen (2.2.0)
listen (2.4.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
......@@ -156,12 +151,11 @@ GEM
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
orm_adapter (0.5.0)
pg (0.17.0)
polyglot (0.3.3)
premailer (1.7.9)
css_parser (>= 1.1.9)
htmlentities (>= 4.0.0)
pry (0.9.12.3)
pry (0.9.12.4)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
......@@ -180,19 +174,14 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.3)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rake (10.1.1)
rb-fsevent (0.9.3)
rb-inotify (0.9.2)
rb-inotify (0.9.3)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
......@@ -213,7 +202,7 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
sass (3.2.12)
sass (3.2.13)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
......@@ -254,7 +243,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.38)
uglifier (2.3.2)
uglifier (2.4.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
......@@ -269,29 +258,27 @@ DEPENDENCIES
better_errors
binding_of_caller
coderay
coffee-rails (~> 4.0.0)
coffee-rails
coveralls
devise
email_spec
factory_girl_rails
faraday
guard-rspec
guard-spring
jbuilder (~> 1.2)
jbuilder
mail
minitest (= 4.7.5)
nokogiri
omniauth-google-oauth2
pg
premailer
pry-rails
rack-mini-profiler
rails (~> 4.0.2)
rails_12factor
redcarpet!
rspec-rails
sass-rails (~> 4.0.0)
sass-rails
sdoc
spring
sqlite3
thin
uglifier (>= 1.3.0)
uglifier
coverage/.last_run.json 0 → 100644
{
"result": {
"covered_percent": 82.72
}
}
coverage/.resultset.json 0 → 100644
{
"RSpec": {
"coverage": {
"/Users/tady/data/projects/rendezvous/config/environment.rb": [
null,
1,
null,
null,
1
],
"/Users/tady/data/projects/rendezvous/config/application.rb": [
1,
null,
1,
null,
null,
null,
1,
null,
1,
1,
null,
null,
null,
null,
null,
null,
1,
null,
1,
null,
null,
null,
1,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/config/boot.rb": [
null,
1,
null,
1
],
"/Users/tady/data/projects/rendezvous/config/environments/test.rb": [
1,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
1,
null,
null,
1,
1,
null,
null,
1,
1,
null,
null,
1,
null,
null,
1,
null,
null,
null,
null,
1,
null,
null,
1,
null
],
"/Users/tady/data/projects/rendezvous/config/initializers/backtrace_silencers.rb": [
null,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/config/initializers/devise.rb": [
null,
null,
1,
null,
null,
null,
1,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/config/initializers/filter_parameter_logging.rb": [
null,
null,
null,
1
],
"/Users/tady/data/projects/rendezvous/config/initializers/inflections.rb": [
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/config/initializers/mime_types.rb": [
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/config/initializers/omniauth.rb": [
1,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/config/initializers/secret_token.rb": [
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
1
],
"/Users/tady/data/projects/rendezvous/config/initializers/session_store.rb": [
null,
null,
1
],
"/Users/tady/data/projects/rendezvous/config/initializers/wrap_parameters.rb": [
null,
null,
null,
null,
null,
null,
1,
1,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/spec/factories/posts.rb": [
null,
null,
1,
1,
1,
1,
null,
1,
0,
null,
null,
null,
1,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/spec/factories/tags.rb": [
null,
null,
1,
1,
1,
null,
null
],
"/Users/tady/data/projects/rendezvous/app/models/tag.rb": [
1,
1,
1,
null,
1,
null,
null
],
"/Users/tady/data/projects/rendezvous/spec/factories/users.rb": [
1,
1,
1,
1,
1,
1,
null,
null,
1,
1,
1,
1,
1,
null,
null,
1,
1,
1,
1,
1,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/app/models/user.rb": [
1,
null,
1,
null,
null,
1,
null,
1,
null,
1,
null,
null,
1,
0,
0,
null,
0,
0,
null,
null,
null,
null,
null,
null,
0,
null,
null,
null,
null,
null,
0,
null,
null,
null,
1,
2,
null,
null,
null,
1,
0,
0,
0,
null,
0,
null,
null,
null,
null,
null,
0,
null,
0,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/config/routes.rb": [
1,
null,
1,
null,
1,
1,
1,
1,
1,
null,
1,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/app/helpers/application_helper.rb": [
1,
null,
1,
1,
0,
null,
null,
null,
1,
null,
0,
0,
null,
null,
null,
null,
null,
0,
0,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/app/helpers/home_helper.rb": [
1,
null
],
"/Users/tady/data/projects/rendezvous/app/helpers/posts_helper.rb": [
1,
null,
null,
1,
0,
0,
0,
null,
0,
0,
null,
0,
0,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/spec/support/devise.rb": [
1,
1,
null
],
"/Users/tady/data/projects/rendezvous/app/controllers/home_controller.rb": [
1,
null,
1,
null,
1,
3,
2,
null,
1,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/app/controllers/application_controller.rb": [
1,
null,
null,
1,
null,
1,
0,
0,
0,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/spec/models/post_spec.rb": [
1,
null,
1,
null,
1,
1,
4,
4,
null,
null,
1,
null,
5,
null,
1,
1,
null,
null,
1,
1,
null,
null,
1,
1,
null,
null,
1,
1,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/app/models/post.rb": [
1,
1,
1,
1,
null,
null,
null,
1,
0,
null,
null,
0,
null,
0,
null,
0,
0,
null,
0,
null,
0,
null,
0,
null,
0,
null,
0,
null,
0,
0,
null,
0,
null,
null,
null,
0,
null,
null,
null,
null,
1,
4,
4,
4,
4,
null,
4,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/spec/models/tag_spec.rb": [
1,
null,
1,
1,
null
],
"/Users/tady/data/projects/rendezvous/spec/models/user_spec.rb": [
1,
null,
1,
null,
1,
1,
2,
2,
null,
null,
1,
null,
1,
1,
null,
null,
1,
1,
null,
null,
null,
null,
null,
1,
1,
13,
null,
null,
null,
null,
null,
null,
null,
1,
1,
null,
null,
1,
1,
1,
null,
null,
1,
1,
1,
3,
3,
null,
null,
null,
1,
1,
1,
3,
3,
null,
null,
null,
1,
1,
1,
1,
null,
null,
1,
1,
1,
1,
1,
null,
null,
1,
null,
1,
2,
null,
null,
1,
1,
null,
null,
1,
1,
null,
null,
null,
1,
null,
1,
1,
null,
null,
null,
1,
1,
null,
null,
null,
1,
1,
1,
1,
null,
null,
null,
null,
1,
null,
1,
2,
null,
null,
1,
1,
null,
null,
1,
1,
null,
null,
null,
null,
null,
null,
null
],
"/Users/tady/data/projects/rendezvous/app/models/post_tag.rb": [
1,
1,
1,
null
]
},
"timestamp": 1388288955
}
}
spec/spec_helper.rb
......@@ -9,7 +9,7 @@ ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
require 'email_spec'
# require 'email_spec'
require 'factory_girl'
# Requires supporting ruby files with custom matchers and macros, etc,
......@@ -50,8 +50,8 @@ RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods
config.include(EmailSpec::Helpers)
config.include(EmailSpec::Matchers)
# config.include(EmailSpec::Helpers)
# config.include(EmailSpec::Matchers)
config.before(:all) do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment