Skip to content

Commit

Permalink
Merge c3000b7 into 8f23c8b
Browse files Browse the repository at this point in the history
  • Loading branch information
smartinez87 committed Jan 28, 2016
2 parents 8f23c8b + c3000b7 commit d0ea099
Show file tree
Hide file tree
Showing 10 changed files with 137 additions and 125 deletions.
8 changes: 2 additions & 6 deletions .travis.yml
@@ -1,12 +1,8 @@
language: ruby
rvm:
- 2.0.0
- 2.1
- 2.2
- 2.2.2
install:
- "gem install bundler"
- "bundle install --jobs=3 --retry=3"
gemfile:
- gemfiles/rails4_0.gemfile
- gemfiles/rails4_1.gemfile
- gemfiles/rails4_2.gemfile
- gemfiles/rails5_0.gemfile
2 changes: 1 addition & 1 deletion Appraisals
@@ -1,4 +1,4 @@
rails_versions = ['~> 4.0.5', '~> 4.1.1', '~> 4.2.0']
rails_versions = ['~> 5.0.0.beta']

rails_versions.each do |rails_version|
appraise "rails#{rails_version.slice(/\d+\.\d+/).gsub('.', '_')}" do
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -17,8 +17,8 @@ There's a great [Railscast about Exception Notification](http://railscasts.com/e

## Requirements

* Ruby 2.0 or greater
* Rails 4.0 or greater, Sinatra or another Rack-based application.
* Ruby 2.2.2 or greater
* Rails 5.0 or greater, Sinatra or another Rack-based application.

