moonshot 0.7.7 → 1.0.0.rc1

data/lib/moonshot/stack_list_printer.rb

@@ -0,0 +1,21 @@
+module Moonshot
+  class StackListPrinter
+    attr_accessor :stacks
+
+    def initialize(stacks)
+      @stacks = stacks
+      @table = UnicodeTable.new('Environment List')
+    end
+
+    def print
+      rows = @stacks.map do |stack|
+        [stack.name, stack.creation_time, stack.status]
+      end
+
+      @table.add_table(rows)
+
+      @table.draw
+      @table.draw_children
+    end
+  end
+end

data/lib/moonshot/stack_lister.rb

@@ -1,20 +1,30 @@
 module Moonshot
   # The StackLister is world renoun for it's ability to list stacks.
   class StackLister
+    EnvironmentDescription = Struct.new(:name, :creation_time, :status)
     include CredsHelper
 
-    def initialize(app_name, log:)
+    def initialize(app_name)
       @app_name = app_name
-      @log = log
     end
 
     def list
-      all_stacks = cf_client.describe_stacks.stacks
-      app_stacks = all_stacks.reject { |s| s.stack_name !~ /^#{@app_name}/ }
+      result = []
+      next_token = nil
+      loop do
+        resp = cf_client.describe_stacks(next_token: next_token)
+        resp.stacks.each do |stack|
+          app_tag = stack.tags.find { |t| t.key == 'moonshot_application' }
+          env_tag = stack.tags.find { |t| t.key == 'moonshot_environment' }
 
-      app_stacks.each do |stack|
-        puts stack.stack_name
+          next unless app_tag && app_tag.value == Moonshot.config.app_name
+          result <<
+            EnvironmentDescription.new(env_tag.value, stack.creation_time, stack.stack_status)
+        end
+        break unless resp.next_token
+        next_token = resp.next_token
       end
+      result.sort_by(&:name)
     end
   end
 end

data/lib/moonshot/stack_parameter.rb

@@ -0,0 +1,64 @@
+module Moonshot
+  class StackParameter
+    attr_reader :name
+    attr_reader :default
+    attr_reader :description
+
+    def initialize(name, default: nil, use_previous: false, description: '')
+      @default      = default
+      @description  = description
+      @name         = name
+      @use_previous = use_previous
+      @value        = nil
+    end
+
+    # Does this Stack Parameter have a default value that will be used?
+    def default?
+      !@default.nil?
+    end
+
+    def use_previous?
+      @use_previous ? true : false
+    end
+
+    # Has the user provided a value for this parameter?
+    def set?
+      !@value.nil?
+    end
+
+    def set(value)
+      @value = value
+      @use_previous = false
+    end
+
+    def use_previous!(value)
+      if @value
+        raise "Value already set for StackParameter #{@name}, cannot use previous value!"
+      end
+
+      # Make the current value available to plugins.
+      @value = value
+      @use_previous = true
+    end
+
+    def value
+      unless @value || default?
+        raise "No value set and no default for StackParameter #{@name}!"
+      end
+
+      @value || default
+    end
+
+    def to_cf
+      result = { parameter_key: @name }
+
+      if use_previous?
+        result[:use_previous_value] = true
+      else
+        result[:parameter_value] = value
+      end
+
+      result
+    end
+  end
+end

data/lib/moonshot/stack_parameter_printer.rb

@@ -9,62 +9,16 @@ module Moonshot
 
     def print
       p_table = @table.add_leaf('Stack Parameters')
-      overrides = @stack.overrides
       rows = @stack.parameters.sort.map do |key, value|
-        t_param = @stack.template.parameters.find do |p|
-          p.name == key
-        end
-
-        properties = determine_change(t_param ? t_param.default : nil,
-                                      overrides[key],
-                                      value)
-
-        [
-          "#{key}:",
-          format_value(value),
-          format_properties(properties)
-        ]
+        ["#{key}:", format_value(value)]
       end
 
       p_table.add_table(rows)
     end
 
-    def determine_change(default, override, current)
-      properties = []
-
-      # If there is a stack override, determine if it would change the current
-      # stack.
-      if override
-        properties << 'overridden'
-        if current == '****'
-          properties << 'may be updated, NoEcho set'
-        elsif override != current
-          properties << "would be updated to #{override}"
-        end
-
-      else
-        # Otherwise, compare the template default with the current value to
-        # determine outcome.
-        properties << 'default'
-        properties << "would be updated to #{default}" if default != current
-      end
-
-      properties
-    end
-
-    def format_properties(properties)
-      string = " (#{properties.join(', ')})"
-
-      if properties.any? { |p| p =~ /be updated/ }
-        string.yellow
-      else
-        string.green
-      end
-    end
-
     def format_value(value)
-      if value.size > 40
-        value[0..40] + '...'
+      if value.size > 60
+        value[0..60] + '...'
       else
         value
       end

data/lib/moonshot/stack_template.rb

@@ -1,39 +1,27 @@
-require 'json'
+require_relative 'stack_parameter'
 
 module Moonshot
-  # A StackTemplate loads the JSON template from disk and stores information
+  # A StackTemplate loads the template from disk and stores information
   # about it.
   class StackTemplate
-    Parameter = Struct.new(:name, :default) do
-      def required?
-        default.nil?
-      end
-    end
-
-    attr_reader :body
-
-    def initialize(filename, log:)
-      @log = log
-
-      unless File.exist?(filename)
-        @log.error("Could not find CloudFormation template at #{filename}")
-        raise
-      end
-
-      # The maximum TemplateBody length is 51,200 bytes, so we remove
-      # formatting white space.
-      @body = JSON.parse(File.read(filename)).to_json
+    def initialize(filename)
+      @filename = filename
     end
 
     def parameters
-      JSON.parse(@body).fetch('Parameters', {}).map do |k, v|
-        Parameter.new(k, v['Default'])
+      template_body.fetch('Parameters', {}).map do |k, v|
+        StackParameter.new(k,
+                           default: v['Default'],
+                           description: v.fetch('Description', ''))
       end
     end
 
-    # Return a list of defined resource names in the template.
     def resource_names
-      JSON.parse(@body).fetch('Resources', {}).keys
+      template_body.fetch('Resources', {}).keys
+    end
+
+    def exist?
+      File.exist?(@filename)
     end
   end
 end

data/lib/moonshot/task.rb

@@ -0,0 +1,10 @@
+module Moonshot
+  class Task
+    attr_reader :name, :desc, :block
+    def initialize(name, desc, &block)
+      @name = name.to_sym
+      @desc = desc
+      @block = block
+    end
+  end
+end

data/lib/moonshot/tools/asg_rollout.rb

@@ -4,7 +4,7 @@ require_relative 'asg_rollout/hook_exec_environment'
 
 module Moonshot
   module Tools
-    class ASGRollout # rubocop:disable Documentation
+    class ASGRollout
       attr_accessor :config
 
       def initialize(controller:, logical_id:)

data/lib/moonshot/tools/asg_rollout/instance_health.rb

@@ -1,7 +1,7 @@
 module Moonshot
   module Tools
     class ASGRollout
-      class InstanceHealth # rubocop:disable Documentation
+      class InstanceHealth
         attr_reader :asg_status, :elb_status
 
         VALID_ASG_IN_SERVICE_STATES = ['InService'].freeze

data/lib/moonshot/tools/asg_rollout_config.rb

@@ -1,6 +1,6 @@
 module Moonshot
   module Tools
-    class ASGRolloutConfig # rubocop:disable Documentation
+    class ASGRolloutConfig
       attr_reader :pre_detach, :terminate_when, :terminate_when_timeout, :terminate
       attr_accessor :terminate_when_delay, :instance_health_delay
 

data/lib/moonshot/yaml_stack_template.rb

@@ -0,0 +1,17 @@
+require 'yaml'
+require_relative 'stack_template'
+
+module Moonshot
+  # Handles YAML formatted AWS template files.
+  class YamlStackTemplate < StackTemplate
+    def body
+      template_body.to_yaml
+    end
+
+    private
+
+    def template_body
+      @template_body ||= YAML.load_file(@filename)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -212,32 +226,56 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A library for launching services into AWS.
+description: A library and CLI tool for launching services into AWS.
 email: engineering@acquia.com
-executables: []
+executables:
+- moonshot
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/moonshot
+- lib/default/Moonfile.rb
 - lib/moonshot.rb
+- lib/moonshot/always_use_default_source.rb
 - lib/moonshot/artifact_repository/s3_bucket.rb
 - lib/moonshot/artifact_repository/s3_bucket_via_github_releases.rb
+- lib/moonshot/ask_user_source.rb
 - lib/moonshot/build_mechanism/github_release.rb
 - lib/moonshot/build_mechanism/script.rb
 - lib/moonshot/build_mechanism/travis_deploy.rb
 - lib/moonshot/build_mechanism/version_proxy.rb
-- lib/moonshot/cli.rb
+- lib/moonshot/command.rb
+- lib/moonshot/command_line.rb
+- lib/moonshot/commands/build.rb
+- lib/moonshot/commands/console.rb
+- lib/moonshot/commands/create.rb
+- lib/moonshot/commands/delete.rb
+- lib/moonshot/commands/deploy.rb
+- lib/moonshot/commands/doctor.rb
+- lib/moonshot/commands/list.rb
+- lib/moonshot/commands/new.rb
+- lib/moonshot/commands/parameter_arguments.rb
+- lib/moonshot/commands/push.rb
+- lib/moonshot/commands/ssh.rb
+- lib/moonshot/commands/status.rb
+- lib/moonshot/commands/update.rb
+- lib/moonshot/commands/version.rb
+- lib/moonshot/config.rb
 - lib/moonshot/controller.rb
 - lib/moonshot/controller_config.rb
 - lib/moonshot/creds_helper.rb
 - lib/moonshot/default_strategy.rb
 - lib/moonshot/deployment_mechanism/code_deploy.rb
 - lib/moonshot/doctor_helper.rb
-- lib/moonshot/environment_parser.rb
 - lib/moonshot/interactive_logger_proxy.rb
+- lib/moonshot/json_stack_template.rb
 - lib/moonshot/merge_strategy.rb
+- lib/moonshot/parameter_collection.rb
+- lib/moonshot/parent_stack_parameter_loader.rb
 - lib/moonshot/resources.rb
 - lib/moonshot/resources_helper.rb
 - lib/moonshot/shell.rb
+- lib/moonshot/ssh_command.rb
 - lib/moonshot/ssh_command_builder.rb
 - lib/moonshot/ssh_config.rb
 - lib/moonshot/ssh_fork_executor.rb
@@ -246,10 +284,13 @@ files:
 - lib/moonshot/stack_asg_printer.rb
 - lib/moonshot/stack_config.rb
 - lib/moonshot/stack_events_poller.rb
+- lib/moonshot/stack_list_printer.rb
 - lib/moonshot/stack_lister.rb
 - lib/moonshot/stack_output_printer.rb
+- lib/moonshot/stack_parameter.rb
 - lib/moonshot/stack_parameter_printer.rb
 - lib/moonshot/stack_template.rb
+- lib/moonshot/task.rb
 - lib/moonshot/tools/asg_rollout.rb
 - lib/moonshot/tools/asg_rollout/asg.rb
 - lib/moonshot/tools/asg_rollout/asg_instance.rb
@@ -257,6 +298,7 @@ files:
 - lib/moonshot/tools/asg_rollout/instance_health.rb
 - lib/moonshot/tools/asg_rollout_config.rb
 - lib/moonshot/unicode_table.rb
+- lib/moonshot/yaml_stack_template.rb
 - lib/plugins/backup.rb
 homepage: https://github.com/acquia/moonshot
 licenses:
@@ -273,14 +315,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: A library for launching services into AWS
+summary: A library and CLI tool for launching services into AWS
 test_files: []
 has_rdoc: 

data/lib/moonshot/cli.rb

@@ -1,220 +0,0 @@
-require 'interactive-logger'
-require_relative 'default_strategy'
-require_relative 'merge_strategy'
-
-# Base class for Moonshot-powered project tooling.
-module Moonshot
-  # The main entry point for Moonshot, this class should be extended by
-  # project tooling.
-  class CLI < Thor # rubocop:disable ClassLength
-    class_option(:name, aliases: 'n', default: nil, type: :string)
-    class_option(:interactive_logger, type: :boolean, default: true)
-    class_option(:verbose, aliases: 'v', type: :boolean)
-
-    class << self
-      attr_accessor :application_name
-      attr_accessor :artifact_repository
-      attr_accessor :auto_prefix_stack
-      attr_accessor :build_mechanism
-      attr_accessor :deployment_mechanism
-      attr_accessor :default_parent_stack
-      attr_accessor :default_parameter_strategy
-      attr_reader :plugins
-
-      def plugin(plugin)
-        @plugins ||= []
-        @plugins << plugin
-      end
-
-      def parent(value)
-        @default_parent_stack = value
-      end
-
-      def parameter_strategy(strategy)
-        @default_parameter_strategy = strategy
-      end
-
-      def check_class_configuration
-        raise Thor::Error, 'No application_name is set!' unless application_name
-      end
-
-      def exit_on_failure?
-        true
-      end
-
-      def inherited(base)
-        base.include(Moonshot::ArtifactRepository)
-        base.include(Moonshot::BuildMechanism)
-        base.include(Moonshot::DeploymentMechanism)
-      end
-
-      def ssh_options!
-        option :user, default: ENV['MOONSHOT_SSH_USER'] || ENV['USER'], type: :string,
-                      aliases: '-l',
-                      desc: 'Specifies the user to log in as on the remote machine.'
-        option :identity_file, default: ENV['MOONSHOT_SSH_KEY_FILE'], type: :string,
-                               aliases: '-i',
-                               desc: 'Selects a file from which the identity (private key) for '\
-                                     'public key authentication is read.'
-        option :instance, default: nil, type: :string, aliases: '-s',
-                          desc: 'Connect to specified instance ID instead of the first one.'
-        option :command, default: nil, type: :string, aliases: '-c',
-                         desc: 'Execute the specified command instead of opening a shell.'
-        option :auto_scaling_group, default: nil, type: :string, aliases: '-g',
-                                    desc: 'The logical ID of the auto scaling group to SSH into. '\
-                                    'Mandatory if the stack has multiple ASGs, '\
-                                    'ignored if you have only one.'
-      end
-    end
-
-    def initialize(*args)
-      super
-      @log = Logger.new(STDOUT)
-      @log.formatter = proc do |s, d, _, msg|
-        "[#{self.class.name} #{s} #{d.strftime('%T')}] #{msg}\n"
-      end
-      @log.level = options[:verbose] ? Logger::DEBUG : Logger::INFO
-
-      EnvironmentParser.parse(@log)
-      self.class.check_class_configuration
-    end
-
-    no_tasks do
-      # Build a Moonshot::Controller from the CLI options.
-      def controller # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity
-        Moonshot::Controller.new do |config|
-          config.app_name             = self.class.application_name
-          config.artifact_repository  = self.class.artifact_repository
-          config.auto_prefix_stack    = self.class.auto_prefix_stack
-          config.build_mechanism      = self.class.build_mechanism
-          config.deployment_mechanism = self.class.deployment_mechanism
-          config.environment_name     = options[:name]
-          config.logger               = @log
-
-          # Degrade to a more compatible logger if the terminal seems outdated,
-          # or at the users request.
-          if !$stdout.isatty || !options[:interactive_logger]
-            config.interactive_logger = InteractiveLoggerProxy.new(@log)
-          end
-
-          config.show_all_stack_events = true if options[:show_all_events]
-          config.plugins = self.class.plugins if self.class.plugins
-
-          if options[:parent]
-            config.parent_stacks << options[:parent]
-          elsif self.class.default_parent_stack
-            config.parent_stacks << self.class.default_parent_stack
-          end
-
-          parameter_strategy = options[:parameter_strategy] || self.class.default_parameter_strategy
-          config.parameter_strategy = parameter_strategy_factory(parameter_strategy) \
-            unless parameter_strategy.nil?
-
-          config.ssh_config.ssh_user = options[:user]
-          config.ssh_config.ssh_identity_file = options[:identity_file]
-          config.ssh_instance = options[:instance]
-          config.ssh_command = options[:command]
-          config.ssh_auto_scaling_group_name = options[:auto_scaling_group]
-        end
-      rescue => e
-        raise Thor::Error, e.message
-      end
-
-      def parameter_strategy_factory(value)
-        case value.to_sym
-        when :default
-          Moonshot::ParameterStrategy::DefaultStrategy.new
-        when :merge
-          Moonshot::ParameterStrategy::MergeStrategy.new
-        else
-          raise Thor::Error, "Unknown parameter strategy: #{value}"
-        end
-      end
-
-      def ssh_command(command)
-        arguments = ARGV.drop(1)
-        arguments += ['--command', command]
-        invoke :ssh, [], arguments
-      end
-    end
-
-    desc :list, 'List stacks for this application.'
-    def list
-      controller.list
-    end
-
-    desc :create, 'Create a new environment.'
-    option(
-      :parent,
-      type: :string,
-      aliases: '-p',
-      desc: "Parent stack to import parameters from. (Default: #{default_parent_stack || 'None'})")
-    option :deploy, default: true, type: :boolean, aliases: '-d',
-                    desc: 'Choose if code should be deployed after stack is created'
-    option :version, default: nil, type: :string,
-                     desc: 'Version to deploy. Only valid if deploy flag is set.'
-    option :show_all_events, desc: 'Show all stack events during update. (Default: errors only)'
-    def create
-      controller.create
-
-      if options[:deploy]
-        if options[:version].nil?
-          controller.deploy_code
-        else
-          controller.deploy_version(options[:version])
-        end
-      end
-    end
-
-    desc :update, 'Update the CloudFormation stack within an environment.'
-    option(
-      :parameter_strategy,
-      type: :string,
-      desc: 'Override default parameter strategy.')
-    option(
-      :show_all_events,
-      type: :boolean,
-      desc: 'Show all stack events during update. (Default: errors only)')
-    def update
-      controller.update
-    end
-
-    desc :status, 'Get the status of an existing environment.'
-    def status
-      controller.status
-    end
-
-    desc 'deploy-code', 'Create a build from the working directory, and deploy it.' # rubocop:disable LineLength
-    def deploy_code
-      controller.deploy_code
-    end
-
-    desc 'build-version VERSION', 'Build a tarball of the software, ready for deployment.' # rubocop:disable LineLength
-    def build_version(version_name)
-      controller.build_version(version_name)
-    end
-
-    desc 'deploy-version VERSION_NAME', 'Deploy a versioned release to both EB environments in an environment.' # rubocop:disable LineLength
-    def deploy_version(version_name)
-      controller.deploy_version(version_name)
-    end
-
-    desc :delete, 'Delete an existing environment.'
-    option :show_all_events, desc: 'Show all stack events during update. (Default: errors only)'
-    def delete
-      controller.delete
-    end
-
-    desc :doctor, 'Run configuration checks against current environment.'
-    def doctor
-      success = controller.doctor
-      raise Thor::Error, 'One or more checks failed.' unless success
-    end
-
-    desc :ssh, 'SSH into the first or specified instance on the stack.'
-    ssh_options!
-    def ssh
-      controller.ssh
-    end
-  end
-end