appsignal 0.8.3.beta.1 → 0.8.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQxZWUzNTcwNmE3YjRjYWE4MTYyYWYyZDJkZjhmYWFiMWIyZDViYQ==
+    N2UwODdmZmQyMDg4NDRlYzRkOWUyNWFkYzIxZTE4NTNmZWEyNzRiMQ==
   data.tar.gz: !binary |-
-    NmYwMGU1NjdiMTg5OGE0MjM4MjBlYmY1ZjIwYTI2NzNjZDAzNDQ0Nw==
+    MWUwM2ZhOTY0NGVjYmVkZWJjOThmYWYxMGJiZDc0N2QwMmU5NzBhMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWY4ZmY0ZjBlYWU2ZTYyYTk1YzA5ZjM4OTY4MzE1M2ViNWRiMjUwMmM5YWFm
-    YmU0MTEyMzI0ZTc4YjFlNTYxZWQyODg1MzEyOWFmM2Y1Mzg3NTk4OTM0YjZl
-    YTQ0YTRiNWJlYzIxNTE1ZjcwNjliZGU5YTQ1NzVmOTIzMmFiZmM=
+    MjAzZWI1YTI5ZjYzYjFkZDQ2NmY3OTM5MzZhZWVlMzdmYzNhMWE0MmQxNzk4
+    OWY3NjVlZTUyNjliNjBlYzA0MDc3NTFiMDk3MmFkNDRmYzQ0NDE4YzZjM2Ri
+    MTFhYmI0NzdmMDZiNzZhNDE1ODM5YTBmYTM3NzMwY2Y4NmJkYjg=
   data.tar.gz: !binary |-
-    YzIwMDNmNjk1NmM3ZjZkNTAwM2FhODc4ODc4ZDVlMDgzOTUxN2RlYzZkZjdj
-    MDMxMmJkNzU0NWJlODlmYjQ4ZGJmOWQ0ZjhhODdmOTBlYmU4N2YwZWU2NWRm
-    NGQ5MzdjNjM5MzlhZGY1OTZjNGZhYTlmYzBlMDZjN2UwMzk0ZDM=
+    MGY1OTM5YjA3YjlmOWNkYTQxYTE0ODE5ZTYzODAzMzUxYzViYWZhMGY3OWI0
+    NTRjZjk5MjNkNDIwZTI0NDMyNjZkNzNkNGNiODI2ZGEwMDFjYTM3NzBkYzgz
+    ZmFjZTNiNmZhMjAzYWUwMDE1YWExZmY2ZjY3Yzc5ZTY0Yjc5MTI=

data/lib/appsignal/cli.rb

@@ -43,6 +43,7 @@ module Appsignal
         @config ||= Appsignal::Config.new(
           ENV['PWD'],
           options[:environment],
+          {},
           logger
         )
       end

data/lib/appsignal/config.rb

@@ -12,11 +12,12 @@ module Appsignal
       :slow_request_threshold => 200
     }.freeze
 
-    attr_reader :root_path, :env, :config_hash
+    attr_reader :root_path, :env, :initial_config, :config_hash
 
-    def initialize(root_path, env, logger=Appsignal.logger)
+    def initialize(root_path, env, initial_config={}, logger=Appsignal.logger)
       @root_path = root_path
       @env = env.to_s
+      @initial_config = initial_config
       @logger = logger
 
       if File.exists?(config_file)
@@ -74,17 +75,21 @@ module Appsignal
           config_for_this_env[:push_api_key] = config_for_this_env[:api_key]
         end
 
-        @config_hash = DEFAULT_CONFIG.merge(config_for_this_env)
+        @config_hash = merge_config(config_for_this_env)
       else
         carefully_log_error("Not loading: config for '#{env}' not found")
       end
     end
 
     def load_default_config_with_push_api_key(key)
