rollbar 2.16.2 → 2.22.1

data/gemfiles/rails42.gemfile

@@ -2,22 +2,23 @@ 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
 
 gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '4.2.7.1'
+gem 'rails', '4.2.8'
 gem 'rake'
 gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
-
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '>= 2.13.0', '< 5.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
+gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 platforms :rbx do
   gem 'minitest'
@@ -26,17 +27,25 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
 end
 
-if RUBY_VERSION.start_with?('2.4') && is_not_jruby
-  gem 'oj', '~> 2.16.0'
-elsif is_not_jruby
-  gem 'oj', '~> 2.12.14'
+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
 
-gem 'codeclimate-test-reporter', :group => :test, :require => nil
 gem 'database_cleaner', '~> 1.0.0'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
+gem 'rspec-command'
 gem 'redis'
 gem 'resque'
 gem 'sinatra'
@@ -51,9 +60,10 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
 else
   gem 'sucker_punch', '~> 2.0'
   gem 'webmock', :require => false
+  gem 'codacy-coverage'
+  gem 'simplecov'
 end
 
 gem 'aws-sdk-sqs'
-gem 'shoryuken'
 
 gemspec :path => '../'

data/gemfiles/rails50.gemfile

@@ -2,13 +2,20 @@ 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 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+gem 'rails', '~> 5.0.7'
+gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-core', '~> 3.5.0.beta3'
 gem 'rspec-rails', '~> 3.5.0.beta3'
@@ -18,12 +25,7 @@ gem 'rspec-mocks', '~> 3.5.0.beta3'
 
 gem 'rake'
 
-gem 'oj', '~> 2.12.14' unless is_jruby
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '>= 2.13.0', '< 5.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
+gem 'sidekiq', '>= 2.13.0'
 
 platforms :rbx do
   gem 'minitest'
@@ -33,22 +35,29 @@ 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'
-
-gem 'codeclimate-test-reporter', :group => :test, :require => nil
-gem 'database_cleaner', '~> 1.x'
+gem 'database_cleaner'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
 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,13 +2,20 @@ 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 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+gem 'rails', '~> 5.1.7'
+gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-core', '~> 3.5.0.beta3'
 gem 'rspec-rails', '~> 3.5.0.beta3'
@@ -18,12 +25,7 @@ gem 'rspec-mocks', '~> 3.5.0.beta3'
 
 gem 'rake'
 
-gem 'oj', '~> 2.16.1' unless is_jruby
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '>= 2.13.0', '< 5.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
+gem 'sidekiq', '>= 2.13.0'
 
 platforms :rbx do
   gem 'minitest'
@@ -33,22 +35,30 @@ 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'
 
-gem 'codeclimate-test-reporter', :group => :test, :require => nil
-gem 'database_cleaner', '~> 1.x'
+gem 'database_cleaner'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
 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

@@ -0,0 +1,65 @@
+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.3'
+gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
+
+gem 'rspec-core', '~> 3.8.0'
+gem 'rspec-rails', '~> 3.8.0'
+gem 'rspec-support', '~> 3.8.0'
+gem 'rspec-expectations', '~> 3.8.0'
+gem 'rspec-mocks', '~> 3.8.0'
+
+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', :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/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.0.rc1'
+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

@@ -1,7 +1,10 @@
 require 'rails'
 require 'rollbar'
 
-APP_PATH = File.expand_path('config/application', Dir.pwd)
+# Rails.root is not present here.
+# RSpec needs ENV['DUMMYAPP_PATH'] in order to have a valid path.
+# Dir.pwd is used in normal operation.
+APP_PATH = File.expand_path('config/application', (ENV['DUMMYAPP_PATH'] || Dir.pwd))
 
 module Rails
   class RollbarRunner
@@ -36,6 +39,14 @@ module Rails
     end
 
     def eval_runner
+      if Rails.version >= '5.1.0'
+        rails5_runner
+      else
+        legacy_runner
+      end
+    end
+
+    def legacy_runner
       string_to_eval = File.read(runner_path)
 
       ::Rails.module_eval(<<-EOL, __FILE__, __LINE__ + 2)
@@ -43,9 +54,13 @@ module Rails
       EOL
     end
 
+    def rails5_runner
+      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.rb

@@ -1,7 +1,6 @@
 require 'net/protocol'
 require 'net/https'
 require 'socket'
