appsignal 1.4.0.alpha.2 → 1.4.0.beta.1

data/lib/appsignal/utils.rb

@@ -14,12 +14,81 @@ module Appsignal
     end
     extend ClassMethods
 
+    def self.data_generate(body)
+      Data.generate(body)
+    end
+
+    class Data
+      class << self
+        def generate(body)
+          if body.is_a?(Hash)
+            map_hash(body)
+          elsif body.is_a?(Array)
+            map_array(body)
+          else
+            raise TypeError.new("Body of type #{body.class} should be a Hash or Array")
+          end
+        end
+
+        def map_hash(hash_value)
+          map = Appsignal::Extension.data_map_new
+          hash_value.each do |key, value|
+            key = key.to_s
+            case value
+            when String
+              map.set_string(key, value)
+            when Fixnum
+              map.set_fixnum(key, value)
+            when Float
+              map.set_float(key, value)
+            when TrueClass, FalseClass
+              map.set_boolean(key, value)
+            when NilClass
+              map.set_nil(key)
+            when Hash
+              map.set_data(key, map_hash(value))
+            when Array
+              map.set_data(key, map_array(value))
+            else
+              map.set_string(key, value.to_s)
+            end
+          end
+          map
+        end
+
+        def map_array(array_value)
+          array = Appsignal::Extension.data_array_new
+          array_value.each do |value|
+            case value
+            when String
+              array.append_string(value)
+            when Fixnum
+              array.append_fixnum(value)
+            when Float
+              array.append_float(value)
+            when TrueClass, FalseClass
+              array.append_boolean(value)
+            when NilClass
+              array.append_nil
+            when Hash
+              array.append_data(map_hash(value))
+            when Array
+              array.append_data(map_array(value))
+            else
+              array.append_string(value.to_s)
+            end
+          end
+          array
+        end
+      end
+    end
+
     def self.json_generate(body)
       JSON.generate(body)
     end
 
     class JSON
-      module ClassMethods
+      class << self
         def generate(body)
           ::JSON.generate(jsonify(body))
         end
@@ -49,8 +118,13 @@ module Appsignal
           )
         end
       end
+    end
 
-      extend ClassMethods
+    class Gzip
+      def self.compress(body)
+        Zlib::Deflate.deflate(body, Zlib::BEST_SPEED)
+      end
     end
   end
+
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.4.0.alpha.2'
+  VERSION = '1.4.0.beta.1'
 end

data/spec/lib/appsignal/auth_check_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::AuthCheck do
   let(:config) { project_fixture_config }
   let(:logger) { Logger.new(StringIO.new) }

data/spec/lib/appsignal/capistrano2_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-if capistrano2_present?
+if DependencyHelper.capistrano2_present?
   require 'capistrano'
   require 'capistrano/configuration'
   require 'appsignal/capistrano'
@@ -8,39 +6,36 @@ if capistrano2_present?
   describe "Capistrano 2 integration" do
     let(:out_stream) { StringIO.new }
     let(:config) { project_fixture_config }
-
-    before do
-      @original_stdout = $stdout
-      $stdout = out_stream
+    let(:capistrano_config) do
+      Capistrano::Configuration.new.tap do |c|
+        c.set(:rails_env, 'production')
+        c.set(:repository, 'master')
+        c.set(:deploy_to, '/home/username/app')
+        c.set(:current_release, '')
+        c.set(:current_revision, '503ce0923ed177a3ce000005')
+        c.dry_run = false
+      end
     end
-    after do
-      $stdout = @original_stdout
+    before do
+      Appsignal::Capistrano.tasks(capistrano_config)
     end
-
-    before :all do
-      @capistrano_config = Capistrano::Configuration.new
-      Appsignal::Capistrano.tasks(@capistrano_config)
+    around do |example|
+      capture_stdout(out_stream) { example.run }
     end
 
     it "should have a deploy task" do
-      @capistrano_config.find_task('appsignal:deploy').should_not be_nil
+      capistrano_config.find_task('appsignal:deploy').should_not be_nil
     end
 
     describe "appsignal:deploy task" do
       before do
-        @capistrano_config.set(:rails_env, 'production')
-        @capistrano_config.set(:repository, 'master')
-        @capistrano_config.set(:deploy_to, '/home/username/app')
-        @capistrano_config.set(:current_release, '')
-        @capistrano_config.set(:current_revision, '503ce0923ed177a3ce000005')
-        @capistrano_config.dry_run = false
         ENV['USER'] = 'batman'
         ENV['PWD'] = project_fixture_path
       end
 
       context "config" do
         before do
-          @capistrano_config.dry_run = true
+          capistrano_config.dry_run = true
         end
 
         it "should be instantiated with the right params" do
