appsignal 0.12.beta.32 → 0.12.beta.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3904c5300ef30db2a6f5c8eaadce8e7a1ac7a5b6
-  data.tar.gz: dc5d9e98c1eaabaf84eacb629e490f6494819bf0
+  metadata.gz: e66eec14b175b0b6948bc0156c75f0a487509f8a
+  data.tar.gz: 6ff24a317d2a7fbfcf3839b6f86bd86b03f5d351
 SHA512:
-  metadata.gz: 66c82fe27b587026438c1608735dbd29e80ba2d475fb9057d33bb7b66b60a55c8347ee4fe92544a2b8bb74d0f8adb4e446bd392f59fb139a1ec48e715f7bf89b
-  data.tar.gz: 2e67ade5b8bb20aa9c28728590f0bf490f90806420804151c66f9952c11105e300c08e2467cf98199448738455e89a5d2217b40b81dc23e3167a873d07412408
+  metadata.gz: 5fd9d8738134d349e4cd0278d871f1ac25041446c6e045a642c4f11f8b837b47d0016f04592c5d1f5bb08fac4d60a5b065da8b9feb8576b8c531715f25639de1
+  data.tar.gz: 80335bfef01c3aae87f4ff4666908cf07521ec52516c5bb5f59150e6105e0d673d3c59593bd34b4db895b2a3b3e7f070e8f43307c7ba98edfcca12d765d10019

data/ext/appsignal_extension.c

@@ -7,14 +7,8 @@ static VALUE start(VALUE self) {
   return Qnil;
 }
 
-static VALUE stop_agent(VALUE self) {
-  appsignal_stop_agent();
-
-  return Qnil;
-}
-
-static VALUE stop_extension(VALUE self) {
-  appsignal_stop_extension();
+static VALUE stop(VALUE self) {
+  appsignal_stop();
 
   return Qnil;
 }
@@ -222,8 +216,7 @@ void Init_appsignal_extension(void) {
 
   // Transaction monitoring
   rb_define_singleton_method(Extension, "start",                       start,                       0);
-  rb_define_singleton_method(Extension, "stop_agent",                  stop_agent,                  0);
-  rb_define_singleton_method(Extension, "stop_extension",              stop_extension,              0);
+  rb_define_singleton_method(Extension, "stop",                        stop,                        0);
   rb_define_singleton_method(Extension, "start_transaction",           start_transaction,           2);
   rb_define_singleton_method(Extension, "start_event",                 start_event,                 1);
   rb_define_singleton_method(Extension, "finish_event",                finish_event,                4);

data/lib/appsignal.rb

@@ -37,7 +37,14 @@ module Appsignal
     end
 
     def start
-      if config
+      unless @config
+        @config = Config.new(
+          ENV['PWD'],
+          ENV['APPSIGNAL_APP_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV']
+        )
+      end
+
+      if config.valid?
         if config[:debug]
           logger.level = Logger::DEBUG
         else
@@ -56,16 +63,12 @@ module Appsignal
           logger.info("Not starting, not active for #{config.env}")
         end
       else
-        logger.error('Can\'t start, no config loaded')
+        logger.error('Not starting, no valid config for this environment')
       end
     end
 
-    def stop_agent
-      Appsignal::Extension.stop_agent
-    end
-
-    def stop_extension
-      Appsignal::Extension.stop_extension
+    def stop
+      Appsignal::Extension.stop
     end
 
     def monitor_transaction(name, env={})

data/lib/appsignal/integrations/celluloid.rb

@@ -10,7 +10,7 @@ if defined?(::Celluloid)
       alias shutdown_without_appsignal shutdown
 
       def shutdown
-        Appsignal.stop_extension
+        Appsignal.stop
         shutdown_without_appsignal
       end
     end

data/lib/appsignal/version.rb

@@ -1,4 +1,4 @@
 module Appsignal
-  VERSION       = '0.12.beta.32'
-  AGENT_VERSION = '246e4be'
+  VERSION       = '0.12.beta.33'
+  AGENT_VERSION = '9686343'
 end

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

@@ -15,9 +15,9 @@ describe "Celluloid integration" do
       load file
     end
 
-    specify { expect(Appsignal).to receive(:stop_extension) }
-
+    specify { expect(Appsignal).to receive(:stop) }
     specify { expect(Celluloid).to receive(:shutdown_without_appsignal) }
+
     after do
       Celluloid.shutdown
     end

data/spec/lib/appsignal_spec.rb

@@ -32,12 +32,23 @@ describe Appsignal do
   end
 
   describe ".start" do
-    it "should do nothing when config is not loaded" do
-      Appsignal.logger.should_receive(:error).with(
-        "Can't start, no config loaded"
-      )
-      Appsignal.start
-      Appsignal.agent.should be_nil
+    context "with no config set beforehand" do
+      it "should do nothing when config is not set and there is no valid config in the env" do
+        Appsignal.logger.should_receive(:error).with(
+          "Push api key not set after loading config"
+        ).once
+        Appsignal.logger.should_receive(:error).with(
+          "Not starting, no valid config for this environment"
+        ).once
+        Appsignal::Extension.should_not_receive(:start)
+        Appsignal.start
+      end
+
+      it "should create a config from the env" do
+        ENV['APPSIGNAL_PUSH_API_KEY'] = 'something'
+        Appsignal::Extension.should_receive(:start)
+        Appsignal.start
+      end
     end
 
     context "when config is loaded" do
@@ -77,9 +88,6 @@ describe Appsignal do
         before { Appsignal.config = project_fixture_config('staging') }
 
         it "should do nothing" do
-          Appsignal.logger.should_receive(:info).with(
-            'Not starting, not active for staging'
-          )
           Appsignal.start
           Appsignal.agent.should be_nil
         end
@@ -135,18 +143,10 @@ describe Appsignal do
     end
   end
 
-  describe ".stop_agent" do
-    it "should call stop_agent on the extension" do
-      Appsignal::Extension.should_receive(:stop_agent)
-      Appsignal.stop_agent
-      Appsignal.active?.should be_false
-    end
-  end
-
-  describe ".stop_extension" do
-    it "should call stop_extension on the extension" do
-      Appsignal::Extension.should_receive(:stop_extension)
-      Appsignal.stop_extension
+  describe ".stop" do
+    it "should call stop on the extension" do
+      Appsignal::Extension.should_receive(:stop)
+      Appsignal.stop
       Appsignal.active?.should be_false
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.32
+  version: 0.12.beta.33
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack