appsignal 1.3.5 → 1.3.6.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1df981364fb99fb2a476f560e03d4daa641ed611
-  data.tar.gz: 2f0ce5ca8fbf1a6b71aba911969526bff71e25a7
+  metadata.gz: c006b3a5ff128b594596cc197d2f9c1b7a2c6a8e
+  data.tar.gz: caf8636d1ba933831cf582f65962d2c7155b62a9
 SHA512:
-  metadata.gz: 089d7016d35c1bcde5db31d0030b7d35f8961f97f776121886d1d113ce775bdb0db77afea79b70cf64000ce141bb954af5c3a39c756fe4dbe9d8df8274c837c3
-  data.tar.gz: 535b644066102b0deecd804aea5fc5bab859c59b659e51f29ffa34ffbc8d9ba5509636fd18d0f03da7637ce0c85233703d350c7d645f85a4716aaff532fa2e0b
+  metadata.gz: ddcb3f8151c062c01a029a595a7ca0d93cd93920bdeb1cf8cbc4f0922ab66fc291fba56fc3db3f2f121779a4bd3a186959da19ac1105a56fa251c6963e1c95ae
+  data.tar.gz: 5c79420049ae3cf242c426e1953c7a3286fa4630dd018703534b30502a2ec33aeb085ba5339e6caed01430c5629050eb571ffb9d533d69f483f4e6871fabebf5

data/CHANGELOG.md

@@ -1,8 +1,17 @@
+# 1.3.6
+* Support blocks arguments on method instrumentation
+* Support `APPSIGNAL_APP_ENV` for Sinatra
+* Minor improvements to installer
+* More robust handing of non-writable log files
+* Cleaner internal exception handling
+* Support for mixed case keywords in sql lexing
+* Support for inserting multiple rows in sql lexing
+
 # 1.3.5
 
-- Fix SSL certificate config in appsignal-agent. PR #151
-- Remove mounted_at Sinatra middleware option. Now detected by default. PR #146
-- Sinatra applications with middleware loading before AppSignal's middleware
+* Fix SSL certificate config in appsignal-agent. PR #151
+* Remove mounted_at Sinatra middleware option. Now detected by default. PR #146
+* Sinatra applications with middleware loading before AppSignal's middleware
   would crash a request. Fixed in PR #156
 
 # 1.3.4

data/ext/agent.yml

@@ -1,18 +1,18 @@
 ---
-version: f0c15da
+version: 220a888
 triples:
   x86_64-linux:
-    checksum: 2af2810c660b7b1ad38f5962db00a81965dcf0be07b101ff87f182d1699165b5
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-x86_64-linux-all-static.tar.gz
+    checksum: 5e313156339389b339c289592327ac1c3d57999df93cd31ce9c69fa4ede1e38f
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-x86_64-linux-all-static.tar.gz
   i686-linux:
-    checksum: a96f492f08bcccb0e66347fb0920b56d3d5c2958776469a241bf4357cfb4c1a0
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-i686-linux-all-static.tar.gz
+    checksum: caeac8747e368bc122e56fdebd498b8c381a6d19d2b2dfaf01b648a6a973b28d
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-i686-linux-all-static.tar.gz
   x86-linux:
-    checksum: a96f492f08bcccb0e66347fb0920b56d3d5c2958776469a241bf4357cfb4c1a0
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-i686-linux-all-static.tar.gz
+    checksum: caeac8747e368bc122e56fdebd498b8c381a6d19d2b2dfaf01b648a6a973b28d
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-i686-linux-all-static.tar.gz
   x86_64-darwin:
-    checksum: 0bbfdf50c06f1b3759ccac1a5b9bed8ebe42859144a045404ce258b3a2a93a4a
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 949a325baf8b1a40978288082cf1689c22d48cdef6acbbc389d5613d670f6fb9
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-x86_64-darwin-all-static.tar.gz
   universal-darwin:
-    checksum: 0bbfdf50c06f1b3759ccac1a5b9bed8ebe42859144a045404ce258b3a2a93a4a
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 949a325baf8b1a40978288082cf1689c22d48cdef6acbbc389d5613d670f6fb9
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-x86_64-darwin-all-static.tar.gz

data/lib/appsignal.rb

@@ -235,22 +235,26 @@ module Appsignal
     end
 
     def log_formatter
-        proc do |severity, datetime, progname, msg|
-          "[#{datetime.strftime('%Y-%m-%dT%H:%M:%S')} (process) ##{Process.pid}][#{severity}] #{msg}\n"
-        end
+      proc do |severity, datetime, progname, msg|
+        "[#{datetime.strftime('%Y-%m-%dT%H:%M:%S')} (process) ##{Process.pid}][#{severity}] #{msg}\n"
+      end
     end
 
     def start_logger(path_arg=nil)
       path = Appsignal.config ? Appsignal.config.log_file_path : nil
