simple_deploy 0.7.2 → 0.7.3

data/spec/cli/attributes_spec.rb

@@ -2,27 +2,17 @@ require 'spec_helper'
 require 'simple_deploy/cli'
 
 describe SimpleDeploy::CLI::Attributes do
+  include_context 'cli config'
+  include_context 'double stubbed logger'
+  include_context 'double stubbed stack', :name        => 'my_stack',
+                                          :environment => 'my_env'
 
   describe 'show' do
     before do
-      @config  = mock 'config'
-      @logger  = stub 'logger'
       @options = { :environment => 'my_env',
                    :log_level   => 'debug',
                    :name        => 'my_stack' }
-      @stack   = stub :attributes => { 'foo' => 'bar', 'baz' => 'blah' }
-
-      SimpleDeploy::Config.stub(:new).and_return(@config)
-      @config.should_receive(:environment).with('my_env').and_return(@config)
-      SimpleDeploy::SimpleDeployLogger.should_receive(:new).
-                                       with(:log_level => 'debug').
-                                       and_return(@logger)
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack').
-                          and_return(@stack)
+      @stack_stub.stub(:attributes).and_return({ 'foo' => 'bar', 'baz' => 'blah' })
     end
 
     it 'should output the attributes' do

data/spec/cli/clone_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 require 'simple_deploy/cli'
 
 describe SimpleDeploy::CLI::Clone do
+  include_context 'cli config'
+  include_context 'double stubbed logger'
+  include_context 'clone stack pair', :source_name => 'source_stack',
+                                      :source_env  => 'my_env',
+                                      :new_name    => 'new_stack',
+                                      :new_env     => 'my_env'
 
   describe 'clone' do
     context 'filter_attributes' do
@@ -117,8 +123,6 @@ describe SimpleDeploy::CLI::Clone do
 
     context 'stack creation' do
       before do
-        @config  = mock 'config'
-        @logger  = stub 'logger', :info => 'true'
         @options = { :environment => 'my_env',
                      :log_level   => 'debug',
                      :source_name => 'source_stack',
@@ -127,7 +131,7 @@ describe SimpleDeploy::CLI::Clone do
                                       'chef_repo_domain=updated_community_chef_repo',
                                       'SolrClientTrafficContainer=solr-client-traffic-container'] }
 
-        @source_stack   = stub :attributes => {
+        @source_stack_stub.stub(:attributes).and_return(
           'AmiId' => 'ami-7b6a4e3e',
           'AppEnv' => 'pod-2-cd-1',
           'MaximumAppInstances' => 1,
@@ -135,36 +139,19 @@ describe SimpleDeploy::CLI::Clone do
           'chef_repo_bucket_prefix' => 'intu-lc',
           'chef_repo_domain' => 'live_community_chef_repo',
           'deployment_user' => 'rmendes'
-        }, :template => { 'foo' => 'bah' }
-        @new_stack   = stub :attributes => {}
-
-        SimpleDeploy::Config.stub(:new).and_return(@config)
-        @config.should_receive(:environment).with('my_env').and_return(@config)
-        SimpleDeploy::SimpleDeployLogger.should_receive(:new).
-                                  with(:log_level => 'debug').
-                                  and_return(@logger)
-
-        SimpleDeploy::Stack.should_receive(:new).
-                                      with(:config      => @config,
-                                           :environment => 'my_env',
-                                           :logger      => @logger,
-                                           :name        => 'source_stack').
-                                      and_return(@source_stack)
-        SimpleDeploy::Stack.should_receive(:new).
-                                      with(:config      => @config,
-                                           :environment => 'my_env',
-                                           :logger      => @logger,
-                                           :name        => 'new_stack').
-                                      and_return(@new_stack)
+        )
+        @source_stack_stub.stub(:template).and_return('foo' => 'bah')
+        @new_stack_mock.stub(:attributes).and_return({})
       end
-      
+
       it 'should create the new stack using the filtered, merged and added attributes' do
         subject.should_receive(:valid_options?).
                 with(:provided => @options,
                      :required => [:environment, :source_name, :new_name])
         Trollop.stub(:options).and_return(@options)
+        @new_stack_mock.stub(:template).and_return('foo' => 'bah')
 
-        @new_stack.should_receive(:create) do |options|
+        @new_stack_mock.should_receive(:create) do |options|
           options[:attributes].should == [{ 'AmiId' => 'ami-7b6a4e3e' },
                                           { 'AppEnv' => 'pod-2-cd-1' },
                                           { 'MaximumAppInstances' => 1 },
@@ -186,7 +173,7 @@ describe SimpleDeploy::CLI::Clone do
                       :required => [:environment, :source_name, :new_name])
         Trollop.stub(:options).and_return(@options)
 
-        @new_stack.should_receive(:create) do |options|
+        @new_stack_mock.should_receive(:create) do |options|
           options[:attributes].should == [{ 'AmiId' => 'ami-7b6a4e3e' },
                                           { 'AppEnv' => 'pod-2-cd-1' },
                                           { 'MaximumAppInstances' => 1 },

data/spec/cli/create_spec.rb

@@ -1,12 +1,15 @@
 require 'spec_helper'
+require 'simple_deploy/cli'
 
 describe SimpleDeploy::CLI::Create do
+  include_context 'cli config'
+  include_context 'double stubbed logger'
+  include_context 'stubbed stack', :name        => 'mytest',
+                                   :environment => 'test'
+
   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' ],
@@ -15,23 +18,13 @@ describe SimpleDeploy::CLI::Create do
                  :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.stub(:environments).and_return(@config_env)
+    @config_env.should_receive(:keys).and_return(['test'])
+
     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"] }

data/spec/cli/deploy_spec.rb

@@ -3,15 +3,16 @@ require 'spec_helper'
 require 'simple_deploy/cli'
 
 describe SimpleDeploy::CLI::Deploy do
+  include_context 'cli config'
+  include_context 'double stubbed logger'
+  include_context 'stubbed stack', :name        => 'my_stack',
+                                   :environment => 'my_env',
+                                   :internal    => false
+
   describe 'deploy' do
     before do
-      @logger   = stub 'logger', 'info' => 'true', 'error' => 'true'
-      @stack    = stub :attributes => {}
+      @stack_mock.stub(:attributes).and_return({})
       @notifier = stub
-
-      SimpleDeploy::SimpleDeployLogger.should_receive(:new).
-                                       with(:log_level => 'debug').
-                                       and_return(@logger)
     end
 
     it "should notify on success" do
@@ -29,19 +30,11 @@ describe SimpleDeploy::CLI::Deploy do
 
       SimpleDeploy::Notifier.should_receive(:new).
                           with(:stack_name  => 'my_stack',
-                               :environment => 'my_env',
-                               :logger      => @logger).
+                               :environment => 'my_env').
                           and_return(@notifier)
 
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack',
-                               :internal    => false).
-                          and_return(@stack)
-
-      @stack.should_receive(:wait_for_stable)
-      @stack.should_receive(:deploy).with(true).and_return(true)
+      @stack_mock.should_receive(:wait_for_stable)
+      @stack_mock.should_receive(:deploy).with(true).and_return(true)
       @notifier.should_receive(:send_deployment_start_message)
       @notifier.should_receive(:send_deployment_complete_message)
 
@@ -63,19 +56,11 @@ describe SimpleDeploy::CLI::Deploy do
 
       SimpleDeploy::Notifier.should_receive(:new).
                           with(:stack_name  => 'my_stack',
-                               :environment => 'my_env',
-                               :logger      => @logger).
+                               :environment => 'my_env').
                           and_return(@notifier)
 
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack',
-                               :internal    => false).
-                          and_return(@stack)
-
-      @stack.should_receive(:wait_for_stable)
-      @stack.should_receive(:deploy).with(true).and_return(false)
+      @stack_mock.should_receive(:wait_for_stable)
+      @stack_mock.should_receive(:deploy).with(true).and_return(false)
       @notifier.should_receive(:send_deployment_start_message)
 
       begin
@@ -100,20 +85,12 @@ describe SimpleDeploy::CLI::Deploy do
 
       SimpleDeploy::Notifier.should_receive(:new).
                           with(:stack_name  => 'my_stack',
-                               :environment => 'my_env',
-                               :logger      => @logger).
+                               :environment => 'my_env').
                           and_return(@notifier)
 
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack',
-                               :internal    => false).
-                          and_return(@stack)
-
-      @stack.should_receive(:update).with(hash_including(:force => true, :attributes => [{'foo' => 'bah'}])).and_return(true)
-      @stack.should_receive(:wait_for_stable)
-      @stack.should_receive(:deploy).with(true).and_return(true)
+      @stack_mock.should_receive(:update).with(hash_including(:force => true, :attributes => [{'foo' => 'bah'}])).and_return(true)
+      @stack_mock.should_receive(:wait_for_stable)
+      @stack_mock.should_receive(:deploy).with(true).and_return(true)
       @notifier.should_receive(:send_deployment_start_message)
       @notifier.should_receive(:send_deployment_complete_message)
 
@@ -135,20 +112,12 @@ describe SimpleDeploy::CLI::Deploy do
 
       SimpleDeploy::Notifier.should_receive(:new).
                           with(:stack_name  => 'my_stack',
-                               :environment => 'my_env',
-                               :logger      => @logger).
+                               :environment => 'my_env').
                           and_return(@notifier)
 
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack',
-                               :internal    => false).
-                          and_return(@stack)
-
-      @stack.should_receive(:update).with(hash_including(:force => true,
+      @stack_mock.should_receive(:update).with(hash_including(:force => true,
                                                          :attributes => [{'foo' => 'bah'}])).and_return(false)
-      @stack.should_receive(:wait_for_stable)
+      @stack_mock.should_receive(:wait_for_stable)
 
       begin
         subject.deploy
@@ -172,20 +141,12 @@ describe SimpleDeploy::CLI::Deploy do
 
       SimpleDeploy::Notifier.should_receive(:new).
                           with(:stack_name  => 'my_stack',
-                               :environment => 'my_env',
-                               :logger      => @logger).
+                               :environment => 'my_env').
                           and_return(@notifier)
 
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack',
-                               :internal    => false).
-                          and_return(@stack)
-
-      @stack.should_not_receive(:update)
-      @stack.should_receive(:wait_for_stable)
-      @stack.should_receive(:deploy).with(true).and_return(true)
+      @stack_mock.should_not_receive(:update)
+      @stack_mock.should_receive(:wait_for_stable)
+      @stack_mock.should_receive(:deploy).with(true).and_return(true)
       @notifier.should_receive(:send_deployment_start_message)
       @notifier.should_receive(:send_deployment_complete_message)
 

data/spec/cli/destroy_spec.rb

@@ -3,21 +3,17 @@ require 'spec_helper'
 require 'simple_deploy/cli'
 
 describe SimpleDeploy::CLI::Destroy do
+  include_context 'cli config'
+  include_context 'double stubbed logger'
+  include_context 'stubbed stack', :name        => 'my_stack',
+                                   :environment => 'my_env'
 
   describe 'destroy' do
     before do
-      @config  = mock 'config'
-      @logger  = stub 'logger', 'info' => 'true'
       @options = { :environment => 'my_env',
                    :log_level   => 'debug',
                    :name        => 'my_stack' }
-      @stack   = stub :attributes => {}
-
-      SimpleDeploy::Config.stub(:new).and_return(@config)
-      @config.should_receive(:environment).with('my_env').and_return(@config)
-      SimpleDeploy::SimpleDeployLogger.should_receive(:new).
-                                       with(:log_level => 'debug').
-                                       and_return(@logger)
+      @stack_mock.stub(:attributes).and_return({})
     end
 
     it "should exit with 0" do
@@ -26,14 +22,7 @@ describe SimpleDeploy::CLI::Destroy do
                    :required => [:environment, :name])
       Trollop.stub(:options).and_return(@options)
 
-      @stack.should_receive(:destroy).and_return(true)
-
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack').
-                          and_return(@stack)
+      @stack_mock.should_receive(:destroy).and_return(true)
 
       begin
         subject.destroy
@@ -48,14 +37,7 @@ describe SimpleDeploy::CLI::Destroy do
                    :required => [:environment, :name])
       Trollop.stub(:options).and_return(@options)
 
-      @stack.should_receive(:destroy).and_return(false)
-
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack').
-                          and_return(@stack)
+      @stack_mock.should_receive(:destroy).and_return(false)
 
       begin
         subject.destroy

data/spec/cli/outputs_spec.rb

@@ -2,35 +2,30 @@ require 'spec_helper'
 require 'simple_deploy/cli'
 
 describe SimpleDeploy::CLI::Outputs do
+  include_context 'cli config'
+  include_context 'double stubbed logger'
+  include_context 'stubbed stack', :name        => 'mytest',
+                                   :environment => 'test'
 
   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
+    @config_mock.stub(:environments => { 'test' => 'data' })
+    SimpleDeploy.stub(:environments).and_return(@config_env)
+    @config_env.should_receive(:keys).and_return(['test'])
+    @stack_mock.stub(:outputs).and_return(@data)
     @outputs = SimpleDeploy::CLI::Outputs.new
   end
 
+  after do
+    SimpleDeploy.release_config
+  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')

data/spec/cli/protect_spec.rb

@@ -3,127 +3,89 @@ require 'spec_helper'
 require 'simple_deploy/cli'
 
 describe SimpleDeploy::CLI::Protect do
+  include_context 'cli config'
+  include_context 'double stubbed logger'
 
   describe 'protect' do
     before do
-      @config_mock  = mock 'config'
-      @logger  = stub 'logger', 'info' => 'true'
-
-      SimpleDeploy::Config.stub(:new).and_return(@config_mock)
-      @config_mock.should_receive(:environment).with('my_env').and_return(@config)
-      SimpleDeploy::SimpleDeployLogger.should_receive(:new).
-                                       with(:log_level => 'debug').
-                                       and_return(@logger)
-    end
-
-    it "should enable protection" do
-      options = { :environment => 'my_env',
+      @options = { :environment => 'my_env',
                   :log_level   => 'debug',
-                  :name        => ['my_stack'],
+                  :name        => ['my_stack1'],
                   :protection  => 'on' }
-
-      subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
-      Trollop.stub(:options).and_return(options)
-
-      stack   = stub :attributes => { 'protection' => 'on' }
-      stack.should_receive(:update).with(hash_including(:attributes => [{ 'protection' => 'on' }]))
-
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack').
-                          and_return(stack)
-
-      subject.protect
     end
 
-    it "should enable protection for multiple stacks" do
-      options = { :environment => 'my_env',
-                  :log_level   => 'debug',
-                  :name        => ['my_stack1', 'my_stack2'],
-                  :protection  => 'on' }
+    context "single stack" do
+      include_context 'received stack array', 'my_stack', 'my_env', 1
+      
+      it "should enable protection" do
+        subject.should_receive(:valid_options?).
+                with(:provided => @options,
+                     :required => [:environment, :name])
+        Trollop.stub(:options).and_return(@options)
 
-      subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
-      Trollop.stub(:options).and_return(options)
-
-      stack   = stub :attributes => { 'protection' => 'on' }
-      stack.should_receive(:update).twice.with(hash_including(:attributes => [{ 'protection' => 'on' }]))
-
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack1').
-                          and_return(stack)
-
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack2').
-                          and_return(stack)
-
-      subject.protect
-    end
+        @stack_mock1.stub(:attributes).and_return('protection' => 'on')
+        @stack_mock1.should_receive(:update).with(
+          hash_including(:attributes => [{ 'protection' => 'on' }]))
 
-    it "should disable protection" do
-      options = { :environment => 'my_env',
-                  :log_level   => 'debug',
-                  :name        => ['my_stack'],
-                  :protection  => 'off' }
+        subject.protect
+      end
 
-      subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
-      Trollop.stub(:options).and_return(options)
+      it "should disable protection" do
+        @options[:protection]= 'off'
 
-      stack   = stub :attributes => { 'protection' => 'off' }
-      stack.should_receive(:update).with(hash_including(:attributes => [{ 'protection' => 'off' }]))
+        subject.should_receive(:valid_options?).
+                with(:provided => @options,
+                     :required => [:environment, :name])
+        Trollop.stub(:options).and_return(@options)
 
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack').
-                          and_return(stack)
+        @stack_mock1.stub(:attributes).and_return('protection' => 'off')
+        @stack_mock1.should_receive(:update).with(
+          hash_including(:attributes => [{ 'protection' => 'off' }]))
 
-      subject.protect
+        subject.protect
+      end
     end
 
-    it "should disable protection for multiple stacks" do
-      options = { :environment => 'my_env',
-                  :log_level   => 'debug',
-                  :name        => ['my_stack1', 'my_stack2'],
-                  :protection  => 'off' }
-
-      subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
-      Trollop.stub(:options).and_return(options)
-
-      stack   = stub :attributes => { 'protection' => 'off' }
-      stack.should_receive(:update).twice.with(hash_including(:attributes => [{ 'protection' => 'off' }]))
-
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack1').
-                          and_return(stack)
-
-      SimpleDeploy::Stack.should_receive(:new).
-                          with(:config      => @config,
-                               :environment => 'my_env',
-                               :logger      => @logger,
-                               :name        => 'my_stack2').
-                          and_return(stack)
-
-      subject.protect
+    context "multiple stacks" do
+      include_context 'received stack array', 'my_stack', 'my_env', 2
+
+      it "should enable protection" do
+        @options[:name] = ['my_stack1', 'my_stack2']
+
+        subject.should_receive(:valid_options?).
+                with(:provided => @options,
+                     :required => [:environment, :name])
+        Trollop.stub(:options).and_return(@options)
+
+        @stack_mock1.stub(:attributes).and_return('protection' => 'on')
+        @stack_mock1.should_receive(:update).with(
+          hash_including(:attributes => [{ 'protection' => 'on' }]))
+        @stack_mock2.stub(:attributes).and_return('protection' => 'on')
+        @stack_mock2.should_receive(:update).with(
+          hash_including(:attributes => [{ 'protection' => 'on' }]))
+
+        subject.protect
+      end
+
+      it "should disable protection" do
+        @options[:name] = ['my_stack1', 'my_stack2']
+        @options[:protection]= 'off'
+
+        subject.should_receive(:valid_options?).
+                with(:provided => @options,
+                     :required => [:environment, :name])
+        Trollop.stub(:options).and_return(@options)
+
+        @stack_mock1.stub(:attributes).and_return('protection' => 'off')
+        @stack_mock1.should_receive(:update).with(
+          hash_including(:attributes => [{ 'protection' => 'off' }]))
+        @stack_mock2.stub(:attributes).and_return('protection' => 'off')
+        @stack_mock2.should_receive(:update).with(
+          hash_including(:attributes => [{ 'protection' => 'off' }]))
+
+        subject.protect
+      end
     end
+
   end 
 end