appsignal 0.8.3.beta.0 → 0.8.3.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjI5MDhiMzVjMGUyYzUyNWViOTkzYTQ2YmIzYWU1YjVmNGVjOGU5Nw==
+    NmQxZWUzNTcwNmE3YjRjYWE4MTYyYWYyZDJkZjhmYWFiMWIyZDViYQ==
   data.tar.gz: !binary |-
-    OWVhNmFiZTFkMjkzOWZlNjg5MDY4ZmNiYWJhN2UzZGY3OTQzMDQ3Zg==
+    NmYwMGU1NjdiMTg5OGE0MjM4MjBlYmY1ZjIwYTI2NzNjZDAzNDQ0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzZiZDQ1YzcwZDk1NjkxYWVjMGFhMDFiNzBmYWVhNjZmMzU0MWI1ZTgzMDRh
-    OGIyN2NhNDRiNDgyYTkzM2RlNTI4MzVmYmRlMDg1NWM0ZDRkYzE5NjM4YmIw
-    N2U5NjFkOTNhMDQ0ZDkyNDkyNTc3MGNjZmM0MTg4NTFlMDhiODk=
+    ZWY4ZmY0ZjBlYWU2ZTYyYTk1YzA5ZjM4OTY4MzE1M2ViNWRiMjUwMmM5YWFm
+    YmU0MTEyMzI0ZTc4YjFlNTYxZWQyODg1MzEyOWFmM2Y1Mzg3NTk4OTM0YjZl
+    YTQ0YTRiNWJlYzIxNTE1ZjcwNjliZGU5YTQ1NzVmOTIzMmFiZmM=
   data.tar.gz: !binary |-
-    MTAzNDY1NjY1ZDRjYjg3OTNmMjVlZWJhODQ2Njg0MjUwMTRjMWIyNWVhNTQy
-    Y2Q0NzZlMTdkMWQ5YzdhYjVhYmViN2QwOGM5ZWI2YmZlNzljYjBhYTc3MTVj
-    YTllZmMxNTNjYTIxOWYxZWQ1Yjc3NDc4Njg3NzQ3YTEzMzI5MDI=
+    YzIwMDNmNjk1NmM3ZjZkNTAwM2FhODc4ODc4ZDVlMDgzOTUxN2RlYzZkZjdj
+    MDMxMmJkNzU0NWJlODlmYjQ4ZGJmOWQ0ZjhhODdmOTBlYmU4N2YwZWU2NWRm
+    NGQ5MzdjNjM5MzlhZGY1OTZjNGZhYTlmYzBlMDZjN2UwMzk0ZDM=

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # 0.8.3
 * Restart thread when we've been forked
+* Only notify of deploy when active in capistrano
+* Make sure env is a string in config
 
 # 0.8.2
 * Bugfix in Delayed Job integration

data/lib/appsignal.rb

@@ -120,7 +120,7 @@ module Appsignal
     end
 
     def active?
-      config && config[:active] == true
+      config && config.active?
     end
 
     def is_ignored_exception?(exception)

data/lib/appsignal/config.rb

@@ -16,7 +16,7 @@ module Appsignal
 
     def initialize(root_path, env, logger=Appsignal.logger)
       @root_path = root_path
-      @env = env
+      @env = env.to_s
       @logger = logger
 
       if File.exists?(config_file)
@@ -50,6 +50,10 @@ module Appsignal
       config_hash[key]
     end
 
+    def active?
+      !! self[:active]
+    end
+
     protected
 
     def config_file

data/lib/appsignal/integrations/capistrano.rb

@@ -19,17 +19,19 @@ module Appsignal
                 logger
               )
 
-              marker_data = {
-                :revision => current_revision,
-                :repository => repository,
-                :user => user
-              }
+              if appsignal_config && appsignal_config.active?
+                marker_data = {
+                  :revision => current_revision,
+                  :repository => repository,
+                  :user => user
+                }
 
-              marker = Marker.new(marker_data, appsignal_config, logger)
-              if config.dry_run
-                logger.info('Dry run: Deploy marker not actually sent.')
-              else
-                marker.transmit
+                marker = Marker.new(marker_data, appsignal_config, logger)
+                if config.dry_run
+                  logger.info('Dry run: Deploy marker not actually sent.')
+                else
+                  marker.transmit
+                end
               end
             end
           end

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/config_spec.rb

@@ -34,6 +34,22 @@ 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
+    end
+
     context "and there's also an env var present" do
       before do
         ENV['APPSIGNAL_PUSH_API_KEY'] = 'push_api_key'
@@ -85,6 +101,12 @@ 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'
@@ -97,6 +119,12 @@ describe Appsignal::Config do
 
       its(:loaded?) { should be_true }
 
+      describe "#active?" do
+        subject { config.active? }
+
+        it { should be_true }
+      end
+
       it "should merge with the default config and fill the config hash" do
         subject.config_hash.should == {
           :push_api_key => 'push_api_key',

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

@@ -23,6 +23,7 @@ describe Appsignal::Integrations::Capistrano do
       @capistrano_config.set(:current_revision, '503ce0923ed177a3ce000005')
       @capistrano_config.dry_run = false
       ENV['USER'] = 'batman'
+      ENV['PWD'] = project_fixture_path
     end
 
     context "config" do
@@ -30,7 +31,7 @@ describe Appsignal::Integrations::Capistrano do
 
       it "should be instantiated with the right params" do
         Appsignal::Config.should_receive(:new).with(
-          ENV['PWD'],
+          project_fixture_path,
           'production',
           kind_of(Capistrano::Logger)
         )
@@ -44,7 +45,7 @@ describe Appsignal::Integrations::Capistrano do
 
         it "should be instantiated with the right params" do
           Appsignal::Config.should_receive(:new).with(
-            ENV['PWD'],
+            project_fixture_path,
             'rack_production',
             kind_of(Capistrano::Logger)
           )
@@ -64,58 +65,66 @@ describe Appsignal::Integrations::Capistrano do
 
       let(:marker_data) do
         {
-          :revision => "503ce0923ed177a3ce000005",
-          :repository => "master",
-          :user => "batman"
+          :revision => '503ce0923ed177a3ce000005',
+          :repository => 'master',
+          :user => 'batman'
         }
       end
 
-      before do
-        @marker = Appsignal::Marker.new(
-          marker_data,
-          config,
-          @logger
-        )
-        Appsignal::Marker.should_receive(:new).with(
-          marker_data,
-          kind_of(Appsignal::Config),
-          kind_of(Capistrano::Logger)
-        ).and_return(@marker)
-      end
-
-      context "proper setup" do
+      context "when active for this environment" do
         before do
-          @transmitter = double
-          Appsignal::Transmitter.should_receive(:new).and_return(@transmitter)
+          @marker = Appsignal::Marker.new(
+            marker_data,
+            config,
+            @logger
+          )
+          Appsignal::Marker.should_receive(:new).with(
+            marker_data,
+            kind_of(Appsignal::Config),
+            kind_of(Capistrano::Logger)
+          ).and_return(@marker)
+        end
+
+        context "proper setup" do
+          before do
+            @transmitter = double
+            Appsignal::Transmitter.should_receive(:new).and_return(@transmitter)
+          end
+
+          it "should transmit data" do
+            @transmitter.should_receive(:transmit).and_return('200')
+            @capistrano_config.find_and_execute_task('appsignal:deploy')
+            @io.string.should include('** Notifying Appsignal of deploy...')
+            @io.string.should include('** Appsignal has been notified of this deploy!')
+          end
         end
 
-        it "should transmit data" do
-          @transmitter.should_receive(:transmit).and_return('200')
+        it "should not transmit data" do
           @capistrano_config.find_and_execute_task('appsignal:deploy')
           @io.string.should include('** Notifying Appsignal of deploy...')
-          @io.string.should include(
-            '** Appsignal has been notified of this deploy!'
-          )
+          @io.string.should include('** Something went wrong while trying to notify Appsignal:')
         end
-      end
 
-      it "should not transmit data" do
-        @capistrano_config.find_and_execute_task('appsignal:deploy')
-        @io.string.should include('** Notifying Appsignal of deploy...')
-        @io.string.should include(
-          '** Something went wrong while trying to notify Appsignal:'
-        )
+        context "dry run" do
+          before { @capistrano_config.dry_run = true }
+
+          it "should not send deploy marker" do
+            @marker.should_not_receive(:transmit)
+            @capistrano_config.find_and_execute_task('appsignal:deploy')
+            @io.string.should include('** Dry run: Deploy marker not actually sent.')
+          end
+        end
       end
 
-      context "dry run" do
-        before { @capistrano_config.dry_run = true }
+      context "when not active for this environment" do
+        before do
+          @capistrano_config.set(:rails_env, 'nonsense')
+        end
 
         it "should not send deploy marker" do
-          @marker.should_not_receive(:transmit)
+          Appsignal::Marker.should_not_receive(:new)
           @capistrano_config.find_and_execute_task('appsignal:deploy')
-          @io.string.should include(
-            '** Dry run: Deploy marker not actually sent.'
-          )
+          @io.string.should include('Not loading:')
         end
       end
     end

data/spec/lib/appsignal_spec.rb

@@ -78,19 +78,19 @@ describe Appsignal do
     subject { Appsignal.active? }
 
     context "without config" do
-      before { Appsignal.stub(:config => nil) }
+      before { Appsignal.config = nil }
 
       it { should be_false }
     end
 
     context "with config but inactive" do
-      before { Appsignal.stub(:config => {:active => false}) }
+      before { Appsignal.config = project_fixture_config('nonsense') }
 
       it { should be_false }
     end
 
     context "with active config" do
-      before { Appsignal.stub(:config => {:active => true}) }
+      before { Appsignal.config = project_fixture_config }
 
       it { should be_true }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.8.3.beta.0
+  version: 0.8.3.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport