appsignal 0.5.1 → 0.5.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGM1YThiMDUxODYwMmYxNzc3NGFhM2FkMzliNmM2NTAxY2FhMDA1Mw==
+  data.tar.gz: !binary |-
+    ZjljZWQ2YzBiMWUzNTc1ZThkYjAxYzIwZTA3YzBkZDliNDY5ZjhiZg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MmE4YWQ3MzNhYmQ4NGNlZTJlZDM5MDVkNGZlN2RjOWE5ODk3OTg5NDg3NzIw
+    ZjUwYTAxYWI4OTkzMWUwNzMwYzMyMmFjZTVkYjRhMWUzZGU1OTY4Y2ExZjY1
+    ZGFkYmQ1Zjg2ZWI2YmQ0OTgxZTk4YzBmYjcxZDcwNzE1Y2NmNjM=
+  data.tar.gz: !binary |-
+    OWFjYjM1MWM3NDgyNmFlZjk2MTE2NWNlZGZjNzkxOGY5ZGNiOTBkMzZhZGJj
+    MDY0NmMwYTQ4ZmU2YjY3N2RhZDBkZDg4MzllZjczNTA4YzUyM2VkN2FkODMw
+    NjZhYTA3ZTk3ZjY1NzUyOGY4NTEyOTcxMTI2ZDVkODg5Nzk2Mzc=

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# 0.5.2
+
+* General improvements to the rails generator
+* Log to STDOUT if writing to log/appsignal.log is not possible (Heroku)
+* Handle the last transactions before the rails process shuts down
+* require 'erb' to enable loading of appsignal config

data/Rakefile

@@ -43,6 +43,7 @@ task :publish do
 
   system("$EDITOR #{VERSION_FILE}")
   if changes.member?(VERSION_FILE)
+    Appsignal.send(:remove_const, :VERSION)
     load File.expand_path(VERSION_FILE)
     build_and_push_gem
     create_and_push_tag

data/lib/appsignal.rb

@@ -51,7 +51,6 @@ module Appsignal
     def active?
       config && config[:active] == true
     end
-
   end
 end
 
@@ -61,6 +60,7 @@ require 'appsignal/auth_check'
 require 'appsignal/cli'
 require 'appsignal/config'
 require 'appsignal/exception_notification'
+require 'appsignal/integrations/passenger'
 require 'appsignal/listener'
 require 'appsignal/marker'
 require 'appsignal/middleware'

data/lib/appsignal/agent.rb

@@ -1,8 +1,8 @@
 module Appsignal
   class Agent
-    ACTION = 'log_entries'
+    ACTION = 'log_entries'.freeze
 
-    attr_reader :aggregator, :active, :sleep_time, :transmitter
+    attr_reader :aggregator, :thread, :active, :sleep_time, :transmitter
 
     def initialize
       return unless Appsignal.active?
@@ -12,6 +12,7 @@ module Appsignal
       @thread = Thread.new do
         while true do
           send_queue if aggregator.has_transactions?
+          Appsignal.logger.debug("[#{$$}] Sleeping #{sleep_time}")
           sleep(sleep_time)
         end
       end
@@ -20,7 +21,7 @@ module Appsignal
         ACTION,
         Appsignal.config.fetch(:api_key)
       )
-      Appsignal.logger.info 'Started the Appsignal agent'
+      Appsignal.logger.info("[#{$$}] Started the Appsignal agent")
     end
 
     def enqueue(transaction)
@@ -28,7 +29,7 @@ module Appsignal
     end
 
     def send_queue
-      Appsignal.logger.debug "Sending queue"
+      Appsignal.logger.debug("[#{$$}] Sending queue")
       current_aggregator = aggregator
       @aggregator = Aggregator.new
       begin
@@ -36,14 +37,30 @@ module Appsignal
       rescue Exception => ex
         Appsignal.logger.error "#{ex.class} while sending queue: #{ex.message}"
         Appsignal.logger.error ex.backtrace.join('\n')
-        stop_logging
       end
     end
 
