rollbar 1.4.4 → 1.4.5

data/.travis.yml

@@ -30,10 +30,18 @@ matrix:
       gemfile: gemfiles/rails40.gemfile
     - rvm: 1.8.7
       gemfile: gemfiles/rails41.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails32.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails31.gemfile
     - rvm: 1.9.2
       gemfile: gemfiles/rails40.gemfile
     - rvm: 1.9.2
       gemfile: gemfiles/rails41.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails32.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails31.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/rails41.gemfile
     - rvm: ruby-head

data/Appraisals

@@ -7,13 +7,13 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
-  gem "rails", "3.2.17"
+  gem "rails", "3.2.21"
 end
 
 appraise "rails40" do
-  gem "rails", "4.0.4"
+  gem "rails", "4.0.13"
 end
 
 appraise "rails41" do
-  gem "rails", "4.1.0"
+  gem "rails", "4.1.9"
 end

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.4.5
+
+Bug fixes:
+
+- Fixed internal error reporting IpSpoofAttackErrors. See [#233](https://github.com/rollbar/rollbar-gem/pull/233)
+- Removed duplicated `schedule_payload` definition. See [#231](https://github.com/rollbar/rollbar-gem/pull/231)
+
+
 ## 1.4.4
 
 New features:

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v1.4.4)](https://travis-ci.org/rollbar/rollbar-gem/branches)
+# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v1.4.5)](https://travis-ci.org/rollbar/rollbar-gem/branches)
 
 <!-- RemoveNext -->
 Ruby gem for reporting exceptions, errors, and log messages to [Rollbar](https://rollbar.com).
@@ -9,7 +9,7 @@ Ruby gem for reporting exceptions, errors, and log messages to [Rollbar](https:/
 
 Add this line to your application's Gemfile:
 
-    gem 'rollbar', '~> 1.4.4'
+    gem 'rollbar', '~> 1.4.5'
 
 And then execute:
 
@@ -535,6 +535,39 @@ config.filepath = '/path/to/file.rollbar' #should end in '.rollbar' for use with
 
 For this to work, you'll also need to set up rollbar-agent--see its docs for details.
 
+## Rails booting process
+
+Rails doesn't provide a way to hook into its booting process, so we can't catch errors during boot out of the box. To report these errors to Rollbar, make the following changes to your project files.
+
+First, move your `config/initializers/rollbar.rb` file to `config/rollbar.rb`. Then be sure your `config/environment.rb` looks similar to this:
+
+```ruby
+# config/environment.rb
+
+require File.expand_path('../application', __FILE__)
+require File.expand_path('../rollbar', __FILE__)
+
+begin
+  Rails.application.initialize!
+rescue Exception => e
+  Rollbar.error(e)
+  raise
+end
+```
+
+How this works: first, Rollbar config (which is now at `config/rollbar.rb` is required). Later, `Rails.application/initialize` statement is wrapped with a `begin/rescue` and any exceptions within will be reported to Rollbar.
+
+## Rails runner command
+
+We aren't able to instrument `rails runner` directly, but we do provide a wrapper, `rollbar-rails-runner`, which you can use to capture errors when running commands in a `rails runner`-like way. For example:
+
+```shell
+$ bundle exec rollbar-rails-runner 'puts User.count'
+45
+```
+
+If an error occurs during that command, the exception will be reported to Rollbar.
+
 ## Deploy Tracking with Capistrano
 
 ### Capistrano 3

data/bin/rollbar-rails-runner

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'rollbar/rails_runner'
+
+Rollbar::RailsRunner.new.run

data/gemfiles/rails30.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jruby-openssl", :platform => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "appraisal"
+gem "appraisal", '= 1.0.2'
 gem "rubysl", "~> 2.0", :platform => :rbx
 gem "racc", :platform => :rbx
 gem "minitest", :platform => :rbx

data/gemfiles/rails31.gemfile

@@ -5,13 +5,12 @@ source "https://rubygems.org"
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jruby-openssl", :platform => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "appraisal"
+gem "appraisal", '= 1.0.2'
 gem "rubysl", "~> 2.0", :platform => :rbx
 gem "racc", :platform => :rbx
 gem "minitest", :platform => :rbx
 gem "rubysl-test-unit", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "3.1.12"
-gem 'i18n', '~> 0.6.0'
 
 gemspec :path => "../"

data/gemfiles/rails32.gemfile

@@ -11,7 +11,6 @@ gem "racc", :platform => :rbx
 gem "minitest", :platform => :rbx
 gem "rubysl-test-unit", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
-gem "rails", "3.2.17"
-gem 'i18n', '~> 0.6.0'
+gem "rails", "3.2.21"
 
 gemspec :path => "../"

data/gemfiles/rails40.gemfile

@@ -11,6 +11,6 @@ gem "racc", :platform => :rbx
 gem "minitest", :platform => :rbx
 gem "rubysl-test-unit", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
-gem "rails", "4.0.4"
+gem "rails", "4.0.13"
 
 gemspec :path => "../"

data/gemfiles/rails41.gemfile

@@ -10,6 +10,6 @@ gem "rubysl", "~> 2.0", :platform => :rbx
 gem "racc", :platform => :rbx
 gem "minitest", :platform => :rbx
 gem "rubinius-developer_tools", :platform => :rbx
-gem "rails", "4.1.0"
+gem "rails", "4.1.9"
 
 gemspec :path => "../"

data/lib/rollbar.rb

@@ -14,9 +14,8 @@ require 'rollbar/version'
 require 'rollbar/configuration'
 require 'rollbar/logger_proxy'
 require 'rollbar/exception_reporter'
-require 'rollbar/active_record_extension' if defined?(ActiveRecord)
 require 'rollbar/util'
-require 'rollbar/railtie' if defined?(Rails)
+require 'rollbar/railtie' if defined?(Rails::VERSION)
 require 'rollbar/delay/girl_friday'
 require 'rollbar/delay/thread'
 require 'rollbar/truncation'
@@ -451,26 +450,6 @@ module Rollbar
 
     ## Delivery functions
 
-    def schedule_payload(payload)
-      log_info '[Rollbar] Scheduling payload'
-
-      if configuration.use_async
-        unless configuration.async_handler
-          configuration.async_handler = method(:default_async_handler)
-        end
-
-        if configuration.write_to_file
-          unless @file_semaphore
-            @file_semaphore = Mutex.new
-          end
-        end
-
-        configuration.async_handler.call(payload)
-      else
-        process_payload(payload)
-      end
-    end
-
     def send_payload_using_eventmachine(payload)
       body = dump_payload(payload)
       headers = { 'X-Rollbar-Access-Token' => payload['access_token'] }
@@ -718,6 +697,7 @@ module Rollbar
       return if configuration.disable_monkey_patch
       wrap_delayed_worker
 
+      require 'rollbar/active_record_extension' if defined?(ActiveRecord)
       require 'rollbar/sidekiq' if defined?(Sidekiq)
       require 'rollbar/goalie' if defined?(Goalie)
       require 'rollbar/rack' if defined?(Rack)

data/lib/rollbar/rails_runner.rb

@@ -0,0 +1,72 @@
+require 'rails'
+require 'rollbar'
+
+APP_PATH = File.expand_path('config/application', Dir.pwd)
+
+module Rollbar
+  class RailsRunner
+    class GemResolver
+      def railties_gem
+        Gem::Specification.find_by_name('railties')
+      end
+    end
+
+    class LegacyGemResolver
+      def railties_gem
+        searcher = Gem::GemPathSearcher.new
+        searcher.find('rails')
+      end
+    end
+
+    attr_reader :command
+
+    def initialize
+      @command = ARGV[0]
+    end
+
+    def run
+      prepare_environment
+
+      rollbar_managed { eval_runner }
+    end
+
+    def prepare_environment
+      require File.expand_path('../environment', APP_PATH)
+      ::Rails.application.require_environment!
+    end
+
+    def eval_runner
+      string_to_eval = File.read(runner_path)
+
+      Module.module_eval(<<-EOL,__FILE__,__LINE__ + 2)
+          #{string_to_eval}
+      EOL
+    end
+
+    def rollbar_managed
+      yield
+    rescue => e
+      Rollbar.scope(:custom => { :command => command }).error(e)
+      raise
+    end
+
+    def runner_path
+      railties_gem_dir + '/lib/rails/commands/runner.rb'
+    end
+
+    def railties_gem
+      resolver_class = Gem::Specification.respond_to?(:find_by_name) ? GemResolver : LegacyGemResolver
+      gem = resolver_class.new.railties_gem
+
+      abort 'railties gem not found' unless gem
+
+      gem
+    end
+
+    def railties_gem_dir
+      railties_gem.gem_dir
+    end
+  end
+end
+
+

data/lib/rollbar/railtie.rb

@@ -29,7 +29,7 @@ module Rollbar
 
     config.after_initialize do
       Rollbar.preconfigure do |config|
-        config.logger ||= ::Rails.logger
+        config.default_logger = proc { ::Rails.logger }
         config.environment ||= ::Rails.env
         config.root ||= ::Rails.root
         config.framework = "Rails: #{::Rails::VERSION::STRING}"

data/lib/rollbar/request_data_extractor.rb

@@ -99,6 +99,8 @@ module Rollbar
 
     def rollbar_user_ip(env)
       (env['action_dispatch.remote_ip'] || env['HTTP_X_REAL_IP'] || env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR']).to_s
+    rescue
+      nil
     end
 
     def rollbar_get_params(rack_req)

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

data/rollbar.gemspec

@@ -5,6 +5,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Rollbar, Inc."]
   gem.email         = ["support@rollbar.com"]
   gem.description   = %q{Rails plugin to catch and send exceptions to Rollbar}
+  gem.executables   = ['rollbar-rails-runner']
   gem.summary       = %q{Reports exceptions to Rollbar}
   gem.homepage      = "https://github.com/rollbar/rollbar-gem"
   gem.license       = 'MIT'

data/spec/controllers/home_controller_spec.rb

@@ -339,6 +339,16 @@ describe HomeController do
     end
   end
 
+  context 'with ip parsing raising error' do
+    it 'raise a IpSpoofAttackError exception' do
+      controller.request.env['action_dispatch.remote_ip'] = GetIpRaising.new
+
+      expect do
+        expect(controller.send(:rollbar_request_data)[:user_ip]).to be_nil
+      end.not_to raise_exception(GetIpRaising::IpSpoofAttackError)
+    end
+  end
+
   after(:each) do
     Rollbar.configure do |config|
       config.logger = ::Rails.logger

data/spec/support/get_ip_raising.rb

@@ -0,0 +1,7 @@
+class GetIpRaising
+  class IpSpoofAttackError < StandardError; end
+
+  def to_s
+    raise IpSpoofAttackError, 'spoofing IP!'
+  end
+end

metadata

@@ -1,187 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
+  prerelease: 
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7871420 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *7871420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7869800 !ruby/object:Gem::Requirement
+    none: false
     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
+  version_requirements: *7869800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7818380 !ruby/object:Gem::Requirement
+    none: false
     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
+  version_requirements: *7818380
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7817420 !ruby/object:Gem::Requirement
+    none: false
     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
+  version_requirements: *7817420
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7816620 !ruby/object:Gem::Requirement
+    none: false
     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
+  version_requirements: *7816620
 - !ruby/object:Gem::Dependency
   name: sucker_punch
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7815720 !ruby/object:Gem::Requirement
+    none: false
     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
+  version_requirements: *7815720
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7814720 !ruby/object:Gem::Requirement
+    none: false
     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
+  version_requirements: *7814720
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7813460 !ruby/object:Gem::Requirement
+    none: false
     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
+  version_requirements: *7813460
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7811380 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7811380
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7756540 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7756540
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7755160 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7755160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7754120 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+  version_requirements: *7754120
 description: Rails plugin to catch and send exceptions to Rollbar
 email:
 - support@rollbar.com
-executables: []
+executables:
+- rollbar-rails-runner
 extensions: []
 extra_rdoc_files: []
 files:
@@ -196,6 +162,7 @@ files:
 - THANKS.md
 - UPGRADE_FROM_RATCHET.md
 - UPGRADING.md
+- bin/rollbar-rails-runner
 - gemfiles/rails30.gemfile
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
@@ -227,6 +194,7 @@ files:
 - lib/rollbar/rack.rb
 - lib/rollbar/rails.rb
 - lib/rollbar/rails/controller_methods.rb
+- lib/rollbar/rails_runner.rb
 - lib/rollbar/railtie.rb
 - lib/rollbar/rake.rb
 - lib/rollbar/rake_tasks.rb
@@ -320,31 +288,33 @@ files:
 - spec/spec_helper.rb
 - spec/support/cause_exception.rb
 - spec/support/fixture_helpers.rb
+- spec/support/get_ip_raising.rb
 - spec/support/notifier_helpers.rb
 - spec/support/shared_contexts.rb
 homepage: https://github.com/rollbar/rollbar-gem
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Reports exceptions to Rollbar
 test_files:
 - spec/controllers/home_controller_spec.rb
@@ -424,5 +394,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/cause_exception.rb
 - spec/support/fixture_helpers.rb
+- spec/support/get_ip_raising.rb
 - spec/support/notifier_helpers.rb
 - spec/support/shared_contexts.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 78c1bdf59f142827061ca417def8b9e593aaa877
-  data.tar.gz: 760a27633c4e7460602c81c506e71028f9a29bfb
-SHA512:
-  metadata.gz: 8ce84b0b7705beaa2bea77b2ff23f5ecf187ed98e52e29d0123b205e51d3591e561193b38baa1eaf0b95e16a5bc04983fb07fa91db1841913005407e9fb5108b
-  data.tar.gz: 8a7ce81a92a3ff906e08e6a489a29f8e99dab6cb997928b7ddc7f74f0175ffa9d4e54facb942d61ddbd10ce305b92376897689b557ae740d9a09cd0f563853b1