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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.12
+  version: 1.1.0.beta.13
 platform: ruby
 authors:
 - Robert Beekman
@@ -150,6 +150,9 @@ files:
 - lib/appsignal/auth_check.rb
 - lib/appsignal/capistrano.rb
 - lib/appsignal/cli.rb
+- lib/appsignal/cli/diagnose.rb
+- lib/appsignal/cli/install.rb
+- lib/appsignal/cli/notify_of_deploy.rb
 - lib/appsignal/config.rb
 - lib/appsignal/event_formatter.rb
 - lib/appsignal/event_formatter/action_view/render_formatter.rb
@@ -197,19 +200,20 @@ files:
 - lib/appsignal/update_active_support.rb
 - lib/appsignal/utils.rb
 - lib/appsignal/version.rb
-- lib/generators/appsignal/USAGE
-- lib/generators/appsignal/appsignal_generator.rb
-- lib/generators/appsignal/templates/appsignal.yml
 - lib/sequel/extensions/appsignal_integration.rb
 - lib/tasks/diag.rake
 - lib/vendor/active_support/notifications.rb
 - lib/vendor/active_support/notifications/fanout.rb
 - lib/vendor/active_support/notifications/instrumenter.rb
 - lib/vendor/active_support/per_thread_registry.rb
+- resources/appsignal.yml.erb
 - resources/cacert.pem
 - spec/lib/appsignal/auth_check_spec.rb
 - spec/lib/appsignal/capistrano2_spec.rb
 - spec/lib/appsignal/capistrano3_spec.rb
+- spec/lib/appsignal/cli/diagnose_spec.rb
+- spec/lib/appsignal/cli/install_spec.rb
+- spec/lib/appsignal/cli/notify_of_deploy_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
 - spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb
@@ -253,7 +257,6 @@ files:
 - spec/lib/appsignal/update_active_support_spec.rb
 - spec/lib/appsignal/utils_spec.rb
 - spec/lib/appsignal_spec.rb
-- spec/lib/generators/appsignal/appsignal_generator_spec.rb
 - spec/lib/tmp/config/appsignal.yml
 - spec/spec_helper.rb
 - spec/support/delegate_matcher.rb
@@ -265,7 +268,11 @@ files:
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
 - spec/support/mocks/mock_extension.rb
+- spec/support/project_fixture/config/application.rb
 - spec/support/project_fixture/config/appsignal.yml
+- spec/support/project_fixture/config/environments/development.rb
+- spec/support/project_fixture/config/environments/production.rb
+- spec/support/project_fixture/config/environments/test.rb
 - spec/support/project_fixture/log/.gitkeep
 - spec/support/rails/my_app.rb
 - spec/support/stubs/delayed_job.rb
@@ -298,6 +305,9 @@ test_files:
 - spec/lib/appsignal/auth_check_spec.rb
 - spec/lib/appsignal/capistrano2_spec.rb
 - spec/lib/appsignal/capistrano3_spec.rb
+- spec/lib/appsignal/cli/diagnose_spec.rb
+- spec/lib/appsignal/cli/install_spec.rb
+- spec/lib/appsignal/cli/notify_of_deploy_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
 - spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb
@@ -341,7 +351,6 @@ test_files:
 - spec/lib/appsignal/update_active_support_spec.rb
 - spec/lib/appsignal/utils_spec.rb
 - spec/lib/appsignal_spec.rb
-- spec/lib/generators/appsignal/appsignal_generator_spec.rb
 - spec/lib/tmp/config/appsignal.yml
 - spec/spec_helper.rb
 - spec/support/delegate_matcher.rb
@@ -353,7 +362,11 @@ test_files:
 - spec/support/helpers/time_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
 - spec/support/mocks/mock_extension.rb
+- spec/support/project_fixture/config/application.rb
 - spec/support/project_fixture/config/appsignal.yml
+- spec/support/project_fixture/config/environments/development.rb
+- spec/support/project_fixture/config/environments/production.rb
+- spec/support/project_fixture/config/environments/test.rb
 - spec/support/project_fixture/log/.gitkeep
 - spec/support/rails/my_app.rb
 - spec/support/stubs/delayed_job.rb

data/lib/generators/appsignal/USAGE

@@ -1,8 +0,0 @@
-Description:
-    Appsignal install generator
-
-Example:
-    rails generate appsignal PUSH_KEY
-
-    This will create config/appsignal.yml with your PUSH_KEY.
-    If you use capistrano it will load Appsignal in the deploy file.

data/lib/generators/appsignal/appsignal_generator.rb

@@ -1,64 +0,0 @@
-require 'appsignal'
-
-class AppsignalGenerator < Rails::Generators::Base
-  EXCLUDED_ENVIRONMENTS = ['test'].freeze
-
-  source_root File.expand_path('../templates', __FILE__)
-  argument :push_api_key, :type => :string
-  desc 'Generate a config file for AppSignal'
-
-  def copy_config_file
-    template_file = 'appsignal.yml'
-    destination_file = File.join('config', template_file)
-    if File.exists?(destination_file)
-      say_status(:error, 'Looks like you already have a config file', :red)
-    else
-      template(template_file, destination_file)
-      add_appsignal_require_for_capistrano
-      check_push_api_key
-    end
-  end
-
-  protected
-
-  def add_appsignal_require_for_capistrano
-    deploy_file = File.expand_path(File.join('config', 'deploy.rb'))
-    cap_file = File.expand_path('Capfile')
-    if [deploy_file, cap_file].all? { |file| File.exists?(file) }
-      file_contents = File.read(deploy_file)
-      if (file_contents =~ /require (\'|\").\/appsignal\/capistrano/).nil?
-        append_to_file deploy_file, "\nrequire 'appsignal/capistrano'\n"
-      end
-    else
-      say_status :info, "No capistrano setup detected! Did you know you can "\
-        "use the AppSignal CLI to notify AppSignal of deployments?", :yellow
-      say_status "", "Run the following command for help:"
-      say_status "", "appsignal notify_of_deploy -h"
-    end
-  end
-
-  def config
-    Appsignal::Config.new(
-      Rails.root,
-      'development'
-    )
-  end
-
-  def check_push_api_key
-    auth_check = ::Appsignal::AuthCheck.new(config, Appsignal.logger)
-    status, result = auth_check.perform_with_result
-    if status == '200'
-      say_status :success, result
-    else
-      say_status :error, result, :red
-    end
-  end
-
-  private
-
-  def environments
-    @environments ||= Dir.glob(
-      File.join(%w(. config environments *.rb))
-    ).map { |o| File.basename(o, ".rb") }.sort - EXCLUDED_ENVIRONMENTS
-  end
-end

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

@@ -1,156 +0,0 @@
-require 'spec_helper'
-
-if rails_present?
-  require 'generator_spec/test_case'
-  require './lib/generators/appsignal/appsignal_generator'
-
-  # The generator doesn't know we're testing
-  # So change the path while running the generator
-  # Change it back upon completion
-  def run_generator_in_tmp(args=[])
-    FileUtils.cd(tmp_dir) do
-      FileUtils.mkdir_p('config/environments')
-      FileUtils.touch('config/environments/development.rb')
-      FileUtils.touch('config/environments/production.rb')
-      @output = run_generator(args)
-    end
-  end
-
-  describe AppsignalGenerator do
-    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
-    end
-    after do
-      $stderr = @original_stderr
-    end
-
-    context "with key" do
-      context "known key" do
-        before do
-          authcheck.should_receive(:perform).and_return('200')
-
-          prepare_destination
-          run_generator_in_tmp %w(my_app_key)
-        end
-
-        it "should generate a correct config file" do
-          fixture_config_file = File.open(File.join(fixtures_dir, 'generated_config.yml')).read
-          generated_config_file = File.open(File.join(tmp_dir, 'config/appsignal.yml')).read
-
-          generated_config_file.should == fixture_config_file
-        end
-
-        it "should mention successful auth check" do
-          @output.should include('AppSignal has confirmed authorization!')
-        end
-      end
-
-      context "invalid key" do
-        before do
-          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')
-          @output.should include('API key not valid with AppSignal...')
-        end
-      end
-
-      context "failed check" do
-        before do
-          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')
-          @output.should include('Could not confirm authorization')
-        end
-      end
-    end
-
-    context "without key" do
-      before do
-        prepare_destination
-        run_generator_in_tmp %w()
-      end
-
-      it "should not create a config file" do
-        destination_root.should have_structure {
-          directory 'config' do
-            no_file 'appsignal.yml'
-            no_file 'deploy.rb'
-          end
-        }
-        err_stream.string.should include "No value provided for required arguments 'push_api_key'"
-      end
-    end
-
-    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
-
-      it "should create a config file" do
-        destination_root.should have_structure {
-          directory 'config' do
-            file 'appsignal.yml'
-            no_file 'deploy.rb'
-          end
-        }
-      end
-
-      it "should mention the deploy task" do
-        @output.should include('No capistrano setup detected!')
-        @output.should include('appsignal notify_of_deploy -h')
-      end
-    end
-
-    context "with capistrano" do
-      before do
-        cap_file = File.join(destination_root, 'Capfile')
-        deploy_file = File.join(destination_root, 'config', 'deploy.rb')
-
-        prepare_destination
-        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
-
-      it "should create a config file and modify the capistrano deploy file" do
-        destination_root.should have_structure {
-          file 'Capfile'
-          directory 'config' do
-            file 'appsignal.yml'
-            file 'deploy.rb' do
-              contains "require 'appsignal/capistrano'"
-            end
-          end
-        }
-      end
-
-      it "should not mention the deploy task" do
-        @output.should_not include('No capistrano setup detected!')
-        @output.should_not include('appsignal notify_of_deploy -h')
-      end
-    end
-  end
-end