appsignal 2.8.1-java → 2.8.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0747403fcace027229d5ca2c436647d2a2c74280cb7c1be6882ec88cde5e8a
-  data.tar.gz: 6af0fe98f5dabe874d9ad9b66706303780f3874240f2d4b1769581e06242ed75
+  metadata.gz: f2eabd73cbf19f0e273bbc84fc53a6ac3138e6b872a8fd9ac19e23ea1f05e6d4
+  data.tar.gz: 9ff2c5e1a0f24b379c84ea121b4844e4a0e5c3c7a84af28afbccaab9b3a58dbc
 SHA512:
-  metadata.gz: cd69107d03207c23d3699ce1e02ba3fcf6163812b3d15903ce02df07457ae41c4798cf1c8cb3aab2d951212ced81fc258469285aa94b99ff0ae9bb7a782c9cb7
-  data.tar.gz: bf0bcf8c5f57d038047f144f8fdabec7a91391adc7d1d23f4e402a51c5a2b1b8535d08c6ed24541afe6b57edd13311506353b6e184fd5aa3c30d0750dec685cd
+  metadata.gz: b84158c3f292448910b41699a642fb283c6ec8a4e60c6b1663c5905975dd0c78e32b521a5227d3a5be1c6686459d4b0f22ffcfa6ddd99d05600744df89fc5b3e
+  data.tar.gz: 33daa43c671018aecc5fc29114cf1a39b93682b782434e0ba24862ccd35e028ec66fa0c7c2904f81060c3cc5692c1e3ac8e78aa792d9db8a4e27de2b605bef0e

data/.travis.yml

@@ -1,86 +1,148 @@
+# DO NOT EDIT
+# This is a generated file by the `rake travis:generate` task.
+# See `build_matrix.yml` for the build matrix.
+# Generate this file with `rake travis:generate`.
+---
 sudo: false
-
 branches:
   only:
-    - "master"
-    - "develop"
-
+  - master
+  - develop
 language: ruby
 cache:
   directories:
-    - vendor/bundle
-
-rvm:
-  - "2.0.0"
-  - "2.3.8"
-  - "2.4.5"
-  - "2.5.3"
-  - "2.6.0"
-  - "jruby-19mode"
-
-gemfile:
-  - "gemfiles/capistrano2.gemfile"
-  - "gemfiles/capistrano3.gemfile"
-  - "gemfiles/no_dependencies.gemfile"
-  - "gemfiles/padrino.gemfile"
-  - "gemfiles/rails-3.2.gemfile"
-  - "gemfiles/rails-4.0.gemfile"
-  - "gemfiles/rails-4.1.gemfile"
-  - "gemfiles/rails-4.2.gemfile"
-  - "gemfiles/rails-5.0.gemfile"
-  - "gemfiles/rails-5.1.gemfile"
-  - "gemfiles/resque.gemfile"
-  - "gemfiles/sequel.gemfile"
-  - "gemfiles/sequel-435.gemfile"
-  - "gemfiles/sinatra.gemfile"
-  - "gemfiles/grape.gemfile"
-  - "gemfiles/webmachine.gemfile"
-  - "gemfiles/que.gemfile"
-
-matrix:
-  fast_finish: true
-  include:
-    - rvm: "2.1.8"
-      gemfile: "gemfiles/no_dependencies.gemfile"
-    - rvm: "2.2.4"
-      gemfile: "gemfiles/no_dependencies.gemfile"
-    - rvm: "2.5.3"
-      gemfile: "gemfiles/no_dependencies.gemfile"
-      script: "bundle exec rubocop"
-  exclude:
-    # Rails 5 doesn't support Ruby < 2.2
-    - rvm: "2.0.0"
-      gemfile: "gemfiles/rails-5.0.gemfile"
-    - rvm: "2.0.0"
-      gemfile: "gemfiles/rails-5.1.gemfile"
-    - rvm: "2.5.3"
-      gemfile: "gemfiles/rails-4.0.gemfile"
-    - rvm: "2.5.3"
-      gemfile: "gemfiles/rails-4.1.gemfile"
-    - rvm: "2.6.0"
-      gemfile: "gemfiles/rails-4.0.gemfile"
-    - rvm: "2.6.0"
-      gemfile: "gemfiles/rails-4.1.gemfile"
-
-  allow_failures:
-    - rvm: "2.4.5"
-      gemfile: "gemfiles/rails-4.0.gemfile"
-    - rvm: "2.4.5"
-      gemfile: "gemfiles/rails-4.1.gemfile"
-
+  - vendor/bundle
 env:
   global:
-    - "RUNNING_IN_CI=true"
-    - "RAILS_ENV=test"
-    - "JRUBY_OPTS=''" # Workaround https://github.com/travis-ci/travis-ci/issues/6471
-
+  - RUNNING_IN_CI=true
+  - RAILS_ENV=test
+  - JRUBY_OPTS=''
 before_install:
-  - "gem update --system 2.7.8"
-  - "gem update bundler"
+- "./support/install_deps"
+install: "./support/bundler_wrapper install --jobs=3 --retry=3"
 before_script:
-  - "bundle exec rake extension:install"
+- "./support/bundler_wrapper exec rake extension:install"
+script: "./support/bundler_wrapper exec rake test"
 after_failure:
-  - "find . -name ext/install.log -exec cat {} \\;"
-  - "find . -name ext/mkmf.log -exec cat {} \\;"
-
-script: "bundle exec rake test"
+- find ./ext -name install.log -exec cat {} \;
+- find ./ext -name mkmf.log -exec cat {} \;
+matrix:
+  fast_finish: true
+  include:
+  - rvm: 2.6.0
+    gemfile: gemfiles/no_dependencies.gemfile
+    before_script: ''
+    script:
+    - "./support/bundler_wrapper exec rake travis:validate"
+    - "./support/bundler_wrapper exec rubocop"
+  - rvm: 2.0.0
+    gemfile: gemfiles/no_dependencies.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.0.0
+    gemfile: gemfiles/capistrano2.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.0.0
+    gemfile: gemfiles/capistrano3.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.0.0
+    gemfile: gemfiles/grape.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.0.0
+    gemfile: gemfiles/padrino.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=1.17.3
+  - rvm: 2.0.0
+    gemfile: gemfiles/que.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails-3.2.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=1.17.3
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails-4.2.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=1.17.3
+  - rvm: 2.0.0
+    gemfile: gemfiles/resque.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=1.17.3
+  - rvm: 2.0.0
+    gemfile: gemfiles/sequel.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.0.0
+    gemfile: gemfiles/sequel-435.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.0.0
+    gemfile: gemfiles/sinatra.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.0.0
+    gemfile: gemfiles/webmachine.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.1.8
+    gemfile: gemfiles/no_dependencies.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.2.4
+    gemfile: gemfiles/no_dependencies.gemfile
+    env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
+  - rvm: 2.3.8
+    gemfile: gemfiles/no_dependencies.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.4.5
+    gemfile: gemfiles/no_dependencies.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.5.3
+    gemfile: gemfiles/no_dependencies.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.5.3
+    gemfile: gemfiles/rails-4.2.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
+  - rvm: 2.5.3
+    gemfile: gemfiles/rails-5.2.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/no_dependencies.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/capistrano2.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/capistrano3.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/grape.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/padrino.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
+  - rvm: 2.6.0
+    gemfile: gemfiles/que.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/rails-5.0.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/rails-5.1.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/rails-5.2.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/resque.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
+  - rvm: 2.6.0
+    gemfile: gemfiles/sequel.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/sequel-435.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/sinatra.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: 2.6.0
+    gemfile: gemfiles/webmachine.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: jruby-19mode
+    gemfile: gemfiles/no_dependencies.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
+  - rvm: jruby-19mode
+    gemfile: gemfiles/rails-4.2.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
+  - rvm: jruby-19mode
+    gemfile: gemfiles/rails-5.2.gemfile
+    env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.8.2
+- Remove Bundler requirement from diagnose command. PR #451
+- Fix Delayed::Job action name reporting for structs. PR #463
+
 # 2.8.1
 - Fix installation on Ruby 2.6 for libc and musl library builds. PR #453
 

data/Rakefile

@@ -39,6 +39,65 @@ VERSION_MANAGERS = {
   :rvm => ->(version) { "rvm use --default #{version.split("-").first}" }
 }.freeze
 
+namespace :travis do
+  task :generate do
+    yaml = YAML.load_file("build_matrix.yml")
+    matrix = yaml["matrix"]
+    defaults = matrix["defaults"]
+    gems = matrix["gems"]
+
+    builds = []
+    matrix["ruby"].each do |ruby|
+      ruby_version = ruby["ruby"]
+      gemset =
+        if ruby["gems"]
+          # Only a specific gemset for this Ruby
+          selected_gems = matrix["gemsets"].fetch(ruby["gems"])
+          gems.select { |g| selected_gems.include?(g["gem"]) }
+        else
+          # All gems for this Ruby
+          gems
+        end
+      gemset.each do |gem|
+        # Don't add build if ignored for this combination of Ruby and gem
+        next if (gem.dig("exclude", "ruby") || []).include?(ruby_version)
+
+        env = ""
+        rubygems = gem["rubygems"] || ruby["rubygems"] || defaults["rubygems"]
+        env = "_RUBYGEMS_VERSION=#{rubygems}" if rubygems
+        bundler = gem["bundler"] || ruby["bundler"] || defaults["bundler"]
+        env += " _BUNDLER_VERSION=#{bundler}" if bundler
+
+        builds << {
+          "rvm" => ruby_version,
+          "gemfile" => "gemfiles/#{gem["gem"]}.gemfile",
+          "env" => env
+        }
+      end
+    end
+    travis = yaml["travis"]
+    travis["matrix"]["include"] = travis["matrix"]["include"] + builds
+
+    header = "# DO NOT EDIT\n" \
+      "# This is a generated file by the `rake travis:generate` task.\n" \
+      "# See `build_matrix.yml` for the build matrix.\n" \
+      "# Generate this file with `rake travis:generate`.\n"
+    generated_yaml = header + YAML.dump(travis)
+    File.write(".travis.yml", generated_yaml)
+    puts "Generated `.travis.yml`"
+    puts "Build count: #{builds.length}"
+  end
+
+  task :validate => :generate do
+    `git status | grep .travis.yml 2>&1`
+    if $?.exitstatus.zero? # rubocop:disable Style/SpecialGlobalVars
+      puts "The `.travis.yml` is modified. The changes were not committed."
+      puts "Please run `rake travis:generate` and commit the changes."
+      exit 1
+    end
+  end
+end
+
 namespace :build do
   def modify_base_gemspec
     eval(File.read("appsignal.gemspec")).tap do |s| # rubocop:disable Security/Eval

data/build_matrix.yml

@@ -0,0 +1,106 @@
+travis: # Default `.travis.yml` contents
+  sudo: false
+
+  branches:
+    only:
+      - "master"
+      - "develop"
+
+  language: ruby
+  cache:
+    directories:
+      - vendor/bundle
+
+  env:
+    global:
+      - "RUNNING_IN_CI=true"
+      - "RAILS_ENV=test"
+      - "JRUBY_OPTS=''" # Workaround https://github.com/travis-ci/travis-ci/issues/6471
+
+  before_install:
+    - "./support/install_deps"
+  install: "./support/bundler_wrapper install --jobs=3 --retry=3"
+  before_script:
+    - "./support/bundler_wrapper exec rake extension:install"
+  script: "./support/bundler_wrapper exec rake test"
+  after_failure:
+    - "find ./ext -name install.log -exec cat {} \\;"
+    - "find ./ext -name mkmf.log -exec cat {} \\;"
+
+  matrix:
+    fast_finish: true
+    include: # Builds based on the matrix below are added to this list
+      - rvm: "2.6.0"
+        gemfile: "gemfiles/no_dependencies.gemfile"
+        before_script: "" # Unset default: No need to install the extension
+        script:
+          - "./support/bundler_wrapper exec rake travis:validate"
+          - "./support/bundler_wrapper exec rubocop"
+
+matrix:
+  defaults:
+    rubygems: "latest"
+    bundler: "latest"
+
+  gemsets: # By default all gems are tested
+    none:
+      - "no_dependencies"
+    minimal:
+      - "no_dependencies"
+      - "rails-4.2"
+      - "rails-5.2"
+
+  ruby:
+    - ruby: "2.0.0"
+      rubygems: "2.7.8"
+    - ruby: "2.1.8"
+      rubygems: "2.7.8"
+      gems: "none"
+    - ruby: "2.2.4"
+      rubygems: "2.7.8"
+      gems: "none"
+    - ruby: "2.3.8"
+      gems: "none"
+    - ruby: "2.4.5"
+      gems: "none"
+    - ruby: "2.5.3"
+      gems: "minimal"
+    - ruby: "2.6.0"
+    - ruby: "jruby-19mode"
+      gems: "minimal"
+  gems:
+    - gem: "no_dependencies"
+    - gem: "capistrano2"
+    - gem: "capistrano3"
+    - gem: "grape"
+    - gem: "padrino"
+      bundler: "1.17.3"
+    - gem: "que"
+    - gem: "rails-3.2"
+      bundler: "1.17.3"
+      exclude:
+        ruby:
+          - "2.6.0"
+    - gem: "rails-4.2"
+      bundler: "1.17.3"
+      exclude:
+        ruby:
+          - "2.6.0"
+    - gem: "rails-5.0"
+      exclude:
+        ruby:
+          - "2.0.0"
+    - gem: "rails-5.1"
+      exclude:
+        ruby:
+          - "2.0.0"
+    - gem: "rails-5.2"
+      exclude:
+        ruby:
+          - "2.0.0"
+    - gem: "resque"
+      bundler: "1.17.3"
+    - gem: "sequel"
+    - gem: "sequel-435"
+    - gem: "sinatra"
+    - gem: "webmachine"

data/gemfiles/rails-5.2.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.2.0'
+
+gemspec :path => '../'

data/lib/appsignal/cli/diagnose.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "rbconfig"
-require "bundler/cli"
-require "bundler/cli/common"
 require "etc"
 require "appsignal/cli/diagnose/utils"
 require "appsignal/cli/diagnose/paths"

data/lib/appsignal/cli/diagnose/paths.rb

@@ -81,9 +81,10 @@ module Appsignal
           end
         end
 
+        # Returns the AppSignal gem installation path. The root directory of
+        # this gem.
         def gem_path
-          @gem_path ||= \
-            Bundler::CLI::Common.select_spec("appsignal").full_gem_path.strip
+          File.expand_path("../../../../../", __FILE__)
         end
       end
     end

data/lib/appsignal/hooks.rb

@@ -65,25 +65,6 @@ module Appsignal
       def truncate(text)
         text.size > 200 ? "#{text[0...197]}..." : text
       end
-
-      def extract_value(object_or_hash, field, default_value = nil, convert_to_s = false)
-        value =
-          if object_or_hash.respond_to?(:[])
-            begin
-              object_or_hash[field]
-            rescue NameError
-              nil
-            end
-          elsif object_or_hash.respond_to?(field)
-            object_or_hash.send(field)
-          end || default_value
-
-        if convert_to_s
-          value.to_s
-        else
-          value
-        end
-      end
     end
   end
 end

