rollbar 2.19.1 → 2.27.1

data/gemfiles/rails31.gemfile

@@ -2,6 +2,13 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
 gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
@@ -12,15 +19,7 @@ gem 'rails', '3.1.12'
 gem 'rspec-rails', '~> 3.4'
 gem 'rake'
 
-unless is_jruby
-  if RUBY_VERSION >= '2.4.0'
-    gem 'oj', '~> 2.16.1'
-  else
-    gem 'oj', '~> 2.12.14'
-  end
-end
-
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
+if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
 else
   gem 'sidekiq', '>= 2.13.0'
@@ -35,9 +34,11 @@ platforms :rbx do
 end
 
 if RUBY_VERSION.start_with?('1.9')
+  gem 'capistrano', '<= 3.4.1', :require => false
   gem 'sucker_punch'
   gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
 elsif RUBY_VERSION.start_with?('2')
+  gem 'capistrano', :require => false
   gem 'sucker_punch'
   gem 'shoryuken'
   gem 'codacy-coverage'

data/gemfiles/rails32.gemfile

@@ -2,6 +2,13 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
 gem 'appraisal'
@@ -14,15 +21,7 @@ gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 # Please see https://github.com/rspec/rspec-rails/issues/1273
 gem 'test-unit'
 
-unless is_jruby
-  if RUBY_VERSION >= '2.4.0'
-    gem 'oj', '~> 2.16.1'
-  else
-    gem 'oj', '~> 2.12.14'
-  end
-end
-
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
+if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
 else
   gem 'sidekiq', '>= 2.13.0'
@@ -37,9 +36,11 @@ platforms :rbx do
 end
 
 if RUBY_VERSION.start_with?('1.9')
+  gem 'capistrano', '<= 3.4.1', :require => false
   gem 'sucker_punch', '~> 1.0'
   gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
 elsif RUBY_VERSION.start_with?('2')
+  gem 'capistrano', :require => false
   gem 'sucker_punch', '~> 2.0'
   gem 'shoryuken'
   gem 'codacy-coverage'

data/gemfiles/rails40.gemfile

@@ -2,6 +2,13 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
 gem 'appraisal'
@@ -14,15 +21,7 @@ gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 # Please see https://github.com/rspec/rspec-rails/issues/1273
 gem 'test-unit'
 
-unless is_jruby
-  if RUBY_VERSION >= '2.4.0'
-    gem 'oj', '~> 2.16.1'
-  else
-    gem 'oj', '~> 2.12.14'
-  end
-end
-
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
+if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
 else
   gem 'sidekiq', '>= 2.13.0'
@@ -37,10 +36,12 @@ platforms :rbx do
 end
 
 if RUBY_VERSION.start_with?('1.9')
+  gem 'capistrano', '<= 3.4.1', :require => false
   gem 'sucker_punch', '~> 1.0'
   gem 'json', '~> 1.8'
   gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
 elsif RUBY_VERSION.start_with?('2')
+  gem 'capistrano', :require => false
   gem 'sucker_punch', '~> 2.0'
   gem 'json', '~> 2.0'
   gem 'shoryuken'

data/gemfiles/rails41.gemfile

@@ -2,6 +2,13 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
 gem 'appraisal'
@@ -12,15 +19,7 @@ gem 'rake'
 gem 'rspec-rails', '~> 3.4'
 gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
-unless is_jruby
-  if RUBY_VERSION >= '2.4.0'
-    gem 'oj', '~> 2.16.1'
-  else
-    gem 'oj', '~> 2.12.14'
-  end
-end
-
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
+if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
 else
   gem 'sidekiq', '>= 2.13.0'
@@ -34,9 +33,11 @@ platforms :rbx do
 end
 
 if RUBY_VERSION.start_with?('1.9')
+  gem 'capistrano', '<= 3.4.1', :require => false
   gem 'sucker_punch', '~> 1.0'
   gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
 elsif RUBY_VERSION.start_with?('2')
+  gem 'capistrano', :require => false
   gem 'sucker_punch', '~> 2.0'
   gem 'shoryuken'
   gem 'codacy-coverage'

data/gemfiles/rails42.gemfile

@@ -2,6 +2,13 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 is_not_jruby = !is_jruby
 
@@ -20,25 +27,21 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
 end
 
-unless is_jruby
-  if RUBY_VERSION >= '2.5'
-    gem 'oj'
-  elsif RUBY_VERSION >= '2.4.0'
-    gem 'oj', '~> 2.16.1'
-  else
-    gem 'oj', '~> 2.12.14'
-  end
+if RUBY_VERSION < '2.0.0'
+  gem 'json', '1.8.6'
 end
 
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
+if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
 else
   gem 'sidekiq', '>= 2.13.0'
 end
 
 if RUBY_VERSION.start_with?('1.9')
+  gem 'capistrano', '<= 3.4.1', :require => false
   gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
 elsif RUBY_VERSION.start_with?('2')
+  gem 'capistrano', :require => false
   gem 'shoryuken'
 end
 

data/gemfiles/rails50.gemfile

@@ -2,12 +2,19 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
 gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '~> 5.0.0'
+gem 'rails', '~> 5.0.7'
 gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-core', '~> 3.5.0.beta3'
@@ -20,16 +27,6 @@ gem 'rake'
 
 gem 'sidekiq', '>= 2.13.0'
 
-unless is_jruby
-  if RUBY_VERSION >= '2.5'
-    gem 'oj'
-  elsif RUBY_VERSION >= '2.4.0'
-    gem 'oj', '~> 2.16.1'
-  else
-    gem 'oj', '~> 2.12.14'
-  end
-end
-
 platforms :rbx do
   gem 'minitest'
   gem 'racc'
@@ -38,23 +35,33 @@ platforms :rbx do
 end
 
 if RUBY_VERSION.start_with?('1.9')
+  gem 'capistrano', '<= 3.4.1', :require => false
   gem 'sucker_punch', '~> 1.0'
 elsif RUBY_VERSION.start_with?('2')
+  gem 'capistrano', :require => false
   gem 'sucker_punch', '~> 2.0'
   gem 'codacy-coverage'
   gem 'simplecov'
 end
 
-# We need last sinatra that uses rack 2.x
-gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
+  gem 'rack', '2.1.2'
+end
+
+# We need last sinatra that uses rack 2.1.x
+gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
 gem 'database_cleaner'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
 gem 'redis'
 gem 'resque'
 
+unless is_jruby
+  # JRuby doesn't support fork, which is required for this test helper.
+  gem 'rspec-command'
+end
+
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
   gem 'mime-types', '< 3.0'
 end

data/gemfiles/rails51.gemfile

@@ -2,12 +2,19 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
 gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '~> 5.1.0'
+gem 'rails', '~> 5.1.7'
 gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-core', '~> 3.5.0.beta3'
@@ -20,16 +27,6 @@ gem 'rake'
 
 gem 'sidekiq', '>= 2.13.0'
 
-unless is_jruby
-  if RUBY_VERSION >= '2.5'
-    gem 'oj'
-  elsif RUBY_VERSION >= '2.4.0'
-    gem 'oj', '~> 2.16.1'
-  else
-    gem 'oj', '~> 2.12.14'
-  end
-end
-
 platforms :rbx do
   gem 'minitest'
   gem 'racc'
@@ -38,24 +35,34 @@ platforms :rbx do
 end
 
 if RUBY_VERSION.start_with?('1.9')
+  gem 'capistrano', '<= 3.4.1', :require => false
   gem 'sucker_punch', '~> 1.0'
 elsif RUBY_VERSION.start_with?('2')
+  gem 'capistrano', :require => false
   gem 'sucker_punch', '~> 2.0'
   gem 'codacy-coverage'
   gem 'simplecov'
 end
 
-# We need last sinatra that uses rack 2.x
-gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
+  gem 'rack', '2.1.2'
+end
+
+# We need last sinatra that uses rack 2.1.x
+gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
 
 gem 'database_cleaner'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
 gem 'redis'
 gem 'resque'
 
+unless is_jruby
+  # JRuby doesn't support fork, which is required for this test helper.
+  gem 'rspec-command'
+end
+
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
   gem 'mime-types', '< 3.0'
 end

data/gemfiles/rails52.gemfile

@@ -2,12 +2,19 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
 gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '~> 5.2.0'
+gem 'rails', '~> 5.2.3'
 gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-core', '~> 3.8.0'
@@ -18,16 +25,6 @@ gem 'rspec-mocks', '~> 3.8.0'
 
 gem 'rake'
 
-unless is_jruby
-  if RUBY_VERSION >= '2.5'
-    gem 'oj'
-  elsif RUBY_VERSION >= '2.4.0'
-    gem 'oj', '~> 2.16.1'
-  else
-    gem 'oj', '~> 2.12.14'
-  end
-end
-
 gem 'sidekiq', '>= 2.13.0'
 
 platforms :rbx do
@@ -47,11 +44,15 @@ gem 'codacy-coverage'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
 gem 'redis'
 gem 'resque'
 gem 'simplecov'
 
+unless is_jruby
+  # JRuby doesn't support fork, which is required for this test helper.
+  gem 'rspec-command'
+end
+
 gem 'mime-types'
 
 gem 'webmock', :require => false
@@ -59,4 +60,6 @@ gem 'webmock', :require => false
 gem 'aws-sdk-sqs'
 gem 'shoryuken'
 
+gem 'capistrano', :require => false
+
 gemspec :path => '../'

data/gemfiles/rails60.gemfile