+    def forked!
+      @forked = true
+      @aggregator = Aggregator.new
+      Appsignal.logger.info("[#{$$}] Forked the Appsignal agent")
+    end
+
+    def forked?
+      @forked ||= false
+    end
+
+    def shutdown(send_current_queue=false)
+      Appsignal.logger.info("[#{$$}] Shutting down the agent")
+      ActiveSupport::Notifications.unsubscribe(Appsignal.subscriber)
+      Thread.kill(thread) if thread
+      send_queue if send_current_queue && @aggregator.has_transactions?
+    end
+
     protected
 
     def handle_result(code)
-      Appsignal.logger.debug "Queue sent, response code: #{code}"
+      Appsignal.logger.debug "[#{$$}] Queue sent, response code: #{code}"
       case code.to_i
       when 200 # ok
       when 420 # Enhance Your Calm
@@ -51,28 +68,23 @@ module Appsignal
       when 413 # Request Entity Too Large
         @sleep_time = sleep_time / 1.5
       when 429
-        Appsignal.logger.error "Too many requests sent"
-        stop_logging
+        Appsignal.logger.error "[#{$$}] Too many requests sent"
+        shutdown
       when 406
-        Appsignal.logger.error "Your appsignal gem cannot communicate with "\
-          "the API anymore, please upgrade."
-        stop_logging
+        Appsignal.logger.error "[#{$$}] Your appsignal gem cannot "\
+          "communicate with the API anymore, please upgrade."
+        shutdown
       when 402
-        Appsignal.logger.error "Payment required"
-        stop_logging
+        Appsignal.logger.error "[#{$$}] Payment required"
+        shutdown
       when 401
-        Appsignal.logger.error "API token cannot be authorized"
-        stop_logging
+        Appsignal.logger.error "[#{$$}] API token cannot be authorized"
+        shutdown
       else
-        Appsignal.logger.error "Unknown Appsignal response code: '#{code}'"
+        Appsignal.logger.error "[#{$$}] Unknown Appsignal response code: "\
+          "'#{code}'"
       end
     end
 
-    def stop_logging
-      Appsignal.logger.info("Disengaging the agent")
-      ActiveSupport::Notifications.unsubscribe(Appsignal.subscriber)
-      Thread.kill(@thread)
-    end
-
   end
 end

data/lib/appsignal/aggregator.rb

@@ -58,7 +58,6 @@ module Appsignal
         transaction.convert_values_to_primitives!
       end
     end
-
   end
 end
 

data/lib/appsignal/aggregator/post_processor.rb

@@ -19,9 +19,11 @@ module Appsignal
       Middleware::Chain.new do |chain|
         chain.add Appsignal::Middleware::DeleteBlanks
         chain.add Appsignal::Middleware::ActionViewSanitizer
-        chain.add Appsignal::Middleware::ActiveRecordSanitizer
+        if defined?(ActiveRecord)
+          require 'appsignal/middleware/active_record_sanitizer'
+          chain.add Appsignal::Middleware::ActiveRecordSanitizer
+        end
       end
     end
-
   end
 end

data/lib/appsignal/auth_check.rb

@@ -1,17 +1,25 @@
 module Appsignal
   class AuthCheck
-    delegate :uri, :to => :transmitter
-    attr_reader :config
+    ACTION = 'auth'.freeze
+
+    attr_reader :environment, :logger
     attr_accessor :transmitter
-    ACTION = 'auth'
+    delegate :uri, :to => :transmitter
+
+    def initialize(*args)
+      @environment = args.shift
+      options = args.empty? ? {} : args.last
+      @config = options[:config]
+      @logger = options[:logger]
+    end
 
-    def initialize(environment)
-      @config = Appsignal::Config.new(Rails.root, environment).load
+    def config
+      @config ||= Appsignal::Config.new(Rails.root, environment, logger).load
     end
 
     def perform
       self.transmitter = Appsignal::Transmitter.new(
-        @config[:endpoint], ACTION, @config[:api_key]
+        config[:endpoint], ACTION, config[:api_key]
       )
       transmitter.transmit({})
     end

data/lib/appsignal/cli.rb

