moonshot 2.0.0.beta6 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 29bfc137789e7c406cf1a235f693e12b142baa97
-  data.tar.gz: a3a9eb8d496c61bb93f9cb7f1d97e41f6dd06fd9
+SHA256:
+  metadata.gz: d87f616758ca8f4b32b4af436e73c565665b8753d38b3fd14d478f6a6d347ce4
+  data.tar.gz: 616b51d3d59341f58beb48efea6af2dba7a3821ef0dace26f4dd1eae395a34bf
 SHA512:
-  metadata.gz: '00381ff4a8552595b8aaa0f1cec95b6c892045cad3b6a6c921bd5fb5e379405db1f7491a4282b68c18aaa55a441ce43df078b5a4100457cf2e28a9024918b737'
-  data.tar.gz: 0e84cbf7b3f6378991a8faf7070a143f14fdca00eccea19d6ae457f0284c725975e16723151da2bc5b3185d33c472ddd0ee028f894fab70059187b25393d0fdf
+  metadata.gz: 8532967756fa789d68ce86fbdffc25bb053f5c483d784285b43ed1c934c40d72c03dc3ec73674bb6d06eb58bf2ec3b6f3641156ea6f7797e387e3d16ecf3ecc8
+  data.tar.gz: a4bcf9e2b1d6367670aa7cba505d4d561231d114dce658c2a92b10786f8eae24c25ba7052057966e5d6c8a5569633f4676eedda7d198483f7ef0c9446bd132da

data/bin/moonshot

@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'moonshot'
 
 # This is the main entry point for the `moonshot` command-line tool.
 begin
   Moonshot::CommandLine.new.run!
-rescue => e
+rescue StandardError => e
   warn "#{e} (at #{e.backtrace.first})"
   raise e if ENV['MOONSHOT_BACKTRACE']
+
   exit 1
 end

data/lib/moonshot/account_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module AccountContext
     def self.get

data/lib/moonshot/always_use_default_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   # The AlwaysUseDefaultSource will always use the previous value in
   # the stack, or use the default value during stack creation. This is
@@ -6,12 +8,11 @@ module Moonshot
   # answer files or command-line arguments will always apply.
   class AlwaysUseDefaultSource
     def get(sp)
-      unless sp.default?
-        raise "Parameter #{sp.name} does not have a default, cannot use AlwaysUseDefaultSource!"
-      end
-
       # Don't do anything, the default will apply on create, and the
       # previous value will be used on update.
+      return if sp.default?
+
+      raise "Parameter #{sp.name} does not have a default, cannot use AlwaysUseDefaultSource!"
     end
   end
 end

data/lib/moonshot/artifact_repository/s3_bucket.rb

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
+require_relative '../resources_helper'
+require_relative '../creds_helper'
+require_relative '../doctor_helper'
+
 # The S3Bucket stores builds in an S3 Bucket.
 #
 # For example:
@@ -19,7 +25,7 @@ class Moonshot::ArtifactRepository::S3Bucket
 
   def store_hook(build_mechanism, version_name)
     unless build_mechanism.respond_to?(:output_file)
-      raise "S3Bucket does not know how to store artifacts from #{build_mechanism.class}, no method '#output_file'." # rubocop:disable LineLength
+      raise "S3Bucket does not know how to store artifacts from #{build_mechanism.class}, no method '#output_file'."
     end
 
     file = build_mechanism.output_file
@@ -41,7 +47,7 @@ class Moonshot::ArtifactRepository::S3Bucket
   def upload_to_s3(file, key)
     s3_client.put_object(
       acl: 'bucket-owner-full-control',
-      key: key,
+      key:,
       body: File.open(file),
       bucket: @bucket_name,
       storage_class: 'STANDARD_IA'
@@ -51,7 +57,7 @@ class Moonshot::ArtifactRepository::S3Bucket
   def doctor_check_bucket_exists
     s3_client.get_bucket_location(bucket: @bucket_name)
     success "Bucket '#{@bucket_name}' exists."
-  rescue => e
+  rescue StandardError => e
     # This is warning because the role you use for deployment may not actually
     # be able to read builds, however the instance role assigned to the nodes
     # might.
@@ -68,9 +74,9 @@ class Moonshot::ArtifactRepository::S3Bucket
     )
     s3_client.delete_object(key: 'test-object', bucket: @bucket_name)
     success 'Bucket is writable, new builds can be uploaded.'
-  rescue => e
+  rescue StandardError => e
     # This is a warning because you may deploy to an environment where you have
     # read access to builds, but could not publish a new build.
-    warning('Could not write to bucket, you may still be able to deploy existing builds.', e.message) # rubocop:disable LineLength
+    warning('Could not write to bucket, you may still be able to deploy existing builds.', e.message)
   end
 end

data/lib/moonshot/artifact_repository/s3_bucket_via_github_releases.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'moonshot/artifact_repository/s3_bucket'
 require 'moonshot/shell'
 require 'digest'
@@ -9,7 +11,7 @@ require 'retriable'
 module Moonshot::ArtifactRepository
   # S3 Bucket repository backed by GitHub releases.
   # If a SemVer package isn't found in S3, it is copied from GitHub releases.
-  class S3BucketViaGithubReleases < S3Bucket # rubocop:disable ClassLength
+  class S3BucketViaGithubReleases < S3Bucket # rubocop:disable Metrics/ClassLength
     include Moonshot::BuildMechanism
     include Moonshot::Shell
 
@@ -36,9 +38,7 @@ module Moonshot::ArtifactRepository
     # artifact repositories a hook before deploy.
     def filename_for_version(version)
       s3_name = super
-      if !@output_file && release?(version) && !in_s3?(s3_name)
-        github_to_s3(version, s3_name)
-      end
+      github_to_s3(version, s3_name) if !@output_file && release?(version) && !in_s3?(s3_name)
       s3_name
     end
 
@@ -51,7 +51,7 @@ module Moonshot::ArtifactRepository
     end
 
     def in_s3?(key)
-      s3_client.head_object(key: key, bucket: bucket_name)
+      s3_client.head_object(key:, bucket: bucket_name)
     rescue ::Aws::S3::Errors::NotFound
       false
     end
@@ -62,7 +62,7 @@ module Moonshot::ArtifactRepository
 
       # If there is a checksum file, attach it as well. We only support MD5
       # since that's what S3 uses.
-      checksum_file = File.basename(file, '.tar.gz') + '.md5'
+      checksum_file = "#{File.basename(file, '.tar.gz')}.md5"
       cmd += " --attach=#{checksum_file}" if File.exist?(checksum_file)
 
       sh_step(cmd)
@@ -218,7 +218,7 @@ module Moonshot::ArtifactRepository
 
     def doctor_check_hub_release_download
       sh_out('hub release download --help')
-    rescue
+    rescue StandardError
       critical '`hub release download` command missing, upgrade hub.' \
                ' See https://github.com/github/hub/pull/1103'
     else

data/lib/moonshot/ask_user_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'colorize'
 
 module Moonshot

data/lib/moonshot/build_mechanism/github_release.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'moonshot/shell'
 require 'open3'
@@ -31,6 +33,8 @@ module Moonshot::BuildMechanism
       parser.on('-s', '--[no-]skip-ci-status', 'Skips checks on CI jobs', TrueClass) do |value|
         @skip_ci_status = value
       end
+
+      parser
     end
 
     def doctor_hook
@@ -83,6 +87,8 @@ module Moonshot::BuildMechanism
       say("Changelog for #{version}", :yellow)
       say("#{@changes}\n\n")
 
+      return unless Moonshot.config.interactive
+
       q = "Do you want to tag and release this commit as #{version}? [y/n]"
       raise 'Release declined.' unless yes?(q)
     end
@@ -131,6 +137,7 @@ module Moonshot::BuildMechanism
 
     def hub_create_release(semver, commitish, changelog_entry)
       return if hub_release_exists(semver)
+
       message = "#{semver}\n\n#{changelog_entry}"
       cmd = "hub release create #{semver} --commitish=#{commitish}"
       cmd << ' --prerelease' if semver.pre || semver.build
@@ -216,7 +223,7 @@ module Moonshot::BuildMechanism
 
     def doctor_check_upstream
       sh_out('git remote | grep ^upstream$')
-    rescue => e
+    rescue StandardError => e
       critical "git remote `upstream` not found.\n#{e.message}"
     else
       success 'git remote `upstream` exists.'
@@ -224,7 +231,7 @@ module Moonshot::BuildMechanism
 
     def doctor_check_hub_auth
       sh_out('hub ci-status 0.0.0')
-    rescue => e
+    rescue StandardError => e
       critical "`hub` failed, install hub and authorize it.\n#{e.message}"
     else
       success '`hub` installed and authorized.'

data/lib/moonshot/build_mechanism/script.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require 'open3'
-include Open3
 
 # Compile a release artifact using a shell script.
 #
@@ -18,6 +19,8 @@ class Moonshot::BuildMechanism::Script
   include Moonshot::ResourcesHelper
   include Moonshot::DoctorHelper
 
+  include Open3
+
   attr_reader :output_file
 
   def initialize(script, output_file: 'output.tar.gz')
@@ -35,12 +38,12 @@ class Moonshot::BuildMechanism::Script
       'OUTPUT_FILE' => @output_file
     }
     ilog.start_threaded "Running Script: #{@script}" do |s|
-      run_script(s, env: env)
+      run_script(s, env:)
     end
   end
 
   def post_build_hook(_version)
-    unless File.exist?(@output_file) # rubocop:disable GuardClause
+    unless File.exist?(@output_file) # rubocop:disable Style/GuardClause
       raise 'Build command did not produce output file!'
     end
   end
@@ -61,10 +64,8 @@ class Moonshot::BuildMechanism::Script
       end
 
       result = wait.value
-      if result.exitstatus == 0
-        step.success "Build script #{@script} exited successfully!"
-      end
-      unless result.exitstatus == 0
+      step.success "Build script #{@script} exited successfully!" if result.exitstatus.zero?
+      unless result.exitstatus.zero?
         ilog.error "Build script failed with exit status #{result.exitstatus}!"
         ilog.error output.join("\n")
         step.failure "Build script #{@script} failed with exit status #{result.exitstatus}!"

data/lib/moonshot/build_mechanism/travis_deploy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'moonshot/shell'
 require 'travis'
 require 'travis/pro'
@@ -25,8 +27,7 @@ module Moonshot::BuildMechanism
       @cli_args = "-r #{@slug} #{@endpoint}"
     end
 
-    def pre_build_hook(_)
-    end
+    def pre_build_hook(_); end
 
     def build_hook(version)
       job_number = find_build_and_job(version)
@@ -34,8 +35,7 @@ module Moonshot::BuildMechanism
       check_build(version)
     end
 
-    def post_build_hook(_)
-    end
+    def post_build_hook(_); end
 
     private
 
@@ -120,7 +120,7 @@ module Moonshot::BuildMechanism
 
     def doctor_check_travis_auth
       sh_out("bundle exec travis raw #{@endpoint} repos/#{@slug}")
-    rescue => e
+    rescue StandardError => e
       critical "`travis` not available or not authorized.\n#{e.message}"
     else
       success '`travis` installed and authorized.'

data/lib/moonshot/build_mechanism/version_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'semantic'
 
@@ -37,6 +39,17 @@ class Moonshot::BuildMechanism::VersionProxy
     active(version).post_build_hook(version)
   end
 
+  def build_cli_hook(parser)
+    # Expose any command line arguments provided by the build mechanisms. We
+    # don't know the version at this point, so we can't call the hook on only
+    # the one we're going to use, which may result in options being exposed that
+    # are only applicable for one of the build mechanisms.
+    parser = @release.build_cli_hook(parser) if @release.respond_to?(:build_cli_hook)
+    parser = @dev.build_cli_hook(parser) if @dev.respond_to?(:build_cli_hook)
+
+    parser
+  end
+
   private
 
   def active(version)

data/lib/moonshot/change_set.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Moonshot
   class ChangeSet
-    attr_reader :name
-    attr_reader :stack_name
+    attr_reader :name, :stack_name
 
     def initialize(name, stack_name)
       @name = name
@@ -11,9 +12,7 @@ module Moonshot
     end
 
     def confirm?
-      unless Moonshot.config.interactive
-        raise 'Cannot confirm ChangeSet when interactive mode is disabled!'
-      end
+      raise 'Cannot confirm ChangeSet when interactive mode is disabled!' unless Moonshot.config.interactive
 
       loop do
         print 'Apply changes? '
@@ -21,6 +20,7 @@ module Moonshot
 
         return true if resp == 'yes'
         return false if resp == 'no'
+
         puts "Please enter 'yes' or 'no'!"
       end
     end
@@ -39,9 +39,10 @@ module Moonshot
       @change_set.changes.map(&:resource_change).each do |c|
         puts "* #{c.action} #{c.logical_resource_id} (#{c.resource_type})"
 
-        if c.replacement == 'True'
+        case c.replacement
+        when 'True'
           puts ' - Will be replaced'
-        elsif c.replacement == 'Conditional'
+        when 'Conditional'
           puts ' - May be replaced (Conditional)'
         end
 
@@ -60,47 +61,36 @@ module Moonshot
       wait_for_change_set unless @change_set
       @cf_client.execute_change_set(
         change_set_name: @name,
-        stack_name: @stack_name)
+        stack_name: @stack_name
+      )
     end
 
     def delete
       wait_for_change_set unless @change_set
       @cf_client.delete_change_set(
         change_set_name: @name,
-        stack_name: @stack_name)
+        stack_name: @stack_name
+      )
     rescue Aws::CloudFormation::Errors::InvalidChangeSetStatus
       sleep 1
       retry
     end
 
-    # NOTE: At the time of this patch, AWS-SDK native Waiters do not
-    # have support for ChangeSets. Once they add this, we can make
-    # this code much better.
-    # Still no support for this waiter, but it's planned.
-    # https://github.com/aws/aws-sdk-ruby/issues/1388
     def wait_for_change_set
-      wait_seconds = Moonshot.config.changeset_wait_time || 90
-      start = Time.now.to_i
-
-      loop do
-        resp = @cf_client.describe_change_set(
-          change_set_name: @name,
-          stack_name: @stack_name)
-
-        if %w(CREATE_COMPLETE FAILED).include?(resp.status)
-          @change_set = resp
-          return
-        end
-
-        if Time.now.to_i > start + wait_seconds
-          raise "ChangeSet did not complete creation within #{wait_seconds} seconds!"
+      begin
+        @cf_client.wait_until(:change_set_create_complete,
+                              stack_name: @stack_name,
+                              change_set_name: @name)
+      rescue Aws::Waiters::Errors::FailureStateError => e
+        if e.message != 'stopped waiting, encountered a failure state'
+          throw e
+        else
+          puts "The change set didn't contain any new changes."
         end
-
-        sleep 5 # http://bit.ly/1qY1ZXJ
-        # Wait 5 seconds because other waiters seem to wait at least 5 seconds
-        # before repeating requests.
-        # See: https://github.com/aws/aws-sdk-ruby/blob/master/aws-sdk-core/apis/cloudformation/2010-05-15/waiters-2.json#L5
       end
+
+      @change_set = @cf_client.describe_change_set(stack_name: @stack_name,
+                                                   change_set_name: @name)
     end
   end
 end

data/lib/moonshot/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse'
 
 module Moonshot
@@ -44,7 +46,7 @@ module Moonshot
       # Degrade to a more compatible logger if the terminal seems outdated,
       # or at the users request.
       if !$stdout.isatty || !@use_interactive_logger
-        log = Logger.new(STDOUT)
+        log = Logger.new($stdout)
         controller.config.interactive_logger = InteractiveLoggerProxy.new(log)
       end
 

data/lib/moonshot/command_line.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   # This class implements the command-line `moonshot` tool.
   class CommandLine
@@ -10,7 +12,7 @@ module Moonshot
       @classes || []
     end
 
-    def run! # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity
+    def run! # rubocop:disable Metrics/MethodLength
       # Commands defined as Moonshot::Commands require a properly
       # configured Moonshot.rb and supporting files. Without them, we only
       # support `--help` and `new`.
@@ -24,7 +26,7 @@ module Moonshot
 
         if Dir.pwd == '/'
           warn 'No Moonfile.rb found, are you in a project? Maybe you need to '\
-	        			'create one with `moonshot new <app_name>`?'
+                'create one with `moonshot new <app_name>`?'
           raise 'No Moonfile found'
         end
 
@@ -51,7 +53,7 @@ module Moonshot
 
       # Determine what command is being run, which should be the first argument.
       command = ARGV.shift
-      if %w(--help -h help).include?(command) || command.nil?
+      if %w[--help -h help].include?(command) || command.nil?
         usage
         return
       end
@@ -94,7 +96,7 @@ module Moonshot
       max_len = fields.map(&:first).map(&:size).max
 
       fields.each do |f|
-        line = format("  %-#{max_len}s # %s", *f)
+        line = format("  %-#{max_len}s # %s", *f) # rubocop:disable Lint/FormatParameterMismatch
         warn line
       end
     end
@@ -117,9 +119,9 @@ module Moonshot
 
     def commandify(klass)
       word = klass.to_s.split('::').last
