rollbar 2.8.3 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681f393e2fa4f6c1c4883bbf4e0c9d5783622fd6
-  data.tar.gz: 4538d40c64e3ec495a439aa85ae06c9af67fd659
+  metadata.gz: 3dc9f3d80ba20b90a83809caefd61cbb724d5f99
+  data.tar.gz: a5bb67e2c58339159d475f23f4f6055db837cb46
 SHA512:
-  metadata.gz: 466ecc982464a853f02cb7e5bf2b13f513022a0563fdfeeadc4cb33d65b8beb226835eeb101cf3cf2d12df0c3a8feeff65220bd0491c1c20a34e6e41b6be3579
-  data.tar.gz: 8ee1700a380167d7aea6ea3ebd1f6d0785e725f07c72103c3548fbbfbe98216bbfd630181d1c5013b7f3af09ac7dfdc3af1a364e24e0f0710281795458229f67
+  metadata.gz: fc4d5c761209f259b2e5761f4cd5843d37083d6996ef758ab1504f02db3d82416c34d61dbd53bdd863caaec47624dec1924a02c6f9fc0d778cd649737b6d16f5
+  data.tar.gz: be9b1342ca1345c1133f0ff7d2144a7a3f4b82431d15958b70eea419f402acc1cfa112808fa09beb07d11e5b5916b074d9163f298aa1fe918d1e41b90fb27197

data/.codeclimate.yml

@@ -0,0 +1,18 @@
+---
+engines:
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+  eslint:
+    enabled: false
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+exclude_paths:
+- spec/

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 2.9.0
+
+Bug fixes:
+
+- Clean scope before every Sidekiq job execution. See [#421](https://github.com/rollbar/rollbar-gem/pull/421).
+- Threads reaper. See [#418](https://github.com/rollbar/rollbar-gem/pull/418).
+
+New features:
+- Rollbar logger. See [#417](https://github.com/rollbar/rollbar-gem/pull/417).
+
+Others:
+- Fix dependencies. See [#402](https://github.com/rollbar/rollbar-gem/pull/402).
+- Use mime-types < 3.0 for RUBY < 2.0. See [#420](https://github.com/rollbar/rollbar-gem/pull/420).
+- Add .codeclimate.yml. See [#409](https://github.com/rollbar/rollbar-gem/pull/409).
+- Use SimpleCov with CodeClimate formatter. See [#408](https://github.com/rollbar/rollbar-gem/pull/408).
+- Setup CodeClimate coverage. See [#407](https://github.com/rollbar/rollbar-gem/pull/407).
+- Typo in the transform hook documentation. See [#406](https://github.com/rollbar/rollbar-gem/pull/406).
+
+
 ## 2.8.3
 
 Bug fixes:

data/Gemfile

@@ -2,6 +2,8 @@
 
 source "https://rubygems.org"
 
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jruby-openssl", :platform => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
@@ -11,7 +13,24 @@ gem "racc", :platform => :rbx
 gem "minitest", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "4.2.3"
-gem 'byebug'
+gem 'rspec-rails', '~> 3.4'
+gem 'rake'
 
-gemspec
+gem 'oj', '~> 2.12.14' unless is_jruby
+gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
+
+if RUBY_VERSION.start_with?('1.9')
+  gem 'sucker_punch', '~> 1.0'
+elsif RUBY_VERSION.start_with?('2')
+  gem 'sucker_punch', '~> 2.0'
+end
 
+gem 'sinatra'
+gem 'resque'
+gem 'delayed_job', :require => false
+gem 'redis'
+gem 'database_cleaner', '~> 1.0.0'
+gem 'girl_friday', '>= 0.11.1'
+gem 'generator_spec'
+
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.8.3)](https://travis-ci.org/rollbar/rollbar-gem/branches)
+# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.9.0)](https://travis-ci.org/rollbar/rollbar-gem/branches)
 
 <!-- RemoveNext -->
 [Rollbar](https://rollbar.com) is an error tracking service for Ruby and other languages. The Rollbar service will alert you of problems with your code and help you understand them in a ways never possible before. We love it and we hope you will too.
@@ -12,7 +12,7 @@ This is the Ruby library for Rollbar. It will instrument many kinds of Ruby appl
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rollbar', '~> 2.8.3'
+gem 'rollbar'
 ```
 
 And then execute:
@@ -488,7 +488,7 @@ handler = proc do |options|
 end
 
 Rollbar.configure do |config|
-  config.before_process << handler
+  config.transform << handler
 end
 ```
 
@@ -533,7 +533,7 @@ Rollbar.silenced {
 }
 ```
 
-# Sending backtrace without rescued exceptions
+## Sending backtrace without rescued exceptions
 
 If you use the gem in this way:
 
@@ -698,6 +698,25 @@ config.failover_handlers = [Rollbar::Delay::GirlFriday, Rollbar::Delay::Thread]
 
 With the configuration above Resque will be your primary asynchronous handler but if it fails queueing the job Rollbar will use GirlFriday at first, and just a thread in case that GirlFriday fails too.
 
+## Logger interface
+
+The gem provides a class `Rollbar::Logger` that inherits from `Logger` so you can use Rollbar to log your application messages. The basic usage is:
+
+```ruby
+require 'rollbar/logger'
+
+logger = Rollbar::Logger.new
+logger.info('Purchase failed!')
+```
+
+If you are using Rails you can extend your `Rails.logger` so the log messages are sent to both outputs. You can use this snippet in one initializer:
+
+```ruby
+require 'rollbar/logger'
+
+Rails.logger.extend(ActiveSupport::Logger.broadcast(Rollbar::Logger.new))
+```
+
 ## Using with rollbar-agent
 
 For even more asynchrony, you can configure the gem to write to a file instead of sending the payload to Rollbar servers directly. [rollbar-agent](https://github.com/rollbar/rollbar-agent) can then be hooked up to this file to actually send the payload across. To enable, add the following in ```config/initializers/rollbar.rb```:

data/gemfiles/rails30.gemfile

@@ -1,7 +1,9 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
 gem 'jruby-openssl', :platform => :jruby
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
@@ -13,8 +15,29 @@ gem 'rubysl-test-unit', :platform => :rbx
 gem 'rubinius-developer_tools', :platform => :rbx
 gem 'rails', '3.0.20'
 gem 'hitimes', '< 1.2.2'
-
+gem 'rake', '< 11'
+gem 'rspec-rails', '>= 2.14.0'
 gem 'celluloid', '< 0.17.0' if RUBY_VERSION == '1.9.2'
 
+gem 'oj', '~> 2.12.14' unless is_jruby
+gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
+
+if RUBY_VERSION.start_with?('1.9')
+  gem 'sucker_punch', '~> 1.0'
+elsif RUBY_VERSION.start_with?('2')
+  gem 'sucker_punch', '~> 2.0'
+end
+
+gem 'sinatra'
+gem 'resque'
+gem 'delayed_job', :require => false
+gem 'redis'
+gem 'database_cleaner', '~> 1.0.0'
+gem 'genspec', '>= 0.2.8'
+gem 'girl_friday', '>= 0.11.1'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
 
 gemspec :path => '../'

data/gemfiles/rails31.gemfile

@@ -1,7 +1,9 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jruby-openssl", :platform => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
@@ -12,5 +14,28 @@ gem "minitest", :platform => :rbx
 gem "rubysl-test-unit", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "3.1.12"
+gem 'rspec-rails', '~> 3.4'
+gem 'rake'
+
+gem 'oj', '~> 2.12.14' unless is_jruby
+gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
+
+if RUBY_VERSION.start_with?('1.9')
+  gem 'sucker_punch'
+elsif RUBY_VERSION.start_with?('2')
+  gem 'sucker_punch'
+end
+
+gem 'sinatra'
+gem 'resque'
+gem 'delayed_job', :require => false
+gem 'redis'
+gem 'database_cleaner'
+gem 'girl_friday'
+gem 'generator_spec'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
 
 gemspec :path => "../"

data/gemfiles/rails32.gemfile

@@ -1,7 +1,9 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
 gem "test-unit"   # Please see https://github.com/rspec/rspec-rails/issues/1273
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jruby-openssl", :platform => :jruby
@@ -13,5 +15,29 @@ gem "minitest", :platform => :rbx
 gem "rubysl-test-unit", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "3.2.22"
+gem 'rspec-rails', '~> 3.4'
+gem 'rake'
+
+gem 'oj', '~> 2.12.14' unless is_jruby
+gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
+
+if RUBY_VERSION.start_with?('1.9')
+  gem 'sucker_punch', '~> 1.0'
+elsif RUBY_VERSION.start_with?('2')
+  gem 'sucker_punch', '~> 2.0'
+end
+
+gem 'sinatra'
+gem 'resque'
+gem 'delayed_job', :require => false
+gem 'redis'
+
+gem 'database_cleaner', '~> 1.0.0'
+gem 'girl_friday', '>= 0.11.1'
+gem 'generator_spec'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
 
 gemspec :path => "../"

data/gemfiles/rails40.gemfile

@@ -1,7 +1,9 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
 gem "test-unit"   # Please see https://github.com/rspec/rspec-rails/issues/1273
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jruby-openssl", :platform => :jruby
@@ -13,5 +15,29 @@ gem "minitest", :platform => :rbx
 gem "rubysl-test-unit", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "4.0.13"
+gem 'rspec-rails', '~> 3.4'
+gem 'rake'
+
+gem 'oj', '~> 2.12.14' unless is_jruby
+gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
+
+if RUBY_VERSION.start_with?('1.9')
+  gem 'sucker_punch', '~> 1.0'
+elsif RUBY_VERSION.start_with?('2')
+  gem 'sucker_punch', '~> 2.0'
+end
+
+gem 'sinatra'
+gem 'resque'
+gem 'delayed_job', :require => false
+gem 'redis'
+
+gem 'database_cleaner', '~> 1.0.0'
+gem 'girl_friday', '>= 0.11.1'
+gem 'generator_spec'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
 
 gemspec :path => "../"

data/gemfiles/rails41.gemfile

@@ -1,7 +1,9 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jruby-openssl", :platform => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
@@ -11,5 +13,29 @@ gem "racc", :platform => :rbx
 gem "minitest", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "4.1.12"
+gem 'rspec-rails', '~> 3.4'
+gem 'rake'
+
+gem 'oj', '~> 2.12.14' unless is_jruby
+gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
+
+if RUBY_VERSION.start_with?('1.9')
+  gem 'sucker_punch', '~> 1.0'
+elsif RUBY_VERSION.start_with?('2')
+  gem 'sucker_punch', '~> 2.0'
+end
+
+gem 'sinatra'
+gem 'resque'
+gem 'delayed_job', :require => false
+gem 'redis'
+
+gem 'database_cleaner', '~> 1.0.0'
+gem 'girl_friday', '>= 0.11.1'
+gem 'generator_spec'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
 
 gemspec :path => "../"

data/gemfiles/rails42.gemfile

@@ -1,7 +1,9 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jruby-openssl", :platform => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
@@ -11,5 +13,29 @@ gem "racc", :platform => :rbx
 gem "minitest", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "4.2.3"
+gem 'rspec-rails', '~> 3.4'
+gem 'rake'
+
+gem 'oj', '~> 2.12.14' unless is_jruby
+gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
+
+if RUBY_VERSION.start_with?('1.9')
+  gem 'sucker_punch', '~> 1.0'
+elsif RUBY_VERSION.start_with?('2')
+  gem 'sucker_punch', '~> 2.0'
+end
+
+gem 'sinatra'
+gem 'resque'
+gem 'delayed_job', :require => false
+gem 'redis'
+gem 'database_cleaner', '~> 1.0.0'
+gem 'girl_friday', '>= 0.11.1'
+gem 'generator_spec'
+gem 'codeclimate-test-reporter', :group => :test, :require => nil
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
 
 gemspec :path => "../"

data/lib/generators/rollbar/rollbar_generator.rb

@@ -1,5 +1,6 @@
 require 'rails/generators'
 require 'rails/generators/named_base'
+require 'generators/rollbar/rollbar_generator'
 
 module Rollbar
   module Generators

data/lib/rollbar/configuration.rb

@@ -63,7 +63,7 @@ module Rollbar
       @before_process = []
       @code_version = nil
       @custom_data_method = nil
-      @default_logger = lambda { Logger.new(STDERR) }
+      @default_logger = lambda { ::Logger.new(STDERR) }
       @delayed_job_enabled = true
       @disable_monkey_patch = false
       @disable_core_monkey_patch = false

data/lib/rollbar/delay/thread.rb

@@ -1,9 +1,65 @@
+require 'thread'
+require 'timeout'
+
 module Rollbar
   module Delay
     class Thread
-      def self.call(payload)
-        new.call(payload)
-      end
+      EXIT_SIGNAL  = :exit
+      EXIT_TIMEOUT = 3
+
+      Error        = Class.new(StandardError)
+      TimeoutError = Class.new(Error)
+
+      class << self
+        attr_reader :reaper
+
+        def call(payload)
+          spawn_threads_reaper
+
+          thread = new.call(payload)
+          threads << thread
+          thread
+        end
+
+        private
+
+        def threads
+          @threads ||= Queue.new
+        end
+
+        def spawn_threads_reaper
+          return if @spawned
+          @spawned = true
+
+          @reaper ||= build_reaper_thread
+          configure_exit_handler
+        end
+
+        def build_reaper_thread
+          ::Thread.start do
+            loop do
+              thread = threads.pop
+
+              break if thread == EXIT_SIGNAL
+
+              thread.join
+            end
+          end
+        end
+
+        def configure_exit_handler
+          at_exit do
+            begin
+              Timeout.timeout(EXIT_TIMEOUT) do
+                threads << EXIT_SIGNAL
+                reaper.join
+              end
+            rescue Timeout::Error
+              raise TimeoutError, "unable to reap all threads within #{EXIT_TIMEOUT} seconds"
+            end
+          end
+        end
+      end # class << self
 
       def call(payload)
         ::Thread.new do

data/lib/rollbar/logger.rb

@@ -0,0 +1,81 @@
+require 'logger'
+require 'rollbar'
+
+module Rollbar
+  # This class provides logger interface that can be used to replace
+  # the application logger and send all the log messages to Rollbar
+  #
+  # Usage:
+  # require 'rollbar/logger'
+  # logger = Rollbar::Logger.new
+  # logger.error('Error processing purchase')
+  #
+  # If using Rails, you can extend the Rails logger so messages are logged
+  # normally and also to Rollbar:
+  #
+  # Rails.logger.extend(ActiveSupport::Logger.broadcast(Rollbar::Logger.new))
+  class Logger < ::Logger
+    class Error < RuntimeError; end
+    class DatetimeFormatNotSupported < Error; end
+    class FormatterNotSupported < Error; end
+
+    def initialize
+      @level = ERROR
+    end
+
+    def add(severity, message = nil, progname = nil)
+      return true if severity < @level
+
+      message ||= block_given? ? yield : progname
+
+      return true if message.blank?
+
+      rollbar.log(rollbar_level(severity), message)
+    end
+
+    def <<(message)
+      error(message)
+    end
+
+    def formatter=(_)
+      raise(FormatterNotSupported)
+    end
+
+    def formatter
+      raise(FormatterNotSupported)
+    end
+
+    def datetime_format=(_)
+      raise(DatetimeFormatNotSupported)
+    end
+
+    def datetime_format
+      raise(DatetimeFormatNotSupported)
+    end
+
+    # Returns a Rollbar::Notifier instance with the current global scope and
+    # with a logger writing to /dev/null so we don't have a infinite loop
+    # when Rollbar.configuration.logger is Rails.logger.
+    def rollbar
+      notifier = Rollbar.scope
+      notifier.configuration.logger = ::Logger.new('/dev/null')
+
+      notifier
+    end
+
+    private
+
+    # Find correct Rollbar level to use using the indexes in Logger::Severity
+    # DEBUG = 0
+    # INFO = 1
+    # WARN = 2
+    # ERROR = 3
+    # FATAL = 4
+    # UNKNOWN = 5
+    #
+    # If not found we'll use 'error' as the used level
+    def rollbar_level(severity)
+      [:debug, :info, :warning, :error, :critical, :error][severity] || :error
+    end
+  end
+end

data/lib/rollbar/rake_tasks.rb

@@ -1,4 +1,5 @@
 require 'rollbar'
+require 'logger'
 
 namespace :rollbar do
   desc "Verify your gem installation by sending a test exception to Rollbar"

data/lib/rollbar/sidekiq.rb

@@ -4,6 +4,14 @@ module Rollbar
   class Sidekiq
     PARAM_BLACKLIST = %w[backtrace error_backtrace error_message error_class]
 
+    class ClearScope
+      def call(worker, msg, queue)
+        Rollbar.reset_notifier!
+
+        yield
+      end
+    end
+
     def self.handle_exception(msg_or_context, e)
       return if skip_report?(msg_or_context, e)
 
@@ -14,11 +22,13 @@ module Rollbar
     end
 
     def self.skip_report?(msg_or_context, e)
-      msg_or_context.is_a?(Hash) && msg_or_context["retry"] && 
+      msg_or_context.is_a?(Hash) && msg_or_context["retry"] &&
         msg_or_context["retry_count"] && msg_or_context["retry_count"] < ::Rollbar.configuration.sidekiq_threshold
     end
 
     def call(worker, msg, queue)
+      Rollbar.reset_notifier!
+
       yield
     rescue Exception => e
       Rollbar::Sidekiq.handle_exception(msg, e)
@@ -28,12 +38,13 @@ module Rollbar
 end
 
 Sidekiq.configure_server do |config|
-  if Sidekiq::VERSION < '3'
+  if Sidekiq::VERSION.split('.')[0].to_i < 3
     config.server_middleware do |chain|
       chain.add Rollbar::Sidekiq
     end
   else
-    config.error_handlers << Proc.new do |e, context|
+    chain.add Rollbar::Sidekiq::ClearScope
+    config.error_handlers << proc do |e, context|
       Rollbar::Sidekiq.handle_exception(context, e)
     end
   end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "2.8.3"
+  VERSION = "2.9.0"
 end

data/rollbar.gemspec

@@ -19,24 +19,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Rollbar::VERSION
 
-  gem.add_development_dependency 'rails', '>= 3.0.0'
-  gem.add_development_dependency 'rspec-rails', '>= 2.14.0'
-  gem.add_development_dependency 'database_cleaner', '~> 1.0.0'
-  gem.add_development_dependency 'girl_friday', '>= 0.11.1'
-
-  if RUBY_VERSION.start_with?('1.9')
-    gem.add_development_dependency 'sucker_punch', '~> 1.0'
-  elsif RUBY_VERSION.start_with?('2')
-    gem.add_development_dependency 'sucker_punch', '~> 2.0'
-  end
-
-  gem.add_development_dependency 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
-  gem.add_development_dependency 'genspec', '>= 0.2.8'
-  gem.add_development_dependency 'sinatra'
-  gem.add_development_dependency 'resque'
-  gem.add_development_dependency 'delayed_job'
-  gem.add_development_dependency 'rake', '< 11'
-  gem.add_development_dependency 'redis'
-  gem.add_runtime_dependency     'multi_json'
-  gem.add_development_dependency 'oj', '~> 2.12.14' unless is_jruby
+  gem.add_runtime_dependency 'multi_json'
 end

data/spec/controllers/home_controller_spec.rb

@@ -394,7 +394,7 @@ describe HomeController do
         sent_params = Rollbar.last_report[:request][:params]['upload']
 
         expect(sent_params).to be_kind_of(Array)
-        expect(sent_params).to have(2).items
+        expect(sent_params.size).to be(2)
       end
     end
   end

data/spec/generators/rollbar/rollbar_generator_rails30_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+begin
+  require 'genspec'
+rescue LoadError
+end
+
+require 'generators/rollbar/rollbar_generator'
+
+describe :rollbar do
+  context "with no arguments" do
+    it "outputs a help message" do
+      subject.should output(/You'll need to add an environment variable ROLLBAR_ACCESS_TOKEN with your access token/)
+    end
+
+    it "generates a Rollbar initializer with ENV" do
+      subject.should generate("config/initializers/rollbar.rb") { |content|
+        content.should =~ /config.access_token = ENV\['ROLLBAR_ACCESS_TOKEN'\]/
+      }
+    end
+  end
+
+  with_args 'aaaabbbbccccddddeeeeffff00001111' do
+    it "generates a Rollbar initializer with access token" do
+      subject.should generate("config/initializers/rollbar.rb") do |content|
+        content.should =~ /aaaabbbbccccddddeeeeffff00001111/
+        content.should =~ /config.access_token = 'aaaabbbbccccddddeeeeffff00001111'/
+      end
+    end
+  end
+end if Rails::VERSION::STRING.start_with?('3.0')

data/spec/generators/rollbar/rollbar_generator_spec.rb

@@ -1,24 +1,51 @@
 require 'spec_helper'
 
-describe :rollbar do
-  context "with no arguments" do
-    it "outputs a help message" do
-      subject.should output(/You'll need to add an environment variable ROLLBAR_ACCESS_TOKEN with your access token/)
+begin
+  require 'generator_spec'
+rescue LoadError
+end
+
+require 'generators/rollbar/rollbar_generator'
+
+describe Rollbar::Generators::RollbarGenerator, :type => :generator do
+  destination File.expand_path('../../../tmp', __FILE__)
+
+  before { prepare_destination }
+
+  context 'with no arguments' do
+    before do
+      run_generator
     end
 
-    it "generates a Rollbar initializer with ENV" do
-      subject.should generate("config/initializers/rollbar.rb") { |content|
-        content.should =~ /config.access_token = ENV\['ROLLBAR_ACCESS_TOKEN'\]/
+    it 'outputs a help message and generates Rollbar initializer with ENV' do
+      expect(destination_root).to have_structure {
+        directory 'config' do
+          directory 'initializers' do
+            file 'rollbar.rb' do
+              contains "config.access_token = ENV\['ROLLBAR_ACCESS_TOKEN'\]"
+            end
+          end
+        end
       }
     end
   end
 
-  with_args 'aaaabbbbccccddddeeeeffff00001111' do
-    it "generates a Rollbar initializer with access token" do
-      subject.should generate("config/initializers/rollbar.rb") do |content|
-        content.should =~ /aaaabbbbccccddddeeeeffff00001111/
-        content.should =~ /config.access_token = 'aaaabbbbccccddddeeeeffff00001111'/
-      end
+  context 'with arguments' do
+    before do
+      run_generator(%w(aaaabbbbccccddddeeeeffff00001111))
+    end
+
+    it 'generates a Rollbar initializer with access token' do
+      expect(destination_root).to have_structure {
+        directory 'config' do
+          directory 'initializers' do
+            file 'rollbar.rb' do
+              contains 'aaaabbbbccccddddeeeeffff00001111'
+              contains "config.access_token = 'aaaabbbbccccddddeeeeffff00001111'"
+            end
+          end
+        end
+      }
     end
   end
-end
+end unless Rails::VERSION::STRING.start_with?('3.0')

data/spec/rollbar/active_job_spec.rb

@@ -18,6 +18,8 @@ describe Rollbar::ActiveJob do
     end
   end
 
+  before { reconfigure_notifier }
+
   let(:exception) { StandardError.new('oh no') }
   let(:job_id) { "123" }
 

data/spec/rollbar/js/middleware_spec.rb

@@ -28,6 +28,7 @@ END
   let(:content_type) { 'text/html' }
 
   before do
+    reconfigure_notifier
     allow(subject).to receive(:js_snippet).and_return(snippet)
   end
 

data/spec/rollbar/logger_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+require 'rollbar/logger'
+
+describe Rollbar::Logger do
+  describe '#add' do
+    context 'with severity under level' do
+      it 'returns true' do
+        result = subject.add(Logger::DEBUG, 'foo')
+
+        expect(result).to be_truthy
+      end
+    end
+
+    context 'with blank message' do
+      it 'returns true' do
+        result = subject.add(subject.level)
+
+        expect(result).to be_truthy
+      end
+    end
+
+    context 'with ERROR severity' do
+      let(:message) { 'foo' }
+
+      it 'calls Rollbar to send the message' do
+        expect_any_instance_of(Rollbar::Notifier).to receive(:log).with(:error, message)
+
+        subject.add(Logger::ERROR, message)
+      end
+    end
+
+    context 'with FATAL severity' do
+      let(:message) { 'foo' }
+
+      it 'calls Rollbar to send the message with critical level' do
+        expect_any_instance_of(Rollbar::Notifier).to receive(:log).with(:critical, message)
+
+        subject.add(Logger::FATAL, message)
+      end
+    end
+
+    context 'with UNKNOWN severity' do
+      let(:message) { 'foo' }
+
+      it 'calls Rollbar to send the message with error level' do
+        expect_any_instance_of(Rollbar::Notifier).to receive(:log).with(:error, message)
+
+        subject.add(Logger::UNKNOWN, message)
+      end
+    end
+
+    context 'with out of range severity' do
+      let(:message) { 'foo' }
+
+      it 'calls Rollbar to send the message with error level' do
+        expect_any_instance_of(Rollbar::Notifier).to receive(:log).with(:error, message)
+
+        subject.add(10, message)
+      end
+    end
+  end
+
+  describe '#<<' do
+    let(:message) { 'foo' }
+
+    it 'calls #error' do
+      expect(subject).to receive(:error).with(message)
+
+      subject << message
+    end
+  end
+
+  describe '#formatter=' do
+    it 'fails with FormatterNotSupported' do
+      expect do
+        subject.formatter = double
+      end.to raise_error(Rollbar::Logger::FormatterNotSupported)
+    end
+  end
+
+  describe '#formatter' do
+    it 'fails with FormatterNotSupported' do
+      expect do
+        subject.formatter
+      end.to raise_error(Rollbar::Logger::FormatterNotSupported)
+    end
+  end
+
+  describe '#datetime_format=' do
+    it 'fails with DatetimeFormatNotSupported' do
+      expect do
+        subject.datetime_format = double
+      end.to raise_error(Rollbar::Logger::DatetimeFormatNotSupported)
+    end
+  end
+
+  describe '#datetime_format' do
+    it 'fails with DatetimeFormatNotSupported' do
+      expect do
+        subject.datetime_format
+      end.to raise_error(Rollbar::Logger::DatetimeFormatNotSupported)
+    end
+  end
+
+  describe '#rollbar' do
+    it 'returns a Rollbar notifier with a logger pointing to /dev/null' do
+      notifier = subject.rollbar
+      logger = notifier.configuration.logger
+      logdev = logger.instance_eval { @logdev }
+
+      expect(logdev.filename).to be_eql('/dev/null')
+    end
+  end
+end

data/spec/rollbar/sidekig/clear_scope_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+unless RUBY_VERSION == '1.8.7'
+  require 'sidekiq'
+  require 'rollbar/sidekiq'
+end
+
+describe Rollbar::Sidekiq::ClearScope, :reconfigure_notifier => false do
+  describe '#call' do
+    let(:middleware_block) { proc{} }
+
+    it 'sends the error to Rollbar::Sidekiq.handle_exception' do
+      expect(Rollbar).to receive(:reset_notifier!)
+
+      subject.call(nil, nil, nil, &middleware_block)
+    end
+  end
+end unless RUBY_VERSION == '1.8.7'

data/spec/rollbar/sidekiq_spec.rb

@@ -59,7 +59,7 @@ describe Rollbar::Sidekiq, :reconfigure_notifier => false do
 
         described_class.handle_exception(msg_or_context, exception)
       end
-      
+
       it 'does not blow up and sends the error to rollbar if retry is true but there is no retry count' do
         allow(Rollbar).to receive(:scope).and_return(rollbar)
         expect(rollbar).to receive(:error)
@@ -70,7 +70,7 @@ describe Rollbar::Sidekiq, :reconfigure_notifier => false do
           described_class.handle_exception(msg_or_context, exception)
         }.to_not raise_error
       end
-      
+
     end
   end
 
@@ -82,6 +82,7 @@ describe Rollbar::Sidekiq, :reconfigure_notifier => false do
     subject { Rollbar::Sidekiq.new }
 
     it 'sends the error to Rollbar::Sidekiq.handle_exception' do
+      expect(Rollbar).to receive(:reset_notifier!)
       expect(Rollbar::Sidekiq).to receive(:handle_exception).with(msg, exception)
 
       expect { subject.call(nil, msg, nil, &middleware_block) }.to raise_error(exception)

data/spec/rollbar_spec.rb

@@ -678,13 +678,17 @@ describe Rollbar do
       end
 
       it 'should include project_gem_paths' do
+        gems = Gem::Specification.map(&:name)
+        project_gems = ['rails']
+        project_gems << 'rspec' if gems.include?('rspec')
+        project_gems << 'rspec-core' if gems.include?('rspec-core')
+
         notifier.configure do |config|
-          config.project_gems = ['rails', 'rspec']
+          config.project_gems = project_gems
         end
 
         payload = notifier.send(:build_payload, 'info', 'message', nil, nil)
-
-        expect(payload['data'][:project_package_paths].count).to eq 2
+        expect(payload['data'][:project_package_paths].count).to eq(project_gems.size)
       end
 
       it 'should include a code_version' do

data/spec/spec_helper.rb

@@ -1,10 +1,24 @@
+begin
+  require 'simplecov'
+  require 'codeclimate-test-reporter'
+
+  SimpleCov.start do
+    add_filter '/spec/'
+
+    formatter SimpleCov::Formatter::MultiFormatter.new([
+      SimpleCov::Formatter::HTMLFormatter,
+      CodeClimate::TestReporter::Formatter
+    ])
+  end
+rescue LoadError
+end
+
 require 'rubygems'
 
 ENV['RAILS_ENV'] = ENV['RACK_ENV'] = 'test'
 require File.expand_path('../dummyapp/config/environment', __FILE__)
 require 'rspec/rails'
 require 'database_cleaner'
-require 'genspec'
 
 namespace :dummy do
   load 'spec/dummyapp/Rakefile'
@@ -45,5 +59,6 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.infer_spec_type_from_file_location! if config.respond_to?(:infer_spec_type_from_file_location!)
   config.backtrace_exclusion_patterns = [/gems\/rspec-.*/]
 end

metadata

@@ -1,183 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.9.0
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: girl_friday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-- !ruby/object:Gem::Dependency
-  name: sucker_punch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-- !ruby/object:Gem::Dependency
-  name: genspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: delayed_job
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '11'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.12.14
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.12.14
 description: Easy and powerful exception tracking for Ruby
 email:
 - support@rollbar.com
@@ -214,6 +32,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rubocop.yml"
@@ -269,6 +88,7 @@ files:
 - lib/rollbar/json/oj.rb
 - lib/rollbar/language_support.rb
 - lib/rollbar/lazy_store.rb
+- lib/rollbar/logger.rb
 - lib/rollbar/logger_proxy.rb
 - lib/rollbar/middleware/rack/builder.rb
 - lib/rollbar/middleware/rack/test_session.rb
@@ -361,6 +181,7 @@ files:
 - spec/fixtures/payloads/message.json
 - spec/fixtures/payloads/sample.trace.json
 - spec/fixtures/payloads/sample.trace_chain.json
+- spec/generators/rollbar/rollbar_generator_rails30_spec.rb
 - spec/generators/rollbar/rollbar_generator_spec.rb
 - spec/requests/home_spec.rb
 - spec/rollbar/active_job_spec.rb
@@ -377,11 +198,13 @@ files:
 - spec/rollbar/json_spec.rb
 - spec/rollbar/lazy_store_spec.rb
 - spec/rollbar/logger_proxy_spec.rb
+- spec/rollbar/logger_spec.rb
 - spec/rollbar/middleware/rack/builder_spec.rb
 - spec/rollbar/middleware/sinatra_spec.rb
 - spec/rollbar/rake_spec.rb
 - spec/rollbar/request_data_extractor_spec.rb
 - spec/rollbar/scrubbers/url_spec.rb
+- spec/rollbar/sidekig/clear_scope_spec.rb
 - spec/rollbar/sidekiq_spec.rb
 - spec/rollbar/truncation/frames_strategy_spec.rb
 - spec/rollbar/truncation/min_body_strategy_spec.rb
@@ -488,6 +311,7 @@ test_files:
 - spec/fixtures/payloads/message.json
 - spec/fixtures/payloads/sample.trace.json
 - spec/fixtures/payloads/sample.trace_chain.json
+- spec/generators/rollbar/rollbar_generator_rails30_spec.rb
 - spec/generators/rollbar/rollbar_generator_spec.rb
 - spec/requests/home_spec.rb
 - spec/rollbar/active_job_spec.rb
@@ -504,11 +328,13 @@ test_files:
 - spec/rollbar/json_spec.rb
 - spec/rollbar/lazy_store_spec.rb
 - spec/rollbar/logger_proxy_spec.rb
+- spec/rollbar/logger_spec.rb
 - spec/rollbar/middleware/rack/builder_spec.rb
 - spec/rollbar/middleware/sinatra_spec.rb
 - spec/rollbar/rake_spec.rb
 - spec/rollbar/request_data_extractor_spec.rb
 - spec/rollbar/scrubbers/url_spec.rb
+- spec/rollbar/sidekig/clear_scope_spec.rb
 - spec/rollbar/sidekiq_spec.rb
 - spec/rollbar/truncation/frames_strategy_spec.rb
 - spec/rollbar/truncation/min_body_strategy_spec.rb