appsignal 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b06d39d3717f054714a64e2961c466b4a9caed2e
-  data.tar.gz: 62ebd705722d24809f4c2649ed777230fe1b66c3
+  metadata.gz: c5af9c6943591c44c841e99c1e8b9f14d40e1c8e
+  data.tar.gz: 54532725587a4ffeaeb4a9f09fbc32cc65785c80
 SHA512:
-  metadata.gz: 04a76fba53a43dad673857e71532d96ddbbc4d2699593ee4b755076866f2c58199be03aaad577a2b2bf16c02d97c1180b175c3e889d70a18016cb44de131c2e5
-  data.tar.gz: d174831943495a569f67b307eedc556524ab29a626053c9015154519e50267dfe64f4300de780f477847434e88172b3a985b076bbee1880ce1cc9a714ed62e40
+  metadata.gz: 30cfc725282a8da8974425a8d2da61cf397509d9096f2a87b221e8f6dea3dca3580eb823210c69ba65d1894e3c0cb748db644b9fa899b9d61248734c146728ca
+  data.tar.gz: 93a4d1bfdbd1bb7f5eeff536a72f662576c5f6e790c0e46c71ddec4d356df9a1af624950be92d2e66bd70b9fe0c53b2e99bacfd468e532fbd5ca56b597302a1c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.1
+* Fix configuration load order regression for the `APPSIGNAL_PUSH_API_KEY`
+  environment variable's activation behavior. PR #208
+
 # 2.0.0
 * Add `Appsignal.instrument_sql` convenience methods. PR #136
 * Use `Appsignal.instrument` internally instead of ActiveSupport

data/lib/appsignal/config.rb

@@ -150,6 +150,9 @@ module Appsignal
     def detect_from_system
       config_hash[:running_in_container] = true if Appsignal::System.container?
       config_hash[:log] = 'stdout' if Appsignal::System.heroku?
+
+      # Make active by default if APPSIGNAL_PUSH_API_KEY is present
+      config_hash[:active] = true if ENV['APPSIGNAL_PUSH_API_KEY']
     end
 
     def load_from_disk
@@ -180,11 +183,6 @@ module Appsignal
     def load_from_environment
       config = {}
 
-      # Make active by default if APPSIGNAL_PUSH_API_KEY is present
-      if ENV['APPSIGNAL_PUSH_API_KEY']
-        config[:active] = true
-      end
-
       # Configuration with string type
       %w(APPSIGNAL_PUSH_API_KEY APPSIGNAL_APP_NAME APPSIGNAL_PUSH_API_ENDPOINT
          APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH APPSIGNAL_HTTP_PROXY

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -2,6 +2,24 @@ describe Appsignal::Config do
   describe "config based on the system" do
     let(:config) { project_fixture_config(:none) }
 
+    describe ":active" do
+      subject { config[:active] }
+
+      context "with APPSIGNAL_PUSH_API_KEY env variable" do
+        before { ENV["APPSIGNAL_PUSH_API_KEY"] = "abc" }
+
+        it "becomes active" do
+          expect(subject).to be_true
+        end
+      end
+
+      context "without APPSIGNAL_PUSH_API_KEY env variable" do
+        it "remains inactive" do
+          expect(subject).to be_false
+        end
+      end
+    end
+
     describe ":running_in_container" do
       subject { config[:running_in_container] }
 
@@ -92,16 +110,38 @@ describe Appsignal::Config do
     end
 
     describe "overriding system detected config" do
-      let(:config) do
-        described_class.new(
-          "non-existing-path",
-          "production",
-          :running_in_container => true
-        )
+      describe ":running_in_container" do
+        let(:config) do
+          described_class.new(
+            "non-existing-path",
+            "production",
+            :running_in_container => true
+          )
+        end
+        subject { config[:running_in_container] }
+
+        it "overrides system detected config" do
+          expect(subject).to be_true
+        end
       end
 
-      it "overrides system detected config" do
-        expect(config[:running_in_container]).to be_true
+      describe ":active" do
+        subject { config[:active] }
+
+        context "with APPSIGNAL_PUSH_API_KEY env variable" do
+          let(:config) do
+            described_class.new(
+              "non-existing-path",
+              "production",
+              :active => false
+            )
+          end
+          before { ENV["APPSIGNAL_PUSH_API_KEY"] = "abc" }
+
+          it "sets given config rather than env variable" do
+            expect(subject).to be_false
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack