appsignal 0.4.6 → 0.4.7

data/lib/appsignal/careful_logger.rb

@@ -0,0 +1,11 @@
+module Appsignal
+  module CarefulLogger
+    def carefully_log_error(message)
+      if @logger.respond_to?(:important)
+        @logger.important(message)
+      else
+        @logger.error(message)
+      end
+    end
+  end
+end

data/lib/appsignal/config.rb

@@ -1,5 +1,9 @@
+require 'appsignal/careful_logger'
+
 module Appsignal
   class Config
+    include Appsignal::CarefulLogger
+
     attr_accessor :root_path, :rails_env
 
     def initialize(root_path, rails_env, logger=Appsignal.logger)
@@ -11,13 +15,13 @@ module Appsignal
     def load
       file = File.join(@root_path, 'config/appsignal.yml')
       unless File.exists?(file)
-        @logger.error "config not found at: #{file}"
+        carefully_log_error "config not found at: #{file}"
         return
       end
 
       config = YAML.load_file(file)[@rails_env]
       unless config
-        @logger.error "config for '#{@rails_env}' not found"
+        carefully_log_error "config for '#{@rails_env}' not found"
         return
       end
 
@@ -26,5 +30,6 @@ module Appsignal
         :slow_request_threshold => 200
       }.merge(config.symbolize_keys)
     end
+
   end
 end

data/lib/appsignal/marker.rb

@@ -1,5 +1,9 @@
+require 'appsignal/careful_logger'
+
 module Appsignal
   class Marker
+    include Appsignal::CarefulLogger
+
     attr_reader :marker_data, :config, :logger
     ACTION = 'markers'
 
@@ -23,12 +27,7 @@ module Appsignal
         end
       rescue Exception => e
         message = "Something went wrong while trying to notify Appsignal: #{e}"
-        if @logger.respond_to?(:important)
-          # This is a Capistrano logger
-          @logger.important message
-        else
-          @logger.error message
-        end
+        carefully_log_error message
       end
     end
   end

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

data/spec/appsignal/config_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe Appsignal::Config do
-  subject { Appsignal::Config.new(Dir.pwd, 'test').load }
+  let(:logger_parameter) { [] }
+  subject { Appsignal::Config.new(Dir.pwd, 'test', *logger_parameter).load }
 
   it {
     should == {
@@ -23,11 +24,23 @@ describe Appsignal::Config do
       )
     end
 
+    context "when the logger has no #error method" do
+      let(:logger) { mock(:logger) }
+      let(:logger_parameter) { [logger] }
+
+      it "should log the error using #important" do
+        logger.should_receive(:important).with(
+          "config not found at:"\
+          " /not/existing/config/appsignal.yml"
+        )
+      end
+    end
+
     after { subject }
   end
 
   context "the env is not in the config" do
-    subject { Appsignal::Config.new(Dir.pwd, 'staging').load }
+    subject { Appsignal::Config.new(Dir.pwd, 'staging', *logger_parameter).load }
 
     it "should generate error" do
       Appsignal.logger.should_receive(:error).with(
@@ -35,6 +48,17 @@ describe Appsignal::Config do
       )
     end
 
+    context "when the logger has no #error method" do
+      let(:logger) { mock(:logger) }
+      let(:logger_parameter) { [logger] }
+
+      it "should log the error using #important" do
+        logger.should_receive(:important).with(
+          "config for 'staging' not found"
+        )
+      end
+    end
+
     after { subject }
   end
 end

data/spec/generators/appsignal/appsignal_generator_spec.rb

@@ -62,6 +62,7 @@ describe AppsignalGenerator do
     context "internal failure" do
       before do
         prepare_destination
+        Appsignal::AuthCheck.should_receive(:new) { raise }
         run_generator_in_tmp %w(my_app_key)
       end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.4.6
   prerelease: 
+  version: 0.4.7
 platform: ruby
 authors:
 - Robert Beekman
@@ -13,120 +13,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+    none: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
 description: The official appsignal.com gem
 email:
 - contact@appsignal.com
@@ -153,6 +153,7 @@ files:
 - lib/appsignal/agent.rb
 - lib/appsignal/auth_check.rb
 - lib/appsignal/capistrano.rb
+- lib/appsignal/careful_logger.rb
 - lib/appsignal/cli.rb
 - lib/appsignal/config.rb
 - lib/appsignal/exception_notification.rb
@@ -200,20 +201,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
+      hash: -3341543659726681693
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3341543659726681693
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Logs performance and exception data from your app toappsignal.com