rollbar 2.18.2 → 2.19.0

data/gemfiles/rails52.gemfile

@@ -0,0 +1,62 @@
+require 'rubygems/version'
+
+source 'https://rubygems.org'
+
+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 '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'
+
+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
+  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 'rspec-command'
+gem 'redis'
+gem 'resque'
+gem 'simplecov'
+
+gem 'mime-types'
+
+gem 'webmock', :require => false
+
+gem 'aws-sdk-sqs'
+gem 'shoryuken'
+
+gemspec :path => '../'

data/gemfiles/ruby_1_8_and_1_9_2.gemfile

@@ -11,7 +11,7 @@ gem 'jruby-openssl', :platform => :jruby
 gem 'rails', '3.0.20'
 gem 'rake', '< 11'
 gem 'rspec-rails', '>= 2.14.0'
-gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 gem 'oj', '~> 2.12.14' unless is_jruby
 if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
@@ -37,7 +37,7 @@ gem 'delayed_job', '4.1.3', :require => false
 gem 'genspec', '= 0.2.8'
 gem 'girl_friday', '>= 0.11.1'
 gem 'redis', '< 3.3.5'
-gem 'resque'
+gem 'resque', '< 2.0.0'
 gem 'sinatra'
 
 ruby_version = RUBY_VERSION.dup

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.0.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,6 +54,10 @@ module Rails
       EOL
     end
 
+    def rails5_runner
+      Rails::Command.invoke 'runner', ARGV
+    end
+
     def rollbar_managed
       yield
     rescue => e

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

data/lib/rollbar/capistrano3.rb

@@ -1 +1,53 @@
-load File.expand_path('../tasks/rollbar.cap', __FILE__)
+# This is a tasks file to use with Capistrano 3
+
+require 'net/http'
+require 'rubygems'
+require 'json'
+require 'rollbar/deploy'
+require 'rollbar/capistrano_tasks'
+
+namespace :rollbar do
+  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?)
+    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?)
+    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?)
+    end
+  end
+
+  task :fail do
+    raise StandardError
+  end
+end
+
+namespace :deploy do
+  after 'deploy:set_current_revision', 'rollbar:deploy_started'
+  after 'deploy:finished', 'rollbar:deploy_succeeded'
+  after 'deploy:failed', 'rollbar:deploy_failed'
+
+  # Used for testing :deploy_failed task
+  # after 'rollbar:deploy_started', 'rollbar:fail'
+end
+
+namespace :load do
+  task :defaults do
+    set :rollbar_user,      (proc { fetch :local_user, ENV['USER'] || ENV['USERNAME'] })
+    set :rollbar_env,       (proc { fetch :rails_env, 'production' })
+    set :rollbar_token,     (proc { abort "Please specify the Rollbar access token, set :rollbar_token, 'your token'" })
+    set :rollbar_role,      (proc { :app })
+    set :rollbar_revision,  (proc { fetch :current_revision })
+  end
+end

data/lib/rollbar/capistrano_tasks.rb

