appsignal 1.1.0.beta.12 → 1.1.0.beta.13

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

@@ -0,0 +1,128 @@
+require 'spec_helper'
+require 'appsignal/cli'
+
+describe Appsignal::CLI::NotifyOfDeploy do
+  let(:out_stream) { StringIO.new }
+  let(:cli) { Appsignal::CLI::NotifyOfDeploy }
+  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
+  after do
+    $stdout = @original_stdout
+  end
+
+  describe ".run" do
+    it "should validate that the config has been loaded and all options have been supplied" do
+      cli.should_receive(:validate_active_config)
+      cli.should_receive(:validate_required_options).with(
+        {},
+        [:revision, :user, :environment]
+      )
+      Appsignal::Marker.should_receive(:new).and_return(double(:transmit => true))
+
+      cli.run({}, config)
+    end
+
+    it "should notify of a deploy" do
+      marker = double
+      Appsignal::Marker.should_receive(:new).with(
+        {
+          :revision => 'aaaaa',
+          :user => 'thijs'
+        },
+        kind_of(Appsignal::Config),
+        nil
+      ).and_return(marker)
+      marker.should_receive(:transmit)
+
+      cli.run(marker_data, config)
+    end
+
+    it "should notify of a deploy with no config file and a name specified" do
+      ENV['PWD'] = '/nonsense'
+      ENV['APPSIGNAL_PUSH_API_KEY'] = 'key'
+
+      marker = double
+      Appsignal::Marker.should_receive(:new).with(
+        {
+          :revision => 'aaaaa',
+          :user => 'thijs'
+        },
+        kind_of(Appsignal::Config),
+        nil
+      ).and_return(marker)
+      marker.should_receive(:transmit)
+
+      cli.run(marker_data, config)
+    end
+  end
+
+  describe "#validate_required_options" do
+    let(:required_options) { [:option_1, :option_2, :option_3] }
+
+    it "should do nothing with all options supplied" do
+      cli.send(
+        :validate_required_options,
+        {
+          :option_1 => 1,
+          :option_2 => 2,
+          :option_3 => 3
+        },
+        required_options
+      )
+      out_stream.string.should be_empty
+    end
+
+    it "should print a message with one option missing and exit" do
+      lambda {
+        cli.send(
+          :validate_required_options,
+          {
+            :option_1 => 1,
+            :option_2 => 2
+          },
+          required_options
+        )
+      }.should raise_error(SystemExit)
+      out_stream.string.should include('Missing options: option_3')
+    end
+
+    it "should print a message with multiple options missing and exit" do
+      lambda {
+        cli.send(
+          :validate_required_options,
+          {
+            :option_1 => 1,
+            :option_2 => ''
+          },
+          required_options
+        )
+      }.should raise_error(SystemExit)
+      out_stream.string.should include("Missing options: option_2, option_3")
+    end
+  end
+
+  describe "#validate_active_config" do
+    context "when config is present" do
+      it "should do nothing" do
+        cli.send(:validate_active_config, config)
+        out_stream.string.should be_empty
+      end
+    end
+
+    context "when config is not active" do
+      before { config.stub(:active? => false) }
+
+      it "should print a message and exit" do
+        lambda {
+          cli.send(:validate_active_config, config)
+        }.should raise_error(SystemExit)
+        out_stream.string.should include('Exiting: No config file or push api key env var found')
+      end
+    end
+  end
+end

data/spec/lib/appsignal/cli_spec.rb

@@ -8,20 +8,12 @@ describe Appsignal::CLI do
     @original_stdout = $stdout
     $stdout = out_stream
     ENV['PWD'] = project_fixture_path
-    cli.config = nil
-    cli.initial_config = {}
     cli.options = {:environment => 'production'}
   end
   after do
     $stdout = @original_stdout
   end
 
-  describe "#logger" do
-    it "should be a logger" do
-      cli.logger.should be_instance_of(Logger)
-    end
-  end
-
   describe "#config" do
     subject { cli.config }
 
@@ -36,7 +28,7 @@ describe Appsignal::CLI do
       }.should raise_error(SystemExit)
 
       out_stream.string.should include 'appsignal <command> [options]'
-      out_stream.string.should include 'Available commands: notify_of_deploy'
+      out_stream.string.should include 'Available commands: diagnose, install, notify_of_deploy'
     end
   end
 
