appsignal 2.0.3 → 2.0.4

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

@@ -3,11 +3,8 @@ require "appsignal/cli"
 describe Appsignal::CLI::NotifyOfDeploy do
   include CLIHelpers
 
-  let(:out_stream) { StringIO.new }
-  let(:output) { out_stream.string }
-  around do |example|
-    capture_stdout(out_stream) { example.run }
-  end
+  let(:out_stream) { std_stream }
+  let(:output) { out_stream.read }
 
   define :include_deploy_notification do
     match do |log|
@@ -35,7 +32,9 @@ describe Appsignal::CLI::NotifyOfDeploy do
   end
 
   def run
-    run_cli("notify_of_deploy", options)
+    capture_stdout(out_stream) do
+      run_cli("notify_of_deploy", options)
+    end
   end
 
   context "without config" do

data/spec/lib/appsignal/cli_spec.rb

@@ -1,52 +1,46 @@
 require 'appsignal/cli'
 
 describe Appsignal::CLI do
-  let(:out_stream) { StringIO.new }
+  let(:out_stream) { std_stream }
+  let(:output) { out_stream.read }
   let(:cli) { Appsignal::CLI }
-  before do
-    Dir.stub(:pwd => project_fixture_path)
-    cli.options = {:environment => 'production'}
-  end
-  around do |example|
-    capture_stdout(out_stream) { example.run }
-  end
-
-  describe "#config" do
-    subject { cli.config }
-
-    it { should be_instance_of(Appsignal::Config) }
-    its(:valid?) { should be_true }
-  end
+  before { Dir.stub(:pwd => project_fixture_path) }
 
   it "should print the help with no arguments, -h and --help" do
     [nil, '-h', '--help'].each do |arg|
-      lambda {
-        cli.run([arg].compact)
-      }.should raise_error(SystemExit)
-
-      out_stream.string.should include 'appsignal <command> [options]'
-      out_stream.string.should include \
+      expect do
+        capture_stdout(out_stream) do
+          cli.run([arg].compact)
+        end
+      end.to raise_error(SystemExit)
+
+      expect(output).to include 'appsignal <command> [options]'
+      expect(output).to include \
         'Available commands: demo, diagnose, install, notify_of_deploy'
     end
   end
 
   it "should print the version with -v and --version" do
     ['-v', '--version'].each do |arg|
-      lambda {
-        cli.run([arg])
-      }.should raise_error(SystemExit)
-
-      out_stream.string.should include 'AppSignal'
-      out_stream.string.should include '.'
+      expect do
+        capture_stdout(out_stream) do
+          cli.run([arg])
+        end
+      end.to raise_error(SystemExit)
+
+      expect(output).to include 'AppSignal'
+      expect(output).to include '.'
     end
   end
 
   it "should print a notice if a command does not exist" do
-    lambda {
+    expect do
+      capture_stdout(out_stream) do
         cli.run(['nonsense'])
-      }.should raise_error(SystemExit)
+      end
+    end.to raise_error(SystemExit)
 
-    out_stream.string.should include "Command 'nonsense' does not exist, run "\
+    expect(output).to include "Command 'nonsense' does not exist, run "\
       "appsignal -h to see the help"
   end
 
@@ -59,18 +53,4 @@ describe Appsignal::CLI do
       ])
     end
   end
-
-  describe "install" do
-    it "should call Appsignal::Install.install" do
-      Appsignal::CLI::Install.should_receive(:run).with(
-        'api-key',
-        instance_of(Appsignal::Config)
-      )
-
-      cli.run([
-        'install',
-        'api-key'
-      ])
-    end
-  end
 end

data/spec/lib/appsignal/config_spec.rb

@@ -1,4 +1,34 @@
 describe Appsignal::Config do
+  describe "#initialize" do
+    subject { config.env }
+
+    describe "environment" do
+      context "when environment is nil" do
+        let(:config) { described_class.new("", "") }
+
+        it "sets an empty string" do
+          expect(subject).to eq("")
+        end
+      end
+
+      context "when environment is given" do
+        let(:config) { described_class.new("", "my_env") }
+
+        it "sets the environment" do
+          expect(subject).to eq("my_env")
+        end
+
+        context "with APPSIGNAL_APP_ENV environment variable" do
+          before { ENV["APPSIGNAL_APP_ENV"] = "my_env_env" }
+
+          it "uses the environment variable" do
+            expect(subject).to eq("my_env_env")
+          end
+        end
+      end
+    end
+  end
+
   describe "config based on the system" do
     let(:config) { project_fixture_config(:none) }
 
@@ -407,12 +437,13 @@ describe Appsignal::Config do
   end
 
   describe "#log_file_path" do
-    let(:stdout) { StringIO.new }
+    let(:out_stream) { std_stream }
+    let(:output) { out_stream.read }
     let(:config) { project_fixture_config('production', :log_path => log_path) }
