moonshot 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 817938d5e697cd44c2c346438043111c7d323538
-  data.tar.gz: 68b387fdfbfc3c191c6b7270fd241112f39cec92
+  metadata.gz: 4efa7393335490c5e80a03e6f3c733727c75acdf
+  data.tar.gz: 185c228d9dcec000b92fafca815cf9ac9b36ebf4
 SHA512:
-  metadata.gz: b6e66c46e218e4e1763b11bed6043a7b9225b6962a7de5cf8ffd59519666d4e38ccb72c4e783a3f40ca0b3454faa9f51c00e8f5efcf683bd5c8663fa34b7efd3
-  data.tar.gz: f675f519b87322a2802d5198b399ce78a16e616bf2b573466e685c36460ddbbc2ffc78e55630b255179aa26db26829f032b14087d98596227a83195df901284a
+  metadata.gz: 17624a530e39bbe1179a776c082d9f1b4e5d2b8ea68dd0c0fc811d3767b5a4b014721b6b41d7253ba973d33772ee1cfb2b4b7c9345bfeef5625dcbeb9e045646
+  data.tar.gz: ca1d90df3feba59452c6d0a5c6bf63467c73d7fc009c2fda144cfce826a31e7f6184c1042b6bfbf99256baaab37ae9a4cabcb8cd5de03e162c2fd5f21d0cd63f

data/lib/moonshot/artifact_repository/s3_bucket.rb

@@ -12,8 +12,9 @@ class Moonshot::ArtifactRepository::S3Bucket
 
   attr_reader :bucket_name
 
-  def initialize(bucket_name)
+  def initialize(bucket_name, prefix: '')
     @bucket_name = bucket_name
+    @prefix = prefix
   end
 
   def store_hook(build_mechanism, version_name)
@@ -32,7 +33,7 @@ class Moonshot::ArtifactRepository::S3Bucket
   end
 
   def filename_for_version(version_name)
-    "#{version_name}.tar.gz"
+    "#{@prefix}#{version_name}.tar.gz"
   end
 
   private

data/lib/moonshot/cli.rb

@@ -121,10 +121,19 @@ module Moonshot
       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
-      controller.deploy_code if options[:deploy]
+
+      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.'

data/lib/moonshot/controller.rb

@@ -32,9 +32,10 @@ module Moonshot
     end
 
     def status
-      run_plugins(:status)
+      run_plugins(:pre_status)
       run_hook(:deploy, :status)
       stack.status
+      run_plugins(:post_status)
     end
 
     def deploy_code

data/lib/moonshot/default_strategy.rb

@@ -1,13 +1,12 @@
 module Moonshot
   module ParameterStrategy
-    # Default strategy: grabbing every parameter
-    # from the parameter file.
+    # Default strategy: use parameter defined in the parameter file
     class DefaultStrategy
-      def parameters(_, overrides)
-        overrides.map do |key, _|
+      def parameters(params, _, _)
+        params.map do |key, _|
           {
             parameter_key: key,
-            parameter_value: overrides[key],
+            parameter_value: params[key],
             use_previous_value: false
           }
         end

data/lib/moonshot/merge_strategy.rb

@@ -3,16 +3,19 @@ require_relative 'unicode_table'
 
 module Moonshot
   module ParameterStrategy
-    # Merge strategy: merging parameter values
-    # declared in the parameter file, otherwise
-    # using previous value.
+    # Merge strategy: prefer parameter values defined in the parameter file,
+    # otherwise use the previously set value on the existing stack.
     class MergeStrategy
-      def parameters(current, overrides)
-        current.map do |key, _|
-          if overrides[key]
+      def parameters(params, stack_params, template)
+        stack_keys = stack_params.keys.select do |k|
+          template.parameters.any? { |p| p.name == k }
+        end
+
+        (params.keys + stack_keys).uniq.map do |key|
+          if params[key]
             {
               parameter_key: key,
-              parameter_value: overrides[key],
+              parameter_value: params[key],
               use_previous_value: false
             }
           else

data/lib/moonshot/stack.rb

@@ -138,7 +138,7 @@ module Moonshot
     # update.
     def overrides
       if File.exist?(parameters_file)
-        YAML.load_file(parameters_file)
+        YAML.load_file(parameters_file) || {}
       else
         {}
       end
@@ -260,7 +260,11 @@ module Moonshot
         stack_name: @name,
         template_body: template.body,
         capabilities: ['CAPABILITY_IAM'],
-        parameters: @config.parameter_strategy.parameters(parameters, overrides)
+        parameters: @config.parameter_strategy.parameters(
+          overrides,
+          parameters,
+          template
+        )
       )
       true
     rescue Aws::CloudFormation::Errors::ValidationError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk