appsignal 0.8.15 → 0.9.0.alpha.1

data/spec/lib/appsignal_spec.rb

@@ -54,6 +54,11 @@ describe Appsignal do
         Appsignal.start
       end
 
+      it "should load instrumentations" do
+        Appsignal.should_receive(:load_instrumentations)
+        Appsignal.start
+      end
+
       context "with an extension" do
         before { Appsignal.extensions << Appsignal::MockExtension }
 
@@ -64,6 +69,36 @@ describe Appsignal do
       end
     end
 
+    describe ".load_integrations" do
+      it "should require the integrations" do
+        Appsignal.should_receive(:require).at_least(:once)
+      end
+
+      after { Appsignal.load_integrations }
+    end
+
+    describe ".load_instrumentations" do
+      before { Appsignal.config = project_fixture_config }
+
+      context "Net::HTTP" do
+        context "if on in the config" do
+          it "should require net_http" do
+            Appsignal.should_receive(:require).with('appsignal/instrumentations/net_http')
+          end
+        end
+
+        context "if off in the config" do
+          before { Appsignal.config.config_hash[:instrument_net_http] = false }
+
+          it "should not require net_http" do
+            Appsignal.should_not_receive(:require).with('appsignal/instrumentations/net_http')
+          end
+        end
+      end
+
+      after { Appsignal.load_instrumentations }
+    end
+
     context "with debug logging" do
       before { Appsignal.config = project_fixture_config('test') }
 

data/spec/lib/generators/appsignal/appsignal_generator_spec.rb

@@ -20,9 +20,11 @@ if rails_present?
     include GeneratorSpec::TestCase
     destination tmp_dir
 
+    let(:authcheck) { Appsignal::AuthCheck.new(nil, nil) }
     let(:err_stream) { StringIO.new }
 
     before do
+      Appsignal::AuthCheck.stub(:new => authcheck)
       FileUtils.rm_rf(tmp_dir)
       @original_stderr = $stderr
       $stderr = err_stream
@@ -34,9 +36,7 @@ if rails_present?
     context "with key" do
       context "known key" do
         before do
-          authcheck = double
-          Appsignal::AuthCheck.should_receive(:new).and_return(authcheck)
-          authcheck.should_receive(:perform_with_result).and_return(['200', 'everything ok'])
+          authcheck.should_receive(:perform).and_return('200')
 
           prepare_destination
           run_generator_in_tmp %w(my_app_key)
@@ -50,45 +50,42 @@ if rails_present?
         end
 
         it "should mention successful auth check" do
-          @output.should include('success  everything ok')
+          @output.should include('success')
+          @output.should include('AppSignal has confirmed authorization!')
         end
       end
 
       context "invalid key" do
         before do
-          authcheck = double
-          Appsignal::AuthCheck.should_receive(:new).and_return(authcheck)
-          authcheck.should_receive(:perform_with_result).and_return(['401', 'unauthorized'])
+          authcheck.should_receive(:perform).and_return('401')
 
           prepare_destination
           run_generator_in_tmp %w(my_app_key)
         end
 
         it "should mention invalid key" do
-          @output.should include('error  unauthorized')
+          @output.should include('error')
+          @output.should include('API key not valid with AppSignal...')
         end
       end
 
       context "failed check" do
         before do
-          authcheck = double
-          Appsignal::AuthCheck.should_receive(:new).and_return(authcheck)
-          authcheck.should_receive(:perform_with_result).and_return(['500', 'error!'])
+          authcheck.should_receive(:perform).and_return('500')
 
           prepare_destination
           run_generator_in_tmp %w(my_app_key)
         end
 
         it "should mention failed check" do
-          @output.should include('error  error!')
+          @output.should include('error')
+          @output.should include('Could not confirm authorization')
         end
       end
 
       context "internal failure" do
         before do
-          authcheck = Appsignal::AuthCheck.new(nil, nil)
           authcheck.stub(:perform).and_throw(:error)
-          Appsignal::AuthCheck.should_receive(:new).and_return(authcheck)
 
           prepare_destination
           run_generator_in_tmp %w(my_app_key)
@@ -123,6 +120,7 @@ if rails_present?
     context "without capistrano" do
       before do
         prepare_destination
+        authcheck.stub(:perform).and_return(['200', 'everything ok'])
         run_generator_in_tmp %w(my_app_key)
       end
 
@@ -150,6 +148,7 @@ if rails_present?
         File.open(cap_file, 'w') {}
         FileUtils.mkdir(File.join(destination_root, 'config'))
         File.open(deploy_file, 'w') {}
+        authcheck.stub(:perform).and_return(['200', 'everything ok'])
         run_generator_in_tmp %w(my_app_key)
       end
 

data/spec/spec_helper.rb

@@ -18,6 +18,20 @@ def rails_present?
   RAILS_PRESENT
 end
 
+def capistrano_present?
+  !! Gem.loaded_specs['capistrano']
+end
+
+def capistrano2_present?
+  capistrano_present? &&
+    Gem.loaded_specs['capistrano'].version < Gem::Version.new('3.0')
+end
+
+def capistrano3_present?
+  capistrano_present? &&
+    Gem.loaded_specs['capistrano'].version >= Gem::Version.new('3.0')
+end
+
 require 'appsignal'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support/helpers','*.rb'))].each {|f| require f}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.9.0.alpha.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,20 +84,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +129,8 @@ files:
 - Rakefile
 - appsignal.gemspec
 - bin/appsignal
+- gemfiles/capistrano2.gemfile
+- gemfiles/capistrano3.gemfile
 - gemfiles/no_dependencies.gemfile
 - gemfiles/rails-3.0.gemfile
 - gemfiles/rails-3.1.gemfile
@@ -163,7 +151,9 @@ files:
 - lib/appsignal/capistrano.rb
 - lib/appsignal/cli.rb
 - lib/appsignal/config.rb
-- lib/appsignal/integrations/capistrano.rb
+- lib/appsignal/instrumentations/net_http.rb
+- lib/appsignal/integrations/capistrano/appsignal.cap
+- lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
 - lib/appsignal/integrations/capistrano/careful_logger.rb
 - lib/appsignal/integrations/delayed_job.rb
 - lib/appsignal/integrations/passenger.rb
@@ -195,7 +185,9 @@ files:
 - spec/lib/appsignal/auth_check_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
-- spec/lib/appsignal/integrations/capistrano_spec.rb
+- spec/lib/appsignal/instrumentations/net_http_spec.rb
+- spec/lib/appsignal/integrations/capistrano2_spec.rb
+- spec/lib/appsignal/integrations/capistrano3_spec.rb
 - spec/lib/appsignal/integrations/delayed_job_spec.rb
 - spec/lib/appsignal/integrations/passenger_spec.rb
 - spec/lib/appsignal/integrations/rails_spec.rb
@@ -240,9 +232,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -260,7 +252,9 @@ test_files:
 - spec/lib/appsignal/auth_check_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
-- spec/lib/appsignal/integrations/capistrano_spec.rb
+- spec/lib/appsignal/instrumentations/net_http_spec.rb
+- spec/lib/appsignal/integrations/capistrano2_spec.rb
+- spec/lib/appsignal/integrations/capistrano3_spec.rb
 - spec/lib/appsignal/integrations/delayed_job_spec.rb
 - spec/lib/appsignal/integrations/passenger_spec.rb
 - spec/lib/appsignal/integrations/rails_spec.rb

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

@@ -1,151 +0,0 @@
-require 'spec_helper'
-require 'appsignal/capistrano'
-require 'capistrano/configuration'
-
-describe Appsignal::Integrations::Capistrano do
-  let(:config) { project_fixture_config }
-
-  before :all do
-    @capistrano_config = Capistrano::Configuration.new
-    Appsignal::Integrations::Capistrano.tasks(@capistrano_config)
-  end
-
-  it "should have a deploy task" do
-    @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
-      end
-
-      it "should be instantiated with the right params" do
-        Appsignal::Config.should_receive(:new).with(
-          project_fixture_path,
-          'production',
-          {},
-          kind_of(Capistrano::Logger)
-        )
-      end
-
-      context "when appsignal_config is available" do
-        before do
-          @capistrano_config.set(:appsignal_config, :name => 'AppName')
-        end
-
-        it "should be instantiated with the right params" do
-          Appsignal::Config.should_receive(:new).with(
-            project_fixture_path,
-            'production',
-            {:name => 'AppName'},
-            kind_of(Capistrano::Logger)
-          )
-        end
-
-        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')
-          end
-
-          it "should be instantiated with the right params" do
-            Appsignal::Config.should_receive(:new).with(
-              project_fixture_path,
-              'rack_production',
-              {:name => 'AppName'},
-              kind_of(Capistrano::Logger)
-            )
-          end
-        end
-      end
-
-      after { @capistrano_config.find_and_execute_task('appsignal:deploy') }
-    end
-
-    context "send marker" do
-      before :all do
-        @io = StringIO.new
-        @logger = Capistrano::Logger.new(:output => @io)
-        @logger.level = Capistrano::Logger::MAX_LEVEL
-        @capistrano_config.logger = @logger
-      end
-
-      let(:marker_data) do
-        {
-          :revision => '503ce0923ed177a3ce000005',
-          :repository => 'master',
-          :user => 'batman'
-        }
-      end
-
-      context "when active for this environment" do
-        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
-          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 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:')
-        end
-
-        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 "when not active for this environment" do
-        before do
-          @capistrano_config.set(:rails_env, 'nonsense')
-        end
-
-        it "should not send deploy marker" do
-          Appsignal::Marker.should_not_receive(:new)
-          @capistrano_config.find_and_execute_task('appsignal:deploy')
-          @io.string.should include('Not loading:')
-        end
-      end
-    end
-  end
-end