appsignal 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec2efb96b788112eddc36f06d1a5b08ded6102ec
-  data.tar.gz: 14c8aea711a79ad90ce04ffce963fe19546f2b84
+  metadata.gz: a80bbf4de405c95b2cbca06180e74dba72dd0e56
+  data.tar.gz: 43b9f3679d47469adfc74355f5589849355e84d2
 SHA512:
-  metadata.gz: c452757e1ac4c4db326810f1b2ed014fd5d185edde76eab088bd5ca761a90b1de532fde1807cd46bb9eba7c431ea3c2f3a0201a43644b4f966d0e934971d0b05
-  data.tar.gz: 513c9907c8be8a26f07ef98d34f5840567e7bfdf4243f3dab6fdc88cea9e9b247ec6949459bca60cb9c6509544c95763f7347193532360f149872386f35eabd4
+  metadata.gz: 69f92345497c592f802d91d97f407b87f4cf73ad3fe79f8bacbb6ee0dbb0e01e58656b01c52715592b29722be8e4fdb0d55f2b7c41918b9691769d7c602f882c
+  data.tar.gz: e2b37a993766b1538de718e2a395f92c771552c4093148d2974fe2c249d1c4dfc733b4dfbe4620cee85a9e45c40deaafc5ced69355028f2a21ae18ebf56c5eea

data/.rspec

@@ -1 +1,3 @@
---order default --warnings
+--order default
+--warnings
+--require spec_helper

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.3.3
+
+* Output AppSignal environment on `appsignal diagnose`
+* Prevent transaction crashes on Sinatra routes with optional parameters
+* Listen to `stage` option to Capistrano 2 for automatic environment detection
+* Add `appsignal_env` option to Capistrano 2 to set a custom environment
+
 # 1.3.2
 * Add method to discard a transaction
 * Run spec suite with warnings, fixes for warnings
@@ -23,6 +30,8 @@
 * Allow overriding Padrino environment with APPSIGNAL_APP_ENV
 * Add mkmf.log to diagnose command
 * Allow for local install with bundler `bundle exec rake install`
+* Listen to `stage` option to Capistrano 3 for automatic environment detection
+* Add `appsignal_env` option to Capistrano 3 to set a custom environment
 
 # 1.2.5
 * Bugfix in CPU utilization calculation for host metrics

data/benchmark.rake

@@ -1,10 +1,6 @@
 require 'appsignal'
 require 'benchmark'
 
-class ::Appsignal::EventFormatter::ActiveRecord::SqlFormatter
-  def connection_config; {:adapter => 'mysql'}; end
-end
-
 GC.disable
 
 task :default => :'benchmark:all'

data/lib/appsignal/cli/diagnose.rb

@@ -26,6 +26,7 @@ module Appsignal
 
         def config
           start_appsignal
+          puts "Environment: #{Appsignal.config.env}"
           Appsignal.config.config_hash.each do |key, val|
             puts "Config #{key}: #{val}"
           end
@@ -60,12 +61,12 @@ module Appsignal
         def check_ext_install
           require 'bundler/cli'
           require "bundler/cli/common"
-          path     = Bundler::CLI::Common.select_spec('appsignal').full_gem_path
-          install_log_path = "#{path.strip}/ext/install.log"
+          path = Bundler::CLI::Common.select_spec('appsignal').full_gem_path.strip
+          install_log_path = "#{path}/ext/install.log"
           puts "Showing last lines of extension install log: #{install_log_path}"
           puts File.read(install_log_path)
           puts "\n"
-          mkmf_log_path = "#{path.strip}/ext/mkmf.log"
+          mkmf_log_path = "#{path}/ext/mkmf.log"
           if File.exist?(mkmf_log_path)
             puts "Showing last lines of extension compilation log: #{mkmf_log_path}"
             puts File.read(mkmf_log_path)

data/lib/appsignal/integrations/capistrano/appsignal.cap

@@ -20,7 +20,7 @@ namespace :appsignal do
       marker = Appsignal::Marker.new(marker_data, appsignal_config)
       marker.transmit
     else
-      puts 'Not notifying of deploy, config is not active'
+      puts "Not notifying of deploy, config is not active for environment: #{env}"
     end
   end
 end

data/lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb

@@ -7,7 +7,7 @@ module Appsignal
 
         namespace :appsignal do
           task :deploy do
-            env = fetch(:rails_env, fetch(:rack_env, 'production'))
+            env = fetch(:appsignal_env, fetch(:stage, fetch(:rails_env, fetch(:rack_env, 'production'))))
             user = ENV['USER'] || ENV['USERNAME']
             revision = fetch(:appsignal_revision, fetch(:current_revision))
 
@@ -31,7 +31,7 @@ module Appsignal
                 marker.transmit
               end
             else
-              puts 'Not notifying of deploy, config is not active'
+              puts "Not notifying of deploy, config is not active for environment: #{env}"
             end
           end
         end

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -73,6 +73,8 @@ module Appsignal
       end
 
       def action_name(env)
+        return unless env['sinatra.route']
+
         if @options.fetch(:mounted_at, nil)
           method, route = env['sinatra.route'].split(" ")
           "#{method} #{@options[:mounted_at]}#{route}"

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/spec/lib/appsignal/auth_check_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::AuthCheck do
   let(:config) { project_fixture_config }
   let(:logger) { Logger.new(StringIO.new) }

data/spec/lib/appsignal/capistrano2_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if capistrano2_present?
   require 'capistrano'
   require 'capistrano/configuration'
@@ -81,9 +79,47 @@ if capistrano2_present?
               )
             end
           end
+
+          context "when stage is used instead of rack_env / rails_env" do
+            before do
+              @capistrano_config.unset(:rails_env)
+              @capistrano_config.set(:stage, 'stage_production')
+            end
+
+            it "should be instantiated with the right params" do
+              Appsignal::Config.should_receive(:new).with(
+                project_fixture_path,
+                'stage_production',
+                {:name => 'AppName'},
+                kind_of(Logger)
+              )
+            end
+          end
+
+          context "when appsignal_env is set" do
+            before do
+              @capistrano_config.set(:rack_env, 'rack_production')
+              @capistrano_config.set(:stage, 'stage_production')
+              @capistrano_config.set(:appsignal_env, 'appsignal_production')
+            end
+
+            it "should prefer the appsignal_env rather than stage, rails_env and rack_env" do
+              Appsignal::Config.should_receive(:new).with(
+                project_fixture_path,
+                'appsignal_production',
+                {:name => 'AppName'},
+                kind_of(Logger)
+              )
+            end
+          end
         end
 
-        after { @capistrano_config.find_and_execute_task('appsignal:deploy') }
+        after do
+          @capistrano_config.find_and_execute_task('appsignal:deploy')
+          @capistrano_config.unset(:stage)
+          @capistrano_config.unset(:rack_env)
+          @capistrano_config.unset(:appsignal_env)
+        end
       end
 
       context "send marker" do
@@ -168,7 +204,7 @@ if capistrano2_present?
           it "should not send deploy marker" do
             Appsignal::Marker.should_not_receive(:new)
             @capistrano_config.find_and_execute_task('appsignal:deploy')
-            out_stream.string.should include('Not notifying of deploy, config is not active')
+            out_stream.string.should include('Not notifying of deploy, config is not active for environment: nonsense')
           end
         end
       end

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if capistrano3_present?
   require 'capistrano/all'
   require 'capistrano/deploy'
@@ -198,7 +196,7 @@ if capistrano3_present?
           it "should not send deploy marker" do
             Appsignal::Marker.should_not_receive(:new)
             invoke('appsignal:deploy')
-            out_stream.string.should include("Not notifying of deploy, config is not active")
+            out_stream.string.should include("Not notifying of deploy, config is not active for environment: nonsense")
           end
         end
       end

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

@@ -1,27 +1,26 @@
-require 'spec_helper'
 require 'appsignal/cli'
 
 describe Appsignal::CLI::Diagnose do
   let(:out_stream) { StringIO.new }
   let(:cli) { Appsignal::CLI::Diagnose }
-  before do
-    @original_stdout = $stdout
+  around do |example|
+    original_stdout = $stdout
     $stdout = out_stream
-  end
-  after do
-    $stdout = @original_stdout
+    example.run
+    $stdout = original_stdout
   end
 
   describe ".run" do
     it "should output diagnostic information" do
       cli.run
-
-      out_stream.string.should include('Gem version')
-      out_stream.string.should include('Agent version')
-      out_stream.string.should include('Config')
-      out_stream.string.should include('Checking API key')
-      out_stream.string.should include('Checking if required paths are writable')
-      out_stream.string.should include('Showing last lines of extension install log')
+      output = out_stream.string
+      expect(output).to include('Gem version')
+      expect(output).to include('Agent version')
+      expect(output).to include('Environment')
+      expect(output).to include('Config')
+      expect(output).to include('Checking API key')
+      expect(output).to include('Checking if required paths are writable')
+      expect(output).to include('Showing last lines of extension install log')
     end
   end
 end

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

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/cli'
 
 begin

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

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/cli'
 
 describe Appsignal::CLI::NotifyOfDeploy do

data/spec/lib/appsignal/cli_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/cli'
 
 describe Appsignal::CLI do

data/spec/lib/appsignal/config_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Config do
   subject { config }
 

data/spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if rails_present?
   require 'action_view'
 

data/spec/lib/appsignal/event_formatter/active_record/instantiation_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
   let(:klass)     { Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
   let(:klass)     { Appsignal::EventFormatter::ActiveRecord::SqlFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::ElasticSearch::SearchFormatter do
   let(:klass)     { Appsignal::EventFormatter::ElasticSearch::SearchFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::Faraday::RequestFormatter do
   let(:klass)     { Appsignal::EventFormatter::Faraday::RequestFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::MongoRubyDriver::QueryFormatter do
   let(:formatter) { Appsignal::EventFormatter::MongoRubyDriver::QueryFormatter }
 

data/spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::EventFormatter::Moped::QueryFormatter do
   let(:klass) { Appsignal::EventFormatter::Moped::QueryFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class MockFormatter < Appsignal::EventFormatter
   register 'mock'
 

data/spec/lib/appsignal/extension_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'fileutils'
 
 describe "extension loading and operation" do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::CelluloidHook do
   context "with celluloid" do
     before :all do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::DataMapperHook do
   context "with datamapper" do
     before :all do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::DelayedJobHook do
   context "with delayed job" do
     before(:all) do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::MongoRubyDriverHook do
   require 'appsignal/integrations/mongo_ruby_driver'
 

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::NetHttpHook do
   before :all do
     start_agent

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::PassengerHook do
   context "with passenger" do
     before(:all) do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::PumaHook do
   context "with puma" do
     before(:all) do

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

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'rake'
 
 describe Appsignal::Hooks::RakeHook do

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::RedisHook do
   before :all do
     start_agent

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::SequelHook, if: sequel_present? do
   let(:db) { Sequel.sqlite }
 

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

@@ -1,6 +1,3 @@
-require 'spec_helper'
-
-
 describe Appsignal::Hooks::ShoryukenMiddleware do
   let(:current_transaction) { background_job_transaction }
 
@@ -51,7 +48,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
   end
 
   context "with an erroring call" do
-    let(:error) { VerySpecificError.new('on fire') }
+    let(:error) { VerySpecificError.new }
 
     it "should add the exception to appsignal" do
       Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::SidekiqPlugin do
   let(:worker) { double }
   let(:queue) { double }
@@ -79,7 +77,8 @@ describe Appsignal::Hooks::SidekiqPlugin do
   end
 
   context "with an erroring call" do
-    let(:error) { VerySpecificError.new('the roof') }
+    let(:error) { VerySpecificError.new }
+
     it "should add the exception to appsignal" do
       Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
     end

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Hooks::UnicornHook do
   context "with unicorn" do
     before :all do

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

@@ -1,7 +1,4 @@
-require 'spec_helper'
-
 if webmachine_present?
-
   describe Appsignal::Hooks::WebmachineHook do
     context "with webmachine" do
       before(:all) do

data/spec/lib/appsignal/hooks_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class MockPresentHook < Appsignal::Hooks::Hook
   def dependencies_present?
     true

data/spec/lib/appsignal/integrations/data_mapper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/integrations/data_mapper'
 
 describe Appsignal::Hooks::DataMapperLogListener do

data/spec/lib/appsignal/integrations/grape_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if grape_present?
   require 'appsignal/integrations/grape'
 

data/spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/integrations/mongo_ruby_driver'
 describe Appsignal::Hooks::MongoMonitorSubscriber do
   let(:subscriber) { Appsignal::Hooks::MongoMonitorSubscriber.new }

data/spec/lib/appsignal/integrations/object_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/integrations/object'
 
 describe Object do

data/spec/lib/appsignal/integrations/padrino_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 begin
   require 'padrino'
 rescue LoadError

data/spec/lib/appsignal/integrations/railtie_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if rails_present?
   describe Appsignal::Integrations::Railtie do
     context "after initializing the app" do

data/spec/lib/appsignal/integrations/resque_active_job_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if resque_present? && active_job_present?
   describe "Resque ActiveJob integration" do
     let(:file) { File.expand_path('lib/appsignal/integrations/resque_active_job.rb') }

data/spec/lib/appsignal/integrations/resque_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if resque_present?
   describe "Resque integration" do
     let(:file) { File.expand_path('lib/appsignal/integrations/resque.rb') }
@@ -20,7 +18,7 @@ if resque_present?
           extend Appsignal::Integrations::ResquePlugin
 
           def self.perform
-            raise VerySpecificError.new('broken')
+            raise VerySpecificError.new
           end
         end
       end

data/spec/lib/appsignal/integrations/sinatra_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if sinatra_present? && !padrino_present?
   ENV['APPSIGNAL_PUSH_API_KEY'] = 'key'
   require 'appsignal/integrations/sinatra'

data/spec/lib/appsignal/js_exception_transaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::JSExceptionTransaction do
   before { SecureRandom.stub(:uuid => '123abc') }
 

data/spec/lib/appsignal/marker_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Marker do
   let(:config) { project_fixture_config }
   let(:marker) {

data/spec/lib/appsignal/minutely_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Minutely do
   before do
     Appsignal::Minutely.probes.clear

data/spec/lib/appsignal/rack/generic_instrumentation_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Rack::GenericInstrumentation do
   before :all do
     start_agent

data/spec/lib/appsignal/rack/js_exception_catcher_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Rack::JSExceptionCatcher do
   let(:app)            { double(:call => true) }
   let(:options)        { double }

data/spec/lib/appsignal/rack/rails_instrumentation_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class MockController
 end
 

data/spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 begin
   require 'sinatra'
   require 'appsignal/integrations/sinatra'
@@ -133,12 +131,28 @@ if defined?(::Sinatra)
           Appsignal::Transaction.any_instance.should_receive(:set_action).with('GET /')
         end
 
+        context "without 'sinatra.route' env" do
+          let(:env) { {:path => '/', :method => 'GET'} }
+
+          it "returns nil" do
+            Appsignal::Transaction.any_instance.should_receive(:set_action).with(nil)
+          end
+        end
+
         context "with option to set path a mounted_at prefix" do
           let(:options) {{ :mounted_at  => "/api/v2" }}
 
           it "should call set_action with a prefix path" do
             Appsignal::Transaction.any_instance.should_receive(:set_action).with("GET /api/v2/")
           end
+
+          context "without 'sinatra.route' env" do
+            let(:env) { {:path => '/', :method => 'GET'} }
+
+            it "returns nil" do
+              Appsignal::Transaction.any_instance.should_receive(:set_action).with(nil)
+            end
+          end
         end
 
         context "with mounted modular application" do
@@ -147,6 +161,14 @@ if defined?(::Sinatra)
           it "should call set_action with an application prefix path" do
             Appsignal::Transaction.any_instance.should_receive(:set_action).with("GET /api/")
           end
+
+          context "without 'sinatra.route' env" do
+            let(:env) { {:path => '/', :method => 'GET'} }
+
+            it "returns nil" do
+              Appsignal::Transaction.any_instance.should_receive(:set_action).with(nil)
+            end
+          end
         end
       end
 

data/spec/lib/appsignal/rack/streaming_listener_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/rack/streaming_listener'
 
 describe Appsignal::Rack::StreamingListener do
@@ -89,7 +88,7 @@ describe Appsignal::Rack::StreamingListener do
 
     context "with an exception in the instrumentation call" do
       it "should add the exception to the transaction" do
-        allow( app ).to receive(:call).and_raise(VerySpecificError.new('broken'))
+        allow( app ).to receive(:call).and_raise(VerySpecificError.new)
 
         expect( transaction ).to receive(:set_error)
 
@@ -124,7 +123,7 @@ describe Appsignal::StreamWrapper do
     context "when each raises an error" do
       it "should add the exception to the transaction" do
         allow( stream ).to receive(:each)
-          .and_raise(VerySpecificError.new('broken'))
+          .and_raise(VerySpecificError.new)
 
         expect( transaction ).to receive(:set_error)
 
@@ -144,7 +143,7 @@ describe Appsignal::StreamWrapper do
     context "when each raises an error" do
       it "should add the exception to the transaction and close it" do
         allow( stream ).to receive(:close)
-          .and_raise(VerySpecificError.new('broken'))
+          .and_raise(VerySpecificError.new)
 
         expect( transaction ).to receive(:set_error)
         expect( Appsignal::Transaction ).to receive(:complete_current!)

data/spec/lib/appsignal/subscriber_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Subscriber do
   before :all do
     start_agent

data/spec/lib/appsignal/transaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class Smash < Hash
   def []=(key, val)
     raise 'the roof'

data/spec/lib/appsignal/transmitter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Transmitter do
   let(:config) { project_fixture_config }
   let(:action) { 'action' }

data/spec/lib/appsignal/update_active_support_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Appsignal::UpdateActiveSupport', :if => (
   Gem.loaded_specs['rails'] &&
   Gem.loaded_specs['rails'].version < Gem::Version.create('4.0')

data/spec/lib/appsignal/utils/params_sanitizer_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Utils::ParamsSanitizer do
   let(:file) { uploaded_file }
   let(:params) do

data/spec/lib/appsignal/utils/query_params_sanitizer_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Utils::QueryParamsSanitizer do
   describe ".sanitize" do
     context "when only_top_level = true" do

data/spec/lib/appsignal/utils_spec.rb

@@ -1,7 +1,5 @@
 # encoding: UTF-8
 
-require 'spec_helper'
-
 describe Appsignal::Utils do
   describe ".json_generate" do
     subject { Appsignal::Utils.json_generate(body) }

data/spec/lib/appsignal_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require './spec/support/mocks/mock_extension'
 
 describe Appsignal do
@@ -361,7 +360,7 @@ describe Appsignal do
       end
 
       context "with an erroring call" do
-        let(:error) { VerySpecificError.new('the roof') }
+        let(:error) { VerySpecificError.new }
 
         it "should add the error to the current transaction and complete" do
           Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
@@ -392,7 +391,7 @@ describe Appsignal do
       end
 
       context "with an erroring call" do
-        let(:error) { VerySpecificError.new('the roof') }
+        let(:error) { VerySpecificError.new }
 
         it "should call monitor_transaction and stop and then raise the error" do
           Appsignal.should_receive(:monitor_transaction).with(

data/spec/spec_helper.rb

@@ -1,15 +1,21 @@
 ENV['RAILS_ENV'] ||= 'test'
 ENV['PADRINO_ENV'] ||= 'test'
 
+APPSIGNAL_SPEC_DIR = File.expand_path(File.dirname(__FILE__))
+
 require 'rack'
 require 'rspec'
 require 'pry'
 require 'timecop'
 require 'webmock/rspec'
 
-puts "Runnings specs in #{RUBY_VERSION} on #{RUBY_PLATFORM}"
+Dir[File.join(APPSIGNAL_SPEC_DIR, 'support/helpers', '*.rb')].each do |f|
+  require f
+end
+
+$LOAD_PATH.unshift(File.join(APPSIGNAL_SPEC_DIR, 'support/stubs'))
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support/stubs'))
+puts "Running specs in #{RUBY_VERSION} on #{RUBY_PLATFORM}\n\n"
 
 begin
   require 'rails'
@@ -21,6 +27,8 @@ rescue LoadError
   RAILS_PRESENT = false
 end
 
+require 'appsignal'
+
 def rails_present?
   RAILS_PRESENT
 end
@@ -101,26 +109,6 @@ rescue LoadError
   false
 end
 
-require 'appsignal'
-
-def spec_dir
-  File.dirname(__FILE__)
-end
-
-def tmp_dir
-  @tmp_dir ||= File.expand_path('tmp', spec_dir)
-end
-
-def fixtures_dir
-  @fixtures_dir ||= File.expand_path('support/fixtures', spec_dir)
-end
-
-def helpers_dir
-  @helpers_dir ||= File.expand_path('support/helpers', spec_dir)
-end
-
-Dir[File.join(helpers_dir, '*.rb')].each { |file| require file }
-
 # Add way to clear subscribers between specs
 module ActiveSupport
   module Notifications
@@ -134,6 +122,7 @@ module ActiveSupport
 end
 
 RSpec.configure do |config|
+  config.include DirectoryHelper
   config.include ConfigHelpers
   config.include EnvHelpers
   config.include NotificationHelpers
@@ -166,6 +155,3 @@ RSpec.configure do |config|
     Appsignal.logger = nil
   end
 end
-
-class VerySpecificError < RuntimeError
-end

data/spec/support/helpers/directory_helper.rb

@@ -0,0 +1,17 @@
+module DirectoryHelper
+  def spec_dir
+    APPSIGNAL_SPEC_DIR
+  end
+
+  def support_dir
+    @support_dir ||= File.join(spec_dir, 'support')
+  end
+
+  def tmp_dir
+    @tmp_dir ||= File.join(spec_dir, 'tmp')
+  end
+
+  def fixtures_dir
+    @fixtures_dir ||= File.join(support_dir, 'fixtures')
+  end
+end

data/spec/support/helpers/very_specific_error.rb

@@ -0,0 +1,8 @@
+# This VerySpecificError is used for throwing errors in specs that are allowed
+# or expected.
+#
+# For example, this error can be thrown to raise an exception in AppSignal's
+# run, which should stop the program and the appsignal gem, but not crash the
+# test suite.
+class VerySpecificError < RuntimeError
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -129,7 +129,6 @@ files:
 - appsignal.gemspec
 - benchmark.rake
 - bin/appsignal
-- circle.yml
 - ext/agent.yml
 - ext/appsignal_extension.c
 - ext/extconf.rb
@@ -283,10 +282,12 @@ files:
 - spec/support/fixtures/generated_config.yml
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/config_helpers.rb
+- spec/support/helpers/directory_helper.rb
 - spec/support/helpers/env_helpers.rb
 - spec/support/helpers/notification_helpers.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
+- spec/support/helpers/very_specific_error.rb
 - spec/support/mocks/mock_extension.rb
 - spec/support/project_fixture/config/application.rb
 - spec/support/project_fixture/config/appsignal.yml
@@ -317,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -386,10 +387,12 @@ test_files:
 - spec/support/fixtures/generated_config.yml
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/config_helpers.rb
+- spec/support/helpers/directory_helper.rb
 - spec/support/helpers/env_helpers.rb
 - spec/support/helpers/notification_helpers.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
+- spec/support/helpers/very_specific_error.rb
 - spec/support/mocks/mock_extension.rb
 - spec/support/project_fixture/config/application.rb
 - spec/support/project_fixture/config/appsignal.yml
@@ -399,4 +402,3 @@ test_files:
 - spec/support/project_fixture/log/.gitkeep
 - spec/support/rails/my_app.rb
 - spec/support/stubs/delayed_job.rb
-has_rdoc: 

data/circle.yml

@@ -1,12 +0,0 @@
-machine:
-  ruby:
-    version: 2.3.0
-
-dependencies:
-  override:
-    - bundle
-    - bundle exec rake generate_bundle_and_spec_all
-
-test:
-  override:
-    - ./bundle_and_spec_all_rvm