-      @config_hash = DEFAULT_CONFIG.merge(
+      @config_hash = merge_config(
         :push_api_key => key,
         :active => true
       )
     end
+
+    def merge_config(config)
+      DEFAULT_CONFIG.merge(initial_config).merge(config)
+    end
   end
 end

data/lib/appsignal/integrations/capistrano.rb

@@ -16,6 +16,7 @@ module Appsignal
               appsignal_config = Appsignal::Config.new(
                 ENV['PWD'],
                 env,
+                {},
                 logger
               )
 

data/lib/appsignal/integrations/rails.rb

@@ -16,7 +16,11 @@ if defined?(::Rails)
           Appsignal.start_logger(Rails.root.join('log'))
 
           # Load config
-          Appsignal.config = Appsignal::Config.new(Rails.root, Rails.env)
+          Appsignal.config = Appsignal::Config.new(
+            Rails.root,
+            Rails.env,
+            :name => Rails.application.class.parent_name
+          )
 
           # Start agent if config for this env is present
           Appsignal.start if Appsignal.active?

data/lib/appsignal/integrations/sinatra.rb

@@ -5,7 +5,7 @@ Appsignal.logger.info('Loading Sinatra integration')
 app_settings = ::Sinatra::Application.settings
 Appsignal.config = Appsignal::Config.new(
   app_settings.root,
-  app_settings.environment.to_s
+  app_settings.environment
 )
 
 Appsignal.start_logger(app_settings.root)

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.8.3.beta.1'
+  VERSION = '0.8.3'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -12,6 +12,7 @@ describe Appsignal::Config do
     end
 
     its(:loaded?) { should be_true }
+    its(:active?) { should be_true }
 
     it "should merge with the default config and fill the config hash" do
       subject.config_hash.should == {
@@ -34,20 +35,10 @@ describe Appsignal::Config do
       end
     end
 
-    describe "#active?" do
-      subject { config.active? }
-
-      it { should be_true }
-    end
-
     context "if the env is passed as a symbol" do
       let(:config) { project_fixture_config(:production) }
 
-      describe "#active?" do
-        subject { config.active? }
-
-        it { should be_true }
-      end
+      its(:active?) { should be_true }
     end
 
     context "and there's also an env var present" do
@@ -60,6 +51,15 @@ describe Appsignal::Config do
       end
     end
 
+    context "and there is an initial config" do
+      let(:config) { project_fixture_config('production', :name => 'Initial name', :initial_key => 'value') }
+
+      it "should merge with the config" do
+        subject[:name].should == 'TestApp'
+        subject[:initial_key].should == 'value'
+      end
+    end
+
     context "and there is an old-style api_key defined" do
       let(:config) { project_fixture_config('old_api_key') }
 
@@ -80,10 +80,12 @@ describe Appsignal::Config do
     end
 
     its(:loaded?) { should be_false }
+    its(:active?) { should be_false }
   end
 
   context "when there is no config file" do
-    let(:config) { Appsignal::Config.new('/nothing', 'production') }
+    let(:initial_config) { {} }
+    let(:config) { Appsignal::Config.new('/nothing', 'production', initial_config) }
 
     it "should log an error" do
       Appsignal::Config.any_instance.should_receive(:carefully_log_error).with(
@@ -94,6 +96,7 @@ describe Appsignal::Config do
     end
 
     its(:loaded?) { should be_false }
+    its(:active?) { should be_false }
 
     describe "#[]" do
       it "should return nil" do
@@ -101,12 +104,6 @@ describe Appsignal::Config do
       end
     end
 
-    describe "#active?" do
-      subject { config.active? }
-
-      it { should be_false }
-    end
-
     context "and an env var is present" do
       before do
         ENV['APPSIGNAL_PUSH_API_KEY'] = 'push_api_key'
@@ -118,12 +115,7 @@ describe Appsignal::Config do
       end
 
       its(:loaded?) { should be_true }
-
-      describe "#active?" do
-        subject { config.active? }
-
-        it { should be_true }
-      end
+      its(:active?) { should be_true }
 
       it "should merge with the default config and fill the config hash" do
         subject.config_hash.should == {
@@ -135,6 +127,14 @@ describe Appsignal::Config do
         }
       end
 
+      context "and an initial config is present" do
+        let(:initial_config) { {:name => 'Initial Name'} }
+
+        it "should merge with the config" do
+          subject[:name].should == 'Initial Name'
+        end
+      end
+
       context "with only APPSIGNAL_API_KEY" do
         before do
           ENV.delete('APPSIGNAL_PUSH_API_KEY')

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

@@ -33,6 +33,7 @@ describe Appsignal::Integrations::Capistrano do
         Appsignal::Config.should_receive(:new).with(
           project_fixture_path,
           'production',
+          {},
           kind_of(Capistrano::Logger)
         )
       end
@@ -47,6 +48,7 @@ describe Appsignal::Integrations::Capistrano do
           Appsignal::Config.should_receive(:new).with(
             project_fixture_path,
             'rack_production',
+            {},
             kind_of(Capistrano::Logger)
           )
         end

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

@@ -18,6 +18,16 @@ if rails_present?
         subject { Appsignal.config }
 
         it { should be_a(Appsignal::Config) }
+
+        its(:root_path) { should == Pathname.new(project_fixture_path) }
+        its(:env) { should == 'test' }
+        its([:name]) { should == 'TestApp' }
+
+        context "initial config" do
+          subject { Appsignal.config.initial_config }
+
+          its([:name]) { should == 'MyApp' }
+        end
       end
 
       context "agent" do

data/spec/support/helpers/config_helpers.rb

@@ -9,10 +9,11 @@ module ConfigHelpers
     File.join(project_fixture_path, 'log/appsignal.log')
   end
 
-  def project_fixture_config(env='production', logger=Logger.new(project_fixture_log_file))
+  def project_fixture_config(env='production', initial_config={}, logger=Logger.new(project_fixture_log_file))
     Appsignal::Config.new(
       project_fixture_path,
       env,
+      initial_config,
       logger
     )
   end

data/spec/support/project_fixture/config/appsignal.yml

@@ -7,6 +7,10 @@ production:
   <<: *defaults
   active: true
 
+development:
+  <<: *defaults
+  active: true
+
 test:
   <<: *defaults
   endpoint: "http://localhost:3000/1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.8.3.beta.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -237,9 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3