-      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2'.freeze)
-      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2'.freeze)
-      word.tr!('_'.freeze, '-'.freeze)
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      word.tr!('_', '-')
       word.downcase!
       word
     end
@@ -127,10 +129,11 @@ module Moonshot
     def handle_early_commands
       # If this is a legacy (Thor) help command, re-write it as
       # OptionParser format.
-      if ARGV[0] == 'help'
+      case ARGV[0]
+      when 'help'
         ARGV.delete_at(0)
         ARGV.push('-h')
-      elsif ARGV[0] == 'new'
+      when 'new'
         app_name = ARGV[1]
         ::Moonshot::Commands::New.run!(app_name)
         return true

data/lib/moonshot/command_line_dispatcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   class CommandLineDispatcher
     def initialize(command, klass, args)
@@ -46,18 +48,14 @@ module Moonshot
 
       # Each mechanism / plugin may manipulate the OptionParser object
       # associated with this command.
-      [:build_mechanism, :deployment_mechanism, :artifact_repository].each do |prov|
+      %i[build_mechanism deployment_mechanism artifact_repository].each do |prov|
         provider = Moonshot.config.send(prov)
 
-        if provider.respond_to?(hook_func_name(@command))
-          parser = provider.send(hook_func_name(@command), parser)
-        end
+        parser = provider.send(hook_func_name(@command), parser) if provider.respond_to?(hook_func_name(@command))
       end
 
       Moonshot.config.plugins.each do |plugin|
-        if plugin.respond_to?(hook_func_name(@command))
-          parser = plugin.send(hook_func_name(@command), parser)
-        end
+        parser = plugin.send(hook_func_name(@command), parser) if plugin.respond_to?(hook_func_name(@command))
       end
 
       parser

data/lib/moonshot/commands/build.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+
+require_relative 'interactive_command'
+
 module Moonshot
   module Commands
     class Build < Moonshot::Command
+      include InteractiveCommand
+
       self.usage = 'build VERSION'
       self.description = 'Build a release artifact, ready for deployment'
 

data/lib/moonshot/commands/console.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pry'
 
 module Moonshot

data/lib/moonshot/commands/create.rb

@@ -1,7 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'parameter_arguments'
+require_relative 'tag_arguments'
+require_relative 'show_all_events_option'
+require_relative 'parent_stack_option'
+
 module Moonshot
   module Commands
     class Create < Moonshot::Command
       include ParameterArguments
+      include TagArguments
       include ShowAllEventsOption
       include ParentStackOption
 
@@ -14,13 +22,19 @@ module Moonshot
         @deploy = true
 
         parser = super
-        parser.on('-d', '--[no-]deploy', TrueClass, 'Choose if code should be deployed immediately after the stack is created') do |v| # rubocop:disable LineLength
+        desc = 'Choose if code should be deployed immediately after the stack is created'
+        parser.on('-d', '--[no-]deploy', TrueClass, desc) do |v|
           @deploy = v
         end
 
-        parser.on('--version VERSION_NAME', 'Version for initial deployment. If unset, a new development build is created from the local directory') do |v| # rubocop:disable LineLength
+        desc = 'Version for initial deployment. If unset, a new development build is created from the local directory'
+        parser.on('--version VERSION_NAME', desc) do |v|
           @version = 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/delete.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     class Delete < Moonshot::Command
@@ -6,6 +8,13 @@ module Moonshot
       self.usage = 'delete [options]'
       self.description = 'Delete an existing environment'
 
+      def parser
+        parser = super
+        parser.on('--template-file=FILE', 'Override the path to the CloudFormation template.') do |v|
+          Moonshot.config.template_file = v
+        end
+      end
+
       def execute
         controller.delete
       end

data/lib/moonshot/commands/deploy.rb

@@ -1,17 +1,13 @@
+# frozen_string_literal: true
+
 module Moonshot
   module Commands
     class Deploy < Moonshot::Command
+      include InteractiveCommand
+
       self.usage = 'deploy VERSION'
       self.description = 'Deploy a versioned release to the environment'
 
-      def parser
-        parser = super
-
-        parser.on('--[no-]interactive', TrueClass, 'Use interactive prompts.') do |v|
-          Moonshot.config.interactive = v
-        end
-      end
-
       def execute(version_name)
         controller.deploy_version(version_name)
       end

data/lib/moonshot/commands/doctor.rb

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