@@ -54,7 +49,7 @@ if capistrano2_present?
 
         context "when appsignal_config is available" do
           before do
-            @capistrano_config.set(:appsignal_config, :name => 'AppName')
+            capistrano_config.set(:appsignal_config, :name => 'AppName')
           end
 
           it "should be instantiated with the right params" do
@@ -68,8 +63,8 @@ if capistrano2_present?
 
           context "when rack_env is used instead of rails_env" do
             before do
-              @capistrano_config.unset(:rails_env)
-              @capistrano_config.set(:rack_env, 'rack_production')
+              capistrano_config.unset(:rails_env)
+              capistrano_config.set(:rack_env, 'rack_production')
             end
 
             it "should be instantiated with the right params" do
@@ -81,12 +76,51 @@ if capistrano2_present?
               )
             end
           end
+
+          context "when stage is used instead of rack_env / rails_env" do
+            before do
+              capistrano_config.unset(:rails_env)
+              capistrano_config.set(:stage, 'stage_production')
+            end
+
+            it "should be instantiated with the right params" do
+              Appsignal::Config.should_receive(:new).with(
+                project_fixture_path,
+                'stage_production',
+                {:name => 'AppName'},
+                kind_of(Logger)
+              )
+            end
+          end
+
+          context "when appsignal_env is set" do
+            before do
+              capistrano_config.set(:rack_env, 'rack_production')
+              capistrano_config.set(:stage, 'stage_production')
+              capistrano_config.set(:appsignal_env, 'appsignal_production')
+            end
+
+            it "should prefer the appsignal_env rather than stage, rails_env and rack_env" do
+              Appsignal::Config.should_receive(:new).with(
+                project_fixture_path,
+                'appsignal_production',
+                {:name => 'AppName'},
+                kind_of(Logger)
+              )
+            end
+          end
         end
 
-        after { @capistrano_config.find_and_execute_task('appsignal:deploy') }
+        after do
+          capistrano_config.find_and_execute_task('appsignal:deploy')
+        end
       end
 