-    subject { config.log_file_path }
+    subject { capture_stdout(out_stream) { config.log_file_path } }
     around do |example|
       recognize_as_container(:none) do
-        capture_stdout(stdout) { example.run }
+        example.run
       end
     end
 
@@ -427,7 +458,7 @@ describe Appsignal::Config do
 
       it "prints no warning" do
         subject
-        expect(stdout.string).to be_empty
+        expect(output).to be_empty
       end
     end
 
@@ -445,7 +476,7 @@ describe Appsignal::Config do
 
         it "prints a warning" do
           subject
-          expect(stdout.string).to include "appsignal: Unable to log to '#{log_path}'. "\
+          expect(output).to include "appsignal: Unable to log to '#{log_path}'. "\
             "Logging to '#{system_tmp_dir}' instead."
         end
       end
@@ -459,7 +490,7 @@ describe Appsignal::Config do
 
         it "prints a warning" do
           subject
-          expect(stdout.string).to include "appsignal: Unable to log to '#{log_path}' "\
+          expect(output).to include "appsignal: Unable to log to '#{log_path}' "\
             "or the '#{system_tmp_dir}' fallback."
         end
       end
@@ -476,12 +507,12 @@ describe Appsignal::Config do
 
       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')
+          expect(subject).to eq File.join(config.root_path, 'log/appsignal.log')
         end
 
         it "prints no warning" do
           subject
-          expect(stdout.string).to be_empty
+          expect(output).to be_empty
         end
       end
     end

data/spec/lib/appsignal/demo_spec.rb

@@ -11,7 +11,7 @@ describe Appsignal::Demo do
 
     context "without config" do
       it "returns false" do
-        expect(subject).to be_false
+        expect(silence { subject }).to be_false
       end
     end
 
@@ -36,10 +36,12 @@ describe Appsignal::Demo do
     let(:config) { project_fixture_config("production") }
     before do
       Appsignal.config = config
-      expect(Appsignal::Transaction).to receive(:create)
-        .ordered
-        .with(kind_of(String), Appsignal::Transaction::HTTP_REQUEST, kind_of(::Rack::Request))
-        .and_return(error_transaction)
+      expect(Appsignal::Transaction).to receive(:new).with(
+        kind_of(String),
+        Appsignal::Transaction::HTTP_REQUEST,
+        kind_of(::Rack::Request),
+        kind_of(Hash)
+      ).and_return(error_transaction)
     end
     subject { described_class.send(:create_example_error_request) }
 
@@ -57,9 +59,12 @@ describe Appsignal::Demo do
     let(:config) { project_fixture_config("production") }
     before do
       Appsignal.config = config
-      expect(Appsignal::Transaction).to receive(:create)
-        .with(kind_of(String), Appsignal::Transaction::HTTP_REQUEST, kind_of(::Rack::Request))
-        .and_return(performance_transaction)
+      expect(Appsignal::Transaction).to receive(:new).with(
+        kind_of(String),
+        Appsignal::Transaction::HTTP_REQUEST,
+        kind_of(::Rack::Request),
+        kind_of(Hash)
+      ).and_return(performance_transaction)
     end
     subject { described_class.send(:create_example_performance_request) }
 

data/spec/lib/appsignal/hooks_spec.rb

@@ -44,6 +44,7 @@ describe Appsignal::Hooks do
     Appsignal::Hooks.load_hooks
     Appsignal::Hooks.load_hooks
     Appsignal::Hooks.hooks[:mock_present_hook].installed?.should be_true
+    Appsignal::Hooks.hooks.delete(:mock_present_hook)
   end
 
   it "should not install if depencies are not present" do
@@ -57,6 +58,7 @@ describe Appsignal::Hooks do
     Appsignal::Hooks.load_hooks
 
     Appsignal::Hooks.hooks[:mock_not_present_hook].installed?.should be_false
+    Appsignal::Hooks.hooks.delete(:mock_not_present_hook)
   end
 
   it "should not install if there is an error while installing" do
@@ -70,6 +72,7 @@ describe Appsignal::Hooks do
     Appsignal::Hooks.load_hooks
 
     Appsignal::Hooks.hooks[:mock_error_hook].installed?.should be_false
+    Appsignal::Hooks.hooks.delete(:mock_error_hook)
   end
 end
 

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

@@ -15,15 +15,18 @@ describe Object do
 
       context "when active" do
         let(:transaction) { http_request_transaction }
-        before { Appsignal.config = project_fixture_config }
+        before do
+          expect(Appsignal::Transaction).to receive(:current).at_least(:once).and_return(transaction)
+          Appsignal.config = project_fixture_config
+        end
         after { Appsignal.config = nil }
 
         context "with anonymous class" do
           it "instruments the method and calls it" do
             expect(Appsignal.active?).to be_true
-            transaction.should_receive(:start_event)
-            transaction.should_receive(:finish_event).with \
-              "foo.AnonymousClass.other", nil, nil, 0
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "foo.AnonymousClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(instance.foo).to eq(1)
           end
         end
