diff --git a/Gemfile.lock b/Gemfile.lock index 74c86b5a..a6914b46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,158 +2,189 @@ PATH remote: . specs: exception_notification (4.1.1) - actionmailer (>= 3.0.4) - activesupport (>= 3.0.4) + actionmailer (~> 4.0) + activesupport (~> 4.0) GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.6) - actionpack (= 3.2.6) - mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) + actionmailer (4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.4) + actionview (= 4.2.4) + activesupport (= 4.2.4) + 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.4) + activesupport (= 4.2.4) + builder (~> 3.1) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) - i18n (~> 0.6) - multi_json (~> 1.0) - addressable (2.3.5) - appraisal (1.0.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.4) + activesupport (= 4.2.4) + globalid (>= 0.3.0) + activemodel (4.2.4) + activesupport (= 4.2.4) + builder (~> 3.1) + activerecord (4.2.4) + activemodel (= 4.2.4) + activesupport (= 4.2.4) + arel (~> 6.0) + activesupport (4.2.4) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.3.8) + appraisal (1.0.3) bundler rake thor (>= 0.14.0) - arel (3.0.2) - builder (3.0.0) + arel (6.0.3) + builder (3.2.2) carrier-pigeon (0.7.0) addressable - celluloid (0.15.2) - timers (~> 1.1.0) - colorize (0.5.8) - connection_pool (2.0.0) - coveralls (0.6.5) - colorize + celluloid (0.16.0) + timers (~> 4.0.0) + connection_pool (2.2.0) + coveralls (0.6.9) multi_json (~> 1.3) rest-client simplecov (>= 0.7) + term-ansicolor thor + docile (1.1.5) + domain_name (0.5.24) + unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - eventmachine (1.0.3) - faraday (0.8.7) - multipart-post (~> 1.1) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - hashie (1.2.0) - hike (1.2.1) - hipchat (1.2.0) + eventmachine (1.0.8) + faraday (0.9.1) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + globalid (0.3.6) + activesupport (>= 4.1.0) + hashie (3.4.2) + hipchat (1.5.2) httparty + mimemagic + hitimes (1.2.2) + http-cookie (1.0.2) + domain_name (~> 0.5) http_parser.rb (0.5.3) httparty (0.10.2) multi_json (~> 1.0) multi_xml (>= 0.5.2) - i18n (0.6.0) - journey (1.0.4) - json (1.8.1) - mail (2.4.4) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - metaclass (0.0.1) - mime-types (1.19) - mocha (0.13.3) + i18n (0.7.0) + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.3) + mime-types (>= 1.16, < 3) + metaclass (0.0.4) + mime-types (2.6.1) + mimemagic (0.3.0) + mini_portile (0.6.2) + minitest (5.8.0) + mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.10.1) + multi_json (1.11.2) multi_xml (0.5.5) - multipart-post (1.2.0) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) + multipart-post (2.0.0) + netrc (0.10.3) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + rack (1.6.4) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) - bundler (~> 1.0) - railties (= 3.2.6) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) - rack-ssl (~> 1.3.2) + rails (4.2.4) + actionmailer (= 4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) + activemodel (= 4.2.4) + activerecord (= 4.2.4) + activesupport (= 4.2.4) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.4) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + 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) + loofah (~> 2.0) + railties (4.2.4) + actionpack (= 4.2.4) + activesupport (= 4.2.4) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - redis (3.0.7) - redis-namespace (1.4.1) - redis (~> 3.0.4) + thor (>= 0.18.1, < 2.0) + rake (10.4.2) + redis (3.2.1) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) resque (1.2.3) redis redis-namespace - rest-client (1.6.7) - mime-types (>= 1.16) - sidekiq (3.0.0) - celluloid (>= 0.15.2) - connection_pool (>= 2.0.0) - json - redis (>= 3.0.6) - redis-namespace (>= 1.3.1) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + sidekiq (3.4.2) + celluloid (~> 0.16.0) + connection_pool (~> 2.2, >= 2.2.0) + json (~> 1.0) + redis (~> 3.2, >= 3.2.1) + redis-namespace (~> 1.5, >= 1.5.2) simple_oauth (0.1.9) - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) - slack-notifier (1.0.0) - sprockets (2.1.3) - hike (~> 1.2) + simplecov (0.10.0) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + slack-notifier (1.2.1) + sprockets (3.3.3) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) - thor (0.15.4) - tilt (1.3.3) - timers (1.1.0) - tinder (1.9.1) - eventmachine (>= 0.12.0, < 2) - faraday (~> 0.8) - faraday_middleware (~> 0.8) - hashie (~> 1.0) - json (~> 1.6) - mime-types (~> 1.16) - multi_json (~> 1.0) - multipart-post (~> 1.1) + sprockets-rails (2.3.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) + sqlite3 (1.3.10) + term-ansicolor (1.3.2) + tins (~> 1.0) + thor (0.19.1) + thread_safe (0.3.5) + timers (4.0.1) + hitimes + tinder (1.10.1) + eventmachine (~> 1.0) + faraday (~> 0.9.0) + faraday_middleware (~> 0.9) + hashie (>= 1.0) + json (~> 1.8.0) + mime-types + multi_json (~> 1.7) twitter-stream (~> 0.1) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) + tins (1.6.0) twitter-stream (0.1.16) eventmachine (>= 0.12.8) http_parser.rb (~> 0.5.1) simple_oauth (~> 0.1.4) - tzinfo (0.3.33) + tzinfo (1.2.2) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) PLATFORMS ruby @@ -166,7 +197,7 @@ DEPENDENCIES hipchat (>= 1.0.0) httparty (~> 0.10.2) mocha (>= 0.13.0) - rails (>= 3.0.4) + rails (~> 4.0) resque (~> 1.2.0) sidekiq (~> 3.0) slack-notifier (>= 1.0.0) diff --git a/exception_notification.gemspec b/exception_notification.gemspec index a5eb573c..d3fc9e5d 100644 --- a/exception_notification.gemspec +++ b/exception_notification.gemspec @@ -8,7 +8,7 @@ Gem::Specification.new do |s| s.email = "smartinez87@gmail.com" s.license = "MIT" - s.required_ruby_version = '>= 1.9.3' + s.required_ruby_version = '>= 2.0' s.required_rubygems_version = '>= 1.8.11' s.files = `git ls-files`.split("\n") @@ -16,10 +16,10 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- test`.split("\n") s.require_path = 'lib' - s.add_dependency("actionmailer", ">= 3.0.4") - s.add_dependency("activesupport", ">= 3.0.4") + s.add_dependency("actionmailer", "~> 4.0") + s.add_dependency("activesupport", "~> 4.0") - s.add_development_dependency "rails", ">= 3.0.4" + s.add_development_dependency "rails", "~> 4.0" s.add_development_dependency "resque", "~> 1.2.0" s.add_development_dependency "sidekiq", "~> 3.0" s.add_development_dependency "tinder", "~> 1.8" diff --git a/gemfiles/rails3_1.gemfile b/gemfiles/rails3_1.gemfile deleted file mode 100644 index ff47f3a4..00000000 --- a/gemfiles/rails3_1.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 3.1.0" - -gemspec :path => "../" diff --git a/gemfiles/rails3_2.gemfile b/gemfiles/rails3_2.gemfile deleted file mode 100644 index 3fb69d3f..00000000 --- a/gemfiles/rails3_2.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 3.2.0" - -gemspec :path => "../" diff --git a/test/dummy/Gemfile b/test/dummy/Gemfile index a6d2d4ce..b39bf4e8 100644 --- a/test/dummy/Gemfile +++ b/test/dummy/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '4.0.0' +gem 'rails', '4.2.0' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/test/dummy/Gemfile.lock b/test/dummy/Gemfile.lock index 13c7d6b8..b822df77 100644 --- a/test/dummy/Gemfile.lock +++ b/test/dummy/Gemfile.lock @@ -1,112 +1,130 @@ PATH remote: ../../.. specs: - exception_notification (4.1.0.rc1) - actionmailer (>= 3.0.4) - activesupport (>= 3.0.4) + exception_notification (4.1.1) + actionmailer (~> 4.0) + activesupport (~> 4.0) GEM remote: http://rubygems.org/ specs: - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) + actionmailer (4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) + 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) - activemodel (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) - i18n (~> 0.6, >= 0.6.4) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - arel (4.0.0) - atomic (1.1.10) - builder (3.1.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.0) + activesupport (= 4.2.0) + 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) + builder (~> 3.1) + activerecord (4.2.0) + activemodel (= 4.2.0) + activesupport (= 4.2.0) + arel (~> 6.0) + activesupport (4.2.0) + 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.3) + builder (3.2.2) erubis (2.7.0) - eventmachine (1.0.3) - faraday (0.8.7) - multipart-post (~> 1.1) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - hashie (1.2.0) - hike (1.2.3) + eventmachine (1.0.8) + faraday (0.9.1) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + globalid (0.3.6) + activesupport (>= 4.1.0) + hashie (3.4.2) http_parser.rb (0.5.3) - httparty (0.11.0) - multi_json (~> 1.0) + httparty (0.13.5) + json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.6.4) - json (1.7.7) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.23) - minitest (4.7.5) - multi_json (1.7.7) - multi_xml (0.5.4) - multipart-post (1.2.0) - polyglot (0.3.3) - rack (1.5.2) - rack-test (0.6.2) + i18n (0.7.0) + json (1.8.3) + 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.8.0) + 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) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.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) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) - sprockets-rails (~> 2.0.0) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + railties (= 4.2.0) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + 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) + loofah (~> 2.0) + railties (4.2.0) + actionpack (= 4.2.0) + activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) + rake (10.4.2) simple_oauth (0.1.9) - sprockets (2.10.0) - hike (~> 1.2) - multi_json (~> 1.0) + sprockets (3.3.3) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.0) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.7) - thor (0.18.1) - thread_safe (0.1.0) - atomic - tilt (1.4.1) - tinder (1.9.2) + sprockets (>= 2.8, < 4.0) + sqlite3 (1.3.10) + thor (0.19.1) + thread_safe (0.3.5) + tinder (1.10.1) eventmachine (~> 1.0) - faraday (~> 0.8) + faraday (~> 0.9.0) faraday_middleware (~> 0.9) - hashie (~> 1.0) - json (~> 1.7.5) - mime-types (~> 1.19) - multi_json (~> 1.5) + hashie (>= 1.0) + json (~> 1.8.0) + mime-types + multi_json (~> 1.7) twitter-stream (~> 0.1) - treetop (1.4.14) - polyglot - polyglot (>= 0.3.1) twitter-stream (0.1.16) eventmachine (>= 0.12.8) http_parser.rb (~> 0.5.1) simple_oauth (~> 0.1.4) - tzinfo (0.3.37) + tzinfo (1.2.2) + thread_safe (~> 0.1) PLATFORMS ruby @@ -114,6 +132,6 @@ PLATFORMS DEPENDENCIES exception_notification! httparty - rails (= 4.0.0) + rails (= 4.2.0) sqlite3 tinder diff --git a/test/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb index 95e23715..ff5c7bfc 100644 --- a/test/dummy/config/initializers/secret_token.rb +++ b/test/dummy/config/initializers/secret_token.rb @@ -5,3 +5,4 @@ # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. Dummy::Application.config.secret_token = 'cfdf538142b0b383e722e8e7ea839b8ce6c3dc94a57856b343a2d13be66f5b690a55c991cec6e98ed60ea9b7e58265af23cb40cbadee02f13f1c45c2625f482b' +Dummy::Application.config.secret_key_base = 'my new secret'