@@ -0,0 +1,67 @@
+
+require 'rubygems/version'
+
+source 'https://rubygems.org'
+
+# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
+# new process is created during tests. (Testing rake tasks, for example.)
+# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
+# We use the ||= assignment because Travis loads the gemfile twice, the second time
+# with the wrong gemfile path.
+ENV['CURRENT_GEMFILE'] ||= __FILE__
+
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
+gem 'appraisal'
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+gem 'jruby-openssl', :platform => :jruby
+gem 'rails', '6.0.2.1'
+gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
+
+gem 'rspec-core', '~> 3.8.0'
+gem 'rspec-support', '~> 3.8.0'
+gem 'rspec-expectations', '~> 3.8.0'
+gem 'rspec-mocks', '~> 3.8.0'
+# TODO: update this when 4.x becomes available on Rubygems
+gem 'rspec-rails', :git => 'https://github.com/rspec/rspec-rails', :ref => 'v4.0.0.beta2' # rubocop:disable Bundler/DuplicatedGem
+
+gem 'rake'
+
+gem 'sidekiq', '>= 2.13.0'
+
+platforms :rbx do
+  gem 'minitest'
+  gem 'racc'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
+end
+
+gem 'sucker_punch', '~> 2.0'
+
+# We need last sinatra that uses rack 2.x
+gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
+
+gem 'database_cleaner'
+gem 'codacy-coverage'
+gem 'delayed_job', '4.1.8.beta1', :require => false
+gem 'generator_spec'
+gem 'girl_friday', '>= 0.11.1'
+gem 'redis'
+gem 'resque'
+gem 'simplecov'
+
+unless is_jruby
+  # JRuby doesn't support fork, which is required for this test helper.
+  gem 'rspec-command'
+end
+
+gem 'mime-types'
+
+gem 'webmock', :require => false
+
+gem 'aws-sdk-sqs'
+gem 'shoryuken'
+
+gem 'capistrano', :require => false
+
+gemspec :path => '../'

data/lib/generators/rollbar/rollbar_generator.rb

@@ -52,7 +52,7 @@ module Rollbar
       end
 
       def access_token_configured?
-        File.exists?('config/initializers/rollbar.rb')
+        File.exist?('config/initializers/rollbar.rb')
       end
     end
   end

data/lib/rails/rollbar_runner.rb

@@ -39,7 +39,7 @@ module Rails
     end
 
     def eval_runner
-      if Rails.version >= '5.0.0'
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('5.1.0')
         rails5_runner
       else
         legacy_runner
@@ -55,12 +55,14 @@ module Rails
     end
 
     def rails5_runner
+      require 'rails/command'
+
       Rails::Command.invoke 'runner', ARGV
     end
 
     def rollbar_managed
       yield
-    rescue => e
+    rescue StandardError => e
       Rollbar.scope(:custom => { :command => command }).error(e)
       raise
     end

data/lib/rollbar/capistrano.rb

@@ -35,7 +35,7 @@ module Rollbar
           _cset(:rollbar_user)  { ENV['USER'] || ENV['USERNAME'] }
           _cset(:rollbar_env)   { fetch(:rails_env, 'production') }
           _cset(:rollbar_token) { abort("Please specify the Rollbar access token, set :rollbar_token, 'your token'") }
-          _cset(:rollbar_revision) { current_revision }
+          _cset(:rollbar_revision) { real_revision }
           _cset(:rollbar_comment) { nil }
         end
       end

data/lib/rollbar/capistrano3.rb

@@ -7,24 +7,27 @@ require 'rollbar/deploy'
 require 'rollbar/capistrano_tasks'
 
 namespace :rollbar do
+  # dry_run? wasn't introduced till Capistrano 3.5.0; use the old fetch(:sshkit_backed)
+  set :dry_run, (proc { ::Capistrano::Configuration.env.fetch(:sshkit_backend) == ::SSHKit::Backend::Printer })
+
   desc 'Send deployment started notification to Rollbar.'
   task :deploy_started do
     on primary fetch(:rollbar_role) do
-      ::Rollbar::CapistranoTasks.deploy_started(self, self, dry_run?)
+      ::Rollbar::CapistranoTasks.deploy_started(self, self, fetch(:dry_run))
     end
   end
 
   desc 'Send deployment succeeded notification to Rollbar.'
   task :deploy_succeeded do
     on primary fetch(:rollbar_role) do
-      ::Rollbar::CapistranoTasks.deploy_succeeded(self, self, dry_run?)
+      ::Rollbar::CapistranoTasks.deploy_succeeded(self, self, fetch(:dry_run))
     end
   end
 
   desc 'Send deployment failed notification to Rollbar.'
   task :deploy_failed do
     on primary fetch(:rollbar_role) do
-      ::Rollbar::CapistranoTasks.deploy_failed(self, self, dry_run?)
+      ::Rollbar::CapistranoTasks.deploy_failed(self, self, fetch(:dry_run))
     end
   end