@@ -4,12 +4,14 @@ require 'yaml'
 require 'rails'
 require 'appsignal/version'
 require 'appsignal/config'
+require 'appsignal/auth_check'
 require 'appsignal/marker'
 require 'appsignal/transmitter'
 
 module Appsignal
   class CLI
-    AVAILABLE_COMMANDS = %w( notify_of_deploy )
+    AVAILABLE_COMMANDS = %w(notify_of_deploy api_check).freeze
+    PROJECT_ROOT = File.join(File.dirname(__FILE__), '..', '..').freeze
 
     class << self
       def run(argv=ARGV)
@@ -24,12 +26,14 @@ module Appsignal
 
         global.order!(argv)
         command = argv.shift
-        if command then
-          if AVAILABLE_COMMANDS.include?(command) then
+        if command
+          if AVAILABLE_COMMANDS.include?(command)
             commands[command].parse!(argv)
-            case options[:command]
+            case command.to_sym
             when :notify_of_deploy
               notify_of_deploy(options)
+            when :api_check
+              api_check
             end
           else
             puts "Command '#{command}' does not exist, run appsignal -h to see the help"
@@ -48,7 +52,7 @@ module Appsignal
 
       def global_option_parser(options)
         OptionParser.new do |o|
-          o.banner = %Q{Usage: appsignal <command> [options]}
+          o.banner = 'Usage: appsignal <command> [options]'
 
           o.on '-v', '--version', "Print version and exit" do |arg|
             puts "Appsignal #{Appsignal::VERSION}"
@@ -68,8 +72,7 @@ module Appsignal
       def command_option_parser(options)
         {
           'notify_of_deploy' => OptionParser.new do |o|
-            o.banner = %Q{Usage: appsignal notify_of_deploy [options] }
-            options[:command] = :notify_of_deploy
+            o.banner = 'Usage: appsignal notify_of_deploy [options]'
 
             o.on '--revision=<revision>', "The revision you're deploying" do |arg|
               options[:revision] = arg
@@ -86,6 +89,13 @@ module Appsignal
             o.on '--environment=<rails_env>', "The environment you're deploying to" do |arg|
               options[:environment] = arg
             end
+          end,
+          'api_check' => OptionParser.new do |o|
+            o.banner = %q(Usage: appsignal api_check
+
+            This command checks the config file in config/appsignal.yml
+            and tries to use the api_keys available in each environment to
+            see if they work.)
           end
         }
       end
@@ -104,6 +114,38 @@ module Appsignal
         ).transmit
       end
 
+      def api_check
+        puts "\nReading config/appsignal.yml and attempting to use the config "\
+          "in order to check if it is set up the way it should be.\n\n"
+        Appsignal::Config.new(
+          PROJECT_ROOT, '', logger
+        ).load_all.each do |env, config|
+          auth_check = ::Appsignal::AuthCheck.new(
+            env,
+            {:config => config, :logger => logger}
+          )
+          puts "[#{env}]"
+          puts '  * Configured not to monitor this environment' unless config[:active]
+          begin
+            result = auth_check.perform
+            case result
+            when '200'
+              puts '  * AppSignal has confirmed authorisation!'
+            when '401'
+              puts '  * API key not valid with AppSignal...'
+            else
+              puts '  * Could not confirm authorisation: '\
+                "#{result.nil? ? 'nil' : result}"
+            end
+          rescue Exception => e
+            puts "Something went wrong while trying to "\
+              "authenticate with AppSignal: #{e}"
+          end
+        end
+      end
+
+      protected
+
       def validate_required_options(required_options, options)
         missing = required_options.select do |required_option|
           options[required_option].blank?

data/lib/appsignal/config.rb

@@ -1,7 +1,9 @@
+require 'erb'
+require 'yaml'
 require 'appsignal/careful_logger'
+require 'erb'
 
 module Appsignal
-
   class Config
     include Appsignal::CarefulLogger
 
@@ -28,6 +30,17 @@ module Appsignal
       DEFAULT_CONFIG.merge(configurations[env])
     end
 