data/lib/appsignal/integrations/delayed_job_plugin.rb

@@ -53,6 +53,33 @@ module Appsignal
           block.call(job)
         end
       end
+
+      def self.extract_value(object_or_hash, field, default_value = nil, convert_to_s = false)
+        value = nil
+
+        # Attempt to read value from hash
+        if object_or_hash.respond_to?(:[])
+          value = begin
+            object_or_hash[field]
+          rescue NameError
+            nil
+          end
+        end
+
+        # Attempt to read value from object
+        if value.nil? && object_or_hash.respond_to?(field)
+          value = object_or_hash.send(field)
+        end
+
+        # Set default value if nothing was found
+        value = default_value if value.nil?
+
+        if convert_to_s
+          value.to_s
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.8.1".freeze
+  VERSION = "2.8.2".freeze
 end

data/spec/lib/appsignal/cli/diagnose/paths_spec.rb

@@ -0,0 +1,16 @@
+require "bundler/cli"
+require "bundler/cli/common"
+require "appsignal/cli/diagnose/paths"
+
+describe Appsignal::CLI::Diagnose::Paths do
+  describe "#paths" do
+    before { Appsignal.config = project_fixture_config }
+
+    it "returns gem installation path as package_install_path" do
+      expect(described_class.new.paths[:package_install_path]).to eq(
+        :label => "AppSignal gem path",
+        :path => Bundler::CLI::Common.select_spec("appsignal").full_gem_path.strip
+      )
+    end
+  end
+end

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -1,3 +1,5 @@
+require "bundler/cli"
+require "bundler/cli/common"
 require "appsignal/cli"
 
 describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_input do
@@ -1140,10 +1142,9 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         it_behaves_like "diagnose file" do
           let(:filename) { File.join("ext", "install.log") }
           before do
-            expect(Bundler::CLI::Common).to receive(:select_spec)
-              .with("appsignal")
+            expect_any_instance_of(Appsignal::CLI::Diagnose::Paths).to receive(:gem_path)
               .at_least(:once)
-              .and_return(double(:full_gem_path => parent_directory))
+              .and_return(parent_directory)
           end
         end
 
@@ -1157,10 +1158,9 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         it_behaves_like "diagnose file" do
           let(:filename) { File.join("ext", "mkmf.log") }
           before do
-            expect(Bundler::CLI::Common).to receive(:select_spec)
-              .with("appsignal")
+            expect_any_instance_of(Appsignal::CLI::Diagnose::Paths).to receive(:gem_path)
               .at_least(:once)
-              .and_return(double(:full_gem_path => parent_directory))
+              .and_return(parent_directory)
           end
         end
 

data/spec/lib/appsignal/hooks/delayed_job_spec.rb

@@ -346,6 +346,143 @@ describe Appsignal::Hooks::DelayedJobHook do
         end
       end
     end
