appsignal 0.6.3.beta.3 → 0.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
 - data/CHANGELOG.md +1 -0
 - data/lib/appsignal/agent.rb +1 -2
 - data/lib/appsignal/config.rb +4 -7
 - data/lib/appsignal/version.rb +1 -1
 - data/spec/appsignal/config_spec.rb +5 -13
 - metadata +4 -4
 
    
        checksums.yaml
    CHANGED
    
    | 
         @@ -1,15 +1,15 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            ---
         
     | 
| 
       2 
2 
     | 
    
         
             
            !binary "U0hBMQ==":
         
     | 
| 
       3 
3 
     | 
    
         
             
              metadata.gz: !binary |-
         
     | 
| 
       4 
     | 
    
         
            -
                 
     | 
| 
      
 4 
     | 
    
         
            +
                YWQxNjliNTEwYjc3ODI4ZjBkZGNjYzFhZjEwZDJlM2QzMDc0OWEyNQ==
         
     | 
| 
       5 
5 
     | 
    
         
             
              data.tar.gz: !binary |-
         
     | 
| 
       6 
     | 
    
         
            -
                 
     | 
| 
      
 6 
     | 
    
         
            +
                NjVmNDU2YjI3YTlkOGNkY2MyYzAwYmMyMGM4ZjU5MDczZTI1OTg0ZQ==
         
     | 
| 
       7 
7 
     | 
    
         
             
            !binary "U0hBNTEy":
         
     | 
| 
       8 
8 
     | 
    
         
             
              metadata.gz: !binary |-
         
     | 
| 
       9 
     | 
    
         
            -
                 
     | 
| 
       10 
     | 
    
         
            -
                 
     | 
| 
       11 
     | 
    
         
            -
                 
     | 
| 
      
 9 
     | 
    
         
            +
                NzI5NzJhY2RhYjE2NjdlMDZlNmNkNDRlMzdjNThlZmRkMGRjNjZjOTQ4YWRk
         
     | 
| 
      
 10 
     | 
    
         
            +
                ZjJmYTc1MDhkMjE3N2UwODVkZmMwNWFkMmJmOThiMGYzMmZmMjRkOGIzMTZl
         
     | 
| 
      
 11 
     | 
    
         
            +
                MjBkMWQyODAwNDY2YTE2YTA4YWVlMWE3ZGQyYmNhODQyMjkyMDA=
         
     | 
| 
       12 
12 
     | 
    
         
             
              data.tar.gz: !binary |-
         
     | 
| 
       13 
     | 
    
         
            -
                 
     | 
| 
       14 
     | 
    
         
            -
                 
     | 
| 
       15 
     | 
    
         
            -
                 
     | 
| 
      
 13 
     | 
    
         
            +
                NzEwNTMwOTBlYzU3NWFhZTA5OTFkNTRiMzVmODFjMjA3NDM1MTcyNDQ5YjNm
         
     | 
| 
      
 14 
     | 
    
         
            +
                ZWFlNDBhNTJiZDNjNjI1ZGIwNDhiM2Q0ZDUwMWM3NmI2YjYyY2I2YTQ5Y2Q1
         
     | 
| 
      
 15 
     | 
    
         
            +
                MmViNjU1ODE1ODZiNTAwNGMyYzk0MzM4NWM5MmQ4OWVhMzJiZGU=
         
     | 
    
        data/CHANGELOG.md
    CHANGED
    
    
    
        data/lib/appsignal/agent.rb
    CHANGED
    
    | 
         @@ -22,7 +22,7 @@ module Appsignal 
     | 
|
| 
       22 
22 
     | 
    
         
             
                    ACTION,
         
     | 
| 
       23 
23 
     | 
    
         
             
                    Appsignal.config.fetch(:api_key)
         
     | 
| 
       24 
24 
     | 
    
         
             
                  )
         
     | 
