appsignal 1.3.6 → 1.4.0.alpha.1

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 if capistrano3_present?
   require 'capistrano/all'
   require 'capistrano/deploy'
@@ -9,23 +11,22 @@ if capistrano3_present?
     let(:config) { project_fixture_config }
     let(:out_stream) { StringIO.new }
     let(:logger) { Logger.new(out_stream) }
-    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
+
+    before do
+      @capistrano_config = Capistrano::Configuration.env
+      @capistrano_config.set(:log_level, :error)
+      @capistrano_config.set(:logger, logger)
     end
     before do
-      Rake::Task['appsignal:deploy'].reenable
+      @original_stdout = $stdout
+      $stdout = out_stream
+      @original_stderr = $stderr
+      $stderr = out_stream
     end
-    around do |example|
-      capture_std_streams(out_stream, out_stream) { example.run }
+    after do
+      $stdout = @original_stdout
+      $stderr = @original_stderr
+      Rake::Task['appsignal:deploy'].reenable
     end
 
     it "should have a deploy task" do
@@ -34,6 +35,11 @@ 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
@@ -50,7 +56,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
@@ -64,8 +70,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
@@ -80,8 +86,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
@@ -96,9 +102,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
@@ -114,14 +120,13 @@ if capistrano3_present?
 
         after do
           invoke('appsignal:deploy')
+          @capistrano_config.delete(:stage)
+          @capistrano_config.delete(:rack_env)
+          @capistrano_config.delete(:appsignal_env)
         end
       end
 
-      describe "markers" do
-        def stub_marker_request(data = {})
-          stub_api_request config, 'markers', marker_data.merge(data)
-        end
-
+      context "send marker" do
         let(:marker_data) do
           {
             :revision => '503ce0923ed177a3ce000005',
@@ -130,54 +135,70 @@ if capistrano3_present?
         end
 
         context "when active for this environment" do
-          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!'
+          before do
+            @marker = Appsignal::Marker.new(
+              marker_data,
+              config
+            )
+            Appsignal::Marker.stub(:new => @marker)
           end
 
-          context "with overridden revision" do
+          context "proper setup" do
             before do
-              capistrano_config.set(:appsignal_revision, 'abc123')
-              stub_marker_request(:revision => 'abc123').to_return(:status => 200)
-              invoke('appsignal:deploy')
+              @transmitter = double
+              Appsignal::Transmitter.should_receive(:new).and_return(@transmitter)
             end
 
-            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!'
+            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')
             end
-          end
 
-          context "with failed request" do
-            before do
-              stub_marker_request.to_return(:status => 500)
+            it "should transmit data" do
+              @transmitter.should_receive(:transmit).and_return('200')
               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
 
-            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!'
+            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
             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')
-            invoke('appsignal:deploy')
+            @capistrano_config.set(:rails_env, 'nonsense')
           end
 
           it "should not send deploy marker" do
-            expect(out_stream.string).to include \
-              "Not notifying of deploy, config is not active for environment: nonsense"
+            Appsignal::Marker.should_not_receive(:new)
+            invoke('appsignal:deploy')
+            out_stream.string.should include("Not notifying of deploy, config is not active")
           end
         end
       end

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -1,26 +1,27 @@
+require 'spec_helper'
 require 'appsignal/cli'
 
 describe Appsignal::CLI::Diagnose do
   let(:out_stream) { StringIO.new }
   let(:cli) { Appsignal::CLI::Diagnose }
-  around do |example|
-    original_stdout = $stdout
+  before do
+    @original_stdout = $stdout
     $stdout = out_stream
-    example.run
-    $stdout = original_stdout
+  end
+  after do
+    $stdout = @original_stdout
   end
 
   describe ".run" do
     it "should output diagnostic information" do
       cli.run
-      output = out_stream.string
-      expect(output).to include('Gem version')
-      expect(output).to include('Agent version')
-      expect(output).to include('Environment')
-      expect(output).to include('Config')
-      expect(output).to include('Checking API key')
-      expect(output).to include('Checking if required paths are writable')
-      expect(output).to include('Showing last lines of extension install log')
+
+      out_stream.string.should include('Gem version')
+      out_stream.string.should include('Agent version')
+      out_stream.string.should include('Config')
+      out_stream.string.should include('Checking API key')
+      out_stream.string.should include('Checking if required paths are writable')
+      out_stream.string.should include('Showing last lines of extension install log')
     end
   end
 end

data/spec/lib/appsignal/cli/install_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'appsignal/cli'
 
 begin
@@ -13,13 +14,15 @@ describe Appsignal::CLI::Install do
 
   before do
     Dir.stub(:pwd => project_fixture_path)
+    @original_stdout = $stdout
+    $stdout = out_stream
     Appsignal::AuthCheck.stub(:new => auth_check)
     auth_check.stub(:perform => '200')
     cli.stub(:sleep)
     cli.stub(:press_any_key)
   end
-  around do |example|
-    capture_stdout(out_stream) { example.run }
+  after do
+    $stdout = @original_stdout
   end
 
   describe ".run" do
@@ -372,50 +375,24 @@ describe Appsignal::CLI::Install do
       end
     end
 
-    context "with capistrano" do
-      let(:capfile) { File.join(tmp_dir, 'Capfile') }
+    context "when deploy.rb is present" do
+      let(:config_dir) { File.join(tmp_dir, 'config') }
+      let(:deploy_rb_file) { File.join(tmp_dir, 'config/deploy.rb') }
       before do
         Dir.stub(:pwd => tmp_dir)
-        FileUtils.mkdir_p(tmp_dir)
+        FileUtils.mkdir_p(config_dir)
+        FileUtils.touch(deploy_rb_file)
         cli.should_receive(:gets).once.and_return('2')
       end
       after do
-        FileUtils.rm_rf(tmp_dir)
+        FileUtils.rm_rf(config_dir)
       end
 
-      context "without Capfile" do
-        before { cli.configure(config, [], false) }
-
-        it "does nothing" do
-          expect(out_stream.string).to_not include 'Adding AppSignal integration to Capfile'
-          expect(File.exist?(capfile)).to be_false
-        end
-      end
-
-      context "with Capfile" do
-        context "when already installed" do
-          before do
-            File.open(capfile, 'w') { |f| f.write("require 'appsignal/capistrano'") }
-            cli.configure(config, [], false)
-          end
-
-          it "does not add another require to Capfile" do
-            expect(out_stream.string).to_not include 'Adding AppSignal integration to Capfile'
-            expect(File.read(capfile).scan(/appsignal/).count).to eq(1)
-          end
-        end
-
-        context "when not installed" do
-          before do
-            FileUtils.touch(capfile)
-            cli.configure(config, [], false)
-          end
+      it "should add a require to deploy.rb" do
+        cli.configure(config, [], false)
 
-          it "adds a require to Capfile" do
-            expect(out_stream.string).to include 'Adding AppSignal integration to Capfile'
-            expect(File.read(capfile)).to include "require 'appsignal/capistrano'"
-          end
-        end
+        out_stream.string.should include 'Adding AppSignal integration to deploy.rb'
+        File.read(deploy_rb_file).should include "require 'appsignal/capistrano'"
       end
     end
   end

data/spec/lib/appsignal/cli/notify_of_deploy_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'appsignal/cli'
 
 describe Appsignal::CLI::NotifyOfDeploy do
@@ -6,10 +7,12 @@ describe Appsignal::CLI::NotifyOfDeploy do
   let(:config) { Appsignal::Config.new(project_fixture_path, {}) }
   let(:marker_data) { {:revision => 'aaaaa', :user => 'thijs', :environment => 'production'} }
   before do
+    @original_stdout = $stdout
+    $stdout = out_stream
     config.stub(:active? => true)
   end
-  around do |example|
-    capture_stdout(out_stream) { example.run }
+  after do
+    $stdout = @original_stdout
   end
 
   describe ".run" do

data/spec/lib/appsignal/cli_spec.rb

@@ -1,14 +1,17 @@
+require 'spec_helper'
 require 'appsignal/cli'
 
 describe Appsignal::CLI do
   let(:out_stream) { StringIO.new }
   let(:cli) { Appsignal::CLI }
   before do
+    @original_stdout = $stdout
+    $stdout = out_stream
     Dir.stub(:pwd => project_fixture_path)
     cli.options = {:environment => 'production'}
   end
-  around do |example|
-    capture_stdout(out_stream) { example.run }
+  after do
+    $stdout = @original_stdout
   end
 
   describe "#config" do

data/spec/lib/appsignal/config_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Config do
   subject { config }
 
@@ -35,150 +37,35 @@ describe Appsignal::Config do
         :running_in_container           => false,
         :enable_host_metrics            => true,
         :enable_minutely_probes         => false,
-        :hostname                       => Socket.gethostname,
-        :ca_file_path                   => File.join(resources_dir, 'cacert.pem')
+        :hostname                       => Socket.gethostname
       })
     end
 
-    describe "#log_file_path" do
-      let(:stdout) { StringIO.new }
-      let(:config) { project_fixture_config('production', :log_path => log_path) }
-      subject { config.log_file_path }
-      around do |example|
-        original_stdout = $stdout
-        $stdout = stdout
-        example.run
-        $stdout = original_stdout
-      end
-
-      context "when path is writable" do
-        let(:log_path) { File.join(tmp_dir, 'writable-path') }
-        before { FileUtils.mkdir_p(log_path, :mode => 0755) }
-        after { FileUtils.rm_rf(log_path) }
-
-        it "returns log file path" do
-          expect(subject).to eq File.join(log_path, 'appsignal.log')
-        end
-
-        it "prints no warning" do
-          subject
-          expect(stdout.string).to be_empty
-        end
-      end
-
-      shared_examples '#log_file_path: tmp path' do
-        let(:system_tmp_dir) { Appsignal::Config::SYSTEM_TMP_DIR }
-        before { FileUtils.mkdir_p(system_tmp_dir) }
-        after { FileUtils.rm_rf(system_tmp_dir) }
-
-        context "when the /tmp fallback path is writable" do
-          before { FileUtils.chmod(0777, system_tmp_dir) }
-
-          it "returns returns the tmp location" do
-            expect(subject).to eq(File.join(system_tmp_dir, 'appsignal.log'))
-          end
-
-          it "prints a warning" do
-            subject
-            expect(stdout.string).to include "appsignal: Unable to log to '#{log_path}'. "\
-              "Logging to '#{system_tmp_dir}' instead."
-          end
-        end
-
-        context "when the /tmp fallback path is not writable" do
-          before { FileUtils.chmod(0555, system_tmp_dir) }
-
-          it "returns nil" do
-            expect(subject).to be_nil
-          end
+    context "if a log file path is set" do
+      let(:config) { project_fixture_config('production', :log_path => '/tmp') }
 
