moonshot 2.0.0.beta6 → 2.0.0.beta7

data/lib/moonshot/commands/generate_template.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Moonshot
+  module Commands
+    class GenerateTemplate < Moonshot::Command
+      self.usage = 'generate-template [options]'
+      self.description = 'Processes an ERB formatted CloudFormation template.'
+
+      def initialize(*)
+        super
+        @parameters = {}
+      end
+
+      def parser
+        parser = super
+
+        parser.on('--source SOURCE_FILE', 'The ERB template file.') do |v|
+          @source = v
+        end
+
+        parser.on('--parameter KEY=VALUE', '-PKEY=VALUE',
+                  'Specify Stack Parameter on the command line') do |v|
+          data = v.split('=', 2)
+          unless data.size == 2
+            raise "Invalid parameter format '#{v}',"\
+                  'expected KEY=VALUE (e.g. MyTemplateParameter=12)'
+          end
+
+          @parameters[data[0]] = data[1]
+        end
+
+        parser.on('--destination DESTINATION_FILE', 'Destionation file.') do |v|
+          @destination = v
+        end
+      end
+
+      def execute
+        ::Moonshot::DynamicTemplate.new(
+          source: @source,
+          parameters: @parameters,
+          destination: @destination
+        ).process
+      end
+    end
+  end
+end

data/lib/moonshot/commands/interactive_command.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Moonshot
+  module Commands
+    module InteractiveCommand
+      def parser
+        parser = super
+
+        parser.on('--[no-]interactive', TrueClass, 'Use interactive prompts.') do |v|
+          Moonshot.config.interactive = v
+        end
+      end
+    end
+  end
+end

data/lib/moonshot/commands/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     class List < Moonshot::Command

data/lib/moonshot/commands/new.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     class New < Moonshot::Command
@@ -25,6 +27,7 @@ module Moonshot
         def create_project_dir
           raise "Directory '#{@application_name}' already exists!" \
             if Dir.exist?(project_path)
+
           Dir.mkdir(project_path)
         end
 
@@ -49,7 +52,7 @@ Moonshot.config do |m|
   m.build_mechanism      = Script.new('bin/build.sh')
   m.deployment_mechanism = CodeDeploy.new(asg: 'AutoScalingGroup')
 end
-EOF
+          EOF
         end
 
         def print_success_message
@@ -69,7 +72,7 @@ You will also need to ensure your Amazon account is configured for
 CodeDeploy by creating a role that allows deployments.
 
 See: http://moonshot.readthedocs.io/en/latest/mechanisms/deployment/
-EOF
+          EOF
         end
       end
     end

data/lib/moonshot/commands/parameter_arguments.rb

@@ -1,4 +1,6 @@
-# rubocop:disable LineLength
+# frozen_string_literal: true
+
+# rubocop:disable Layout/LineLength
 module Moonshot
   module Commands
     module ParameterArguments
@@ -15,9 +17,7 @@ module Moonshot
 
         parser.on('--parameter KEY=VALUE', '-PKEY=VALUE', 'Specify Stack Parameter on the command line') do |v|
           data = v.split('=', 2)
-          unless data.size == 2
-            raise "Invalid parameter format '#{v}', expected KEY=VALUE (e.g. MyStackParameter=12)"
-          end
+          raise "Invalid parameter format '#{v}', expected KEY=VALUE (e.g. MyStackParameter=12)" unless data.size == 2
 
           Moonshot.config.parameter_overrides[data[0]] = data[1]
         end
@@ -25,3 +25,4 @@ module Moonshot
     end
   end
 end
+# rubocop:enable Layout/LineLength

data/lib/moonshot/commands/parent_stack_option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     module ParentStackOption

data/lib/moonshot/commands/push.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     class Push < Moonshot::Command

data/lib/moonshot/commands/show_all_events_option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     module ShowAllEventsOption

