appsignal 1.4.0.beta.1 → 2.0.0.beta.1

data/spec/lib/appsignal_spec.rb

@@ -565,7 +565,9 @@ describe Appsignal do
         )
       end
       around do |example|
-        capture_stdout(out_stream) { example.run }
+        recognize_as_container(:none) do
+          capture_stdout(out_stream) { example.run }
+        end
       end
       after { FileUtils.rm_rf(log_path) }
 
@@ -601,11 +603,14 @@ describe Appsignal do
             expect(out_stream.string).to include 'Log to not writable log file'
           end
 
+          it "amends in memory log to stdout" do
+            expect(out_stream.string).to include 'Log in memory'
+          end
+
           it "outputs a warning" do
-            output = out_stream.string
-            expect(output).to include "appsignal: Unable to start logger with "\
-              "log path '#{log_file}'."
-            expect(output).to include "appsignal: Permission denied"
+            expect(out_stream.string).to include \
+              "appsignal: Unable to start logger with log path '#{log_file}'.",
+              "appsignal: Permission denied"
           end
         end
       end
@@ -626,6 +631,12 @@ describe Appsignal do
         it "amends in memory log to stdout" do
           expect(out_stream.string).to include 'Log in memory'
         end
+
+        it "outputs a warning" do
+          expect(out_stream.string).to include \
+            "appsignal: Unable to log to '#{log_path}' "\
+            "or the '#{Appsignal::Config::SYSTEM_TMP_DIR}' fallback."
+        end
       end
 
       context "when on Heroku" do
@@ -635,8 +646,8 @@ describe Appsignal do
         end
         around { |example| recognize_as_heroku { example.run } }
 
-        it "should log to stdout" do
-          out_stream.string.should include 'appsignal: Log to stdout'
+        it "logs to stdout" do
+          expect(out_stream.string).to include 'appsignal: Log to stdout'
         end
 
         it "amends in memory log to stdout" do

data/spec/support/helpers/cli_helpers.rb

@@ -0,0 +1,17 @@
+module CLIHelpers
+  def cli
+    Appsignal::CLI
+  end
+
+  def run_cli(command, options = {})
+    cli.run(format_cli_arguments_and_options(command, options))
+  end
+
+  def format_cli_arguments_and_options(command, options = {})
+    [*command].tap do |o|
+      options.each do |key, value|
+        o << "--#{key}=#{value}"
+      end
+    end
+  end
+end

data/spec/support/helpers/env_helpers.rb

@@ -1,7 +1,8 @@
 module EnvHelpers
   def http_request_env_with_data(args={})
+    path = args.delete(:path) || "/blog"
     Rack::MockRequest.env_for(
-      '/blog',
+      path,
       :params => {
         'controller' => 'blog_posts',
         'action' => 'show',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.4.0.beta.1
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -198,7 +198,6 @@ files:
 - lib/appsignal/js_exception_transaction.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/minutely.rb
-- lib/appsignal/params_sanitizer.rb
 - lib/appsignal/rack/generic_instrumentation.rb
 - lib/appsignal/rack/js_exception_catcher.rb
 - lib/appsignal/rack/rails_instrumentation.rb
@@ -212,7 +211,6 @@ files:
 - lib/appsignal/utils/query_params_sanitizer.rb
 - lib/appsignal/version.rb
 - lib/sequel/extensions/appsignal_integration.rb
-- lib/tasks/diag.rake
 - resources/appsignal.yml.erb
 - resources/cacert.pem
 - spec/lib/appsignal/auth_check_spec.rb
@@ -287,6 +285,7 @@ files:
 - spec/support/fixtures/generated_config.yml
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/api_request_helper.rb
+- spec/support/helpers/cli_helpers.rb
 - spec/support/helpers/config_helpers.rb
 - spec/support/helpers/dependency_helper.rb
 - spec/support/helpers/directory_helper.rb
@@ -327,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -404,6 +403,7 @@ test_files:
 - spec/support/fixtures/generated_config.yml
 - spec/support/fixtures/uploaded_file.txt
 - spec/support/helpers/api_request_helper.rb
+- spec/support/helpers/cli_helpers.rb
 - spec/support/helpers/config_helpers.rb
 - spec/support/helpers/dependency_helper.rb
 - spec/support/helpers/directory_helper.rb
@@ -423,4 +423,3 @@ test_files:
 - spec/support/project_fixture/log/.gitkeep
 - spec/support/rails/my_app.rb
 - spec/support/stubs/delayed_job.rb
-has_rdoc: 

data/lib/appsignal/params_sanitizer.rb

@@ -1,13 +0,0 @@
-module Appsignal
-  class ParamsSanitizer
-    class << self
-      extend Gem::Deprecate
-
-      def sanitize(params)
-        Appsignal::Utils::ParamsSanitizer.sanitize(params)
-      end
-
-      deprecate :sanitize, "AppSignal::Utils::ParamsSanitizer.sanitize", 2016, 9
-    end
-  end
-end

data/lib/tasks/diag.rake

@@ -1,79 +0,0 @@
-require 'appsignal'
-
-namespace :appsignal do
-  namespace :diag do
-
-    desc "Shows the AppSignal gem version"
-    task :gem_version do
-      puts "Gem version: #{Appsignal::VERSION}"
-    end
-
-    desc "Shows the agent version"
-    task :agent_version do
-      puts "Agent version: #{Appsignal::Extension.agent_version}"
-    end
-
-    desc "Attempt to start appsignal"
-    task :start_appsignal do
-      Appsignal.start
-    end
-
-    desc "Checks if config is present and shows the values"
-    task :config => :start_appsignal do
-      if Appsignal.config && Appsignal.config.config_hash
-        Appsignal.config.config_hash.each do |key, val|
-          puts "Config #{key}: #{val}"
-        end
-      else
-        puts "No config present"
-      end
-    end
-
-    desc "Checks if required paths are writeable"
-    task :paths_writable => :start_appsignal do
-      possible_paths = [
-        Appsignal.config.root_path,
-        Appsignal.config.log_file_path
-      ]
-
-      puts "Checking if required paths are writable:"
-      possible_paths.each do |path|
-        result = File.writable?(path) ? 'Ok' : 'Failed'
-        puts "#{path} ...#{result}"
-      end
-      puts "\n"
-    end
-
-    desc "Check if API key is valid"
-    task :check_api_key => :start_appsignal do
-      auth_check = ::Appsignal::AuthCheck.new(Appsignal.config, Appsignal.logger)
-      status, result = auth_check.perform_with_result
-      if status == '200'
-        puts "Checking API key: Ok"
-      else
-        puts "Checking API key: Failed"
-      end
-    end
-
-    desc "Check the ext installation log"
-    task :check_ext_install do
-      require 'bundler/cli'
-      require "bundler/cli/common"
-      path     = Bundler::CLI::Common.select_spec('appsignal').full_gem_path
-      log_path = "#{path.strip}/ext/install.log"
-      puts "Showing last lines of extension install log: #{log_path}"
-      puts File.read(log_path)
-      puts "\n"
-    end
-
-    task :run => [
-      "diag:gem_version",
-      "diag:agent_version",
-      "diag:start_appsignal",
-      "diag:config",
-      "diag:check_api_key",
-      "diag:paths_writable",
-      "diag:check_ext_install"
-    ]
-  end
-end