-      context "send marker" do
+      describe "markers" do
+        def stub_marker_request(data = {})
+          stub_api_request config, 'markers', marker_data.merge(data)
+        end
+
         let(:marker_data) do
           {
             :revision => '503ce0923ed177a3ce000005',
@@ -95,80 +129,66 @@ if capistrano2_present?
         end
 
         context "when active for this environment" do
-          before do
-            @marker = Appsignal::Marker.new(
-              marker_data,
-              config
-            )
-            Appsignal::Marker.stub(:new => @marker)
+          it "transmits marker" do
+            stub_marker_request.to_return(:status => 200)
+            capistrano_config.find_and_execute_task('appsignal:deploy')
+
+            expect(out_stream.string).to include \
+              'Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
+              'Appsignal has been notified of this deploy!'
           end
 
-          context "proper setup" do
+          context "with overridden revision" do
             before do
-              @transmitter = double
-              Appsignal::Transmitter.should_receive(:new).and_return(@transmitter)
+              capistrano_config.set(:appsignal_revision, 'abc123')
+              stub_marker_request(:revision => 'abc123').to_return(:status => 200)
+              capistrano_config.find_and_execute_task('appsignal:deploy')
             end
 
-            it "should add the correct marker data" do
-              Appsignal::Marker.should_receive(:new).with(
-                marker_data,
-                kind_of(Appsignal::Config)
-              ).and_return(@marker)
-
-              @capistrano_config.find_and_execute_task('appsignal:deploy')
+            it "transmits the overriden revision" do
+              expect(out_stream.string).to include \
+                'Notifying Appsignal of deploy with: revision: abc123, user: batman',
+                'Appsignal has been notified of this deploy!'
             end
+          end
 
-            it "should transmit data" do
-              @transmitter.should_receive(:transmit).and_return('200')
-              @capistrano_config.find_and_execute_task('appsignal:deploy')
-              out_stream.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
-              out_stream.string.should include('Appsignal has been notified of this deploy!')
+          context "with failed request" do
+            before do
+              stub_marker_request.to_return(:status => 500)
+              capistrano_config.find_and_execute_task('appsignal:deploy')
             end
 
-            context "with overridden revision" do
-              before do
-                @capistrano_config.set(:appsignal_revision, 'abc123')
-              end
-              it "should add the correct marker data" do
-                Appsignal::Marker.should_receive(:new).with(
-                  {
-                    :revision => 'abc123',
-                    :user => 'batman'
-                  },
-                  kind_of(Appsignal::Config)
-                ).and_return(@marker)
-
-                @capistrano_config.find_and_execute_task('appsignal:deploy')
-              end
+            it "does not transmit marker" do
+              output = out_stream.string
+              expect(output).to include \
+                'Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
+                'Something went wrong while trying to notify Appsignal:'
+              expect(output).to_not include 'Appsignal has been notified of this deploy!'
             end
           end
 
-          it "should not transmit data" do
-            @capistrano_config.find_and_execute_task('appsignal:deploy')
-            out_stream.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
-            out_stream.string.should include('Something went wrong while trying to notify Appsignal:')
-          end
-
-          context "dry run" do
-            before { @capistrano_config.dry_run = true }
+          context "when dry run" do
+            before do
+              capistrano_config.dry_run = true
+              capistrano_config.find_and_execute_task('appsignal:deploy')
+            end
 
-            it "should not send deploy marker" do
-              @marker.should_not_receive(:transmit)
-              @capistrano_config.find_and_execute_task('appsignal:deploy')
-              out_stream.string.should include('Dry run: AppSignal deploy marker not actually sent.')
+            it "does not transmit marker" do
+              expect(out_stream.string).to include \
+                'Dry run: AppSignal deploy marker not actually sent.'
             end
           end
         end
 
         context "when not active for this environment" do
           before do
-            @capistrano_config.set(:rails_env, 'nonsense')
+            capistrano_config.set(:rails_env, 'nonsense')
+            capistrano_config.find_and_execute_task('appsignal:deploy')
           end
 
-          it "should not send deploy marker" do
-            Appsignal::Marker.should_not_receive(:new)
-            @capistrano_config.find_and_execute_task('appsignal:deploy')
-            out_stream.string.should include('Not notifying of deploy, config is not active')
+          it "does not transmit marker" do
+            expect(out_stream.string).to include \
+              "Not notifying of deploy, config is not active for environment: nonsense"
           end
         end
       end

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-if capistrano3_present?
+if DependencyHelper.capistrano3_present?
   require 'capistrano/all'
   require 'capistrano/deploy'
   require 'appsignal/capistrano'
@@ -11,23 +9,24 @@ if capistrano3_present?
     let(:config) { project_fixture_config }
     let(:out_stream) { StringIO.new }
     let(:logger) { Logger.new(out_stream) }
-
-    before do
-      @capistrano_config = Capistrano::Configuration.env
-      @capistrano_config.set(:log_level, :error)
-      @capistrano_config.set(:logger, logger)
+    let!(:capistrano_config) do
+      Capistrano::Configuration.reset!
+      Capistrano::Configuration.env.tap do |c|
+        c.set(:log_level, :error)
+        c.set(:logger, logger)
+        c.set(:rails_env, 'production')
+        c.set(:repository, 'master')
+        c.set(:deploy_to, '/home/username/app')
+        c.set(:current_release, '')
+        c.set(:current_revision, '503ce0923ed177a3ce000005')
+      end
     end
     before do
-      @original_stdout = $stdout
-      $stdout = out_stream
-      @original_stderr = $stderr
-      $stderr = out_stream
-    end
-    after do
-      $stdout = @original_stdout
-      $stderr = @original_stderr
       Rake::Task['appsignal:deploy'].reenable
     end
+    around do |example|
+      capture_std_streams(out_stream, out_stream) { example.run }
+    end
 
     it "should have a deploy task" do
       Rake::Task.task_defined?('appsignal:deploy').should be_true
@@ -35,11 +34,6 @@ if capistrano3_present?
 
     describe "appsignal:deploy task" do
       before do
-        @capistrano_config.set(:rails_env, 'production')
-        @capistrano_config.set(:repository, 'master')
-        @capistrano_config.set(:deploy_to, '/home/username/app')
-        @capistrano_config.set(:current_release, '')
-        @capistrano_config.set(:current_revision, '503ce0923ed177a3ce000005')
         ENV['USER'] = 'batman'
         ENV['PWD'] = project_fixture_path
       end
@@ -56,7 +50,7 @@ if capistrano3_present?
 
         context "when appsignal_config is available" do
           before do
-            @capistrano_config.set(:appsignal_config, :name => 'AppName')
+            capistrano_config.set(:appsignal_config, :name => 'AppName')
           end
 
           it "should be instantiated with the right params" do
@@ -70,8 +64,8 @@ if capistrano3_present?
 
           context "when rack_env is the only env set" do
             before do
-              @capistrano_config.delete(:rails_env)
-              @capistrano_config.set(:rack_env, 'rack_production')
+              capistrano_config.delete(:rails_env)
+              capistrano_config.set(:rack_env, 'rack_production')
             end
 
             it "should be instantiated with the rack env" do
@@ -86,8 +80,8 @@ if capistrano3_present?
 
           context "when stage is set" do
             before do
-              @capistrano_config.set(:rack_env, 'rack_production')
-              @capistrano_config.set(:stage, 'stage_production')
+              capistrano_config.set(:rack_env, 'rack_production')
+              capistrano_config.set(:stage, 'stage_production')
             end
 
             it "should prefer the stage rather than rails_env and rack_env" do
@@ -102,9 +96,9 @@ if capistrano3_present?
 
           context "when appsignal_env is set" do
             before do
-              @capistrano_config.set(:rack_env, 'rack_production')
-              @capistrano_config.set(:stage, 'stage_production')
-              @capistrano_config.set(:appsignal_env, 'appsignal_production')
+              capistrano_config.set(:rack_env, 'rack_production')
+              capistrano_config.set(:stage, 'stage_production')
+              capistrano_config.set(:appsignal_env, 'appsignal_production')
             end
 
             it "should prefer the appsignal_env rather than stage, rails_env and rack_env" do
@@ -120,13 +114,14 @@ if capistrano3_present?
 
         after do
           invoke('appsignal:deploy')
-          @capistrano_config.delete(:stage)
-          @capistrano_config.delete(:rack_env)
-          @capistrano_config.delete(:appsignal_env)
         end
       end
 
-      context "send marker" do
+      describe "markers" do
+        def stub_marker_request(data = {})
+          stub_api_request config, 'markers', marker_data.merge(data)
+        end
+
         let(:marker_data) do
           {
             :revision => '503ce0923ed177a3ce000005',
@@ -135,70 +130,54 @@ if capistrano3_present?
         end
 
         context "when active for this environment" do
-          before do
-            @marker = Appsignal::Marker.new(
-              marker_data,
-              config
-            )
-            Appsignal::Marker.stub(:new => @marker)
+          it "transmits marker" do
+            stub_marker_request.to_return(:status => 200)
+            invoke('appsignal:deploy')
+
+            expect(out_stream.string).to include \
+              'Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
+              'Appsignal has been notified of this deploy!'
           end
 
-          context "proper setup" do
+          context "with overridden revision" do
             before do
-              @transmitter = double
-              Appsignal::Transmitter.should_receive(:new).and_return(@transmitter)
+              capistrano_config.set(:appsignal_revision, 'abc123')
+              stub_marker_request(:revision => 'abc123').to_return(:status => 200)
+              invoke('appsignal:deploy')
             end
 
-            it "should add the correct marker data" do
-              Appsignal::Marker.should_receive(:new).with(
-                marker_data,
-                kind_of(Appsignal::Config)
-              ).and_return(@marker)
-
-              invoke('appsignal:deploy')
+            it "transmits the overriden revision" do
+              expect(out_stream.string).to include \
+                'Notifying Appsignal of deploy with: revision: abc123, user: batman',
+                'Appsignal has been notified of this deploy!'
             end
+          end
 
-            it "should transmit data" do
-              @transmitter.should_receive(:transmit).and_return('200')
+          context "with failed request" do
+            before do
+              stub_marker_request.to_return(:status => 500)
               invoke('appsignal:deploy')
-              out_stream.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
-              out_stream.string.should include('ppsignal has been notified of this deploy!')
             end
 
-            context "with overridden revision" do
-              before do
-                @capistrano_config.set(:appsignal_revision, 'abc123')
-              end
-              it "should add the correct marker data" do
-                Appsignal::Marker.should_receive(:new).with(
-                  {
-                    :revision => 'abc123',
-                    :user => 'batman'
-                  },
-                  kind_of(Appsignal::Config)
-                ).and_return(@marker)
-
-                invoke('appsignal:deploy')
-              end
+            it "does not transmit marker" do
+              output = out_stream.string
+              expect(output).to include \
+                'Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
+                'Something went wrong while trying to notify Appsignal:'
+              expect(output).to_not include 'Appsignal has been notified of this deploy!'
             end
           end
-
-          it "should not transmit data" do
-            invoke('appsignal:deploy')
-            out_stream.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
-            out_stream.string.should include('Something went wrong while trying to notify Appsignal:')
-          end
         end
 
         context "when not active for this environment" do
           before do
-            @capistrano_config.set(:rails_env, 'nonsense')
+            capistrano_config.set(:rails_env, 'nonsense')
+            invoke('appsignal:deploy')
           end
 
           it "should not send deploy marker" do
-            Appsignal::Marker.should_not_receive(:new)
-            invoke('appsignal:deploy')
-            out_stream.string.should include("Not notifying of deploy, config is not active")
+            expect(out_stream.string).to include \
+              "Not notifying of deploy, config is not active for environment: nonsense"
           end
         end
       end