appsignal 2.0.3 → 2.0.4

data/lib/appsignal/cli/install.rb

@@ -6,10 +6,12 @@ require 'appsignal/demo'
 module Appsignal
   class CLI
     class Install
+      extend CLI::Helpers
+
       EXCLUDED_ENVIRONMENTS = ['test'].freeze
 
       class << self
-        def run(push_api_key, config)
+        def run(push_api_key)
           puts
           puts colorize "#######################################", :green
           puts colorize "## Starting AppSignal Installer      ##", :green
@@ -25,9 +27,9 @@ module Appsignal
             puts "  - Already signed up? Click 'New app' on the account overview page"
             puts
             puts colorize 'Exiting installer...', :red
-            return false
+            return
           end
-
+          config = new_config
           config[:push_api_key] = push_api_key
 
           print 'Validating API key'
@@ -37,31 +39,28 @@ module Appsignal
             auth_check = Appsignal::AuthCheck.new(config)
             unless auth_check.perform == '200'
               puts "\n  API key '#{config[:push_api_key]}' is not valid, please get a new one on https://appsignal.com"
-              return false
+              return
             end
-          rescue Exception => e
+          rescue => e
             puts "  There was an error validating your API key:"
             puts colorize "'#{e}'", :red
             puts "  Please try again"
-            return false
+            return
           end
           puts colorize '  API key valid!', :green
           puts
 
           if installed_frameworks.include?(:rails)
             install_for_rails(config)
-          elsif installed_frameworks.include?(:sinatra) && !installed_frameworks.include?(:padrino)
-            install_for_sinatra(config)
           elsif installed_frameworks.include?(:padrino)
             install_for_padrino(config)
           elsif installed_frameworks.include?(:grape)
             install_for_grape(config)
+          elsif installed_frameworks.include?(:sinatra)
+            install_for_sinatra(config)
           else
             puts "We could not detect which framework you are using. We'd be very grateful if you email us on support@appsignal.com with information about your setup."
-            return false
           end
-
-          true
         end
 
         def install_for_rails(config)
@@ -93,16 +92,17 @@ module Appsignal
           puts "  Add this line beneath require 'sinatra':"
           puts
           puts "  require 'appsignal/integrations/sinatra'"
+          puts
+          puts "  You can find more information in the documentation:"
+          puts "  http://docs.appsignal.com/getting-started/supported-frameworks.html#sinatra"
           press_any_key
           done_notice
         end
 
         def install_for_padrino(config)
           puts 'Installing for Padrino'
-
           config[:name] = required_input('  Enter application name: ')
           puts
-
           configure(config, ['development', 'production', 'staging'], true)
 
           puts "Finish Padrino installation"
@@ -126,7 +126,7 @@ module Appsignal
           configure(config, ['development', 'production', 'staging'], true)
 
           puts "Manual Grape configuration needed"
-          puts "  See the installation instructions here:"
+          puts "  See the installation instructions at:"
           puts "  http://docs.appsignal.com/getting-started/supported-frameworks.html#grape"
           press_any_key
           done_notice
@@ -147,56 +147,6 @@ module Appsignal
           puts
         end
 
-        def colorize(text, color)
-          return text if Gem.win_platform?
-          color_code = case color
-                       when :red then 31
-                       when :green then 32
-                       when :yellow then 33
-                       when :blue then 34
-                       when :pink then 35
-                       else 0
-                       end
-         "\e[#{color_code}m#{text}\e[0m"
-        end
-
-        def periods
-          3.times do
-            print "."
-            sleep(0.5)
-          end
-        end
-
-        def press_any_key
-          puts
-          print "  Ready? Press any key:"
-          STDIN.getch
-          puts
-          puts
-        end
-
-        def yes_or_no(prompt)
-          loop do
-            print prompt
-            input = gets.chomp
-            if input == 'y'
-              return true
-            elsif input == 'n'
-              return false
-            end
-          end
-        end
-
-        def required_input(prompt)
-          loop do
-            print prompt
-            input = gets.chomp
-            if input.length > 0
-              return input
-            end
-          end
-        end
-
         def configure(config, environments, name_overwritten)
           install_for_capistrano
 
@@ -207,8 +157,8 @@ module Appsignal
           puts "  (2) environment variables"
           loop do
             print "  Choose (1/2): "
-            input = gets.chomp
-            if input == '1'
+            case ask_for_input
+            when '1'
               puts
               print "Writing config file"
               periods
@@ -221,14 +171,13 @@ module Appsignal
               )
               puts
               break
-            elsif input == '2'
+            when '2'
               ENV["APPSIGNAL_ACTIVE"] = "true"
               ENV["APPSIGNAL_PUSH_API_KEY"] = config[:push_api_key]
               ENV["APPSIGNAL_APP_NAME"] = config[:name]
 
               puts
               puts "Add the following environment variables to configure AppSignal:"
-              puts "  export APPSIGNAL_ACTIVE=true"
               puts "  export APPSIGNAL_PUSH_API_KEY=#{config[:push_api_key]}"
               if name_overwritten
                 puts "  export APPSIGNAL_APP_NAME=#{config[:name]}"
@@ -291,7 +240,7 @@ module Appsignal
         end
 
         def rails_environments
-          @environments ||= Dir.glob(
+          Dir.glob(
             File.join(Dir.pwd, 'config/environments/*.rb')
           ).map { |o| File.basename(o, ".rb") }.sort - EXCLUDED_ENVIRONMENTS
         end
@@ -308,6 +257,10 @@ module Appsignal
           FileUtils.mkdir_p(File.join(Dir.pwd, 'config'))
           File.write(File.join(Dir.pwd, 'config/appsignal.yml'), config)
         end
+
+        def new_config
+          Appsignal::Config.new(Dir.pwd, "")
+        end
       end
     end
   end

data/lib/appsignal/config.rb

@@ -5,7 +5,7 @@ require 'socket'
 
 module Appsignal
   class Config
-    SYSTEM_TMP_DIR = '/tmp'
+    SYSTEM_TMP_DIR = File.realpath('/tmp')
     DEFAULT_CONFIG = {
       :debug                          => false,
       :log                            => 'file',
@@ -63,7 +63,7 @@ module Appsignal
 
     def initialize(root_path, env, initial_config={}, logger=Appsignal.logger)
       @root_path      = root_path
-      @env            = env.to_s
+      @env            = ENV.fetch("APPSIGNAL_APP_ENV".freeze, env.to_s)
       @initial_config = initial_config
       @logger         = logger
       @valid          = false
@@ -90,7 +90,7 @@ module Appsignal
     end
 
     def log_file_path
-      path = config_hash[:log_path] || root_path
+      path = config_hash[:log_path] || root_path && File.join(root_path, 'log')
       if path && File.writable?(path)
         return File.join(File.realpath(path), 'appsignal.log')
       end

data/lib/appsignal/integrations/padrino.rb

@@ -8,7 +8,7 @@ module Appsignal::Integrations
       root             = Padrino.mounted_root
       Appsignal.config = Appsignal::Config.new(
         root,
-        ENV.fetch('APPSIGNAL_APP_ENV'.freeze, Padrino.env.to_s),
+        Padrino.env,
         :log_path => File.join(root, 'log')
       )
 

data/lib/appsignal/integrations/railtie.rb

@@ -13,7 +13,7 @@ module Appsignal
         # Load config
         Appsignal.config = Appsignal::Config.new(
           Rails.root,
-          ENV.fetch('APPSIGNAL_APP_ENV', Rails.env),
+          Rails.env,
           :name => Rails.application.class.parent_name,
           :log_path => Rails.root.join('log')
         )

data/lib/appsignal/integrations/sinatra.rb

@@ -6,7 +6,7 @@ Appsignal.logger.info("Loading Sinatra (#{Sinatra::VERSION}) integration")
 app_settings = ::Sinatra::Application.settings
 Appsignal.config = Appsignal::Config.new(
   app_settings.root || Dir.pwd,
-  ENV.fetch('APPSIGNAL_APP_ENV'.freeze, app_settings.environment)
+  app_settings.environment
 )
 
 Appsignal.start_logger

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/spec/lib/appsignal/capistrano2_spec.rb

@@ -4,7 +4,8 @@ if DependencyHelper.capistrano2_present?
   require 'appsignal/capistrano'
 
   describe "Capistrano 2 integration" do
-    let(:out_stream) { StringIO.new }
+    let(:out_stream) { std_stream }
+    let(:output) { out_stream.read }
     let(:config) { project_fixture_config }
     let(:capistrano_config) do
       Capistrano::Configuration.new.tap do |c|
@@ -16,11 +17,12 @@ if DependencyHelper.capistrano2_present?
         c.dry_run = false
       end
     end
-    before do
-      Appsignal::Capistrano.tasks(capistrano_config)
-    end
-    around do |example|
-      capture_stdout(out_stream) { example.run }
+    before { Appsignal::Capistrano.tasks(capistrano_config) }
+
+    def run
+      capture_stdout(out_stream) do
+        capistrano_config.find_and_execute_task('appsignal:deploy')
+      end
     end
 
     it "should have a deploy task" do
@@ -111,9 +113,7 @@ if DependencyHelper.capistrano2_present?
           end
         end
 
-        after do
-          capistrano_config.find_and_execute_task('appsignal:deploy')
-        end
+        after { run }
       end
 
       describe "markers" do
@@ -131,9 +131,9 @@ if DependencyHelper.capistrano2_present?
         context "when active for this environment" do
           it "transmits marker" do
             stub_marker_request.to_return(:status => 200)
-            capistrano_config.find_and_execute_task('appsignal:deploy')
+            run
 
-            expect(out_stream.string).to include \
+            expect(output).to include \
               'Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
               'AppSignal has been notified of this deploy!'
           end
@@ -142,11 +142,11 @@ if DependencyHelper.capistrano2_present?
             before do
               capistrano_config.set(:appsignal_revision, 'abc123')
               stub_marker_request(:revision => 'abc123').to_return(:status => 200)
-              capistrano_config.find_and_execute_task('appsignal:deploy')
+              run
             end
 
             it "transmits the overriden revision" do
-              expect(out_stream.string).to include \
+              expect(output).to include \
                 'Notifying AppSignal of deploy with: revision: abc123, user: batman',
                 'AppSignal has been notified of this deploy!'
             end
@@ -155,11 +155,10 @@ if DependencyHelper.capistrano2_present?
           context "with failed request" do
             before do
               stub_marker_request.to_return(:status => 500)
-              capistrano_config.find_and_execute_task('appsignal:deploy')
+              run
             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:'
@@ -170,11 +169,11 @@ if DependencyHelper.capistrano2_present?
           context "when dry run" do
             before do
               capistrano_config.dry_run = true
-              capistrano_config.find_and_execute_task('appsignal:deploy')
+              run
             end
 
             it "does not transmit marker" do
-              expect(out_stream.string).to include \
+              expect(output).to include \
                 'Dry run: AppSignal deploy marker not actually sent.'
             end
           end
@@ -183,11 +182,11 @@ if DependencyHelper.capistrano2_present?
         context "when not active for this environment" do
           before do
             capistrano_config.set(:rails_env, 'nonsense')
-            capistrano_config.find_and_execute_task('appsignal:deploy')
+            run
           end
 
           it "does not transmit marker" do
-            expect(out_stream.string).to include \
+            expect(output).to include \
               "Not notifying of deploy, config is not active for environment: nonsense"
           end
         end

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -7,7 +7,8 @@ if DependencyHelper.capistrano3_present?
 
   describe "Capistrano 3 integration" do
     let(:config) { project_fixture_config }
-    let(:out_stream) { StringIO.new }
+    let(:out_stream) { std_stream }
+    let(:output) { out_stream.read }
     let(:logger) { Logger.new(out_stream) }
     let!(:capistrano_config) do
       Capistrano::Configuration.reset!
@@ -21,11 +22,12 @@ if DependencyHelper.capistrano3_present?
         c.set(:current_revision, '503ce0923ed177a3ce000005')
       end
     end
-    before do
-      Rake::Task['appsignal:deploy'].reenable
-    end
-    around do |example|
-      capture_std_streams(out_stream, out_stream) { example.run }
+    before { Rake::Task['appsignal:deploy'].reenable }
+
+    def run
+      capture_std_streams(out_stream, out_stream) do
+        invoke('appsignal:deploy')
+      end
     end
 
     it "should have a deploy task" do
@@ -112,9 +114,7 @@ if DependencyHelper.capistrano3_present?
           end
         end
 
-        after do
-          invoke('appsignal:deploy')
-        end
+        after { run }
       end
 
       describe "markers" do
@@ -132,9 +132,9 @@ if DependencyHelper.capistrano3_present?
         context "when active for this environment" do
           it "transmits marker" do
             stub_marker_request.to_return(:status => 200)
-            invoke('appsignal:deploy')
+            run
 
-            expect(out_stream.string).to include \
+            expect(output).to include \
               'Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
               'AppSignal has been notified of this deploy!'
           end
@@ -143,11 +143,11 @@ if DependencyHelper.capistrano3_present?
             before do
               capistrano_config.set(:appsignal_revision, 'abc123')
               stub_marker_request(:revision => 'abc123').to_return(:status => 200)
-              invoke('appsignal:deploy')
+              run
             end
 
             it "transmits the overriden revision" do
-              expect(out_stream.string).to include \
+              expect(output).to include \
                 'Notifying AppSignal of deploy with: revision: abc123, user: batman',
                 'AppSignal has been notified of this deploy!'
             end
@@ -156,11 +156,10 @@ if DependencyHelper.capistrano3_present?
           context "with failed request" do
             before do
               stub_marker_request.to_return(:status => 500)
-              invoke('appsignal:deploy')
+              run
             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:'
@@ -172,11 +171,11 @@ if DependencyHelper.capistrano3_present?
         context "when not active for this environment" do
           before do
             capistrano_config.set(:rails_env, 'nonsense')
-            invoke('appsignal:deploy')
+            run
           end
 
           it "should not send deploy marker" do
-            expect(out_stream.string).to include \
+            expect(output).to include \
               "Not notifying of deploy, config is not active for environment: nonsense"
           end
         end

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

@@ -4,8 +4,9 @@ describe Appsignal::CLI::Demo do
   include CLIHelpers
 
   let(:options) { {} }
-  let(:out_stream) { StringIO.new }
-  let(:output) { out_stream.string }
+  let(:out_stream) { std_stream }
+  let(:output) { out_stream.read }
+  before(:all) { Appsignal.stop }
   before do
     ENV.delete("APPSIGNAL_APP_ENV")
     ENV.delete("RAILS_ENV")
@@ -13,7 +14,6 @@ describe Appsignal::CLI::Demo do
     stub_api_request config, "auth"
   end
   after { Appsignal.config = nil }
-  around { |example| capture_stdout(out_stream) { example.run } }
 
   def run
     run_within_dir project_fixture_path
@@ -21,7 +21,7 @@ describe Appsignal::CLI::Demo do
 
   def run_within_dir(chdir)
     Dir.chdir chdir do
-      run_cli("demo", options)
+      capture_stdout(out_stream) { run_cli("demo", options) }
     end
   end