data/lib/moonshot/commands/ssh.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require_relative '../ssh_command'
+
 module Moonshot
   module Commands
     class Ssh < Moonshot::SSHCommand

data/lib/moonshot/commands/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     class Status < Moonshot::Command

data/lib/moonshot/commands/update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     class Update < Moonshot::Command
@@ -11,7 +13,7 @@ module Moonshot
       def parser
         parser = super
 
-        parser.on('--dry-run', TrueClass, 'Show the changes that would be applied, but do not execute them') do |v| # rubocop:disable LineLength
+        parser.on('--dry-run', TrueClass, 'Show the changes that would be applied, but do not execute them') do |v|
           @dry_run = v
         end
 
@@ -22,6 +24,10 @@ module Moonshot
         parser.on('--refresh-parameters', TrueClass, 'Update parameters from parent stacks') do |v|
           @refresh_parameters = v
         end
+
+        parser.on('--template-file=FILE', 'Override the path to the CloudFormation template.') do |v|
+          Moonshot.config.template_file = v
+        end
       end
 
       def execute

data/lib/moonshot/commands/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     class Version < Moonshot::Command

data/lib/moonshot/controller.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Moonshot
   # The Controller coordinates and performs all Moonshot actions.
-  class Controller # rubocop:disable ClassLength
+  class Controller # rubocop:disable Metrics/ClassLength
     attr_accessor :config
 
     def initialize(config)
@@ -11,7 +13,8 @@ module Moonshot
       Moonshot::StackLister.new(@config.app_name).list
     end
 
-    def create # rubocop:disable AbcSize
+    def create # rubocop:disable Metrics/AbcSize
+      run_plugins(:setup_create)
       # Scan the template for all required parameters and configure
       # the ParameterCollection.
       @config.parameters = ParameterCollection.from_template(stack.template)
@@ -34,7 +37,7 @@ module Moonshot
 
       # Interview the user for missing parameters, using the
       # appropriate prompts.
-      @config.parameters.values.each do |sp|
+      @config.parameters.hash.each_value do |sp|
         next if sp.set?
 
         parameter_source = @config.parameter_sources.fetch(sp.name,
@@ -50,12 +53,12 @@ module Moonshot
       # Fail if any parameters are still missing without defaults.
       missing_parameters = @config.parameters.missing_for_create
       unless missing_parameters.empty?
-        raise "The following parameters were not provided: #{missing_parameters.map(&:name).join(', ')}" # rubocop:disable LineLength
+        raise "The following parameters were not provided: #{missing_parameters.map(&:name).join(', ')}"
       end
 
       run_hook(:deploy, :pre_create)
       stack_ok = stack.create
-      if stack_ok # rubocop:disable GuardClause
+      if stack_ok # rubocop:disable Style/GuardClause
         run_hook(:deploy, :post_create)
         run_plugins(:post_create)
       else
@@ -63,7 +66,8 @@ module Moonshot
       end
     end
 
-    def update(dry_run:, force:, refresh_parameters:) # rubocop:disable AbcSize
+    def update(dry_run:, force:, refresh_parameters:) # rubocop:disable Metrics/AbcSize
+      run_plugins(:setup_update)
       # Scan the template for all required parameters and configure
       # the ParameterCollection.
       @config.parameters = ParameterCollection.from_template(stack.template)
@@ -106,16 +110,17 @@ module Moonshot
       # Fail if any parameters are still missing without defaults.
       missing_parameters = @config.parameters.missing_for_update
       unless missing_parameters.empty?
-        raise "The following parameters were not provided: #{missing_parameters.map(&:name).join(', ')}" # rubocop:disable LineLength
+        raise "The following parameters were not provided: #{missing_parameters.map(&:name).join(', ')}"
       end
 
       run_hook(:deploy, :pre_update)
-      stack.update(dry_run: dry_run, force: force)
+      stack.update(dry_run:, force:)
       run_hook(:deploy, :post_update)
       run_plugins(:post_update)
     end
 
     def status
+      run_plugins(:setup_status)
       run_plugins(:pre_status)
       run_hook(:deploy, :status)
       stack.status
@@ -129,6 +134,7 @@ module Moonshot
     end
 
     def build_version(version_name)
+      run_plugins(:setup_build)
       run_plugins(:pre_build)
       run_hook(:build, :pre_build, version_name)
       run_hook(:build, :build, version_name)
@@ -138,12 +144,14 @@ module Moonshot
     end
 
     def deploy_version(version_name)
+      run_plugins(:setup_deploy)
       run_plugins(:pre_deploy)
       run_hook(:deploy, :deploy, @config.artifact_repository, version_name)
       run_plugins(:post_deploy)
     end
 
     def delete
+      run_plugins(:setup_delete)
       # Populate the current values of parameters, for use by plugins.
       @config.parameters = ParameterCollection.from_template(stack.template)
       stack.parameters.each do |key, value|
@@ -153,7 +161,7 @@ module Moonshot
       run_plugins(:pre_delete)
       run_hook(:deploy, :pre_delete)
       stack_ok = stack.delete
-      if stack_ok # rubocop:disable GuardClause
+      if stack_ok # rubocop:disable Style/GuardClause
         run_hook(:deploy, :post_delete)
         run_plugins(:post_delete)
       else
@@ -176,7 +184,8 @@ module Moonshot
     def ssh
       run_plugins(:pre_ssh)
       @config.ssh_instance ||= SSHTargetSelector.new(
-        stack, asg_name: @config.ssh_auto_scaling_group_name).choose!
+        stack, asg_name: @config.ssh_auto_scaling_group_name
+      ).choose!
       cb = SSHCommandBuilder.new(@config.ssh_config, @config.ssh_instance)
       result = cb.build(@config.ssh_command)
 