+    def load_all
+      return unless load_configurations_from_disk
+      return unless used_unique_api_keys
+
+      {}.tap do |result|
+        configurations.each do |env, config|
+          result[env] = DEFAULT_CONFIG.merge(config)
+        end
+      end
+    end
+
     protected
 
     def load_configurations_from_disk
@@ -57,7 +70,5 @@ module Appsignal
       carefully_log_error "config for '#{env}' not found"
       false
     end
-
   end
-
 end

data/lib/appsignal/integrations/passenger.rb

@@ -0,0 +1,11 @@
+if defined?(PhusionPassenger)
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    Appsignal.logger.debug("[#{$$}] starting worker process")
+    Appsignal.agent.forked!
+  end
+
+  PhusionPassenger.on_event(:stopping_worker_process) do
+    Appsignal.logger.debug("[#{$$}] stopping worker process")
+    Appsignal.agent.shutdown(true)
+  end
+end

data/lib/appsignal/middleware.rb

@@ -1,4 +1,3 @@
 require 'appsignal/middleware/chain'
 require 'appsignal/middleware/delete_blanks'
 require 'appsignal/middleware/action_view_sanitizer'
-require 'appsignal/middleware/active_record_sanitizer'

data/lib/appsignal/middleware/active_record_sanitizer.rb

@@ -1,5 +1,3 @@
-require 'active_record'
-
 module Appsignal
   module Middleware
     class ActiveRecordSanitizer

data/lib/appsignal/railtie.rb

@@ -1,16 +1,24 @@
 module Appsignal
   class Railtie < Rails::Railtie
+
     initializer "appsignal.configure_rails_initialization" do |app|
       # Some apps when run from the console do not have Rails.root set, there's
       # currently no way to spec this.
       if Rails.root
-        Appsignal.logger = Logger.new(Rails.root.join('log/appsignal.log')).tap do |l|
+        if File.writable?('log')
+          output = Rails.root.join('log/appsignal.log')
+        else
+          output = STDOUT
+        end
+        Appsignal.logger = Logger.new(output).tap do |l|
           l.level = Logger::INFO
         end
         Appsignal.flush_in_memory_log
       end
 
       if Appsignal.active?
+        Appsignal.logger.info("Activating appsignal-#{Appsignal::VERSION}")
+        at_exit { Appsignal.agent.shutdown(true) }
         app.middleware.
           insert_before(ActionDispatch::RemoteIp, Appsignal::Listener)
 

data/lib/appsignal/to_appsignal_hash.rb

@@ -1,6 +1,5 @@
 module Appsignal
   module ToAppsignalHash
-
     def to_appsignal_hash
       {
         :name => name,
@@ -10,7 +9,6 @@ module Appsignal
         :payload => payload
       }
     end
-
   end
 end
 

data/lib/appsignal/transaction.rb

@@ -128,6 +128,5 @@ module Appsignal
         Appsignal::ParamsSanitizer.sanitize(request.session)
       @fullpath = request.fullpath
     end
-
   end
 end

data/lib/appsignal/transaction/transaction_formatter.rb

@@ -1,8 +1,7 @@
-require 'forwardable'
+require 'delegate'
 
 module Appsignal
   class TransactionFormatter < SimpleDelegator
-
     def initialize(transaction)
       super(transaction)
     end
@@ -54,6 +53,5 @@ module Appsignal
     def add_events_to_hash!
       hash[:events] = events.map(&:to_appsignal_hash)
     end
-
   end
 end

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 end

data/lib/generators/appsignal/appsignal_generator.rb

@@ -1,26 +1,32 @@
 require 'appsignal'
 
 class AppsignalGenerator < Rails::Generators::Base
+  EXCLUDED_ENVIRONMENTS = [:test].freeze
+
   source_root File.expand_path('../templates', __FILE__)
+  argument :environment, :type => :string
   argument :push_key, :type => :string
-  class_option :environment, :type => :string, :default => 'production',
-    :desc => 'Install AppSignal for a different environment'
-
   desc "Install the config file for AppSignal with your PUSH_KEY."
+
   def copy_config_file
     template_file = 'appsignal.yml'
     appsignal_file = File.join('config', template_file)
     if File.exists?(appsignal_file)
-      if environment_setup?(appsignal_file)
-        say_status :error, "Environment already setup", :red
-      else
-        append_to_file appsignal_file, "\n"+new_template_content(template_file)
-      end
+      say_status(:error, "Looks like you already have a config file.", :red)
+      say_status(:error, "Add the following to config/appsignal.yml:\n\n", :red)
+      say_status(:error, "#{environment}:", :red)
+      say_status(:error, "  api_key: #{push_key}\n\n", :red)
+      say_status(:info, "Then run:\n\n", :red)
+      say_status(:info, "  rake appsignal:check", :red)
     else
       template template_file, appsignal_file
+      capyistrano_install
+      check_key
     end
   end
 
+  protected
+
   def capyistrano_install
     deploy_file = File.expand_path(File.join('config', 'deploy.rb'))
     cap_file = File.expand_path('Capfile')
@@ -39,7 +45,7 @@ class AppsignalGenerator < Rails::Generators::Base
 
   def check_key
     begin
-      auth_check = ::Appsignal::AuthCheck.new(options.environment)
+      auth_check = ::Appsignal::AuthCheck.new(environment)
       result = auth_check.perform
       if result == '200'
         say_status :success, "AppSignal has confirmed authorisation!"
@@ -47,7 +53,7 @@ class AppsignalGenerator < Rails::Generators::Base
         say_status :error, "Push key not valid with AppSignal...", :red
       else
         say_status :error, "Could not confirm authorisation: "\
-          "#{result.nil? ? 'nil' : result} at #{auth_check.uri}", :red
+          "#{result.nil? ? 'nil' : result}", :red
       end
     rescue Exception => e
       say_status :error, "Something went wrong while trying to authenticate "\
@@ -57,9 +63,17 @@ class AppsignalGenerator < Rails::Generators::Base
 
   private
 
+  alias :selected_environment :environment
+
+  def environments
+    @environments ||= Dir.glob(
+      File.join(%w(. config environments *.rb))
+    ).map { |o| File.basename(o, ".rb").to_sym } - EXCLUDED_ENVIRONMENTS
+  end
+
   def environment_setup?(config_file)
     file_contents = File.read(config_file)
-    file_contents =~ Regexp.new("#{options.environment}:")
+    file_contents =~ Regexp.new("#{environment}:")
   end
 
   # As based on Thor's template method

data/lib/generators/appsignal/templates/appsignal.yml

@@ -1,4 +1,25 @@
-<%= options.environment %>:
+---
+# Unlisted environments will not be visible on the AppSignal site,
+# Active environments count towards the account plan limit.
+<%- environments.each do |environment| -%>
+<%= environment %>:
+  <%- if selected_environment.to_sym == environment -%>
+  # The API key used by the AppSignal gem to push this specific environment to
+  # AppSignal.  (required)
+  #
+  # It is possible to use ERB.
+  # api_key: "<%%= ENV['APPSIGNAL_API_KEY'] %>"
   api_key: "<%= push_key %>"
+
+  # The cuttoff point above which a request is considered slow. (default: 200)
+  # slow_request_threshold: 200
+
+  # Change whether this environment should be monitored. (default: false)
   active: true
-  slow_request_threshold: 200
+  <%- else -%>
+  # Go to https://appsignal.com if you want to monitor your <%= environment %>
+  # environment to obtain an api key.
+  # api_key: <<%= environment.upcase %>-API-KEY>
+  active: false
+  <%- end -%>
+<%- end -%>

data/spec/appsignal/agent_spec.rb

@@ -31,7 +31,6 @@ describe Appsignal::Agent do
         PostProcessingException.new('Message')
       )
 
-      subject.should_receive(:stop_logging)
       Appsignal.logger.should_receive(:error).
         with('PostProcessingException while sending queue: Message').
         once
@@ -44,7 +43,7 @@ describe Appsignal::Agent do
       subject.transmitter.stub(:transmit).and_raise(
         Exception.new('Message')
       )
-      subject.should_receive(:stop_logging)
+
       Appsignal.logger.should_receive(:error).
         with('Exception while sending queue: Message').
         once
@@ -56,6 +55,58 @@ describe Appsignal::Agent do
     after { subject.send_queue }
   end
 
+  describe "#shutdown" do
+    before do
+      ActiveSupport::Notifications.should_receive(:unsubscribe).with(Appsignal.subscriber)
+      Thread.should_receive(:kill).with(subject.thread)
+    end
+
+    context "when not sending the current queue" do
+      context "with an empty queue" do
+        it "should shutdown" do
+          subject.shutdown
+        end
+      end
+
+      context "with a queue with transactions" do
+        it "should shutdown" do
+          subject.enqueue(slow_transaction)
+          subject.should_not_receive(:send_queue)
+
+          subject.shutdown
+        end
+      end
+    end
+
+    context "when the queue is to be sent" do
+      context "with an empty queue" do
+        it "should shutdown" do
+          subject.should_not_receive(:send_queue)
+
+          subject.shutdown(true)
+        end
+      end
+
+      context "with a queue with transactions" do
+        it "should send the queue and shutdown" do
+          subject.enqueue(slow_transaction)
+          subject.should_receive(:send_queue)
+
+          subject.shutdown(true)
+        end
+      end
+
+      context "when we're a child process" do
+        it "should shutdown" do
+          subject.stub(:forked? => true)
+          subject.should_not_receive(:send_queue)
+
+          subject.shutdown(true)
+        end
+      end
+    end
+  end
+
   describe '#handle_result' do
     before { subject.aggregator.add(transaction) }
     before { subject.instance_variable_set(:@sleep_time, 3.0) }
@@ -91,7 +142,7 @@ describe Appsignal::Agent do
         let(:code) { '429' }
 
         it "calls a stop to logging" do
-          subject.should_receive :stop_logging
+          subject.should_receive(:shutdown)
         end
       end
 
@@ -99,7 +150,7 @@ describe Appsignal::Agent do
         let(:code) { '406' }
 
         it "calls a stop to logging" do
-          subject.should_receive :stop_logging
+          subject.should_receive(:shutdown)
         end
       end
 
@@ -107,7 +158,7 @@ describe Appsignal::Agent do
         let(:code) { '402' }
 
         it "calls a stop to logging" do
-          subject.should_receive :stop_logging
+          subject.should_receive(:shutdown)
         end
       end
 
@@ -115,7 +166,7 @@ describe Appsignal::Agent do
         let(:code) { '401' }
 
         it "calls a stop to logging" do
-          subject.should_receive :stop_logging
+          subject.should_receive(:shutdown)
         end
       end
 
@@ -131,9 +182,9 @@ describe Appsignal::Agent do
     end
   end
 
-  describe "#stop_logging" do
+  describe "#shutdown" do
     it "does not raise exceptions" do
-      expect { subject.send :stop_logging }.not_to raise_error
+      expect { subject.send(:shutdown) }.not_to raise_error
     end
   end
 

data/spec/appsignal/cli_spec.rb

@@ -50,14 +50,18 @@ describe Appsignal::CLI do
         cli.run(['nonsense'])
       }.should raise_error(SystemExit)
 
-      out_stream.string.should include "Command 'nonsense' does not exist, run appsignal -h to see the help"
+    out_stream.string.should include "Command 'nonsense' does not exist, run "\
+      "appsignal -h to see the help"
   end
 
+  # protected
+
   describe "#validate_required_options" do
     let(:required_options) { [:option_1, :option_2, :option_3] }
 
     it "should do nothing with all options supplied" do
-      cli.validate_required_options(
+      cli.send(
+        :validate_required_options,
         required_options,
         :option_1 => 1,
         :option_2 => 2,
@@ -68,7 +72,8 @@ describe Appsignal::CLI do
 
     it "should print a message with one option missing" do
       lambda {
-        cli.validate_required_options(
+        cli.send(
+          :validate_required_options,
           required_options,
           :option_1 => 1,
           :option_2 => 2
@@ -79,7 +84,8 @@ describe Appsignal::CLI do
 
     it "should print a message with multiple options missing" do
       lambda {
-        cli.validate_required_options(
+        cli.send(
+          :validate_required_options,
           required_options,
           :option_1 => 1,
           :option_2 => ''

data/spec/appsignal/integrations/passenger_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+
+describe "Passenger integration" do
+  let(:file) { File.expand_path('lib/appsignal/integrations/passenger.rb') }
+  before(:all) { module PhusionPassenger ; end }
+
+  it "adds behavior to stopping_worker_process and starting_worker_process" do
+    PhusionPassenger.should_receive(:on_event).with(:starting_worker_process)
+    PhusionPassenger.should_receive(:on_event).with(:stopping_worker_process)
+    load file
+  end
+
+  context "without passenger" do
+    before(:all) { Object.send(:remove_const, :PhusionPassenger) }
+
+    specify { expect { PhusionPassenger }.to raise_error(NameError) }
+    specify { expect { load file }.to_not raise_error }
+  end
+end

data/spec/appsignal/middleware/active_record_sanitizer_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'active_record'
+require 'appsignal/middleware/active_record_sanitizer'
 
 describe Appsignal::Middleware::ActiveRecordSanitizer do
   let(:klass) { Appsignal::Middleware::ActiveRecordSanitizer }

data/spec/generators/appsignal/appsignal_generator_spec.rb

@@ -22,7 +22,7 @@ describe AppsignalGenerator do
         authcheck = mock()
         Appsignal::AuthCheck.should_receive(:new).and_return(authcheck)
         authcheck.should_receive(:perform).and_return('200')
-        run_generator_in_tmp %w(my_app_key)
+        run_generator_in_tmp %w(production my_app_key)
       end
 
       specify "should mention successful auth check" do
@@ -36,7 +36,7 @@ describe AppsignalGenerator do
         authcheck = mock()
         Appsignal::AuthCheck.should_receive(:new).and_return(authcheck)
         authcheck.should_receive(:perform).and_return('401')
-        run_generator_in_tmp %w(my_app_key)
+        run_generator_in_tmp %w(production my_app_key)
       end
 
       specify "should mention invalid key" do
@@ -50,12 +50,11 @@ describe AppsignalGenerator do
         authcheck = mock()
         Appsignal::AuthCheck.should_receive(:new).and_return(authcheck)
         authcheck.should_receive(:perform).and_return('500')
-        authcheck.should_receive(:uri).and_return('auth')
-        run_generator_in_tmp %w(my_app_key)
+        run_generator_in_tmp %w(production my_app_key)
       end
 
       specify "should mention failed check" do
-        @output.should include('Could not confirm authorisation: 500 at auth')
+        @output.should include('error  Could not confirm authorisation: 500')
       end
     end
 
@@ -63,7 +62,7 @@ describe AppsignalGenerator do
       before do
         prepare_destination
         Appsignal::AuthCheck.should_receive(:new) { raise }
-        run_generator_in_tmp %w(my_app_key)
+        run_generator_in_tmp %w(production my_app_key)
       end
 
       specify "should mention internal failure" do
@@ -92,16 +91,13 @@ describe AppsignalGenerator do
   context "without capistrano" do
     before :all do
       prepare_destination
-      run_generator_in_tmp %w(my_app_key)
+      run_generator_in_tmp %w(production my_app_key)
     end
 
     specify "config file is created" do
       destination_root.should have_structure {
         directory 'config' do
-          file 'appsignal.yml' do
-            contains 'production:'
-            contains 'api_key: "my_app_key"'
-          end
+          file 'appsignal.yml'
           no_file 'deploy.rb'
         end
       }
@@ -122,7 +118,7 @@ describe AppsignalGenerator do
       deploy_file = File.expand_path(File.join('config', 'deploy.rb'),
         destination_root)
       File.open(deploy_file, 'w') {}
-      run_generator_in_tmp %w(my_app_key)
+      run_generator_in_tmp %w(production my_app_key)
     end
 
     specify "config file is created and capistrano deploy file modified" do
@@ -146,16 +142,13 @@ describe AppsignalGenerator do
   context "with custom environment" do
     before do
       prepare_destination
-      run_generator_in_tmp %w(my_app_key --environment=development)
+      run_generator_in_tmp %w(development my_app_key)
     end
 
     specify "config file is created" do
       destination_root.should have_structure {
         directory 'config' do
-          file 'appsignal.yml' do
-            contains 'development:'
-            contains 'api_key: "my_app_key"'
-          end
+          file 'appsignal.yml'
           no_file 'deploy.rb'
         end
       }
@@ -171,52 +164,11 @@ describe AppsignalGenerator do
         File.open(File.expand_path(config_file, destination_root), 'w') do |f|
           f.write("production:\n  api_key: 111")
         end
-        run_generator_in_tmp %w(my_app_key --environment=development)
-      end
-
-      specify "config file is created" do
-        destination_root.should have_structure {
-          directory 'config' do
-            file 'appsignal.yml' do
-              contains 'production:'
-              contains "\ndevelopment:"
-              contains 'api_key: "my_app_key"'
-            end
-            no_file 'deploy.rb'
-          end
-        }
-      end
-
-      specify "should not give error about conflicting environment" do
-        @output.should_not include('error  Environment already setup')
-      end
-    end
-
-    context "with existing environment" do
-      before :all do
-        prepare_destination
-        FileUtils.mkdir(File.expand_path('config', destination_root))
-        config_file = File.join('config', 'appsignal.yml')
-        File.open(File.expand_path(config_file, destination_root), 'w') do |f|
-          f.write("development:\n  api_key: \"111\"")
-        end
-        run_generator_in_tmp %w(my_app_key --environment=development)
-      end
-
-      specify "config file is created" do
-        destination_root.should have_structure {
-          directory 'config' do
-            file 'appsignal.yml' do
-              contains "development:"
-              contains 'api_key: "111"'
-            end
-            no_file 'deploy.rb'
-          end
-        }
+        run_generator_in_tmp %w(development my_app_key)
       end
 
-      specify "should give error about conflicting environment" do
-        @output.should include('error  Environment already setup')
+      it "exits and tells to manually edit config/appsignal.yml" do
+        @output.should include('error  Looks like you already have a config file')
       end
     end
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -13,120 +12,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-  prerelease: false
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The official appsignal.com gem
 email:
 - contact@appsignal.com
@@ -138,6 +123,7 @@ files:
 - .gitignore
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENCE
 - README.md
@@ -159,6 +145,7 @@ files:
 - lib/appsignal/cli.rb
 - lib/appsignal/config.rb
 - lib/appsignal/exception_notification.rb
+- lib/appsignal/integrations/passenger.rb
 - lib/appsignal/listener.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/middleware.rb
@@ -187,6 +174,7 @@ files:
 - spec/appsignal/config_spec.rb
 - spec/appsignal/exception_notification_spec.rb
 - spec/appsignal/inactive_railtie_spec.rb
+- spec/appsignal/integrations/passenger_spec.rb
 - spec/appsignal/listener_spec.rb
 - spec/appsignal/marker_spec.rb
 - spec/appsignal/middleware/action_view_sanitizer_spec.rb
@@ -207,6 +195,7 @@ files:
 - spec/support/helpers/transaction_helpers.rb
 homepage: http://github.com/80beans/appsignal
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -216,24 +205,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3609057050199006546
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3609057050199006546
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Logs performance and exception data from your app toappsignal.com
 test_files:
 - spec/appsignal/agent_spec.rb
@@ -245,6 +226,7 @@ test_files:
 - spec/appsignal/config_spec.rb
 - spec/appsignal/exception_notification_spec.rb
 - spec/appsignal/inactive_railtie_spec.rb
+- spec/appsignal/integrations/passenger_spec.rb
 - spec/appsignal/listener_spec.rb
 - spec/appsignal/marker_spec.rb
 - spec/appsignal/middleware/action_view_sanitizer_spec.rb