+
+    describe ".extract_value" do
+      let(:plugin) { Appsignal::Hooks::DelayedJobPlugin }
+
+      context "for a hash" do
+        let(:hash) { { :key => "value", :bool_false => false } }
+
+        context "when the key exists" do
+          subject { plugin.extract_value(hash, :key) }
+
+          it { is_expected.to eq "value" }
+
+          context "when the value is false" do
+            subject { plugin.extract_value(hash, :bool_false) }
+
+            it { is_expected.to be false }
+          end
+        end
+
+        context "when the key does not exist" do
+          subject { plugin.extract_value(hash, :nonexistent_key) }
+
+          it { is_expected.to be_nil }
+
+          context "with a default value" do
+            subject { plugin.extract_value(hash, :nonexistent_key, 1) }
+
+            it { is_expected.to eq 1 }
+          end
+        end
+      end
+
+      context "for a struct" do
+        before :context do
+          TestStruct = Struct.new(:key)
+        end
+        let(:struct) { TestStruct.new("value") }
+
+        context "when the key exists" do
+          subject { plugin.extract_value(struct, :key) }
+
+          it { is_expected.to eq "value" }
+        end
+
+        context "when the key does not exist" do
+          subject { plugin.extract_value(struct, :nonexistent_key) }
+
+          it { is_expected.to be_nil }
+
+          context "with a default value" do
+            subject { plugin.extract_value(struct, :nonexistent_key, 1) }
+
+            it { is_expected.to eq 1 }
+          end
+        end
+      end
+
+      context "for a struct with a method" do
+        before :context do
+          class TestStructClass < Struct.new(:id) # rubocop:disable Style/StructInheritance
+            def appsignal_name
+              "TestStruct#perform"
+            end
+
+            def bool_false
+              false
+            end
+          end
+        end
+        let(:struct) { TestStructClass.new("id") }
+
+        context "when the Struct responds to a method" do
+          subject { plugin.extract_value(struct, :appsignal_name) }
+
+          it "returns the method value" do
+            is_expected.to eq "TestStruct#perform"
+          end
+
+          context "when the value is false" do
+            subject { plugin.extract_value(struct, :bool_false) }
+
+            it "returns the method value" do
+              is_expected.to be false
+            end
+          end
+        end
+
+        context "when the key does not exist" do
+          subject { plugin.extract_value(struct, :nonexistent_key) }
+
+          context "without a method with the same name" do
+            it "returns nil" do
+              is_expected.to be_nil
+            end
+          end
+
+          context "with a default value" do
+            let(:default_value) { :my_default_value }
+            subject { plugin.extract_value(struct, :nonexistent_key, default_value) }
+
+            it "returns the default value" do
+              is_expected.to eq default_value
+            end
+          end
+        end
+      end
+
+      context "for an object" do
+        let(:object) { double(:existing_method => "value") }
+
+        context "when the method exists" do
+          subject { plugin.extract_value(object, :existing_method) }
+
+          it { is_expected.to eq "value" }
+        end
+
+        context "when the method does not exist" do
+          subject { plugin.extract_value(object, :nonexistent_method) }
+
+          it { is_expected.to be_nil }
+
+          context "and there is a default value" do
+            subject { plugin.extract_value(object, :nonexistent_method, 1) }
+
+            it { is_expected.to eq 1 }
+          end
+        end
+      end
+
+      context "when we need to call to_s on the value" do
+        let(:object) { double(:existing_method => 1) }
+
+        subject { plugin.extract_value(object, :existing_method, nil, true) }
+
+        it { is_expected.to eq "1" }
+      end
+    end
   end
 
   context "without delayed job" do

data/spec/lib/appsignal/hooks_spec.rb

@@ -113,83 +113,4 @@ describe Appsignal::Hooks::Helpers do
       end
     end
   end
-
-  describe "#extract_value" do
-    context "for a hash" do
-      let(:hash) { { :key => "value" } }
-
-      context "when the key exists" do
-        subject { with_helpers.extract_value(hash, :key) }
-
-        it { is_expected.to eq "value" }
-      end
-
-      context "when the key does not exist" do
-        subject { with_helpers.extract_value(hash, :nonexistent_key) }
-
-        it { is_expected.to be_nil }
-
-        context "with a default value" do
-          subject { with_helpers.extract_value(hash, :nonexistent_key, 1) }
-
-          it { is_expected.to eq 1 }
-        end
-      end
-    end
-
-    context "for a struct" do
-      before :context do
-        TestStruct = Struct.new(:key)
-      end
-      let(:struct) { TestStruct.new("value") }
-
-      context "when the key exists" do
-        subject { with_helpers.extract_value(struct, :key) }
-
-        it { is_expected.to eq "value" }
-      end
-
-      context "when the key does not exist" do
-        subject { with_helpers.extract_value(struct, :nonexistent_key) }
-
-        it { is_expected.to be_nil }
-
-        context "with a default value" do
-          subject { with_helpers.extract_value(struct, :nonexistent_key, 1) }
-
-          it { is_expected.to eq 1 }
-        end
-      end
-    end
-
-    context "for an object" do
-      let(:object) { double(:existing_method => "value") }
-
-      context "when the method exists" do
-        subject { with_helpers.extract_value(object, :existing_method) }
-
-        it { is_expected.to eq "value" }
-      end
-
-      context "when the method does not exist" do
-        subject { with_helpers.extract_value(object, :nonexistent_method) }
-
-        it { is_expected.to be_nil }
-
-        context "and there is a default value" do
-          subject { with_helpers.extract_value(object, :nonexistent_method, 1) }
-
-          it { is_expected.to eq 1 }
-        end
-      end
-    end
-
-    context "when we need to call to_s on the value" do
-      let(:object) { double(:existing_method => 1) }
-
-      subject { with_helpers.extract_value(object, :existing_method, nil, true) }
-
-      it { is_expected.to eq "1" }
-    end
-  end
 end

data/support/bundler_wrapper

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -eu
+
+case "${_BUNDLER_VERSION-"latest"}" in
+  "latest")
+    bundle $@
+  ;;
+  *)
+    bundle _${_BUNDLER_VERSION}_ $@
+  ;;
+esac

data/support/install_deps

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -eu
+
+case "${_RUBYGEMS_VERSION-"latest"}" in
+  "latest")
+    gem update --no-document --system
+  ;;
+  *)
+    gem update --no-document --system $_RUBYGEMS_VERSION
+  ;;
+esac
+
+case "${_BUNDLER_VERSION-"latest"}" in
+  "latest")
+    gem update bundler --no-document
+  ;;
+  *)
+    gem install bundler --no-document --version $_BUNDLER_VERSION
+  ;;
+esac

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: java
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -160,6 +160,7 @@ files:
 - appsignal.gemspec
 - benchmark.rake
 - bin/appsignal
+- build_matrix.yml
 - ext/Rakefile
 - ext/agent.yml
 - ext/appsignal_extension.c
@@ -177,6 +178,7 @@ files:
 - gemfiles/rails-4.2.gemfile
 - gemfiles/rails-5.0.gemfile
 - gemfiles/rails-5.1.gemfile
+- gemfiles/rails-5.2.gemfile
 - gemfiles/resque.gemfile
 - gemfiles/sequel-435.gemfile
 - gemfiles/sequel.gemfile
@@ -265,6 +267,7 @@ files:
 - spec/lib/appsignal/capistrano2_spec.rb
 - spec/lib/appsignal/capistrano3_spec.rb
 - spec/lib/appsignal/cli/demo_spec.rb
+- spec/lib/appsignal/cli/diagnose/paths_spec.rb
 - spec/lib/appsignal/cli/diagnose/utils_spec.rb
 - spec/lib/appsignal/cli/diagnose_spec.rb
 - spec/lib/appsignal/cli/helpers_spec.rb
@@ -362,6 +365,8 @@ files:
 - spec/support/rails/my_app.rb
 - spec/support/shared_examples/instrument.rb
 - spec/support/stubs/delayed_job.rb
+- support/bundler_wrapper
+- support/install_deps
 homepage: https://github.com/appsignal/appsignal-ruby
 licenses:
 - MIT
@@ -382,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -392,6 +397,7 @@ test_files:
 - spec/lib/appsignal/capistrano2_spec.rb
 - spec/lib/appsignal/capistrano3_spec.rb
 - spec/lib/appsignal/cli/demo_spec.rb
+- spec/lib/appsignal/cli/diagnose/paths_spec.rb
 - spec/lib/appsignal/cli/diagnose/utils_spec.rb
 - spec/lib/appsignal/cli/diagnose_spec.rb
 - spec/lib/appsignal/cli/helpers_spec.rb