@@ -192,14 +201,14 @@ module Moonshot
 
     def resources
       @resources ||=
-        Resources.new(stack: stack, ilog: @config.interactive_logger, controller: self)
+        Resources.new(stack:, ilog: @config.interactive_logger, controller: self)
     end
 
     def run_hook(type, name, *args)
       mech = get_mechanism(type)
       name = name.to_s << '_hook'
 
-      return unless mech && mech.respond_to?(name)
+      return unless mech.respond_to?(name)
 
       mech.resources = resources
       mech.send(name, *args)
@@ -209,7 +218,13 @@ module Moonshot
       results = {}
       @config.plugins.each do |plugin|
         next unless plugin.respond_to?(type)
-        results[plugin] = plugin.send(type, resources)
+
+        results[plugin] =
+          if type =~ /^setup_/
+            plugin.send(type)
+          else
+            plugin.send(type, resources)
+          end
       end
 
       results

data/lib/moonshot/controller_config.rb

@@ -1,32 +1,16 @@
+# frozen_string_literal: true
+
 module Moonshot
   # Holds configuration for Moonshot::Controller
   class ControllerConfig
     attr_reader :account_alias
 
-    attr_accessor :additional_tag
-    attr_accessor :answer_file
-    attr_accessor :app_name
-    attr_accessor :artifact_repository
-    attr_accessor :build_mechanism
-    attr_accessor :changeset_wait_time
-    attr_accessor :deployment_mechanism
-    attr_accessor :dev_build_name_proc
-    attr_accessor :environment_name
-    attr_accessor :interactive
-    attr_accessor :interactive_logger
-    attr_accessor :parameter_overrides
-    attr_accessor :parameters
-    attr_accessor :parent_stacks
-    attr_accessor :default_parameter_source
-    attr_accessor :parameter_sources
-    attr_accessor :plugins
-    attr_accessor :project_root
-    attr_accessor :show_all_stack_events
-    attr_accessor :ssh_auto_scaling_group_name
-    attr_accessor :ssh_command
-    attr_accessor :ssh_config
-    attr_accessor :ssh_instance
-    attr_accessor :template_s3_bucket
+    attr_accessor :additional_tag, :answer_file, :app_name, :artifact_repository, :build_mechanism,
+                  :changeset_wait_time, :deployment_mechanism, :dev_build_name_proc, :environment_name,
+                  :interactive, :interactive_logger, :parameter_overrides, :parameters, :parent_stacks,
+                  :default_parameter_source, :parameter_sources, :plugins, :project_root,
+                  :show_all_stack_events, :ssh_auto_scaling_group_name, :ssh_command, :ssh_config,
+                  :ssh_instance, :template_file, :template_s3_bucket
 
     def initialize
       @default_parameter_source = AskUserSource.new