@@ -42,9 +45,9 @@ describe Object do
 
           it "instruments the method and calls it" do
             expect(Appsignal.active?).to be_true
-            transaction.should_receive(:start_event)
-            transaction.should_receive(:finish_event).with \
-              "foo.NamedClass.other", nil, nil, 0
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "foo.NamedClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(instance.foo).to eq(1)
           end
         end
@@ -67,9 +70,10 @@ describe Object do
 
           it "instruments the method and calls it" do
             expect(Appsignal.active?).to be_true
-            transaction.should_receive(:start_event)
-            transaction.should_receive(:finish_event).with \
-              "bar.NamedClass.NestedModule.MyModule.other", nil, nil, 0
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "bar.NamedClass.NestedModule.MyModule.other", nil, nil,
+              Appsignal::EventFormatter::DEFAULT
             expect(instance.bar).to eq(2)
           end
         end
@@ -86,9 +90,9 @@ describe Object do
 
           it "instruments with custom name" do
             expect(Appsignal.active?).to be_true
-            transaction.should_receive(:start_event)
-            transaction.should_receive(:finish_event).with \
-              "my_method.group", nil, nil, 0
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "my_method.group", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(instance.foo).to eq(1)
           end
         end
@@ -132,15 +136,19 @@ describe Object do
 
       context "when active" do
         let(:transaction) { http_request_transaction }
-        before { Appsignal.config = project_fixture_config }
+        before do
+          expect(Appsignal::Transaction).to receive(:current).at_least(:once)
+            .and_return(transaction)
+          Appsignal.config = project_fixture_config
+        end
         after { Appsignal.config = nil }
 
         context "with anonymous class" do
           it "instruments the method and calls it" do
             expect(Appsignal.active?).to be_true
-            transaction.should_receive(:start_event)
-            transaction.should_receive(:finish_event).with \
-              "bar.class_method.AnonymousClass.other", nil, nil, 0
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "bar.class_method.AnonymousClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(klass.bar).to eq(2)
           end
         end
@@ -159,9 +167,9 @@ describe Object do
 
           it "instruments the method and calls it" do
             expect(Appsignal.active?).to be_true
-            transaction.should_receive(:start_event)
-            transaction.should_receive(:finish_event).with \
-              "bar.class_method.NamedClass.other", nil, nil, 0
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "bar.class_method.NamedClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(klass.bar).to eq(2)
           end
 
@@ -183,9 +191,10 @@ describe Object do
 
             it "instruments the method and calls it" do
               expect(Appsignal.active?).to be_true
-              transaction.should_receive(:start_event)
-              transaction.should_receive(:finish_event).with \
-                "bar.class_method.NamedClass.NestedModule.MyModule.other", nil, nil, 0
+              expect(transaction).to receive(:start_event)
+              expect(transaction).to receive(:finish_event).with \
+                "bar.class_method.NamedClass.NestedModule.MyModule.other", nil, nil,
+                Appsignal::EventFormatter::DEFAULT
               expect(klass.bar).to eq(2)
             end
           end
@@ -203,9 +212,9 @@ describe Object do
 
           it "instruments with custom name" do
             expect(Appsignal.active?).to be_true
-            transaction.should_receive(:start_event)
-            transaction.should_receive(:finish_event).with \
-              "my_method.group", nil, nil, 0
+            expect(transaction).to receive(:start_event)
+            expect(transaction).to receive(:finish_event).with \
+              "my_method.group", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(klass.bar).to eq(2)
           end
         end

data/spec/lib/appsignal/marker_spec.rb

@@ -11,24 +11,23 @@ describe Appsignal::Marker do
       config
     )
   end
-  let(:out_stream) { StringIO.new }
-  around do |example|
-    capture_stdout(out_stream) { example.run }
-  end
+  let(:out_stream) { std_stream }
+  let(:output) { out_stream.read }
 
   describe "#transmit" do
     def stub_marker_request
       stub_api_request config, "markers", marker.marker_data
     end
 
+    def run
+      capture_stdout(out_stream) { marker.transmit }
+    end
+
     context "when request is valid" do
-      before do
-        stub_marker_request.to_return(:status => 200)
-        marker.transmit
-      end
+      before { stub_marker_request.to_return(:status => 200) }
 
       it "outputs success" do
-        output = out_stream.string
+        run
         expect(output).to include \
           'Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
           'AppSignal has been notified of this deploy!'
@@ -36,13 +35,10 @@ describe Appsignal::Marker do
     end
 
     context "when request is invalid" do
-      before do
-        stub_marker_request.to_return(:status => 500)
-        marker.transmit
-      end
+      before { stub_marker_request.to_return(:status => 500) }
 
       it "outputs failure" do
-        output = out_stream.string
+        run
         expect(output).to include \
           'Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
           "Something went wrong while trying to notify AppSignal: 500 at "\