For previous releases, please checkout [this](#versions).

Expand Down
11 changes: 6 additions & 5 deletions exception_notification.gemspec
@@ -1,24 +1,25 @@
Gem::Specification.new do |s|
s.name = 'exception_notification'
s.version = '4.1.4'
s.version = '5.0.0'
s.authors = ["Jamis Buck", "Josh Peek"]
s.date = %q{2015-12-28}
s.summary = "Exception notification for Rails apps"
s.homepage = "https://smartinez87.github.io/exception_notification/"
s.email = "smartinez87@gmail.com"
s.license = "MIT"

s.required_ruby_version = '>= 2.0'
s.required_ruby_version = '>= 2.2'
s.required_rubygems_version = '>= 1.8.11'

s.files = `git ls-files`.split("\n")
s.files -= `git ls-files -- .??*`.split("\n")
s.test_files = `git ls-files -- test`.split("\n")
s.require_path = 'lib'

s.add_dependency("actionmailer", "~> 4.0")
s.add_dependency("activesupport", "~> 4.0")
s.add_dependency("actionmailer", "~> 5.0.0.beta")
s.add_dependency("activesupport", "~> 5.0.0.beta")

s.add_development_dependency "rails", "~> 4.0"
s.add_development_dependency "rails", "~> 5.0.0.beta"
s.add_development_dependency "resque", "~> 1.2.0"
# Sidekiq 3.2.2 does not support Ruby 1.9.
s.add_development_dependency "sidekiq", "~> 3.0.0", "< 3.2.2"
Expand Down
7 changes: 0 additions & 7 deletions gemfiles/rails4_1.gemfile

This file was deleted.

7 changes: 0 additions & 7 deletions gemfiles/rails4_2.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/rails4_0.gemfile → gemfiles/rails5_0.gemfile
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "rails", "~> 4.0.5"
gem "rails", "~> 5.0.0.beta"

gemspec :path => "../"
2 changes: 1 addition & 1 deletion test/dummy/Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '4.2.0'
gem 'rails', '~> 5.0.0.beta'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand Down
173 changes: 115 additions & 58 deletions test/dummy/Gemfile.lock
@@ -1,61 +1,104 @@
PATH
remote: ../../..
specs:
exception_notification (4.1.4)
actionmailer (~> 4.0)
activesupport (~> 4.0)
exception_notification (5.0.0)
actionmailer (~> 5.0.0.beta)
activesupport (~> 5.0.0.beta)

GEM
remote: http://rubygems.org/
specs:
actionmailer (4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
actioncable (5.0.0.beta1)
actionpack (= 5.0.0.beta1)
celluloid (~> 0.17.2)
coffee-rails (~> 4.1.0)
em-hiredis (~> 0.3.0)
faye-websocket (~> 0.10.0)
redis (~> 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.0.beta1)
actionpack (= 5.0.0.beta1)
actionview (= 5.0.0.beta1)
activejob (= 5.0.0.beta1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0)
actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2)
actionpack (5.0.0.beta1)
actionview (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
rack (~> 2.x)
rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0.beta1)
activesupport (= 5.0.0.beta1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0)
activesupport (= 4.2.0)
globalid (>= 0.3.0)
activemodel (4.2.0)
activesupport (= 4.2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (5.0.0.beta1)
activesupport (= 5.0.0.beta1)
globalid (>= 0.3.6)
activemodel (5.0.0.beta1)
activesupport (= 5.0.0.beta1)
builder (~> 3.1)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activesupport (4.2.0)
activerecord (5.0.0.beta1)
activemodel (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
arel (~> 7.0)
activesupport (5.0.0.beta1)
concurrent-ruby (~> 1.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
method_source
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
arel (7.0.0)
builder (3.2.2)
celluloid (0.17.2)
celluloid-essentials
celluloid-extras
celluloid-fsm
celluloid-pool
celluloid-supervision
timers (>= 4.1.1)
celluloid-essentials (0.20.5)
timers (>= 4.1.1)
celluloid-extras (0.20.5)
timers (>= 4.1.1)
celluloid-fsm (0.20.5)
timers (>= 4.1.1)
celluloid-pool (0.20.5)
timers (>= 4.1.1)
celluloid-supervision (0.20.5)
timers (>= 4.1.1)
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.0)
em-hiredis (0.3.0)
eventmachine (~> 1.0)
hiredis (~> 0.5.0)
erubis (2.7.0)
eventmachine (1.0.8)
faraday (0.9.1)
execjs (2.6.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
faye-websocket (0.10.2)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
globalid (0.3.6)
activesupport (>= 4.1.0)
hashie (3.4.2)
hashie (3.4.3)
hiredis (0.5.2)
hitimes (1.2.3)
http_parser.rb (0.5.3)
httparty (0.13.5)
httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.7.0)
Expand All @@ -64,28 +107,31 @@ GEM
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.8.0)
method_source (0.8.2)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.3)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
rack (1.6.4)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
rack (2.0.0.alpha)
json
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.0)
actionmailer (= 4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
activemodel (= 4.2.0)
activerecord (= 4.2.0)
activesupport (= 4.2.0)
rails (5.0.0.beta1)
actioncable (= 5.0.0.beta1)
actionmailer (= 5.0.0.beta1)
actionpack (= 5.0.0.beta1)
actionview (= 5.0.0.beta1)
activejob (= 5.0.0.beta1)
activemodel (= 5.0.0.beta1)
activerecord (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0)
sprockets-rails
railties (= 5.0.0.beta1)
sprockets-rails (>= 2.0.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
Expand All @@ -94,22 +140,27 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
railties (5.0.0.beta1)
actionpack (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
redis (3.2.2)
simple_oauth (0.1.9)
sprockets (3.3.3)
rack (~> 1.0)
sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
timers (4.1.1)
hitimes
tinder (1.10.1)
eventmachine (~> 1.0)
faraday (~> 0.9.0)
Expand All @@ -125,13 +176,19 @@ GEM
simple_oauth (~> 0.1.4)
tzinfo (1.2.2)
thread_safe (~> 0.1)
websocket-driver (0.6.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

PLATFORMS
ruby

DEPENDENCIES
exception_notification!
httparty
rails (= 4.2.0)
rails (~> 5.0.0.beta)
sqlite3
tinder

BUNDLED WITH
1.11.2

0 comments on commit d0ea099

Please sign in to comment.