-require 'thread'
 require 'uri'
 require 'open-uri'
 require 'forwardable'
@@ -22,10 +21,10 @@ require 'rollbar/notifier'
 # The Rollbar module. It stores a Rollbar::Notifier per thread and
 # provides some module methods in order to use the current thread notifier.
 module Rollbar
-  PUBLIC_NOTIFIER_METHODS = %w(debug info warn warning error critical log logger
+  PUBLIC_NOTIFIER_METHODS = %w[debug info warn warning error critical log logger
                                process_item process_from_async_handler scope
                                send_failsafe log_info log_debug log_warning
-                               log_error silenced scope_object).freeze
+                               log_error silenced scope_object].freeze
 
   class << self
     extend Forwardable

data/lib/rollbar/capistrano.rb

@@ -1,43 +1,77 @@
+# This is a tasks file to use with Capistrano 2
+
 require 'capistrano'
+require 'rollbar/deploy'
+require 'net/http'
+require 'rubygems'
+require 'json'
+require 'rollbar/capistrano_tasks'
 
 module Rollbar
-  module Capistrano
-    def self.load_into(configuration)
-      configuration.load do
-        after 'deploy',            'rollbar:deploy'
-        after 'deploy:migrations', 'rollbar:deploy'
-        after 'deploy:cold',       'rollbar:deploy'
-
-        namespace :rollbar do
-          desc 'Send the deployment notification to Rollbar.'
-          task :deploy, :except => { :no_release => true } do
-            require 'net/http'
-            require 'rubygems'
-            require 'json'
-
-            _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'") }
-
-            unless configuration.dry_run
-              uri = URI.parse('https://api.rollbar.com/api/1/deploy/')
-
-              params = {
-                :local_username => rollbar_user,
-                :access_token => rollbar_token,
-                :environment => rollbar_env,
-                :revision => current_revision
-              }
-
-              request = Net::HTTP::Post.new(uri.request_uri)
-              request.body = ::JSON.dump(params)
-
-              Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-                http.request(request)
-              end
-            end
+  # Module for loading Rollbar Capistrano tasks into Capistrano 2
+  module Capistrano2
+    class << self
+      def load_into(configuration)
+        load_tasks(configuration)
+        load_tasks_flow(configuration)
+        load_properties(configuration)
+      end
+
+      private
+
+      def load_tasks_flow(configuration)
+        configuration.load do
+          before 'deploy', 'rollbar:deploy_started'
+
+          after 'deploy', 'rollbar:deploy_succeeded'
+          after 'deploy:migrations', 'rollbar:deploy_succeeded'
+          after 'deploy:cold',       'rollbar:deploy_succeeded'
+        end
+      end
+
+      def load_properties(configuration)
+        configuration.load do
+          _cset(:rollbar_role)  { :app }
+          _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_comment) { nil }
+        end
+      end
 
-            logger.info('Rollbar notification complete')
+      def load_tasks(configuration)
+        load_deploy_started(configuration)
+        load_deploy_succeeded(configuration)
+      end
+
+      def load_deploy_started(configuration)
+        load_task(
+          :desc => 'Send deployment started notification to Rollbar.',
+          :task => :deploy_started,
+          :configuration => configuration
+        ) do
+          ::Rollbar::CapistranoTasks.deploy_started(configuration, configuration.logger, configuration.dry_run)
+        end
+      end
+
+      def load_deploy_succeeded(configuration)
+        load_task(
+          :desc => 'Send deployment succeeded notification to Rollbar.',
+          :task => :deploy_succeeded,
+          :configuration => configuration
+        ) do
+          ::Rollbar::CapistranoTasks.deploy_succeeded(configuration, configuration.logger, configuration.dry_run)
+        end
+      end
+
+      def load_task(configuration:, desc:, task:)
+        configuration.load do
+          namespace :rollbar do
+            desc(desc)
+            task(task) do
+              yield
+            end
           end
         end
       end
@@ -45,6 +79,4 @@ module Rollbar
   end
 end
 
-if Capistrano::Configuration.instance
-  Rollbar::Capistrano.load_into(Capistrano::Configuration.instance)
-end
+Rollbar::Capistrano2.load_into(Capistrano::Configuration.instance) if Capistrano::Configuration.instance