@@ -60,9 +44,10 @@ module Moonshot
     def update_for_account!
       # Evaluated any account-specific configuration.
       @account_alias = Moonshot::AccountContext.get
-      if @account_alias && @per_account_config.key?(account_alias)
-        @per_account_config[@account_alias].call(self)
-      end
+      return unless @account_alias
+      return unless @per_account_config.key?(@account_alias)
+
+      @per_account_config[@account_alias].call(self)
     end
   end
 end

data/lib/moonshot/creds_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   # Create convenience methods for various AWS client creation.
   module CredsHelper

data/lib/moonshot/deployment_mechanism/code_deploy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'colorize'
 
 # This mechanism is used to deploy software to an auto-scaling group within
@@ -8,12 +10,12 @@ require 'colorize'
 #   self.artifact_repository = S3Bucket.new('foobucket')
 #   self.deployment_mechanism = CodeDeploy.new(asg: 'AutoScalingGroup')
 # end
-class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
+class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable Metrics/ClassLength
   include Moonshot::ResourcesHelper
   include Moonshot::CredsHelper
   include Moonshot::DoctorHelper
 
-  DEFAULT_ROLE_NAME = 'CodeDeployRole'.freeze
+  DEFAULT_ROLE_NAME = 'CodeDeployRole'
 
   # @param asg [Array, String]
   #   The logical name of the AutoScalingGroup to create and manage a Deployment
@@ -37,12 +39,13 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
   #   CodeDeployDefault.OneAtATime.
   # rubocop:disable Metrics/ParameterLists
   def initialize(
-      asg: [],
-      optional_asg: [],
-      role: DEFAULT_ROLE_NAME,
-      app_name: nil,
-      group_name: nil,
-      config_name: 'CodeDeployDefault.OneAtATime')
+    asg: [],
+    optional_asg: [],
+    role: DEFAULT_ROLE_NAME,
+    app_name: nil,
+    group_name: nil,
+    config_name: 'CodeDeployDefault.OneAtATime'
+  )
     @asg_logical_ids = Array(asg)
     @optional_asg_logical_ids = Array(optional_asg)
     @app_name = app_name
@@ -51,6 +54,7 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
     @codedeploy_config = config_name
     @ignore_app_stop_failures = false
   end
+  # rubocop:enable Metrics/ParameterLists
 
   def post_create_hook
     create_application_if_needed
@@ -62,7 +66,7 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
   def post_update_hook
     post_create_hook
 
-    unless deployment_group_ok? # rubocop:disable GuardClause
+    unless deployment_group_ok? # rubocop:disable Style/GuardClause
       delete_deployment_group
       create_deployment_group_if_needed
     end
@@ -101,7 +105,7 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
   end
 
   def deploy_cli_hook(parser)
-    parser.on('--ignore-app-stop-failures', TrueClass, 'Continue deployment on ApplicationStop failures') do |v| # rubocop:disable LineLength
+    parser.on('--ignore-app-stop-failures', TrueClass, 'Continue deployment on ApplicationStop failures') do |v|
       puts "ignore = #{v}"
       @ignore_app_stop_failures = v
     end
@@ -178,27 +182,24 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
     autoscaling_groups = []
     @asg_logical_ids.each do |asg_logical_id|
       asg_name = stack.physical_id_for(asg_logical_id)
-      unless asg_name
-        raise "Could not find #{asg_logical_id} resource in Stack."
-      end
+      raise "Could not find #{asg_logical_id} resource in Stack." unless asg_name
 
       groups = as_client.describe_auto_scaling_groups(
-        auto_scaling_group_names: [asg_name])
-      if groups.auto_scaling_groups.empty?
-        raise "Could not find ASG #{asg_name}."
-      end
+        auto_scaling_group_names: [asg_name]
+      )
+
+      raise "Could not find ASG #{asg_name}." if groups.auto_scaling_groups.empty?
 
       autoscaling_groups.push(groups.auto_scaling_groups.first)
     end
     @optional_asg_logical_ids.each do |asg_logical_id|
       asg_name = stack.physical_id_for(asg_logical_id)
       next unless asg_name
+
       groups = as_client.describe_auto_scaling_groups(
         auto_scaling_group_names: [asg_name]
       )
-      unless groups.auto_scaling_groups.empty?
-        autoscaling_groups.push(groups.auto_scaling_groups.first)
-      end
+      autoscaling_groups.push(groups.auto_scaling_groups.first) unless groups.auto_scaling_groups.empty?
     end
     autoscaling_groups
   end
@@ -220,13 +221,16 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
 
   def deployment_group
     cd_client.get_deployment_group(
-      application_name: app_name, deployment_group_name: group_name)
-             .deployment_group_info
+      application_name: app_name,
+      deployment_group_name: group_name
+    ).deployment_group_info
   end
 
   def deployment_group_exists?
     cd_client.get_deployment_group(
-      application_name: app_name, deployment_group_name: group_name)
+      application_name: app_name,
+      deployment_group_name: group_name
+    )
     true
   rescue Aws::CodeDeploy::Errors::ApplicationDoesNotExistException,
          Aws::CodeDeploy::Errors::DeploymentGroupDoesNotExistException
@@ -235,13 +239,13 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
 
   def deployment_group_ok?
     return false unless deployment_group_exists?
+
     asgs = deployment_group.auto_scaling_groups
     return false unless asgs
     return false unless asgs.count == auto_scaling_groups.count
+
     asgs.each do |asg|
-      if (auto_scaling_groups.find_index { |a| a.auto_scaling_group_name == asg.name }).nil?
-        return false
-      end
+      return false if (auto_scaling_groups.find_index { |a| a.auto_scaling_group_name == asg.name }).nil?
     end
     true
   end
@@ -284,7 +288,8 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
     ilog.start "Deleting #{pretty_deploy_group}." do |s|
       cd_client.delete_deployment_group(
         application_name: app_name,
-        deployment_group_name: group_name)
+        deployment_group_name: group_name
+      )
       s.success
     end
   end
@@ -294,7 +299,8 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
       application_name: app_name,
       deployment_group_name: group_name,
       service_role_arn: role.arn,
-      auto_scaling_groups: asg_names)
+      auto_scaling_groups: asg_names
+    )
   end
 
   def wait_for_asg_capacity
@@ -306,10 +312,11 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
           count = asg.instances.count { |i| i.lifecycle_state == 'InService' }
           if asg.desired_capacity == count
             asgs_at_capacity += 1
-            s.continue "#{asg.auto_scaling_group_name} DesiredCapacity is #{asg.desired_capacity}, currently #{count} instance(s) are InService." # rubocop:disable LineLength
+            s.continue "#{asg.auto_scaling_group_name} DesiredCapacity is #{asg.desired_capacity}, currently #{count} instance(s) are InService." # rubocop:disable Layout/LineLength
           end
         end
         break if asgs.count == asgs_at_capacity
+
         sleep 5
       end
 
@@ -327,7 +334,7 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
 
       case status
       when 'Created', 'Queued', 'InProgress'
-        step.continue "Waiting for Deployment #{id.blue} to complete, current status is '#{status}'." # rubocop:disable LineLength
+        step.continue "Waiting for Deployment #{id.blue} to complete, current status is '#{status}'."
       when 'Succeeded'
         step.success "Deployment #{id.blue} completed successfully!"
         break
@@ -342,10 +349,10 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
   end
 
   def handle_deployment_failure(deployment_id)
-    instances = cd_client.list_deployment_instances(deployment_id: deployment_id)
+    instances = cd_client.list_deployment_instances(deployment_id:)
                          .instances_list.map do |instance_id|
-      cd_client.get_deployment_instance(deployment_id: deployment_id,
-                                        instance_id: instance_id)
+      cd_client.get_deployment_instance(deployment_id:,
+                                        instance_id:)
     end
 
     instances.map(&:instance_summary).each do |inst_summary|
@@ -373,7 +380,7 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
     when Moonshot::ArtifactRepository::S3Bucket
       s3_revision_for(artifact_repo, version_name)
     when NilClass
-      raise 'Must specify an ArtifactRepository with CodeDeploy. Take a look at the S3Bucket example.' # rubocop:disable LineLength
+      raise 'Must specify an ArtifactRepository with CodeDeploy. Take a look at the S3Bucket example.'
     else
       raise "Cannot use #{artifact_repo.class} to deploy with CodeDeploy."
     end
@@ -404,7 +411,7 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
   def doctor_check_code_deploy_role
     role
     success("#{@codedeploy_role} exists.")
-  rescue => e
+  rescue StandardError => e
     help = <<-EOF
 Error: #{e.message}
 
@@ -417,9 +424,9 @@ http://docs.aws.amazon.com/codedeploy/latest/userguide/how-to-create-service-rol
   def doctor_check_auto_scaling_resource_defined
     @asg_logical_ids.each do |asg_logical_id|
       if stack.template.resource_names.include?(asg_logical_id)
-        success("Resource '#{asg_logical_id}' exists in the CloudFormation template.") # rubocop:disable LineLength
+        success("Resource '#{asg_logical_id}' exists in the CloudFormation template.")
       else
-        critical("Resource '#{asg_logical_id}' does not exist in the CloudFormation template!") # rubocop:disable LineLength
+        critical("Resource '#{asg_logical_id}' does not exist in the CloudFormation template!")
       end
     end
   end

data/lib/moonshot/doctor_helper.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'colorize'
 
 module Moonshot
@@ -19,18 +20,16 @@ module Moonshot
       puts
       puts self.class.name.split('::').last
       private_methods.each do |meth|
-        begin
-          send(meth) if meth =~ /^doctor_check_/
-        rescue DoctorCritical
-          # Stop running checks in this Mechanism.
-          success = false
-          break
-        rescue => e
-          success = false
-          print '  ✗ '.red
-          puts "Exception while running check: #{e.class}: #{e.message.lines.first}"
-          break
-        end
+        send(meth) if meth =~ /^doctor_check_/
+      rescue DoctorCritical
+        # Stop running checks in this Mechanism.
+        success = false
+        break
+      rescue StandardError => e
+        success = false
+        print '  ✗ '.red
+        puts "Exception while running check: #{e.class}: #{e.message.lines.first}"
+        break
       end
 
       success
@@ -44,13 +43,13 @@ module Moonshot
     def warning(str, additional_info = nil)
       print '  ? '.yellow
       puts str
-      additional_info.lines.each { |l| puts "      #{l}" } if additional_info
+      additional_info&.lines&.each { |l| puts "      #{l}" }
     end
 
     def critical(str, additional_info = nil)
       print '  ✗ '.red
       puts str
-      additional_info.lines.each { |l| puts "      #{l}" } if additional_info
+      additional_info&.lines&.each { |l| puts "      #{l}" }
       raise DoctorCritical
     end
   end