@@ -60,51 +52,36 @@ describe Appsignal::CLI do
       "appsignal -h to see the help"
   end
 
-  describe "#notify_of_deploy" do
-    it "should validate that the config has been loaded and all options have been supplied" do
-      cli.should_receive(:validate_active_config)
-      cli.should_receive(:validate_required_options).with(
-        [:revision, :user, :environment]
-      )
-      Appsignal::Marker.should_receive(:new).and_return(double(:transmit => true))
+  describe "diagnose" do
+    it "should call Appsignal::Diagnose.install" do
+      Appsignal::CLI::Diagnose.should_receive(:run)
 
-      cli.notify_of_deploy
+      cli.run([
+        'diagnose'
+      ])
     end
+  end
 
-    it "should notify of a deploy" do
-      marker = double
-      Appsignal::Marker.should_receive(:new).with(
-        {
-          :revision => 'aaaaa',
-          :user => 'thijs'
-        },
-        kind_of(Appsignal::Config),
-        kind_of(Logger)
-      ).and_return(marker)
-      marker.should_receive(:transmit)
+  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([
-        'notify_of_deploy',
-        '--revision=aaaaa',
-        '--user=thijs',
-        '--environment=production'
+        'install',
+        'api-key'
       ])
     end
+  end
 
-    it "should notify of a deploy with no config file and a name specified" do
-      ENV['PWD'] = '/nonsense'
-      ENV['APPSIGNAL_PUSH_API_KEY'] = 'key'
-
-      marker = double
-      Appsignal::Marker.should_receive(:new).with(
-        {
-          :revision => 'aaaaa',
-          :user => 'thijs'
-        },
-        kind_of(Appsignal::Config),
-        kind_of(Logger)
-      ).and_return(marker)
-      marker.should_receive(:transmit)
+  describe "notify_of_deploy" do
+    it "should call Appsignal::Install.install" do
+      Appsignal::CLI::NotifyOfDeploy.should_receive(:run).with(
+        {:revision=>"aaaaa", :user=>"thijs", :environment=>"production"},
+        instance_of(Appsignal::Config)
+      )
 
       cli.run([
         'notify_of_deploy',
@@ -113,86 +90,6 @@ describe Appsignal::CLI do
         '--user=thijs',
         '--environment=production'
       ])
-
-      cli.config[:name].should == 'project-production'
-    end
-  end
-
-  # protected
-
-  describe "#validate_required_options" do
-    let(:required_options) { [:option_1, :option_2, :option_3] }
-
-    it "should do nothing with all options supplied" do
-      cli.options = {
-        :option_1 => 1,
-        :option_2 => 2,
-        :option_3 => 3
-      }
-      cli.send(
-        :validate_required_options,
-        required_options
-      )
-      out_stream.string.should be_empty
-    end
-
-    it "should print a message with one option missing and exit" do
-      cli.options = {
-        :option_1 => 1,
-        :option_2 => 2
-      }
-      lambda {
-        cli.send(
-          :validate_required_options,
-          required_options
-        )
-      }.should raise_error(SystemExit)
-      out_stream.string.should include('Missing options: option_3')
-    end
-
-    it "should print a message with multiple options missing and exit" do
-      cli.options = {
-        :option_1 => 1,
-        :option_2 => ''
-      }
-      lambda {
-        cli.send(
-          :validate_required_options,
-          required_options
-        )
-      }.should raise_error(SystemExit)
-      out_stream.string.should include("Missing options: option_2, option_3")
-    end
-  end
-
-  describe "#validate_active_config" do
-    context "when config is present" do
-      it "should do nothing" do
-        cli.send(:validate_active_config)
-        out_stream.string.should be_empty
-      end
-    end
-
-    context "when config is not present" do
-      before { cli.options = {:environment => 'nonsense'} }
-
-      it "should print a message and exit" do
-        lambda {
-          cli.send(:validate_active_config)
-        }.should raise_error(SystemExit)
-        out_stream.string.should include('Exiting: No config file or push api key env var found')
-      end
-    end
-
-    context "when config is not active" do
-      before { ENV['PWD'] = '/nonsense' }
-
-      it "should print a message and exit" do
-        lambda {
-          cli.send(:validate_active_config)
-        }.should raise_error(SystemExit)
-        out_stream.string.should include('Exiting: No config file or push api key env var found')
-      end
     end
   end
 end