-      if path && !ENV['DYNO']
-        @logger = Logger.new(path)
-        @logger.formatter = log_formatter
-      else
-        @logger = Logger.new($stdout)
-        @logger.formatter = lambda do |severity, datetime, progname, msg|
-          "appsignal: #{msg}\n"
+      if path && !heroku?
+        begin
+          @logger = Logger.new(path)
+          @logger.formatter = log_formatter
+        rescue SystemCallError => error
+          start_stdout_logger
+          logger.warn "appsignal: Unable to start logger with log path '#{path}'."
+          logger.warn "appsignal: #{error}"
         end
+      else
+        start_stdout_logger
       end
+
       if config && config[:debug]
         @logger.level = Logger::DEBUG
       else
@@ -292,6 +296,19 @@ module Appsignal
     ensure
       Appsignal::Transaction.current.resume! if Appsignal::Transaction.current
     end
+
+    private
+
+    def start_stdout_logger
+      @logger = Logger.new($stdout)
+      @logger.formatter = lambda do |severity, datetime, progname, msg|
+        "appsignal: #{msg}\n"
+      end
+    end
+
+    def heroku?
+      ENV['DYNO']
+    end
   end
 end
 

data/lib/appsignal/cli/install.rb

@@ -93,11 +93,6 @@ module Appsignal
           puts
           puts "  require 'appsignal/integrations/sinatra'"
           press_any_key
-          puts "Configure subclass apps"
-          puts "  If your app is a subclass of Sinatra::Base you need to use this middleware:"
-          puts
-          puts "  use Appsignal::Rack::SinatraInstrumentation"
-          press_any_key
           done_notice
         end
 
@@ -136,6 +131,21 @@ module Appsignal
           done_notice
         end
 
+        def install_for_capistrano
+          capfile = File.join(Dir.pwd, 'Capfile')
+          return unless File.exist?(capfile)
+          return if File.read(capfile) =~ %r{require ['|"]appsignal/capistrano}
+
+          puts 'Installing for Capistrano'
+          print '  Adding AppSignal integration to Capfile'
+          File.open(capfile, 'a') do |f|
+            f.write "\nrequire 'appsignal/capistrano'\n"
+          end
+          periods
+          puts
+          puts
+        end
+
         def colorize(text, color)
           return text if Gem.win_platform?
           color_code = case color
@@ -187,16 +197,7 @@ module Appsignal
         end
 
         def configure(config, environments, name_overwritten)
-          deploy_rb_file = File.join(Dir.pwd, 'config/deploy.rb')
-          if File.exist?(deploy_rb_file) && (File.read(deploy_rb_file) =~ /require (\'|\").\/appsignal\/capistrano/).nil?
-            print 'Adding AppSignal integration to deploy.rb'
-            File.open(deploy_rb_file, 'a') do |f|
-              f.write "\nrequire 'appsignal/capistrano'\n"
-            end
-            periods
-            puts
-            puts
-          end
+          install_for_capistrano
 
           puts "How do you want to configure AppSignal?"
           puts "  (1) a config file"

data/lib/appsignal/config.rb

@@ -5,6 +5,7 @@ require 'socket'
 
 module Appsignal
   class Config
+    SYSTEM_TMP_DIR = '/tmp'
     DEFAULT_CONFIG = {
       :debug                          => false,
       :ignore_errors                  => [],
@@ -91,12 +92,19 @@ module Appsignal
     def log_file_path
       path = config_hash[:log_path] || root_path
       if path && File.writable?(path)
-        File.join(File.realpath(path), 'appsignal.log')
+        return File.join(File.realpath(path), 'appsignal.log')
+      end
+
+      if File.writable? SYSTEM_TMP_DIR
+        $stdout.puts "appsignal: Unable to log to '#{path}'. Logging to "\
+          "'#{SYSTEM_TMP_DIR}' instead. Please check the "\
+          "permissions for the application's log directory."
+        File.join(SYSTEM_TMP_DIR, 'appsignal.log')
       else
-        '/tmp/appsignal.log'
+        $stdout.puts "appsignal: Unable to log to '#{path}' or the "\
+          "'#{SYSTEM_TMP_DIR}' fallback. Please check the permissions "\
+          "for the application's (log) directory."
       end
-    rescue Errno::ENOENT
-      '/tmp/appsignal.log'
     end
 
     def valid?

data/lib/appsignal/event_formatter.rb

@@ -46,7 +46,7 @@ module Appsignal
             else
               raise "#{f} does not have a format(payload) method"
             end
-          rescue Exception => ex
+          rescue => ex
             formatter_classes.delete(name)
             formatters.delete(name)
             Appsignal.logger.debug("'#{ex.message}' when initializing #{name} event formatter")

data/lib/appsignal/integrations/object.rb

@@ -2,24 +2,24 @@ class Object
   def self.appsignal_instrument_class_method(method_name, options = {})
     singleton_class.send \
       :alias_method, "appsignal_uninstrumented_#{method_name}", method_name
-    singleton_class.send(:define_method, method_name) do |*args|
+    singleton_class.send(:define_method, method_name) do |*args, &block|
       name = options.fetch(:name) do
         "#{method_name}.class_method.#{appsignal_reverse_class_name}.other"
       end
       Appsignal.instrument name do
-        send "appsignal_uninstrumented_#{method_name}", *args
+        send "appsignal_uninstrumented_#{method_name}", *args, &block
       end
     end
   end
 
   def self.appsignal_instrument_method(method_name, options = {})
     alias_method "appsignal_uninstrumented_#{method_name}", method_name
-    define_method method_name do |*args|
+    define_method method_name do |*args, &block|
       name = options.fetch(:name) do
         "#{method_name}.#{appsignal_reverse_class_name}.other"
       end
       Appsignal.instrument name do
-        send "appsignal_uninstrumented_#{method_name}", *args
+        send "appsignal_uninstrumented_#{method_name}", *args, &block
       end
     end
   end

data/lib/appsignal/integrations/sinatra.rb

@@ -6,7 +6,7 @@ Appsignal.logger.info("Loading Sinatra (#{Sinatra::VERSION}) integration")
 app_settings = ::Sinatra::Application.settings
 Appsignal.config = Appsignal::Config.new(
   app_settings.root || Dir.pwd,
-  app_settings.environment
+  ENV.fetch('APPSIGNAL_APP_ENV'.freeze, app_settings.environment)
 )
 
 Appsignal.start_logger

data/lib/appsignal/integrations/webmachine.rb

@@ -25,7 +25,7 @@ module Appsignal::Integrations
         handle_exceptions_without_appsignal do
           begin
             yield
-          rescue Exception => e
+          rescue => e
             Appsignal.set_error(e)
             raise e
           end

data/lib/appsignal/rack/streaming_listener.rb

@@ -54,13 +54,15 @@ module Appsignal
     def each
       @stream.each { |c| yield(c) }
     rescue Exception => e
-      @transaction.set_error(e); raise e
+      @transaction.set_error(e)
+      raise e
     end
 
     def close
       @stream.close if @stream.respond_to?(:close)
     rescue Exception => e
-      @transaction.set_error(e); raise e
+      @transaction.set_error(e)
+      raise e
     ensure
       Appsignal::Transaction.complete_current!
     end

data/lib/appsignal/transaction.rb

@@ -52,7 +52,7 @@ module Appsignal
 
       def complete_current!
         current.complete
-      rescue Exception => e
+      rescue => e
         Appsignal.logger.error("Failed to complete transaction ##{current.transaction_id}. #{e.message}")
       ensure
         Thread.current[:appsignal_transaction] = nil
@@ -269,9 +269,9 @@ module Appsignal
       params =
         begin
           request.send options[:params_method]
-        rescue Exception => ex
+        rescue => e
           # Getting params from the request has been know to fail.
-          Appsignal.logger.debug "Exception while getting params: #{ex}"
+          Appsignal.logger.debug "Exception while getting params: #{e}"
           nil
         end
       return unless params

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.3.5'
+  VERSION = '1.3.6.beta.1'
 end

data/spec/lib/appsignal/capistrano2_spec.rb

@@ -6,19 +6,13 @@ if capistrano2_present?
   describe "Capistrano 2 integration" do
     let(:out_stream) { StringIO.new }
     let(:config) { project_fixture_config }
-
-    before do
-      @original_stdout = $stdout
-      $stdout = out_stream
-    end
-    after do
-      $stdout = @original_stdout
-    end
-
     before :all do
       @capistrano_config = Capistrano::Configuration.new
       Appsignal::Capistrano.tasks(@capistrano_config)
     end
+    around do |example|
+      capture_stdout(out_stream) { example.run }
+    end
 
     it "should have a deploy task" do
       @capistrano_config.find_task('appsignal:deploy').should_not be_nil

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -14,18 +14,11 @@ if capistrano3_present?
       @capistrano_config = Capistrano::Configuration.env
       @capistrano_config.set(:log_level, :error)
       @capistrano_config.set(:logger, logger)
-    end
-    before do
-      @original_stdout = $stdout
-      $stdout = out_stream
-      @original_stderr = $stderr
-      $stderr = out_stream
-    end
-    after do
-      $stdout = @original_stdout
-      $stderr = @original_stderr
       Rake::Task['appsignal:deploy'].reenable
     end
+    around do |example|
+      capture_std_streams(out_stream, out_stream) { example.run }
+    end
 
     it "should have a deploy task" do
       Rake::Task.task_defined?('appsignal:deploy').should be_true

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

@@ -13,15 +13,13 @@ describe Appsignal::CLI::Install do
 
   before do
     Dir.stub(:pwd => project_fixture_path)
-    @original_stdout = $stdout
-    $stdout = out_stream
     Appsignal::AuthCheck.stub(:new => auth_check)
     auth_check.stub(:perform => '200')
     cli.stub(:sleep)
     cli.stub(:press_any_key)
   end
-  after do
-    $stdout = @original_stdout
+  around do |example|
+    capture_stdout(out_stream) { example.run }
   end
 
   describe ".run" do
@@ -374,24 +372,50 @@ describe Appsignal::CLI::Install do
       end
     end
 
-    context "when deploy.rb is present" do
-      let(:config_dir) { File.join(tmp_dir, 'config') }
-      let(:deploy_rb_file) { File.join(tmp_dir, 'config/deploy.rb') }
+    context "with capistrano" do
+      let(:capfile) { File.join(tmp_dir, 'Capfile') }
       before do
         Dir.stub(:pwd => tmp_dir)
-        FileUtils.mkdir_p(config_dir)
-        FileUtils.touch(deploy_rb_file)
+        FileUtils.mkdir_p(tmp_dir)
         cli.should_receive(:gets).once.and_return('2')
       end
       after do
-        FileUtils.rm_rf(config_dir)
+        FileUtils.rm_rf(tmp_dir)
       end
 
-      it "should add a require to deploy.rb" do
-        cli.configure(config, [], false)
+      context "without Capfile" do
+        before { cli.configure(config, [], false) }
+
+        it "does nothing" do
+          expect(out_stream.string).to_not include 'Adding AppSignal integration to Capfile'
+          expect(File.exist?(capfile)).to be_false
+        end
+      end
 
-        out_stream.string.should include 'Adding AppSignal integration to deploy.rb'
-        File.read(deploy_rb_file).should include "require 'appsignal/capistrano'"
+      context "with Capfile" do
+        context "when already installed" do
+          before do
+            File.open(capfile, 'w') { |f| f.write("require 'appsignal/capistrano'") }
+            cli.configure(config, [], false)
+          end
+
+          it "does not add another require to Capfile" do
+            expect(out_stream.string).to_not include 'Adding AppSignal integration to Capfile'
+            expect(File.read(capfile).scan(/appsignal/).count).to eq(1)
+          end
+        end
+
+        context "when not installed" do
+          before do
+            FileUtils.touch(capfile)
+            cli.configure(config, [], false)
+          end
+
+          it "adds a require to Capfile" do
+            expect(out_stream.string).to include 'Adding AppSignal integration to Capfile'
+            expect(File.read(capfile)).to include "require 'appsignal/capistrano'"
+          end
+        end
       end
     end
   end

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

@@ -6,12 +6,10 @@ describe Appsignal::CLI::NotifyOfDeploy do
   let(:config) { Appsignal::Config.new(project_fixture_path, {}) }
   let(:marker_data) { {:revision => 'aaaaa', :user => 'thijs', :environment => 'production'} }
   before do
-    @original_stdout = $stdout
-    $stdout = out_stream
     config.stub(:active? => true)
   end
-  after do
-    $stdout = @original_stdout
+  around do |example|
+    capture_stdout(out_stream) { example.run }
   end
 
   describe ".run" do

data/spec/lib/appsignal/cli_spec.rb

@@ -4,13 +4,11 @@ describe Appsignal::CLI do
   let(:out_stream) { StringIO.new }
   let(:cli) { Appsignal::CLI }
   before do
-    @original_stdout = $stdout
-    $stdout = out_stream
     Dir.stub(:pwd => project_fixture_path)
     cli.options = {:environment => 'production'}
   end
-  after do
-    $stdout = @original_stdout
+  around do |example|
+    capture_stdout(out_stream) { example.run }
   end
 
   describe "#config" do

data/spec/lib/appsignal/config_spec.rb

@@ -40,31 +40,145 @@ describe Appsignal::Config do
       })
     end
 
-    context "if a log file path is set" do
-      let(:config) { project_fixture_config('production', :log_path => '/tmp') }
+    describe "#log_file_path" do
+      let(:stdout) { StringIO.new }
+      let(:config) { project_fixture_config('production', :log_path => log_path) }
+      subject { config.log_file_path }
+      around do |example|
+        original_stdout = $stdout
+        $stdout = stdout
+        example.run
+        $stdout = original_stdout
+      end
+
+      context "when path is writable" do
+        let(:log_path) { File.join(tmp_dir, 'writable-path') }
+        before { FileUtils.mkdir_p(log_path, :mode => 0755) }
+        after { FileUtils.rm_rf(log_path) }
+
+        it "returns log file path" do
+          expect(subject).to eq File.join(log_path, 'appsignal.log')
+        end
+
+        it "prints no warning" do
+          subject
+          expect(stdout.string).to be_empty
+        end
+      end
 
-      its(:log_file_path) { should end_with('/tmp/appsignal.log') }
+      shared_examples '#log_file_path: tmp path' do
+        let(:system_tmp_dir) { Appsignal::Config::SYSTEM_TMP_DIR }
+        before { FileUtils.mkdir_p(system_tmp_dir) }
+        after { FileUtils.rm_rf(system_tmp_dir) }
 
-      context "if it is not writable" do
-        before { FileUtils.mkdir_p('/tmp/not-writable', :mode => 0555) }
+        context "when the /tmp fallback path is writable" do
+          before { FileUtils.chmod(0777, system_tmp_dir) }
 
-        let(:config) { project_fixture_config('production', :log_path => '/tmp/not-writable') }
+          it "returns returns the tmp location" do
+            expect(subject).to eq(File.join(system_tmp_dir, 'appsignal.log'))
+          end
 
-        its(:log_file_path) { should eq '/tmp/appsignal.log' }
+          it "prints a warning" do
+            subject
+            expect(stdout.string).to include "appsignal: Unable to log to '#{log_path}'. "\
+              "Logging to '#{system_tmp_dir}' instead."
+          end
+        end
+
+        context "when the /tmp fallback path is not writable" do
+          before { FileUtils.chmod(0555, system_tmp_dir) }
+
+          it "returns nil" do
+            expect(subject).to be_nil
+          end
+
+          it "prints a warning" do
+            subject
+            expect(stdout.string).to include "appsignal: Unable to log to '#{log_path}' "\
+              "or the '#{system_tmp_dir}' fallback."
+          end
+        end
       end
 
-      context "if it does not exist" do
-        let(:config) { project_fixture_config('production', :log_path => '/non-existing') }
+      context "when path is nil" do
+        let(:log_path) { nil }
+
+        context "when root_path is nil" do
+          before { allow(config).to receive(:root_path).and_return(nil) }
 
-        its(:log_file_path) { should eq '/tmp/appsignal.log' }
+          include_examples '#log_file_path: tmp path'
+        end
+
+        context "when root_path is set" do
+          it "returns returns the project log location" do
+            expect(subject).to eq File.join(config.root_path, 'appsignal.log')
+          end
+
+          it "prints no warning" do
+            subject
+            expect(stdout.string).to be_empty
+          end
+        end
+      end
+
+      context "when path does not exist" do
+        let(:log_path) { '/non-existing' }
+
+        include_examples '#log_file_path: tmp path'
+      end
+
+      context "when path is not writable" do
+        let(:log_path) { File.join(tmp_dir, 'not-writable-path') }
+        before { FileUtils.mkdir_p(log_path, :mode => 0555) }
+        after { FileUtils.rm_rf(log_path) }
+
+        include_examples '#log_file_path: tmp path'
       end
 
-      context "if it is nil" do
-        let(:config) { project_fixture_config('production', :log_path => nil) }
+      context "when path is a symlink" do
+        context "when linked path does not exist" do
+          let(:real_path) { File.join(tmp_dir, 'real-path') }
+          let(:log_path) { File.join(tmp_dir, 'symlink-path') }
+          before { File.symlink(real_path, log_path) }
+          after { FileUtils.rm(log_path) }
 
-        before { config.stub(:root_path => nil) }
+          include_examples '#log_file_path: tmp path'
+        end
 
-        its(:log_file_path) { should eq '/tmp/appsignal.log' }
+        context "when linked path exists" do
+          context "when linked path is not writable" do
+            let(:real_path) { File.join(tmp_dir, 'real-path') }
+            let(:log_path) { File.join(tmp_dir, 'symlink-path') }
+            before do
+              FileUtils.mkdir_p(real_path)
+              FileUtils.chmod(0444, real_path)
+              File.symlink(real_path, log_path)
+            end
+            after do
+              FileUtils.rm_rf(real_path)
+              FileUtils.rm(log_path)
+            end
+
+            include_examples '#log_file_path: tmp path'
+          end
+
+          context "when linked path is writable" do
+            let(:real_path) { File.join(tmp_dir, 'real-path') }
+            let(:log_path) { File.join(tmp_dir, 'symlink-path') }
+            before do
+              FileUtils.mkdir_p(real_path)
+              File.symlink(real_path, log_path)
+            end
+            after do
+              FileUtils.rm_rf(real_path)
+              FileUtils.rm(log_path)
+            end
+
+            it "returns real path of log path" do
+              expect(subject).to eq(File.join(real_path, 'appsignal.log'))
+            end
+          end
+        end
       end
     end
 

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

@@ -1,14 +1,11 @@
 if webmachine_present?
   describe Appsignal::Hooks::WebmachineHook do
     context "with webmachine" do
-      before(:all) do
-        Appsignal::Hooks::WebmachineHook.new.install
-      end
+      let(:fsm) { Webmachine::Decision::FSM.new(double(:trace? => false), double, double) }
+      before(:all) { start_agent }
 
       its(:dependencies_present?) { should be_true }
 
-      let(:fsm) { Webmachine::Decision::FSM.new(double(:trace? => false), double, double) }
-
       it "should include the run alias methods" do
         expect( fsm ).to respond_to(:run_with_appsignal)
         expect( fsm ).to respond_to(:run_without_appsignal)

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

@@ -92,6 +92,21 @@ describe Object do
             expect(instance.foo).to eq(1)
           end
         end
+
+        context "with a method given a block" do
+          let(:klass) do
+            Class.new do
+              def foo
+                yield
+              end
+              appsignal_instrument_method :foo
+            end
+          end
+
+          it "should yield the block" do
+            expect(instance.foo { 42 }).to eq(42)
+          end
+        end
       end
 
       context "when not active" do
@@ -194,6 +209,21 @@ describe Object do
             expect(klass.bar).to eq(2)
           end
         end
+
+        context "with a method given a block" do
+          let(:klass) do
+            Class.new do
+              def self.bar
+                yield
+              end
+              appsignal_instrument_class_method :bar
+            end
+          end
+
+          it "should yield the block" do
+            expect(klass.bar { 42 }).to eq(42)
+          end
+        end
       end
 
       context "when not active" do

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

@@ -3,16 +3,43 @@ if sinatra_present? && !padrino_present?
   require 'appsignal/integrations/sinatra'
 
   describe "Sinatra integration" do
-    context "logger" do
+    context "Appsignal.logger" do
       subject { Appsignal.logger }
 
       it { should be_a Logger }
     end
 
-    it "should have added the instrumentation middleware" do
-      Sinatra::Base.middleware.to_a.should include(
-        [Appsignal::Rack::SinatraBaseInstrumentation, [], nil]
-      )
+    describe "middleware" do
+      it "adds the instrumentation middleware to Sinatra::Base" do
+        Sinatra::Base.middleware.to_a.should include(
+          [Appsignal::Rack::SinatraBaseInstrumentation, [], nil]
+        )
+      end
+    end
+
+    describe "environment" do
+      subject { Appsignal.config.env }
+
+      context "without APPSIGNAL_APP_ENV" do
+        before do
+          load File.expand_path('lib/appsignal/integrations/sinatra.rb', project_dir)
+        end
+
+        it "uses the app environment" do
+          expect(subject).to eq('test')
+        end
+      end
+
+      context "with APPSIGNAL_APP_ENV" do
+        before do
+          ENV['APPSIGNAL_APP_ENV'] = 'env-staging'
+          load File.expand_path('lib/appsignal/integrations/sinatra.rb', project_dir)
+        end
+
+        it "uses the environment variable" do
+          expect(subject).to eq('env-staging')
+        end
+      end
     end
   end
 end

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

@@ -3,17 +3,14 @@ if webmachine_present?
   require 'appsignal/integrations/webmachine'
 
   describe Appsignal::Integrations::WebmachinePlugin::FSM do
-    before(:all) do
-      Appsignal::Hooks::WebmachineHook.new.install
-    end
     let(:request) do
       Webmachine::Request.new('GET', 'http://google.com:80/foo', {}, nil)
     end
     let(:resource)    { double(:trace? => false, :handle_exception => true) }
     let(:response)    { double }
     let(:transaction) { double(:set_action => true) }
-
     let(:fsm) { Webmachine::Decision::FSM.new(resource, request, response) }
+    before(:all) { start_agent }
 
     # Make sure the request responds to the method we need to get query params.
     describe "request" do
@@ -58,18 +55,15 @@ if webmachine_present?
       after { fsm.run }
     end
 
-    describe "handle_exceptions_with_appsignal" do
-      let(:error) { VerySpecificError.new('error') }
+    describe "#handle_exceptions_with_appsignal" do
+      let(:error) { VerySpecificError.new }
 
       it "should catch the error and send it to AppSignal" do
         expect( Appsignal ).to receive(:set_error).with(error)
       end
 
       after do
-        begin
-          fsm.send(:handle_exceptions) { raise error };
-        rescue VerySpecificError
-        end
+        fsm.send(:handle_exceptions) { raise error }
       end
     end
 

data/spec/lib/appsignal/marker_spec.rb

@@ -12,12 +12,8 @@ describe Appsignal::Marker do
     )
   }
   let(:out_stream) { StringIO.new }
-  before do
-    @original_stdout = $stdout
-    $stdout = out_stream
-  end
-  after do
-    $stdout = @original_stdout
+  around do |example|
+    capture_stdout(out_stream) { example.run }
   end
 
   context "transmit" do

data/spec/lib/appsignal/transaction_spec.rb

@@ -120,10 +120,11 @@ describe Appsignal::Transaction do
 
       context "if a transaction is discarded" do
         it "should not complete the transaction" do
-          Appsignal::Transaction.current.should_not_receive(:complete)
+          expect(Appsignal::Transaction.current.ext).to_not receive(:complete)
 
           Appsignal::Transaction.current.discard!
           expect(Appsignal::Transaction.current.discarded?).to be_true
+
           Appsignal::Transaction.complete_current!
 
           Thread.current[:appsignal_transaction].should be_nil

data/spec/lib/appsignal_spec.rb

@@ -550,69 +550,124 @@ describe Appsignal do
 
     describe ".start_logger" do
       let(:out_stream) { StringIO.new }
-      let(:log_path) { File.join(project_fixture_path, 'log') }
+      let(:log_path) { File.join(tmp_dir, 'log') }
       let(:log_file) { File.join(log_path, 'appsignal.log') }
 
       before do
-        FileUtils.rm_f(log_file)
-        @original_stdout = $stdout
-        $stdout = out_stream
-        Appsignal.logger.error('Log something')
+        FileUtils.mkdir_p(log_path)
+
+        Appsignal.logger.error('Log in memory')
         Appsignal.config = project_fixture_config(
           'production',
           :log_path => log_path
         )
       end
-      after do
-        $stdout = @original_stdout
+      around do |example|
+        capture_stdout(out_stream) { example.run }
       end
+      after { FileUtils.rm_rf(log_path) }
 
       context "when the log path is writable" do
-        it "should log to file" do
+        context "when the log file is writable" do
+          let(:log_file_contents) { File.open(log_file).read }
+          before do
+            Appsignal.start_logger
+            Appsignal.logger.error('Log to file')
+          end
+
+          it "logs to file" do
+            expect(File.exist?(log_file)).to be_true
+            expect(log_file_contents).to include 'Log to file'
+          end
+
+          it "amends in memory log to log file" do
+            expect(log_file_contents).to include 'Log in memory'
+          end
+        end
+
+        context "when the log file is not writable" do
+          before do
+            FileUtils.touch log_file
+            FileUtils.chmod 0444, log_file
+
+            Appsignal.start_logger
+            Appsignal.logger.error('Log to not writable log file')
+          end
+
+          it "logs to stdout" do
+            expect(File.writable?(log_file)).to be_false
+            expect(out_stream.string).to include 'Log to not writable log file'
+          end
+
+          it "outputs a warning" do
+            output = out_stream.string
+            expect(output).to include "appsignal: Unable to start logger with "\
+              "log path '#{log_file}'."
+            expect(output).to include "appsignal: Permission denied"
+          end
+        end
+      end
+
+      context "when the log path is not writable" do
+        before do
+          FileUtils.chmod 0444, log_path
+
           Appsignal.start_logger
-          Appsignal.logger.level.should eq Logger::INFO
-          Appsignal.logger.error('Log to file')
-          File.exist?(log_file).should be_true
-          File.open(log_file).read.should include 'Log to file'
-          File.open(log_file).read.should include 'Log something'
+          Appsignal.logger.error('Log to not writable log path')
+        end
+
+        it "logs to stdout" do
+          expect(File.writable?(log_path)).to be_false
+          expect(out_stream.string).to include 'Log to not writable log path'
+        end
+
+        it "amends in memory log to stdout" do
+          expect(out_stream.string).to include 'Log in memory'
         end
       end
 
-      context "when we're on Heroku" do
+      context "when on Heroku" do
         before do
           ENV['DYNO'] = 'dyno1'
+          Appsignal.start_logger
+          Appsignal.logger.error('Log to stdout')
         end
         after { ENV.delete('DYNO') }
 
         it "should log to stdout" do
-          Appsignal.start_logger
-          Appsignal.logger.level.should eq Logger::INFO
-          Appsignal.logger.error('Log to stdout')
           out_stream.string.should include 'appsignal: Log to stdout'
-          out_stream.string.should include 'Log something'
         end
-      end
 
-      context "when there is no in memory log" do
-        it "should not crash" do
-          Appsignal.in_memory_log = nil
-          Appsignal.start_logger
+        it "amends in memory log to stdout" do
+          expect(out_stream.string).to include 'Log in memory'
         end
       end
 
-      context "when there is no config and debug is on" do
-        it "should set the log level to info" do
-          Appsignal.config = nil
-          Appsignal.start_logger
-          Appsignal.logger.level.should eq Logger::INFO
+      describe "#logger#level" do
+        subject { Appsignal.logger.level }
+
+        context "when there is no config" do
+          before do
+            Appsignal.config = nil
+            Appsignal.start_logger
+          end
+
+          it "sets the log level to info" do
+            expect(subject).to eq Logger::INFO
+          end
         end
-      end
 
-      context "when there is a config and debug is on" do
-        it "should set the log level to debug" do
-          Appsignal.config.config_hash[:debug] = true
-          Appsignal.start_logger
-          Appsignal.logger.level.should eq Logger::DEBUG
+        context "when there is a config" do
+          context "when log level is configured to debug" do
+            before do
+              Appsignal.config.config_hash[:debug] = true
+              Appsignal.start_logger
+            end
+
+            it "sets the log level to debug" do
+              expect(subject).to eq Logger::DEBUG
+            end
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 ENV['RAILS_ENV'] ||= 'test'
+ENV['RACK_ENV'] ||= 'test'
 ENV['PADRINO_ENV'] ||= 'test'
 
 APPSIGNAL_SPEC_DIR = File.expand_path(File.dirname(__FILE__))
@@ -123,6 +124,7 @@ end
 
 RSpec.configure do |config|
   config.include DirectoryHelper
+  config.include StdStreamsHelper
   config.include ConfigHelpers
   config.include EnvHelpers
   config.include NotificationHelpers
@@ -132,10 +134,11 @@ RSpec.configure do |config|
   config.before :all do
     FileUtils.rm_rf(tmp_dir)
     FileUtils.mkdir_p(tmp_dir)
-  end
 
-  config.after do
-    Thread.current[:appsignal_transaction] = nil
+    # Use modifiable SYSTEM_TMP_DIR
+    Appsignal::Config.send :remove_const, :SYSTEM_TMP_DIR
+    Appsignal::Config.send :const_set, :SYSTEM_TMP_DIR,
+      File.join(tmp_dir, 'system-tmp')
   end
 
   config.before do
@@ -148,6 +151,10 @@ RSpec.configure do |config|
     end
   end
 
+  config.after do
+    Thread.current[:appsignal_transaction] = nil
+  end
+
   config.after :all do
     ActiveSupport::Notifications.notifier.clear_subscribers
     FileUtils.rm_f(File.join(project_fixture_path, 'log/appsignal.log'))

data/spec/support/helpers/std_streams_helper.rb

@@ -0,0 +1,35 @@
+module StdStreamsHelper
+  # Capture STDOUT in a variable
+  #
+  # Usage
+  #
+  #     out_stream = StringIO.new
+  #     capture_stdout(out_stream) { do_something }
+  def capture_stdout(stdout)
+    original_stdout = $stdout
+    $stdout = stdout
+
+    yield
+
+    $stdout = original_stdout
+  end
+
+  # Capture STDOUT and STDERR in variables
+  #
+  # Usage
+  #
+  #     out_stream = StringIO.new
+  #     err_stream = StringIO.new
+  #     capture_std_streams(out_stream, err_stream) { do_something }
+  def capture_std_streams(stdout, stderr)
+    original_stdout = $stdout
+    $stdout = stdout
+    original_stderr = $stderr
+    $stderr = stderr
+
+    yield
+
+    $stdout = original_stdout
+    $stderr = original_stderr
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -285,6 +285,7 @@ files:
 - spec/support/helpers/directory_helper.rb
 - spec/support/helpers/env_helpers.rb
 - spec/support/helpers/notification_helpers.rb
+- spec/support/helpers/std_streams_helper.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
 - spec/support/helpers/very_specific_error.rb
@@ -313,12 +314,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -390,6 +391,7 @@ test_files:
 - spec/support/helpers/directory_helper.rb
 - spec/support/helpers/env_helpers.rb
 - spec/support/helpers/notification_helpers.rb
+- spec/support/helpers/std_streams_helper.rb
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
 - spec/support/helpers/very_specific_error.rb
@@ -402,3 +404,4 @@ test_files:
 - spec/support/project_fixture/log/.gitkeep
 - spec/support/rails/my_app.rb
 - spec/support/stubs/delayed_job.rb
+has_rdoc: