simple_deploy 0.6.7 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+## v0.7.0:
+
+* Added --as-command-args argument to outputs command
+* Added support to read stack parameters from other stack outputs
+* Better handling of errors for deploy/execute commands (#149, #150, #155)
+
 ## v0.6.7:
 
 * Upgraded to stackster 0.4.2

data/lib/simple_deploy/cli/create.rb

@@ -17,8 +17,13 @@ simple_deploy create -n STACK_NAME -t PATH_TO_TEMPLATE -e ENVIRONMENT -a KEY1=VA
 
 EOS
           opt :help, "Display Help"
-          opt :attributes, "= seperated attribute and it's value", :type  => :string,
+          opt :attributes, "= seperated attribute(s) and it's value. \
+Can be specified multiple times.", :type  => :string,
                                                                    :multi => true
+          opt :input_stack, "Read outputs from given stack(s) and map them \
+to parameter inputs in the new stack. These will be passed to inputs with \
+matching or pluralized names. Can be specified multiple times.", :type  => :string,
+                                :multi => true
           opt :environment, "Set the target environment", :type => :string
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
@@ -29,29 +34,44 @@ EOS
         valid_options? :provided => @opts,
                        :required => [:environment, :name, :template]
 
-        config = Config.new.environment @opts[:environment]
-
-        attributes = parse_attributes :attributes => @opts[:attributes]
+        @config = Config.new.environment @opts[:environment]
 
         stack = Stack.new :environment => @opts[:environment],
                           :name        => @opts[:name],
-                          :config      => config,
+                          :config      => @config,
                           :logger      => logger
 
         rescue_stackster_exceptions_and_exit do
-          stack.create :attributes => attributes,
+          stack.create :attributes => merged_attributes,
                        :template   => @opts[:template]
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Create a new stack'
       end
 
+      private
+
+      def merged_attributes
+        provided_attributes = parse_attributes :attributes => @opts[:attributes]
+
+        attribute_merger.merge :attributes   => provided_attributes,
+                               :config       => @config,
+                               :logger       => @logger,
+                               :environment  => @opts[:environment],
+                               :input_stacks => @opts[:input_stack],
+                               :template     => @opts[:template]
+      end
+
+      def attribute_merger
+        SimpleDeploy::Misc::AttributeMerger.new
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
     end
 
   end

data/lib/simple_deploy/cli/execute.rb

@@ -50,8 +50,10 @@ EOS
                             :internal    => @opts[:internal]
 
           begin
-            stack.execute :command => @opts[:command],
-                          :sudo    => @opts[:sudo]
+            unless stack.execute :command => @opts[:command],
+                                 :sudo    => @opts[:sudo]
+              exit 1
+            end
           rescue SimpleDeploy::Exceptions::NoInstances
             logger.error "Stack has no running instances."
             exit 1

data/lib/simple_deploy/cli/outputs.rb

@@ -17,6 +17,8 @@ simple_deploy outputs -n STACK_NAME -e ENVIRONMENT
 
 EOS
           opt :help, "Display Help"
+          opt :as_command_args,
+              "Displays the attributes in a format suitable for using on the command line"
           opt :environment, "Set the target environment", :type => :string
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'warn'
@@ -34,25 +36,37 @@ EOS
                           :logger      => logger
 
         rescue_stackster_exceptions_and_exit do
-          outputs = stack.outputs
+          @outputs = stack.outputs
 
-          logger.info "No outputs." unless outputs.any?
+          logger.info "No outputs." unless @outputs.any?
 
-          outputs.each do |hash|
-            puts "%s: %s" % [hash['OutputKey'], hash['OutputValue']]
-          end
+          @opts[:as_command_args] ? command_args_output : default_output
         end
       end
 
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def command_summary
         'Show outputs of a stack'
       end
 
-    end
+      private
+
+      def command_args_output
+        @outputs.each do |hash|
+          print "-a %s=%s " % [hash['OutputKey'], hash['OutputValue']]
+        end
+        puts ""
+      end
 
+      def default_output
+        @outputs.each do |hash|
+          puts "%s: %s" % [hash['OutputKey'], hash['OutputValue']]
+        end
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+    end
   end
 end

data/lib/simple_deploy/exceptions.rb

@@ -8,6 +8,12 @@ module SimpleDeploy
         @message = message
       end
     end
+    
+    class NoInstances < Base
+    end
+
+    class Exceptions::NoInstances < Base
+    end
 
   end
 end

data/lib/simple_deploy/misc/attribute_merger.rb

@@ -0,0 +1,45 @@
+module SimpleDeploy
+  module Misc
+    class AttributeMerger
+
+      def merge(args)
+        @attributes   = args[:attributes]
+        @config       = args[:config]
+        @environment  = args[:environment]
+        @logger       = args[:logger]
+        @input_stacks = args[:input_stacks]
+        @template     = args[:template]
+
+        combine_provided_and_mapped_attributes
+      end
+
+      private
+
+      def combine_provided_and_mapped_attributes
+        @attributes + mapped_attributes_not_provided
+      end
+
+      def mapped_attributes
+        mapper.map_outputs_from_stacks :stacks   => @input_stacks,
+                                       :template => @template
+      end
+
+      def mapped_attributes_not_provided
+        mapped_attributes.reject do |a|
+          provided_attribute_keys.include? a.keys.first
+        end
+      end
+
+      def provided_attribute_keys
+        @attributes.map {|a| a.keys.first}
+      end
+
+      def mapper
+        @om ||= Stack::OutputMapper.new :environment => @environment,
+                                        :config      => @config,
+                                        :logger      => @logger
+      end
+
+    end
+  end
+end

data/lib/simple_deploy/misc.rb

@@ -0,0 +1 @@
+require 'simple_deploy/misc/attribute_merger'

data/lib/simple_deploy/stack/output_mapper.rb

@@ -0,0 +1,88 @@
+module SimpleDeploy
+  class Stack
+    class OutputMapper
+
+      def initialize(args)
+        @config      = args[:config]
+        @environment = args[:environment]
+        @logger      = args[:logger]
+      end
+
+      def map_outputs_from_stacks(args)
+        @stacks   = args[:stacks]
+        @template = args[:template]
+        @results  = {}
+
+        merge_stacks_outputs
+
+        pluralize_keys
+
+        prune_unused_parameters
+
+        @results.each_pair do |key, value|
+          @logger.info "Mapping output '#{key}' to input parameter with value '#{value}'."
+        end
+
+        @results.map { |x| { x.first => x.last } }
+      end
+
+      private
+
+      def merge_stacks_outputs
+        count = 0
+
+        @stacks.each do |s|
+          count += 1
+          @logger.info "Reading outputs from stack '#{s}'."
+          stack = Stack.new :environment => @environment,
+                            :config      => @config,
+                            :logger      => @logger,
+                            :name        => s
+          stack.wait_for_stable
+          merge_outputs stack
+          SimpleDeploy::Backoff.exp_periods(count < 5 ? count : 5) do |backoff|
+            @logger.info "Backing off for #{backoff} seconds."
+            sleep backoff
+          end
+        end
+      end
+
+      def merge_outputs(stack)
+        stack.outputs.each do |output|
+          key   = output['OutputKey']
+          value = output['OutputValue']
+
+          @logger.debug "Read output #{key}=#{value}."
+
+          if @results.has_key? key
+            @results[key] += ",#{value}"
+          else
+            @results[key] = value
+          end
+        end
+      end
+
+      def pluralize_keys
+        plural_params = @results.each_with_object({}) do |results, new|
+          key            = results.first
+          pluralized_key = "#{key}s"
+
+          if template_parameters.include? pluralized_key
+            new[pluralized_key] = results[1]
+          end
+        end
+
+        @results.merge! plural_params
+      end
+
+      def prune_unused_parameters
+        @results.select! { |key| template_parameters.include? key }
+      end
+
+      def template_parameters
+        @parameters ||= Template.new(:file => @template).parameters
+      end
+
+    end
+  end
+end

data/lib/simple_deploy/stack/ssh.rb

@@ -20,7 +20,22 @@ module SimpleDeploy
       def execute(args)
         return false if @instances.nil? || @instances.empty?
         create_execute_task args
-        @task.execute
+
+        status = false
+
+        begin
+          @task.execute
+          status = true
+          @logger.info "Command executed against instances successfully."
+        rescue ::Capistrano::CommandError => error
+          @logger.error "Error running execute statement: #{error}"
+        rescue ::Capistrano::ConnectionError => error
+          @logger.error "Error connecting to instances: #{error}"
+        rescue ::Capistrano::Error => error
+          @logger.error "Error: #{error}"
+        end
+
+        status
       end
 
       private

data/lib/simple_deploy/stack.rb

@@ -1,6 +1,7 @@
 require 'stackster'
 require 'simple_deploy/stack/deployment'
 require 'simple_deploy/stack/execute'
+require 'simple_deploy/stack/output_mapper'
 require 'simple_deploy/stack/stack_attribute_formater'
 
 module SimpleDeploy

data/lib/simple_deploy/template.rb

@@ -0,0 +1,21 @@
+module SimpleDeploy
+  class Template
+    def initialize(args)
+      @file = args[:file]
+    end
+
+    def parameters
+      parsed_template_contents.fetch('Parameters', {}).keys
+    end
+
+    private
+
+    def parsed_template_contents
+      JSON.parse contents
+    end
+
+    def contents
+      @contents ||= IO.read @file
+    end
+  end
+end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/lib/simple_deploy.rb

@@ -3,6 +3,8 @@ require 'simple_deploy/exceptions'
 require 'simple_deploy/config'
 require 'simple_deploy/artifact'
 require 'simple_deploy/stack'
+require 'simple_deploy/misc'
+require 'simple_deploy/template'
 require 'simple_deploy/notifier'
 require 'simple_deploy/logger'
 require 'simple_deploy/version'

data/spec/cli/create_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe SimpleDeploy::CLI::Create do
+  before do
+    @config_object         = mock 'config'
+    @config_env            = mock 'environment config'
+    @stack_mock            = mock 'stack'
+    @attribute_merger_mock = mock 'attribute merger'
+    @logger                = stub 'logger', :info => true
+
+    @options = { :attributes  => [ 'attr1=val1' ],
+                 :input_stack => [ 'stack1' ],
+                 :environment => 'test',
+                 :name        => 'mytest',
+                 :log_level   => 'info',
+                 :template    => '/tmp/test.json' }
+    Trollop.stub :options => @options
+    SimpleDeploy::Config.stub :new => @config_object
+    SimpleDeploy::SimpleDeployLogger.should_receive(:new).
+                                     with(:log_level => 'info').
+                                     and_return @logger
+    @config_object.stub :environments => { 'test' => 'config_data' }
+    @config_object.should_receive(:environment).with('test').
+                   and_return 'config_data'
+    SimpleDeploy::Stack.should_receive(:new).
+                        with(:environment => 'test',
+                             :name        => 'mytest',
+                             :config      => 'config_data',
+                             :logger      => @logger).
+                        and_return(@stack_mock)
+    SimpleDeploy::Misc::AttributeMerger.stub :new => @attribute_merger_mock
+    merge_options = { :attributes   => [ { "attr1" => "val1" } ], 
+                      :config       => 'config_data', 
+                      :logger       => @logger,
+                      :environment  => 'test',
+                      :template     => '/tmp/test.json',
+                      :input_stacks => ["stack1"] }
+    @attribute_merger_mock.should_receive(:merge).with(merge_options).
+                           and_return({ "attr1" => "val1",
+                                        "attr2" => "val2" })
+    @create = SimpleDeploy::CLI::Create.new
+  end
+
+  it "should create a stack with provided and merged attributes" do
+    @stack_mock.should_receive(:create).
+                with({ :attributes => { "attr1" => "val1",
+                                        "attr2" => "val2" },
+                       :template   => '/tmp/test.json' })
+    @create.create
+  end
+end

data/spec/cli/outputs_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'simple_deploy/cli'
+
+describe SimpleDeploy::CLI::Outputs do
+
+  before do
+    @config_object = mock 'config'
+    @config_env    = mock 'environment config'
+    @stack         = mock 'stack'
+    @logger        = stub 'logger'
+    @options       = { :environment => 'test',
+                       :log_level   => 'info',
+                       :name        => 'mytest' }
+    @data          = [{ 'OutputKey' => 'key1', 'OutputValue' => 'value1' },
+                      { 'OutputKey' => 'key2', 'OutputValue' => 'value2' }]
+    Trollop.stub :options => @options
+    @config_object.stub(:environments => { 'test' => 'data' })
+    SimpleDeploy::Config.stub :new => @config_object
+    SimpleDeploy::SimpleDeployLogger.should_receive(:new).
+                                     with(:log_level => 'info').
+                                     and_return @logger
+    SimpleDeploy::Stack.should_receive(:new).
+                        with(:environment => 'test',
+                             :name        => 'mytest',
+                             :config      => @config_env,
+                             :logger      => @logger).
+                        and_return(@stack)
+    @stack.stub :outputs => @data
+    @config_object.should_receive(:environment).with('test').
+                                                and_return @config_env
+    @outputs = SimpleDeploy::CLI::Outputs.new
+  end
+
+  it "should successfully return the show command with default values" do
+    @outputs.should_receive(:puts).with('key1: value1')
+    @outputs.should_receive(:puts).with('key2: value2')
+    @outputs.show
+  end
+
+  it "should successfully return the show command with as_command_args" do
+    @options[:as_command_args] = true
+    @outputs.should_receive(:print).with('-a key1=value1 ')
+    @outputs.should_receive(:print).with('-a key2=value2 ')
+    @outputs.should_receive(:puts).with('')
+    @outputs.show
+  end
+
+end

data/spec/misc/attribute_merger_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe SimpleDeploy::Misc::AttributeMerger do
+
+  before do
+    @config_mock = mock 'config'
+    @mapper_mock = mock 'mapper'
+    @logger_stub = stub 'logger', :info => true
+
+    @stacks  = ['stack1', 'stack2']
+    @options = { :config      => @config_mock,
+                 :environment  => 'default',
+                 :logger       => @logger_stub,
+                 :attributes   => [ { 'attrib1' => 'val1' } ],
+                 :input_stacks => @stacks,
+                 :template     => '/tmp/file.json' }
+    SimpleDeploy::Stack::OutputMapper.should_receive(:new).
+                                    with(:environment => @options[:environment],
+                                         :config      => @options[:config],
+                                         :logger      => @options[:logger]).
+                                    and_return @mapper_mock
+    @merger = SimpleDeploy::Misc::AttributeMerger.new
+  end
+
+  it "should return the consolidated list of attributes" do
+    @mapper_mock.should_receive(:map_outputs_from_stacks).
+                 with(:stacks   => @options[:input_stacks],
+                      :template => @options[:template]).
+                 and_return [ { 'attrib2' => 'val2' } ]
+    @merger.merge(@options).should == [ { 'attrib1' => 'val1' },
+                                        { 'attrib2' => 'val2' } ]
+  end
+
+  it "should return provided attributes over outputs" do
+    @mapper_mock.should_receive(:map_outputs_from_stacks).
+                 with(:stacks   => @options[:input_stacks],
+                      :template => @options[:template]).
+                 and_return [ { 'attrib1' => 'val2' } ]
+    @merger.merge(@options).should == [ { 'attrib1' => 'val1' } ]
+  end
+end

data/spec/stack/output_mapper_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe SimpleDeploy::Stack::OutputMapper do
+  before do
+    @config_mock = mock 'config'
+    @logger_stub = stub 'logger', :debug => true, :info => true
+
+    stack1_outputs = [ { 'OutputKey' => 'Test1', 'OutputValue' => 'val1' },
+                       { 'OutputKey' => 'Nother', 'OutputValue' => 'another' } ]
+
+    stack2_outputs = [ { 'OutputKey' => 'Test2', 'OutputValue' => 'val2' },
+                       { 'OutputKey' => 'NotMe', 'OutputValue' => 'another' } ]
+
+    stack3_outputs = [ { 'OutputKey' => 'Test1', 'OutputValue' => 'valA' } ]
+
+    stack4_outputs = [ { 'OutputKey' => 'Test', 'OutputValue' => 'val' } ]
+
+    @stack1_stub = stub 'stack1', :outputs => stack1_outputs, :wait_for_stable => true
+    @stack2_stub = stub 'stack2', :outputs => stack2_outputs, :wait_for_stable => true
+    @stack3_stub = stub 'stack3', :outputs => stack3_outputs, :wait_for_stable => true
+    @stack4_stub = stub 'stack4', :outputs => stack4_outputs, :wait_for_stable => true
+
+    @template_stub = stub 'template', :parameters => ["Test1", "Test2", "Tests"]
+
+    @mapper = SimpleDeploy::Stack::OutputMapper.new :config      => @config_mock,
+                                                    :environment => 'default',
+                                                    :logger      => @logger_stub
+  end
+
+  context "when provided stacks" do
+    before do
+      SimpleDeploy::Template.should_receive(:new).
+                             with(:file => '/tmp/file.json').
+                             and_return @template_stub
+    end
+
+    it "should return the outputs which match parameters" do
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'default',
+                               :config      => @config_mock,
+                               :logger      => @logger_stub,
+                               :name        => 'stack1').
+                          and_return @stack1_stub
+      @mapper.should_receive(:sleep)
+      @mapper.map_outputs_from_stacks(:stacks   => ['stack1'],
+                                      :template => '/tmp/file.json').
+              should == [{ 'Test1' => 'val1' }]
+    end
+
+    it "should return the outputs which match pluralized parameters" do
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'default',
+                               :config      => @config_mock,
+                               :logger      => @logger_stub,
+                               :name        => 'stack4').
+                          and_return @stack4_stub
+      @mapper.should_receive(:sleep)
+      @mapper.map_outputs_from_stacks(:stacks   => ['stack4'],
+                                      :template => '/tmp/file.json').
+              should == [{ 'Tests' => 'val' }]
+    end
+
+    it "should return the outputs which match parameters from multiple stacks" do
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'default',
+                               :config      => @config_mock,
+                               :logger      => @logger_stub,
+                               :name        => 'stack1').
+                          and_return @stack1_stub
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'default',
+                               :config      => @config_mock,
+                               :logger      => @logger_stub,
+                               :name        => 'stack2').
+                          and_return @stack2_stub
+      @mapper.should_receive(:sleep).exactly(3).times
+      @mapper.map_outputs_from_stacks(:stacks   => ['stack1', 'stack2'],
+                                      :template => '/tmp/file.json').
+              should == [{ 'Test1' => 'val1' }, {'Test2' => 'val2' }]
+    end
+
+    it "should concatenate multiple outputs of same name into CSV" do
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'default',
+                               :config      => @config_mock,
+                               :logger      => @logger_stub,
+                               :name        => 'stack1').
+                          and_return @stack1_stub
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'default',
+                               :config      => @config_mock,
+                               :logger      => @logger_stub,
+                               :name        => 'stack3').
+                          and_return @stack3_stub
+      @mapper.should_receive(:sleep).exactly(3).times
+      @mapper.map_outputs_from_stacks(:stacks   => ['stack1', 'stack3'],
+                                      :template => '/tmp/file.json').
+              should == [{ 'Test1' => 'val1,valA' }]
+    end
+  end
+
+  it "should return an empty hash if no stacks are specified" do
+    @mapper.map_outputs_from_stacks(:stacks   => [],
+                                    :template => '/tmp/file.json').
+            should == []
+  end
+
+end

data/spec/stack/ssh_spec.rb

@@ -6,77 +6,118 @@ describe SimpleDeploy::Stack::SSH do
     @task_mock = mock 'task'
     @config_mock = mock 'config'
     @logger_stub = stub 'logger', :debug => true,
-                                  :info  => true,
-                                  :error => true
+                        :info  => true,
+                        :error => true
     @config_mock.stub :logger => @logger_stub
     @config_mock.should_receive(:region).
-                 with('test-env').
-                 and_return 'test-us-west-1'
+        with('test-env').
+        and_return 'test-us-west-1'
     @stack_mock.stub :attributes => { :ssh_gateway => false }
+    @options = { :config      => @config_mock,
+                 :instances   => ['1.2.3.4', '4.3.2.1'],
+                 :environment => 'test-env',
+                 :ssh_user    => 'user',
+                 :ssh_key     => 'key',
+                 :stack       => @stack_mock,
+                 :name        => 'test-stack' }
+    @task_logger_mock = mock 'task_logger'
+    @ssh_options = Hash.new
+    @task_mock.stub :logger    => @task_logger_mock,
+                    :variables => @ssh_options
   end
 
   context "when unsuccessful" do
     it "should return false when no running instances running" do
-      options = { :config      => @config_mock,
-                  :instances   => [],
-                  :environment => 'test-env',
-                  :ssh_user    => 'user',
-                  :ssh_key     => 'key',
-                  :stack       => @stack_mock,
-                  :name        => 'test-stack' }
-      @ssh = SimpleDeploy::Stack::SSH.new options
+      @ssh = SimpleDeploy::Stack::SSH.new @options.merge({ :instances   => [] })
+
       @ssh.execute(:sudo    => true, :command => 'uname').should be_false
     end
+
+    context "with capistrano configured" do
+      before do
+        Capistrano::Configuration.should_receive(:new).
+            with(:output => @logger_stub).
+            and_return @task_mock
+
+        @task_logger_mock.should_receive(:level=).with(3)
+        @task_mock.should_receive(:set).with :user, 'user'
+        @task_mock.should_receive(:server).with('1.2.3.4', :instances)
+        @task_mock.should_receive(:server).with('4.3.2.1', :instances)
+      end
+
+      it "should return false when Capistrano command error" do
+        @ssh = SimpleDeploy::Stack::SSH.new @options
+
+        @task_mock.should_receive(:load).with({ :string=>"task :execute do\n          sudo 'a_bad_command'\n          end" })
+        @task_mock.should_receive(:execute).and_raise Capistrano::CommandError.new 'command error'
+
+        @ssh.execute(:sudo => true, :command => 'a_bad_command').should be_false
+      end
+
+      it "should return false when Capistrano connection error" do
+        @ssh = SimpleDeploy::Stack::SSH.new @options
+
+        @task_mock.stub :logger    => @task_logger_mock,
+                        :variables => @ssh_options
+        @task_mock.should_receive(:load).with({ :string=>"task :execute do\n          sudo 'uname'\n          end" })
+        @task_mock.should_receive(:execute).and_raise Capistrano::ConnectionError.new 'connection error'
+
+        @ssh.execute(:sudo => true, :command => 'uname').should be_false
+      end
+
+      it "should return false when Capistrano generic error" do
+        @ssh = SimpleDeploy::Stack::SSH.new @options
+
+        @task_mock.should_receive(:load).with({ :string=>"task :execute do\n          sudo 'uname'\n          end" })
+        @task_mock.should_receive(:execute).and_raise Capistrano::Error.new 'generic error'
+
+        @ssh.execute(:sudo => true, :command => 'uname').should be_false
+      end
+    end
   end
 
   context "when successful" do
     before do
-      options = { :config      => @config_mock,
-                  :instances   => ['1.2.3.4', '4.3.2.1'],
-                  :environment => 'test-env',
-                  :ssh_user    => 'user',
-                  :ssh_key     => 'key',
-                  :stack       => @stack_mock,
-                  :name        => 'test-stack' }
-      @ssh = SimpleDeploy::Stack::SSH.new options
+      @ssh = SimpleDeploy::Stack::SSH.new @options
     end
-  
+
     describe "when execute called" do
       before do
-        task_logger_mock = mock 'task_logger'
-        @ssh_options = Hash.new
         Capistrano::Configuration.should_receive(:new).
-                                  with(:output => @logger_stub).
-                                  and_return @task_mock
-        @task_mock.stub :logger    => task_logger_mock,
-                        :variables => @ssh_options
-        task_logger_mock.should_receive(:level=).with(3)
+            with(:output => @logger_stub).
+            and_return @task_mock
+
+        @task_logger_mock.should_receive(:level=).with(3)
         @task_mock.should_receive(:set).with :user, 'user'
         @task_mock.should_receive(:server).with('1.2.3.4', :instances)
         @task_mock.should_receive(:server).with('4.3.2.1', :instances)
       end
 
-      describe "when succesful" do
+      describe "when successful" do
         it "should execute a task with sudo" do
-          @task_mock.should_receive(:load).with({:string=>"task :execute do\n          sudo 'uname'\n          end"})
+          @task_mock.should_receive(:load).with({ :string=>"task :execute do\n          sudo 'uname'\n          end" })
           @task_mock.should_receive(:execute).and_return true
+
           @ssh.execute(:sudo    => true,
                        :command => 'uname').should be_true
         end
 
         it "should execute a task as the calling user " do
-          @task_mock.should_receive(:load).with({:string=>"task :execute do\n          run 'uname'\n          end"})
+          @task_mock.should_receive(:load).with({ :string=>"task :execute do\n          run 'uname'\n          end" })
           @task_mock.should_receive(:execute).and_return true
+
           @ssh.execute(:sudo    => false,
                        :command => 'uname').should be_true
         end
-      end
-      
-      after do
-          @ssh_options.should == { :ssh_options => { 
-                                     :keys => 'key', :paranoid => false 
-                                   }
-                                 }
+
+        it "sets the ssh options" do
+          @task_mock.stub(:load)
+          @task_mock.stub(:execute).and_return(true)
+          @ssh.execute :sudo => false, :command => 'uname'
+
+          @ssh_options.should == { :ssh_options => { :keys     => 'key',
+                                                     :paranoid => false } }
+        end
       end
     end
   end

data/spec/template_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe SimpleDeploy::Template do
+  before do
+    @contents = {
+                  "Parameters" => {
+                    "Test1" => {
+                      "Type"        => "String",
+                      "Description" => "Test Param #1"
+                    },
+                    "Test2" => {
+                      "Type"        => "String",
+                      "Description" => "Test Param #2"
+                    }
+                  }
+                }.to_json
+    IO.should_receive(:read).with('/tmp/file').and_return @contents
+    @template = SimpleDeploy::Template.new :file => '/tmp/file'
+  end
+
+  it "should return the parameters for a given template" do
+    @template.parameters.should == ["Test1", "Test2"]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70295198764320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70295198764320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70295198763260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,76 +32,51 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+  version_requirements: *70295198763260
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70295198762340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.13.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.5
+  version_requirements: *70295198762340
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70295198760620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+  version_requirements: *70295198760620
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70295198759920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.0
+  version_requirements: *70295198759920
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70295198758960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *70295198758960
 description: Opinionated gem for Managing AWS Cloud Formation stacks and deploying
   updates to Instances.
 email:
@@ -151,37 +121,46 @@ files:
 - lib/simple_deploy/env.rb
 - lib/simple_deploy/exceptions.rb
 - lib/simple_deploy/logger.rb
+- lib/simple_deploy/misc.rb
+- lib/simple_deploy/misc/attribute_merger.rb
 - lib/simple_deploy/notifier.rb
 - lib/simple_deploy/notifier/campfire.rb
 - lib/simple_deploy/stack.rb
 - lib/simple_deploy/stack/deployment.rb
 - lib/simple_deploy/stack/deployment/status.rb
 - lib/simple_deploy/stack/execute.rb
+- lib/simple_deploy/stack/output_mapper.rb
 - lib/simple_deploy/stack/ssh.rb
 - lib/simple_deploy/stack/stack_attribute_formater.rb
+- lib/simple_deploy/template.rb
 - lib/simple_deploy/version.rb
 - simple_deploy.gemspec
 - spec/artifact_spec.rb
 - spec/backoff_spec.rb
 - spec/cli/attributes_spec.rb
 - spec/cli/clone_spec.rb
+- spec/cli/create_spec.rb
 - spec/cli/deploy_spec.rb
 - spec/cli/destroy_spec.rb
+- spec/cli/outputs_spec.rb
 - spec/cli/protect_spec.rb
 - spec/cli/shared_spec.rb
 - spec/cli/update_spec.rb
 - spec/cli_spec.rb
 - spec/config_spec.rb
 - spec/logger_spec.rb
+- spec/misc/attribute_merger_spec.rb
 - spec/notifier/campfire_spec.rb
 - spec/notifier_spec.rb
 - spec/spec_helper.rb
 - spec/stack/deployment/status_spec.rb
 - spec/stack/deployment_spec.rb
 - spec/stack/execute_spec.rb
+- spec/stack/output_mapper_spec.rb
 - spec/stack/ssh_spec.rb
 - spec/stack/stack_attribute_formater_spec.rb
 - spec/stack_spec.rb
+- spec/template_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -196,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4528929630264236802
+      hash: 1762969189670717891
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,10 +184,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4528929630264236802
+      hash: 1762969189670717891
 requirements: []
 rubyforge_project: simple_deploy
-rubygems_version: 1.8.24
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Opinionated gem for AWS resource management.
@@ -217,20 +196,25 @@ test_files:
 - spec/backoff_spec.rb
 - spec/cli/attributes_spec.rb
 - spec/cli/clone_spec.rb
+- spec/cli/create_spec.rb
 - spec/cli/deploy_spec.rb
 - spec/cli/destroy_spec.rb
+- spec/cli/outputs_spec.rb
 - spec/cli/protect_spec.rb
 - spec/cli/shared_spec.rb
 - spec/cli/update_spec.rb
 - spec/cli_spec.rb
 - spec/config_spec.rb
 - spec/logger_spec.rb
+- spec/misc/attribute_merger_spec.rb
 - spec/notifier/campfire_spec.rb
 - spec/notifier_spec.rb
 - spec/spec_helper.rb
 - spec/stack/deployment/status_spec.rb
 - spec/stack/deployment_spec.rb
 - spec/stack/execute_spec.rb
+- spec/stack/output_mapper_spec.rb
 - spec/stack/ssh_spec.rb
 - spec/stack/stack_attribute_formater_spec.rb
 - spec/stack_spec.rb
+- spec/template_spec.rb