-          it "prints a warning" do
-            subject
-            expect(stdout.string).to include "appsignal: Unable to log to '#{log_path}' "\
-              "or the '#{system_tmp_dir}' fallback."
-          end
-        end
-      end
+      its(:log_file_path) { should end_with('/tmp/appsignal.log') }
 
-      context "when path is nil" do
-        let(:log_path) { nil }
-
-        context "when root_path is nil" do
-          before { allow(config).to receive(:root_path).and_return(nil) }
-
-          include_examples '#log_file_path: tmp path'
-        end
+      context "if it is not writable" do
+        before { FileUtils.mkdir_p('/tmp/not-writable', :mode => 0555) }
 
-        context "when root_path is set" do
-          it "returns returns the project log location" do
-            expect(subject).to eq File.join(config.root_path, 'appsignal.log')
-          end
+        let(:config) { project_fixture_config('production', :log_path => '/tmp/not-writable') }
 
-          it "prints no warning" do
-            subject
-            expect(stdout.string).to be_empty
-          end
-        end
-      end
-
-      context "when path does not exist" do
-        let(:log_path) { '/non-existing' }
-
-        include_examples '#log_file_path: tmp path'
+        its(:log_file_path) { should eq '/tmp/appsignal.log' }
       end
 
-      context "when path is not writable" do
-        let(:log_path) { File.join(tmp_dir, 'not-writable-path') }
-        before { FileUtils.mkdir_p(log_path, :mode => 0555) }
-        after { FileUtils.rm_rf(log_path) }
+      context "if it does not exist" do
+        let(:config) { project_fixture_config('production', :log_path => '/non-existing') }
 
-        include_examples '#log_file_path: tmp path'
+        its(:log_file_path) { should eq '/tmp/appsignal.log' }
       end
 
-      context "when path is a symlink" do
-        context "when linked path does not exist" do
-          let(:real_path) { File.join(tmp_dir, 'real-path') }
-          let(:log_path) { File.join(tmp_dir, 'symlink-path') }
-          before { File.symlink(real_path, log_path) }
-          after { FileUtils.rm(log_path) }
+      context "if it is nil" do
+        let(:config) { project_fixture_config('production', :log_path => nil) }
 
-          include_examples '#log_file_path: tmp path'
-        end
+        before { config.stub(:root_path => nil) }
 
-        context "when linked path exists" do
-          context "when linked path is not writable" do
-            let(:real_path) { File.join(tmp_dir, 'real-path') }
-            let(:log_path) { File.join(tmp_dir, 'symlink-path') }
-            before do
-              FileUtils.mkdir_p(real_path)
-              FileUtils.chmod(0444, real_path)
-              File.symlink(real_path, log_path)
-            end
-            after do
-              FileUtils.rm_rf(real_path)
-              FileUtils.rm(log_path)
-            end
-
-            include_examples '#log_file_path: tmp path'
-          end
-
-          context "when linked path is writable" do
-            let(:real_path) { File.join(tmp_dir, 'real-path') }
-            let(:log_path) { File.join(tmp_dir, 'symlink-path') }
-            before do
-              FileUtils.mkdir_p(real_path)
-              File.symlink(real_path, log_path)
-            end
-            after do
-              FileUtils.rm_rf(real_path)
-              FileUtils.rm(log_path)
-            end
-
-            it "returns real path of log path" do
-              expect(subject).to eq(File.join(real_path, 'appsignal.log'))
-            end
-          end
-        end
+        its(:log_file_path) { should eq '/tmp/appsignal.log' }
       end
     end
 
@@ -245,7 +132,6 @@ describe Appsignal::Config do
         ENV['APPSIGNAL_ENABLE_MINUTELY_PROBES'].should       eq 'false'
         ENV['APPSIGNAL_HOSTNAME'].should                     eq 'app1.local'
         ENV['APPSIGNAL_PROCESS_NAME'].should                 include 'rspec'
-        ENV['APPSIGNAL_CA_FILE_PATH'].should                 eq File.join(resources_dir, "cacert.pem")
       end
 
       context "if working_dir_path is set" do