execute_with_rescue_with_airbrake 0.0.2 → 0.0.3

data/.travis.yml

@@ -1,13 +1,39 @@
+# Send builds to container-based infrastructure
+# http://docs.travis-ci.com/user/workers/container-based-infrastructure/
+sudo: false
 language: ruby
 cache:
   - bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2.4
+  # Since the Travis Build Env does not recognize `2.3` alias yet
+  # We need to specify the version precisely
+  - 2.3.0
+  - ruby-head
 gemfile:
-  - gemfiles/rails_3_2.gemfile
-  - gemfiles/rails_4_0.gemfile
-  - gemfiles/rails_4_1.gemfile
+  - gemfiles/rails_3_2_and_airbrake_3.gemfile
+  - gemfiles/rails_4_0_and_airbrake_3.gemfile
+  - gemfiles/rails_4_1_and_airbrake_3.gemfile
+  - gemfiles/rails_4_2_and_airbrake_3.gemfile
+  - gemfiles/rails_5_0_and_airbrake_3.gemfile
+  - gemfiles/rails_3_2_and_airbrake_4.gemfile
+  - gemfiles/rails_4_0_and_airbrake_4.gemfile
+  - gemfiles/rails_4_1_and_airbrake_4.gemfile
+  - gemfiles/rails_4_2_and_airbrake_4.gemfile
+  - gemfiles/rails_5_0_and_airbrake_4.gemfile
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+  exclude:
+    - rvm: 2.0
+      gemfile: gemfiles/rails_5_0_and_airbrake_3.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_5_0_and_airbrake_4.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_0_and_airbrake_3.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_0_and_airbrake_4.gemfile
+

data/Appraisals

@@ -1,11 +1,49 @@
-appraise "rails-3-2" do
-  gem "activesupport", "3.2.18"
+appraise "rails_3_2_and_airbrake_3" do
+  gem 'activesupport', "~> 3.2.20"
+  gem 'airbrake', "~> 3.1"
 end
 
-appraise "rails-4-0" do
-  gem "activesupport", "4.0.5"
+appraise "rails_4_0_and_airbrake_3" do
+  gem 'activesupport', "~> 4.0.12"
+  gem 'airbrake', "~> 3.1"
 end
 
-appraise "rails-4-1" do
-  gem "activesupport", "4.1.1"
+appraise "rails_4_1_and_airbrake_3" do
+  gem 'activesupport', "~> 4.1.8"
+  gem 'airbrake', "~> 3.1"
+end
+
+appraise "rails_4_2_and_airbrake_3" do
+  gem 'activesupport', "~> 4.2.0"
+  gem 'airbrake', "~> 3.1"
+end
+
+appraise "rails_5_0_and_airbrake_3" do
+  gem 'activesupport', ">= 5.0.0.beta1", "<= 5.1"
+  gem 'airbrake', "~> 3.1"
+end
+
+appraise "rails_3_2_and_airbrake_4" do
+  gem 'activesupport', "~> 3.2.20"
+  gem 'airbrake', "~> 4.0"
+end
+
+appraise "rails_4_0_and_airbrake_4" do
+  gem 'activesupport', "~> 4.0.12"
+  gem 'airbrake', "~> 4.0"
+end
+
+appraise "rails_4_1_and_airbrake_4" do
+  gem 'activesupport', "~> 4.1.8"
+  gem 'airbrake', "~> 4.0"
+end
+
+appraise "rails_4_2_and_airbrake_4" do
+  gem 'activesupport', "~> 4.2.0"
+  gem 'airbrake', "~> 4.0"
+end
+
+appraise "rails_5_0_and_airbrake_4" do
+  gem 'activesupport', ">= 5.0.0.beta1", "<= 5.1"
+  gem 'airbrake', "~> 4.0"
 end

data/CHANGELOG.md

@@ -1,8 +1,46 @@
-### Changelog
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
 
 
-- **0.0.2**
-  - Allow `airbrake` `4.*` to be used (It only removes JS notifier)
+## [Unreleased]
 
-- **0.0.1**
-  - Initial Release
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Fixed
+
+- Nothing
+
+  
+## [0.0.3]
+
+### Fixed
+
+- Fix one of version constraints for gem `airbrake` fixed from `<= 5` to `< 5`
+  Also test against all supported major versions of `airbrake`
+
+
+## [0.0.2] - 2014-06-03
+
+### Changed
+
+- Allow `airbrake` `4.*` to be used (It only removes JS notifier)
+
+
+## [0.0.1] - 2014-03-27
+
+### Added
+
+- Initial Release
+
+
+[Unreleased]: https://github.com/PikachuEXE/execute_with_rescue_with_airbrake/compare/v0.0.3...HEAD
+[0.0.3]:      https://github.com/PikachuEXE/execute_with_rescue_with_airbrake/compare/v0.0.2...v0.0.3
+[0.0.2]:      https://github.com/PikachuEXE/execute_with_rescue_with_airbrake/compare/v0.0.1...v0.0.2
+[0.0.1]:      https://github.com/PikachuEXE/execute_with_rescue_with_airbrake/releases/tag/v0.0.1

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in execute_with_rescue_with_airbrake.gemspec
+# Specify your gem"s dependencies in execute_with_rescue_with_airbrake.gemspec
 gemspec

data/README.md

@@ -2,16 +2,13 @@
 
 The Airbrake adapter plus mixin to be used with `execute_with_rescue`.
 
-## Support
-Tested against:
-- Active Support of version `3.2`, `4.0` and `4.1` (pre-3.2 got wrong dependency & I don't want to support)
-- MRI `1.9.3`, `2.0.0`, `2.1.0`, `2.1.1`
-
-[![Build Status](http://img.shields.io/travis/PikachuEXE/execute_with_rescue_with_airbrake.svg)](https://travis-ci.org/PikachuEXE/execute_with_rescue_with_airbrake)
-[![Gem Version](http://img.shields.io/gem/v/execute_with_rescue_with_airbrake.svg)](http://badge.fury.io/rb/execute_with_rescue_with_airbrake)
-[![Dependency Status](http://img.shields.io/gemnasium/PikachuEXE/execute_with_rescue_with_airbrake.svg)](https://gemnasium.com/PikachuEXE/execute_with_rescue_with_airbrake)
-[![Coverage Status](http://img.shields.io/coveralls/PikachuEXE/execute_with_rescue_with_airbrake.svg)](https://coveralls.io/r/PikachuEXE/execute_with_rescue_with_airbrake)
-[![Code Climate](http://img.shields.io/codeclimate/github/PikachuEXE/execute_with_rescue_with_airbrake.svg)](https://codeclimate.com/github/PikachuEXE/execute_with_rescue_with_airbrake)
+## Status
+
+[![Build Status](http://img.shields.io/travis/PikachuEXE/execute_with_rescue_with_airbrake.svg?style=flat-square)](https://travis-ci.org/PikachuEXE/execute_with_rescue_with_airbrake)
+[![Gem Version](http://img.shields.io/gem/v/execute_with_rescue_with_airbrake.svg?style=flat-square)](http://badge.fury.io/rb/execute_with_rescue_with_airbrake)
+[![Dependency Status](http://img.shields.io/gemnasium/PikachuEXE/execute_with_rescue_with_airbrake.svg?style=flat-square)](https://gemnasium.com/PikachuEXE/execute_with_rescue_with_airbrake)
+[![Coverage Status](http://img.shields.io/coveralls/PikachuEXE/execute_with_rescue_with_airbrake.svg?style=flat-square)](https://coveralls.io/r/PikachuEXE/execute_with_rescue_with_airbrake)
+[![Code Climate](http://img.shields.io/codeclimate/github/PikachuEXE/execute_with_rescue_with_airbrake.svg?style=flat-square)](https://codeclimate.com/github/PikachuEXE/execute_with_rescue_with_airbrake)
 
 ## Installation
 

data/Rakefile

@@ -1,16 +1,18 @@
-require "bundler/gem_tasks"
-require "rubygems"
-require "bundler/setup"
-
-require "rspec/core/rake_task"
 require "appraisal"
+require "bundler"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
+
+Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec)
 
+RuboCop::RakeTask.new(:rubocop)
+
 if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
   task :default do
-    sh "appraisal install && rake appraisal spec"
+    sh "appraisal install && rake appraisal spec rubocop"
   end
 else
-  task :default => :spec
+  task default: [:spec, :rubocop]
 end

data/execute_with_rescue_with_airbrake.gemspec

@@ -1,14 +1,16 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'execute_with_rescue_with_airbrake/version'
+require "execute_with_rescue_with_airbrake/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "execute_with_rescue_with_airbrake"
   spec.version       = ExecuteWithRescueWithAirbrake::VERSION
   spec.authors       = ["PikachuEXE"]
   spec.email         = ["pikachuexe@gmail.com"]
-  spec.summary       = %q{The Airbrake adapter plus mixin to be used with `execute_with_rescue`}
+  spec.summary       = <<-SUMMARY
+    The Airbrake adapter plus mixin to be used with `execute_with_rescue`
+  SUMMARY
   spec.homepage      = "http://github.com/PikachuEXE/execute_with_rescue_with_airbrake"
   spec.license       = "MIT"
 
@@ -18,15 +20,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "execute_with_rescue", "~> 0.0", ">= 0.0.1"
-  spec.add_dependency "airbrake", ">= 3.1", "<= 5"
+  spec.add_dependency "airbrake", ">= 3.1", "< 5"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "appraisal", "~> 1.0"
+  spec.add_development_dependency "appraisal", "~> 2.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-its", "~> 1.0"
   spec.add_development_dependency "coveralls", ">= 0.7"
   spec.add_development_dependency "gem-release", ">= 0.7"
+  spec.add_development_dependency "rubocop", "~> 0.30"
 
   spec.required_ruby_version = ">= 1.9.3"
 

data/gemfiles/rails_3_2_and_airbrake_3.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 3.2.20"
+gem "airbrake", "~> 3.1"
+
+gemspec :path => "../"

data/gemfiles/rails_3_2_and_airbrake_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 3.2.20"
+gem "airbrake", "~> 4.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4_0_and_airbrake_3.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.0.12"
+gem "airbrake", "~> 3.1"
+
+gemspec :path => "../"

data/gemfiles/rails_4_0_and_airbrake_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.0.12"
+gem "airbrake", "~> 4.0"
+
+gemspec :path => "../"

data/gemfiles/{rails_3_2.gemfile → rails_4_1_and_airbrake_3.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "3.2.18"
+gem "activesupport", "~> 4.1.8"
+gem "airbrake", "~> 3.1"
 
 gemspec :path => "../"

data/gemfiles/{rails_4_0.gemfile → rails_4_1_and_airbrake_4.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "4.0.5"
+gem "activesupport", "~> 4.1.8"
+gem "airbrake", "~> 4.0"
 
 gemspec :path => "../"

data/gemfiles/{rails_4_1.gemfile → rails_4_2_and_airbrake_3.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "4.1.1"
+gem "activesupport", "~> 4.2.0"
+gem "airbrake", "~> 3.1"
 
 gemspec :path => "../"

data/gemfiles/rails_4_2_and_airbrake_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2.0"
+gem "airbrake", "~> 4.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5_0_and_airbrake_3.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", ">= 5.0.0.beta1", "<= 5.1"
+gem "airbrake", "~> 3.1"
+
+gemspec :path => "../"

data/gemfiles/rails_5_0_and_airbrake_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", ">= 5.0.0.beta1", "<= 5.1"
+gem "airbrake", "~> 4.0"
+
+gemspec :path => "../"

data/lib/execute_with_rescue/mixins/with_airbrake.rb

@@ -1,10 +1,10 @@
-require 'airbrake'
-require 'active_support/concern'
-require 'active_support/core_ext/module/delegation'
+require "airbrake"
+require "active_support/concern"
+require "active_support/core_ext/module/delegation"
 
-require 'execute_with_rescue'
-require 'execute_with_rescue/errors/no_airbrake_adapter'
-require 'execute_with_rescue_with_airbrake/adapters/airbrake_adapter'
+require "execute_with_rescue"
+require "execute_with_rescue/errors/no_airbrake_adapter"
+require "execute_with_rescue_with_airbrake/adapters/airbrake_adapter"
 
 module ExecuteWithRescue
   module Mixins
@@ -15,20 +15,24 @@ module ExecuteWithRescue
         include ExecuteWithRescue::Mixins::Core
 
         add_execute_with_rescue_before_hook do
-          _execute_with_rescue_airbrake_adapters
-          .push(ExecuteWithRescueWithAirbrake::Adapters::AirbrakeAdapter.new)
+          _execute_with_rescue_airbrake_adapters.
+            push(ExecuteWithRescueWithAirbrake::Adapters::AirbrakeAdapter.new)
         end
         add_execute_with_rescue_after_hook do
           _execute_with_rescue_airbrake_adapters.pop
         end
 
-        rescue_from StandardError,
-                    with: :notify_by_airbrake_or_raise
+        rescue_from(
+          StandardError,
+          with: :notify_by_airbrake_or_raise,
+        )
 
-        delegate :set_default_airbrake_notice_error_class,
-                 :set_default_airbrake_notice_error_message,
-                 :add_default_airbrake_notice_parameters,
-                 to: :_execute_with_rescue_current_airbrake_adapter
+        delegate(
+          :set_default_airbrake_notice_error_class,
+          :set_default_airbrake_notice_error_message,
+          :add_default_airbrake_notice_parameters,
+          to: :_execute_with_rescue_current_airbrake_adapter,
+        )
       end
 
       # Call this if you have some custom handling for some classes
@@ -49,17 +53,18 @@ module ExecuteWithRescue
       #     end
       #   end
       def notify_by_airbrake_or_raise(ex)
-        _execute_with_rescue_current_airbrake_adapter
-        .notify_or_raise(ex)
+        _execute_with_rescue_current_airbrake_adapter.
+          notify_or_raise(ex)
       end
 
       # For pushing and popping the adapters
       def _execute_with_rescue_airbrake_adapters
         @_execute_with_rescue_airbrake_adapters ||= []
       end
+
       def _execute_with_rescue_current_airbrake_adapter
         _execute_with_rescue_airbrake_adapters.last ||
-          (raise ExecuteWithRescue::Errors::NoAirbrakeAdapter)
+          fail(ExecuteWithRescue::Errors::NoAirbrakeAdapter)
       end
     end
   end

data/lib/execute_with_rescue_with_airbrake.rb

@@ -1,7 +1,6 @@
-require 'execute_with_rescue_with_airbrake/version'
-require 'execute_with_rescue'
-require 'execute_with_rescue/mixins/with_airbrake'
-
+require "execute_with_rescue_with_airbrake/version"
+require "execute_with_rescue"
+require "execute_with_rescue/mixins/with_airbrake"
 
 module ExecuteWithRescueWithAirbrake
 end

data/lib/execute_with_rescue_with_airbrake/adapters/airbrake_adapter.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext/hash/indifferent_access'
+require "active_support/core_ext/hash/indifferent_access"
 
 module ExecuteWithRescueWithAirbrake
   module Adapters
@@ -19,15 +19,14 @@ module ExecuteWithRescueWithAirbrake
       # @see should_raise?
       def notify_or_raise(ex)
         if should_raise?
-          raise ex
+          fail ex
         else
           notify_or_ignore_with_options(ex)
         end
       end
 
-
       # set the default `error_class` option when notify by Airbrake
-      # It must can be init without argument, this method won't check it
+      # It must can be init without argument, this method won"t check it
       # Pass nil to clear it
       #
       # @param message [NilClass, Class]
@@ -35,7 +34,7 @@ module ExecuteWithRescueWithAirbrake
       #
       # @raise [ArgumentError] when class is not nil or symbol
       def set_default_airbrake_notice_error_class(klass)
-        (klass.nil? || klass.is_a?(Class)) or raise ArgumentError
+        (klass.nil? || klass.is_a?(Class)) || fail(ArgumentError)
 
         @default_airbrake_notice_error_class = klass
       end
@@ -48,7 +47,7 @@ module ExecuteWithRescueWithAirbrake
       #
       # @raise [ArgumentError] when message is not nil or string
       def set_default_airbrake_notice_error_message(message)
-        (message.nil? || message.is_a?(String)) or raise ArgumentError
+        (message.nil? || message.is_a?(String)) || fail(ArgumentError)
 
         @default_airbrake_notice_error_message = message
       end
@@ -64,18 +63,16 @@ module ExecuteWithRescueWithAirbrake
       # @raise [ParameterKeyConflict]
       #   when new_params contains keys conflicting with existing keys
       def add_default_airbrake_notice_parameters(new_params)
-        new_params.is_a?(Hash) or
-          (raise Errors::InvalidParameters)
-        new_params =
-          new_params.with_indifferent_access
+        new_params.is_a?(Hash) || fail(Errors::InvalidParameters)
+        new_params = new_params.with_indifferent_access
 
         # find out common element size (which should be 0)
-        common_keys =
-          default_airbrake_notice_parameters.keys &
-          new_params.keys
+        common_keys = default_airbrake_notice_parameters.keys & new_params.keys
         if common_keys.size > 0
-          raise Errors::ParameterKeyConflict,
-                "Conflicting keys: #{common_keys.inspect}"
+          fail(
+            Errors::ParameterKeyConflict,
+            "Conflicting keys: #{common_keys.inspect}",
+          )
         end
 
         default_airbrake_notice_parameters.merge!(new_params)
@@ -88,22 +85,16 @@ module ExecuteWithRescueWithAirbrake
       end
 
       def build_notice_options
-        result_options_hash = Hash.new
+        h = {}
 
-        if @default_airbrake_notice_error_class
-          result_options_hash[:error_class] =
-            @default_airbrake_notice_error_class
-        end
-        if @default_airbrake_notice_error_message
-          result_options_hash[:error_message] =
-            @default_airbrake_notice_error_message
-        end
-        unless default_airbrake_notice_parameters.empty?
-          result_options_hash[:parameters] =
-            default_airbrake_notice_parameters.symbolize_keys
-        end
+        @default_airbrake_notice_error_class &&
+          h[:error_class] = @default_airbrake_notice_error_class
+        @default_airbrake_notice_error_message &&
+          h[:error_message] = @default_airbrake_notice_error_message
+        !default_airbrake_notice_parameters.empty? &&
+          h[:parameters] = default_airbrake_notice_parameters.symbolize_keys
 
-        result_options_hash
+        h
       end
 
       def default_airbrake_notice_parameters