data/spec/lib/appsignal/config_spec.rb

@@ -32,7 +32,7 @@ describe Appsignal::Config do
         :enable_frontend_error_catching => false,
         :frontend_error_catching_path   => '/appsignal_error_catcher',
         :enable_allocation_tracking     => true,
-        :enable_gc_instrumentation      => true,
+        :enable_gc_instrumentation      => false,
         :running_in_container           => false
       }
     end
@@ -65,11 +65,16 @@ describe Appsignal::Config do
       end
     end
 
-    describe "#[]" do
+    describe "#[]= and #[]" do
       it "should get the value for an existing key" do
         subject[:push_api_key].should == 'abc'
       end
 
+      it "should change and get the value for an existing key" do
+        subject[:push_api_key] = 'abcde'
+        subject[:push_api_key].should == 'abcde'
+      end
+
       it "should return nil for a non-existing key" do
         subject[:nonsense].should be_nil
       end

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

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
-begin
-  require 'sinatra'
-rescue LoadError
-end
-
-if defined?(::Sinatra)
+if sinatra_present? && !padrino_present?
   ENV['APPSIGNAL_PUSH_API_KEY'] = 'key'
   require 'appsignal/integrations/sinatra'
 
@@ -16,12 +11,6 @@ if defined?(::Sinatra)
       it { should be_a Logger }
     end
 
-    context "config" do
-      subject { Appsignal.config }
-
-      it { should be_a(Appsignal::Config) }
-    end
-
     it "should have added the instrumentation middleware" do
       Sinatra::Application.middleware.to_a.should include(
         [Appsignal::Rack::SinatraInstrumentation, [], nil]

data/spec/lib/appsignal_spec.rb

@@ -72,12 +72,6 @@ describe Appsignal do
         Appsignal.subscriber.should be_a(Appsignal::Subscriber)
       end
 
-      it "should install event hooks" do
-        Appsignal::Extension.should_receive(:install_allocation_event_hook)
-        Appsignal::Extension.should_receive(:install_gc_event_hooks)
-        Appsignal.start
-      end
-
       context "when not active for this environment" do
         before { Appsignal.config = project_fixture_config('staging') }
 
@@ -96,7 +90,20 @@ describe Appsignal do
         end
       end
 
-      context "when allocation tracking and gc instrumentation has been disabled" do
+      context "when allocation tracking and gc instrumentation have been enabled" do
+        before do
+          Appsignal.config.config_hash[:enable_allocation_tracking] = true
+          Appsignal.config.config_hash[:enable_gc_instrumentation] = true
+        end
+
+        it "should install event hooks" do
+          Appsignal::Extension.should_receive(:install_allocation_event_hook)
+          Appsignal::Extension.should_receive(:install_gc_event_hooks)
+          Appsignal.start
+        end
+      end
+
+      context "when allocation tracking and gc instrumentation have been disabled" do
         before do
           Appsignal.config.config_hash[:enable_allocation_tracking] = false
           Appsignal.config.config_hash[:enable_gc_instrumentation] = false

data/spec/spec_helper.rb

@@ -69,6 +69,15 @@ rescue LoadError
   false
 end
 
+def sinatra_present?
+  begin
+    require 'sinatra'
+    true
+  rescue LoadError
+    false
+  end
+end
+
 def padrino_present?
   require 'padrino'
   true
@@ -114,6 +123,11 @@ RSpec.configure do |config|
   config.include TimeHelpers
   config.include TransactionHelpers
 
+  config.before :all do
+    FileUtils.rm_rf(tmp_dir)
+    FileUtils.mkdir_p(tmp_dir)
+  end
+
   config.before do
     ENV['PWD'] = File.expand_path(File.join(File.dirname(__FILE__), '../'))
     ENV['RAILS_ENV'] = 'test'
@@ -124,13 +138,11 @@ RSpec.configure do |config|
     end
   end
 
-  config.after do
-    Appsignal.logger = nil
-  end
-
   config.after :all do
     ActiveSupport::Notifications.notifier.clear_subscribers
     FileUtils.rm_f(File.join(project_fixture_path, 'log/appsignal.log'))
+    Appsignal.config = nil
+    Appsignal.logger = nil
   end
 end