@@ -0,0 +1,131 @@
+require 'capistrano'
+require 'capistrano/version'
+require 'rollbar/deploy'
+
+module Rollbar
+  # Module containing the logic of Capistrano tasks for deploy tracking
+  module CapistranoTasks
+    class << self
+      def deploy_started(capistrano, logger, dry_run)
+        deploy_task(logger, :desc => 'Notifying Rollbar of deployment start') do
+          result = report_deploy_started(capistrano, dry_run)
+
+          info_request_response(logger, result)
+
+          capistrano.set(:rollbar_deploy_id, 123) if dry_run
+
+          skip_in_dry_run(logger, dry_run) do
+            if (deploy_id = result[:data][:deploy_id])
+              capistrano.set :rollbar_deploy_id, deploy_id
+            else
+              logger.error 'Unable to report deploy to Rollbar'
+            end
+          end
+        end
+      end
+
+      def deploy_succeeded(capistrano, logger, dry_run)
+        deploy_update(capistrano, logger, dry_run, :desc => 'Setting deployment status to `succeeded` in Rollbar') do
+          report_deploy_succeeded(capistrano, dry_run)
+        end
+      end
+
+      def deploy_failed(capistrano, logger, dry_run)
+        deploy_update(capistrano, logger, dry_run, :desc => 'Setting deployment status to `failed` in Rollbar') do
+          report_deploy_failed(capistrano, dry_run)
+        end
+      end
+
+      private
+
+      def deploy_task(logger, opts = {})
+        capistrano_300_warning(logger)
+        logger.info opts[:desc] if opts[:desc]
+        yield
+      end
+
+      def deploy_update(capistrano, logger, dry_run, opts = {})
+        deploy_task(logger, opts) do
+          depend_on_deploy_id(capistrano, logger) do
+            result = yield
+
+            info_request_response(logger, result)
+
+            skip_in_dry_run(logger, dry_run) do
+              if result[:response].is_a?(Net::HTTPSuccess)
+                logger.info 'Updated deploy status in Rollbar'
+              else
+                logger.error 'Unable to update deploy status in Rollbar'
+              end
+            end
+          end
+        end
+      end
+
+      def capistrano_300_warning(logger)
+        logger.warn("You need to upgrade capistrano to '>= 3.1' version in order to correctly report deploys to Rollbar. (On 3.0, the reported revision will be incorrect.)") if ::Capistrano::VERSION =~ /^3\.0/
+      end
+
+      def report_deploy_started(capistrano, dry_run)
+        ::Rollbar::Deploy.report(
+          {
+            :rollbar_username => capistrano.fetch(:rollbar_user),
+            :local_username => capistrano.fetch(:rollbar_user),
+            :comment => capistrano.fetch(:rollbar_comment),
+            :status => :started,
+            :proxy => :ENV,
+            :dry_run => dry_run
+          },
+          :access_token => capistrano.fetch(:rollbar_token),
+          :environment => capistrano.fetch(:rollbar_env),
+          :revision => capistrano.fetch(:rollbar_revision)
+        )
+      end
+
+      def report_deploy_succeeded(capistrano, dry_run)
+        ::Rollbar::Deploy.update(
+          {
+            :proxy => :ENV,
+            :dry_run => dry_run
+          },
+          :access_token => capistrano.fetch(:rollbar_token),
+          :deploy_id => capistrano.fetch(:rollbar_deploy_id),
+          :status => :succeeded
+        )
+      end
+
+      def report_deploy_failed(capistrano, dry_run)
+        ::Rollbar::Deploy.update(
+          {
+            :proxy => :ENV,
+            :dry_run => dry_run
+          },
+          :access_token => capistrano.fetch(:rollbar_token),
+          :deploy_id => capistrano.fetch(:rollbar_deploy_id),
+          :status => :failed
+        )
+      end
+
+      def depend_on_deploy_id(capistrano, logger)
+        if capistrano.fetch(:rollbar_deploy_id)
+          yield
+        else
+          logger.error 'Failed to update the deploy in Rollbar. No deploy id available.'
+        end
+      end
+
+      def skip_in_dry_run(logger, dry_run)
+        if dry_run
+          logger.info 'Skipping sending HTTP requests to Rollbar in dry run.'
+        else
+          yield
+        end
+      end
+
+      def info_request_response(logger, result)
+        logger.info result[:request_info]
+        logger.info result[:response_info] if result[:response_info]
+      end
+    end
+  end
+end

data/lib/rollbar/configuration.rb

@@ -107,7 +107,7 @@ module Rollbar
       @js_options = {}
       @scrub_fields = [:passwd, :password, :password_confirmation, :secret,
                        :confirm_password, :password_confirmation, :secret_token,
-                       :api_key, :access_token]
+                       :api_key, :access_token, :session_id]
       @scrub_user = true
       @scrub_password = true
       @randomize_scrub_length = true
@@ -130,7 +130,7 @@ module Rollbar
       @anonymize_user_ip = false
       @hooks = {
         :on_error_response => nil, # params: response
-        :on_report_internal_error => nil, #params: exception
+        :on_report_internal_error => nil, # params: exception
       }
     end
 
@@ -161,6 +161,15 @@ module Rollbar
       self
     end
 
+    def use_active_job(options = {})
+      require 'rollbar/delay/active_job'
+
+      Rollbar::Delay::ActiveJob.queue_as(options[:queue] || Rollbar::Delay::ActiveJob.default_queue_name)
+
+      @use_async      = true
+      @async_handler  = Rollbar::Delay::ActiveJob
+    end
+
     def use_delayed_job(options = {})
       require 'rollbar/delay/delayed_job'
 
@@ -263,7 +272,7 @@ module Rollbar
     def logger
       @logger ||= default_logger.call
     end
-    
+
     def hook(symbol, &block)
       if @hooks.has_key?(symbol)
         if block_given?
@@ -275,7 +284,7 @@ module Rollbar
         raise StandardError.new "Hook :" + symbol.to_s + " is not supported by Rollbar SDK."
       end
     end
-    
+
     def execute_hook(symbol, *args)
       hook(symbol).call(*args) if hook(symbol).is_a?(Proc)
     end