| 
       25 
     | 
    
         
            -
                  Appsignal.logger.info("Started  
     | 
| 
      
 25 
     | 
    
         
            +
                  Appsignal.logger.info("Started Appsignal agent")
         
     | 
| 
       26 
26 
     | 
    
         
             
                end
         
     | 
| 
       27 
27 
     | 
    
         | 
| 
       28 
28 
     | 
    
         
             
                def enqueue(transaction)
         
     | 
| 
         @@ -93,6 +93,5 @@ module Appsignal 
     | 
|
| 
       93 
93 
     | 
    
         
             
                      "'#{code}'"
         
     | 
| 
       94 
94 
     | 
    
         
             
                  end
         
     | 
| 
       95 
95 
     | 
    
         
             
                end
         
     | 
| 
       96 
     | 
    
         
            -
             
     | 
| 
       97 
96 
     | 
    
         
             
              end
         
     | 
| 
       98 
97 
     | 
    
         
             
            end
         
     | 
    
        data/lib/appsignal/config.rb
    CHANGED
    
    | 
         @@ -24,8 +24,8 @@ module Appsignal 
     | 
|
| 
       24 
24 
     | 
    
         | 
| 
       25 
25 
     | 
    
         
             
                def load
         
     | 
| 
       26 
26 
     | 
    
         
             
                  return unless load_configurations
         
     | 
| 
       27 
     | 
    
         
            -
                  return unless used_unique_api_keys
         
     | 
| 
       28 
27 
     | 
    
         
             
                  return unless current_environment_present
         
     | 
| 
      
 28 
     | 
    
         
            +
                  warn_if_duplicate_api_keys
         
     | 
| 
       29 
29 
     | 
    
         | 
| 
       30 
30 
     | 
    
         
             
                  if Appsignal.respond_to?(:logger) && @logger == Appsignal.logger
         
     | 
| 
       31 
31 
     | 
    
         
             
                    @logger.level = Logger::DEBUG if configurations[env][:debug]
         
     | 
| 
         @@ -35,7 +35,7 @@ module Appsignal 
     | 
|
| 
       35 
35 
     | 
    
         | 
| 
       36 
36 
     | 
    
         
             
                def load_all
         
     | 
| 
       37 
37 
     | 
    
         
             
                  return unless load_configurations
         
     | 
| 
       38 
     | 
    
         
            -
                   
     | 
| 
      
 38 
     | 
    
         
            +
                  warn_if_duplicate_api_keys
         
     | 
| 
       39 
39 
     | 
    
         | 
| 
       40 
40 
     | 
    
         
             
                  {}.tap do |result|
         
     | 
| 
       41 
41 
     | 
    
         
             
                    configurations.each do |env, config|
         
     | 
| 
         @@ -81,13 +81,10 @@ module Appsignal 
     | 
|
| 
       81 
81 
     | 
    
         
             
                  end
         
     | 
| 
       82 
82 
     | 
    
         
             
                end
         
     | 
| 
       83 
83 
     | 
    
         | 
| 
       84 
     | 
    
         
            -
                def  
     | 
| 
      
 84 
     | 
    
         
            +
                def warn_if_duplicate_api_keys
         
     | 
| 
       85 
85 
     | 
    
         
             
                  keys = configurations.each_value.map { |config| config[:api_key] }.compact
         
     | 
| 
       86 
86 
     | 
    
         
             
                  if keys.uniq.count < keys.count
         
     | 
| 
       87 
     | 
    
         
            -
                    carefully_log_error('Duplicate API keys found in appsignal.yml')
         
     | 
| 
       88 
     | 
    
         
            -
                    false
         
     | 
| 
       89 
     | 
    
         
            -
                  else
         
     | 
| 
       90 
     | 
    
         
            -
                    true
         
     | 
| 
      
 87 
     | 
    
         
            +
                    carefully_log_error('Warning: Duplicate API keys found in appsignal.yml')
         
     | 
| 
       91 
88 
     | 
    
         
             
                  end
         
     | 
| 
       92 
89 
     | 
    
         
             
                end
         
     | 
| 
       93 
90 
     | 
    
         | 
    
        data/lib/appsignal/version.rb
    CHANGED
    
    
| 
         @@ -48,12 +48,6 @@ describe Appsignal::Config do 
     | 
|
| 
       48 
48 
     | 
    
         | 
| 
       49 
49 
     | 
    
         
             
                  it { should be_nil }
         
     | 
| 
       50 
50 
     | 
    
         
             
                end
         
     | 
| 
       51 
     | 
    
         
            -
             
     | 
| 
       52 
     | 
    
         
            -
                context "when an api key is used for more then one environment" do
         
     | 
| 
       53 
     | 
    
         
            -
                  before { config.stub(:used_unique_api_keys => false) }
         
     | 
| 
       54 
     | 
    
         
            -
             
     | 
| 
       55 
     | 
    
         
            -
                  it { should be_nil }
         
     | 
| 
       56 
     | 
    
         
            -
                end
         
     | 
| 
       57 
51 
     | 
    
         
             
              end
         
     | 
| 
       58 
52 
     | 
    
         | 
| 
       59 
53 
     | 
    
         
             
              # protected
         
     | 
| 
         @@ -136,28 +130,26 @@ describe Appsignal::Config do 
     | 
|
| 
       136 
130 
     | 
    
         
             
                end
         
     | 
| 
       137 
131 
     | 
    
         
             
              end
         
     | 
| 
       138 
132 
     | 
    
         | 
| 
       139 
     | 
    
         
            -
              describe "# 
     | 
| 
      
 133 
     | 
    
         
            +
              describe "#warn_if_duplicate_api_keys" do
         
     | 
| 
       140 
134 
     | 
    
         
             
                let(:env) { {:api_key => :foo} }
         
     | 
| 
       141 
     | 
    
         
            -
                subject { config.send(: 
     | 
| 
      
 135 
     | 
    
         
            +
                subject { config.send(:warn_if_duplicate_api_keys) }
         
     | 
| 
       142 
136 
     | 
    
         | 
| 
       143 
137 
     | 
    
         
             
                context "when using all unique keys" do
         
     | 
| 
       144 
138 
     | 
    
         
             
                  before do
         
     | 
| 
       145 
139 
     | 
    
         
             
                    config.should_not_receive(:carefully_log_error)
         
     | 
| 
       146 
140 
     | 
    
         
             
                    config.stub(:configurations => {1 => env})
         
     | 
| 
       147 
141 
     | 
    
         
             
                  end
         
     | 
| 
       148 
     | 
    
         
            -
             
     | 
| 
       149 
     | 
    
         
            -
                  it { should be_true }
         
     | 
| 
       150 
142 
     | 
    
         
             
                end
         
     | 
| 
       151 
143 
     | 
    
         | 
| 
       152 
144 
     | 
    
         
             
                context "when using non-unique keys" do
         
     | 
| 
       153 
145 
     | 
    
         
             
                  before do
         
     | 
| 
       154 
146 
     | 
    
         
             
                    config.should_receive(:carefully_log_error).
         
     | 
| 
       155 
     | 
    
         
            -
                      with("Duplicate API keys found in appsignal.yml")
         
     | 
| 
      
 147 
     | 
    
         
            +
                      with("Warning: Duplicate API keys found in appsignal.yml")
         
     | 
| 
       156 
148 
     | 
    
         
             
                    config.stub(:configurations => {:production => env, :staging => env})
         
     | 
| 
       157 
149 
     | 
    
         
             
                  end
         
     | 
| 
       158 
     | 
    
         
            -
             
     | 
| 
       159 
     | 
    
         
            -
                  it { should be_false }
         
     | 
| 
       160 
150 
     | 
    
         
             
                end
         
     | 
| 
      
 151 
     | 
    
         
            +
             
     | 
| 
      
 152 
     | 
    
         
            +
                after { subject }
         
     | 
| 
       161 
153 
     | 
    
         
             
              end
         
     | 
| 
       162 
154 
     | 
    
         | 
| 
       163 
155 
     | 
    
         
             
              describe "#current_environment_present" do
         
     | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: appsignal
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 0.6.3 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 0.6.3
         
     | 
| 
       5 
5 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       6 
6 
     | 
    
         
             
            authors:
         
     | 
| 
       7 
7 
     | 
    
         
             
            - Robert Beekman
         
     | 
| 
         @@ -12,7 +12,7 @@ authors: 
     | 
|
| 
       12 
12 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       13 
13 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       14 
14 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       15 
     | 
    
         
            -
            date: 2013-09- 
     | 
| 
      
 15 
     | 
    
         
            +
            date: 2013-09-26 00:00:00.000000000 Z
         
     | 
| 
       16 
16 
     | 
    
         
             
            dependencies:
         
     | 
| 
       17 
17 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       18 
18 
     | 
    
         
             
              name: rails
         
     | 
| 
         @@ -205,9 +205,9 @@ required_ruby_version: !ruby/object:Gem::Requirement 
     | 
|
| 
       205 
205 
     | 
    
         
             
                  version: '0'
         
     | 
| 
       206 
206 
     | 
    
         
             
            required_rubygems_version: !ruby/object:Gem::Requirement
         
     | 
| 
       207 
207 
     | 
    
         
             
              requirements:
         
     | 
| 
       208 
     | 
    
         
            -
              - - ! ' 
     | 
| 
      
 208 
     | 
    
         
            +
              - - ! '>='
         
     | 
| 
       209 
209 
     | 
    
         
             
                - !ruby/object:Gem::Version
         
     | 
| 
       210 
     | 
    
         
            -
                  version:  
     | 
| 
      
 210 
     | 
    
         
            +
                  version: '0'
         
     | 
| 
       211 
211 
     | 
    
         
             
            requirements: []
         
     | 
| 
       212 
212 
     | 
    
         
             
            rubyforge_project: 
         
     | 
| 
       213 
213 
     | 
    
         
             
            rubygems_version: 2.0.3
         
     |