simple_deploy 0.7.2 → 0.7.3

data/spec/misc/attribute_merger_spec.rb

@@ -1,23 +1,18 @@
 require 'spec_helper'
 
 describe SimpleDeploy::Misc::AttributeMerger do
+  include_context 'stubbed config'
 
   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,
+    @options = { :environment  => 'default',
                  :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]).
+                                    with(:environment => @options[:environment]).
                                     and_return @mapper_mock
     @merger = SimpleDeploy::Misc::AttributeMerger.new
   end

data/spec/notifier/campfire_spec.rb

@@ -1,57 +1,39 @@
 require 'spec_helper'
 
-describe SimpleDeploy do
+describe SimpleDeploy::Notifier::Campfire do
+  include_context 'stubbed config'
+  include_context 'double stubbed logger'
+  include_context 'stubbed stack', :name        => 'my_stack',
+                                   :environment => 'my_env'
+
+  before do
+    @comms_mock = mock 'Campfire communications'
+
+    @room1_mock = mock 'Esbit room1', :id => 1, :name => 'Room 1'
+    @room2_mock = mock 'Esbit room2', :id => 2, :name => 'Room 2'
+    @comms_mock.stub(:rooms).and_return([@room1_mock, @room2_mock])
+  end
 
   describe "with all required configurations" do
     before do
       config = { 'campfire' => { 'token' => 'tkn' } }
-                
-      @config_mock = mock 'config mock'
-      @stack_mock = mock 'stack'
-      @logger_mock = mock 'logger mock'
-      @tinder_mock = mock 'tinder'
-      @config_mock.should_receive(:logger).and_return @logger_mock
       @config_mock.should_receive(:notifications).and_return config
-      @config_mock.should_receive(:environment).and_return 'env_config'
-      Stackster::Stack.should_receive(:new).
-                       with(:environment => 'test',
-                            :name        => 'stack_name',
-                            :config      => 'env_config',
-                            :logger      => @logger_mock).
-                       and_return @stack_mock
 
-      Tinder::Campfire.should_receive(:new).
-                       with("subdom", { :token=>"tkn", :ssl_options=> { :verify => false } }).and_return @tinder_mock
+      Esbit::Campfire.should_receive(:new).with("subdom", "tkn").
+                      and_return @comms_mock
       @stack_mock.should_receive(:attributes).
                   and_return( 'campfire_room_ids'  => '1,2',
                               'campfire_subdomain' => 'subdom' )
-      @logger_mock.should_receive(:debug).
-                   with "Campfire subdomain 'subdom'."
-      @logger_mock.should_receive(:debug).
-                   with "Campfire room ids '1,2'."
       @campfire = SimpleDeploy::Notifier::Campfire.new :stack_name  => 'stack_name',
-                                                       :environment => 'test',
-                                                       :config      => @config_mock
+                                                       :environment => 'test'
 
     end
 
     it "should send a message to campfire rooms" do
-      room1_mock = mock 'tinder'
-      room2_mock = mock 'tinder'
-      @tinder_mock.should_receive(:find_room_by_id).with(1).
-                                                    and_return room1_mock
-      @tinder_mock.should_receive(:find_room_by_id).with(2).
-                                                    and_return room2_mock
-      @logger_mock.should_receive(:debug).
-                   with "Sending notification to Campfire room 1."
-      @logger_mock.should_receive(:debug).
-                   with "Sending notification to Campfire room 2."
-      @logger_mock.should_receive(:info).
-                   with "Sending Campfire notifications."
-      @logger_mock.should_receive(:info).
-                   with "Campfire notifications complete."
-      room1_mock.should_receive(:speak).with :message => "heh you guys!"
-      room2_mock.should_receive(:speak).with :message => "heh you guys!"
+
+      @room1_mock.should_receive(:say).with :message => "heh you guys!"
+      @room2_mock.should_receive(:say).with :message => "heh you guys!"
+
       @campfire.send(:message => 'heh you guys!')
     end
   end
@@ -60,32 +42,10 @@ describe SimpleDeploy do
     before do
       config = nil
                 
-      @config_mock = mock 'config mock'
-      @stack_mock = mock 'stack'
-      @logger_mock = mock 'logger mock'
-      @tinder_mock = mock 'tinder'
-      @config_mock.should_receive(:logger).and_return @logger_mock
-      @config_mock.should_receive(:environment).and_return 'env_config'
-      Stackster::Stack.should_receive(:new).
-                       with(:environment => 'test',
-                            :name        => 'stack_name',
-                            :config      => 'env_config',
-                            :logger      => @logger_mock).
-                       and_return @stack_mock
-
       @stack_mock.should_receive(:attributes).
                   and_return({})
-      @logger_mock.should_receive(:debug).
-                   with "Campfire subdomain ''."
-      @logger_mock.should_receive(:debug).
-                   with "Campfire room ids ''."
-      @logger_mock.should_receive(:info).
-                   with "Sending Campfire notifications."
-      @logger_mock.should_receive(:info).
-                   with "Campfire notifications complete."
       @campfire = SimpleDeploy::Notifier::Campfire.new :stack_name  => 'stack_name',
-                                                       :environment => 'test',
-                                                       :config      => @config_mock
+                                                       :environment => 'test'
     end
 
     it "should not blow up if campfire_subdom & campfire_room_ids are not present" do

data/spec/notifier_spec.rb

@@ -1,29 +1,27 @@
 require 'spec_helper'
 
-describe SimpleDeploy do
+describe SimpleDeploy::Notifier do
+  include_context 'stubbed config'
+  include_context 'stubbed stack', :name        => 'stack_name',
+                                   :environment => 'test'
 
   describe "with valid settings" do
     before do
-      @config_mock = mock 'config mock'
-      @logger_mock = mock 'logger mock'
-      SimpleDeploy::Config.should_receive(:new).
-                           with(:logger => @logger_mock).
-                           and_return @config_mock
-                   
       @config_mock.should_receive(:notifications).
                    exactly(1).times.
                    and_return({ 'campfire' => 'settings' })
-      @config_mock.should_receive(:logger).
-                   and_return @logger_mock
       @notifier = SimpleDeploy::Notifier.new :stack_name  => 'stack_name',
-                                             :environment => 'test',
-                                             :logger      => @logger_mock
+                                             :environment => 'test'
+    end
+
+    after do
+      SimpleDeploy.release_config
     end
 
     it "should support a basic start message" do
       campfire_mock = mock 'campfire mock'
 
-      @config_mock.should_receive(:region).with('test').and_return('us-west-1')
+      @config_mock.stub(:region).and_return('us-west-1')
 
       SimpleDeploy::Notifier::Campfire.should_receive(:new).and_return campfire_mock
       campfire_mock.should_receive(:send).with "Deployment to stack_name in us-west-1 started."
@@ -32,24 +30,14 @@ describe SimpleDeploy do
     end
 
     it "should include the github app & chef links in the completed message" do
-      stack_mock = mock 'stack'
       campfire_mock = mock 'campfire mock'
       environment_mock = mock 'environment mock'
-      @config_mock.should_receive(:environment).
-                   with('test').
-                   and_return environment_mock
-      @config_mock.should_receive(:region).with('test').and_return('us-west-1')
-      Stackster::Stack.should_receive(:new).
-                       with(:environment => 'test',
-                            :name        => 'stack_name',
-                            :config      => environment_mock,
-                            :logger      => @logger_mock).
-                       and_return stack_mock
-      stack_mock.should_receive(:attributes).
-                 and_return({ 'app_github_url'       => 'http://github.com/user/app',
-                              'chef_repo_github_url' => 'http://github.com/user/chef_repo',
-                              'app'                  => 'appsha',
-                              'chef_repo'            => 'chefsha' })
+      @config_mock.stub(:region).and_return('us-west-1')
+      @stack_mock.should_receive(:attributes).
+                  and_return({ 'app_github_url'       => 'http://github.com/user/app',
+                               'chef_repo_github_url' => 'http://github.com/user/chef_repo',
+                               'app'                  => 'appsha',
+                               'chef_repo'            => 'chefsha' })
       SimpleDeploy::Notifier::Campfire.should_receive(:new).
                                        and_return campfire_mock
       campfire_mock.should_receive(:send).
@@ -61,8 +49,7 @@ describe SimpleDeploy do
       campfire_mock = mock 'campfire mock'
       SimpleDeploy::Notifier::Campfire.should_receive(:new).
                                        with(:environment => 'test',
-                                            :stack_name  => 'stack_name',
-                                            :config      => @config_mock).
+                                            :stack_name  => 'stack_name').
                                        and_return campfire_mock
       campfire_mock.should_receive(:send).with 'heh you guys!'
       @notifier.send 'heh you guys!'
@@ -71,19 +58,10 @@ describe SimpleDeploy do
   end
 
   it "should not blow up if the notification section is missing" do
-    @config_mock = mock 'config mock'
-    @logger_mock = mock 'logger mock'
-    SimpleDeploy::Config.should_receive(:new).
-                         with(:logger => @logger_mock).
-                         and_return @config_mock
-                 
     @config_mock.should_receive(:notifications).
                  and_return nil
-    @config_mock.should_receive(:logger).
-                 and_return @logger_mock
     @notifier = SimpleDeploy::Notifier.new :stack_name  => 'stack_name',
-                                           :environment => 'test',
-                                           :logger      => @logger_mock
+                                           :environment => 'test'
     @notifier.send 'heh you guys!'
   end
 

data/spec/spec_helper.rb

@@ -1,9 +1,19 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'fakefs/safe'
+require 'timecop'
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/spec/"
+end
 
 require 'simple_deploy'
 
+['contexts'].each do |dir|
+  Dir[File.expand_path(File.join(File.dirname(__FILE__),dir,'*.rb'))].each {|f| require f}
+end
+
 RSpec.configure do |config|
   #spec config
 end

data/spec/stack/deployment/status_spec.rb

@@ -1,18 +1,16 @@
 require 'spec_helper'
 
-describe SimpleDeploy do
+describe SimpleDeploy::Stack::Deployment::Status do
+  include_context 'stubbed config'
+  include_context 'double stubbed logger'
+  include_context 'stubbed stack', :name        => 'my_stack',
+                                   :environment => 'my_env'
 
   before do
-    @logger_stub = stub 'logger', :debug => true,
-                                  :info  => true
-    @config_mock = mock 'config'
-    @config_mock.stub :logger => @logger_stub
-    @stack_mock = mock 'stack'
-
-    options = { :config   => @config_mock,
-                :stack    => @stack_mock,
+    options = { :stack    => @stack_mock,
                 :ssh_user => 'user',
                 :name     => 'dastack' }
+
     @status = SimpleDeploy::Stack::Deployment::Status.new options
   end
 
@@ -43,8 +41,9 @@ describe SimpleDeploy do
   describe "clear_deployment_lock" do
     it "should unset deploy in progress if force & deploy in progress" do
       @stack_mock.stub :attributes => { 'deployment_in_progress' => 'true' }
-      @stack_mock.should_receive(:update).
-             with( { :attributes => [ { 'deployment_in_progress' => 'false'} ] })
+      @stack_mock.should_receive(:in_progress_update).
+             with( { :attributes => [ { 'deployment_in_progress' => 'false' } ],
+                     :caller => @status })
       @status.clear_deployment_lock(true)
     end
   end
@@ -60,8 +59,9 @@ describe SimpleDeploy do
 
   describe "unset_deployment_in_prgoress" do
     it "clears deployment in progress" do
-      @stack_mock.should_receive(:update).
-             with( { :attributes => [ { 'deployment_in_progress' => 'false'} ] })
+      @stack_mock.should_receive(:in_progress_update).
+             with( { :attributes => [ { 'deployment_in_progress' => 'false'} ],
+                     :caller => @status })
       @status.unset_deployment_in_progress
     end
   end

data/spec/stack/deployment_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-describe SimpleDeploy do
+describe SimpleDeploy::Stack::Deployment do
+  include_context 'stubbed config'
+  include_context 'double stubbed logger'
+  include_context 'stubbed stack', :name        => 'my_stack',
+                                   :environment => 'my_env'
 
   before do
     @attributes = { 'key'                     => 'val',
@@ -13,22 +17,14 @@ describe SimpleDeploy do
                     'cookbooks'               => 'cookbooks',
                     'cookbooks_bucket_prefix' => 'cookbooks_bp',
                     'cookbooks_domain'        => 'cookbooks_d' }
-    @logger_stub = stub 'logger stub'
-    @logger_stub.stub :debug => 'true', 
-                      :info  => 'true',
-                      :error => 'true'
 
-    @config_mock = mock 'config mock'
-    @config_mock.stub(:logger) { @logger_stub }
     @config_mock.stub(:region) { 'test-us-west-1' }
 
-    @stack_mock = mock 'stack mock'
     @stack_mock.stub(:attributes) { @attributes }
 
     @status_mock = mock 'status mock'
 
-    options = { :config      => @config_mock,
-                :instances   => ['1.2.3.4', '4.3.2.1'],
+    options = { :instances   => ['1.2.3.4', '4.3.2.1'],
                 :environment => 'test-us-west-1',
                 :ssh_user    => 'user',
                 :ssh_key     => 'key',
@@ -38,13 +34,16 @@ describe SimpleDeploy do
     @deployment.stub(:sleep) { false }
   end
 
+  after do
+    SimpleDeploy.release_config
+  end
+
   context "manage locks" do
     before do
       status_options = { :name        => 'stack-name',
                          :environment => 'test-us-west-1',
-                         :ssh_user    => 'user',
-                         :config      => @config_mock,
-                         :stack       => @stack_mock }
+                         :stack       => @stack_mock,
+                         :ssh_user    => 'user' }
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               with(status_options).
                                               and_return @status_mock
@@ -77,24 +76,22 @@ describe SimpleDeploy do
  
       status_options = { :name        => 'stack-name',
                          :environment => 'test-us-west-1',
-                         :ssh_user    => 'user',
-                         :config      => @config_mock,
-                         :stack       => @stack_mock }
+                         :stack       => @stack_mock,
+                         :ssh_user    => 'user' }
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               with(status_options).
                                               and_return @status_mock
     end
 
-    describe "when succesful" do
+    describe "when successful" do
         before do
           @execute_mock = mock "execute"
           execute_options = { :name        => 'stack-name',
                               :environment => 'test-us-west-1',
                               :instances   => ['1.2.3.4', '4.3.2.1'],
+                              :stack       => @stack_mock,
                               :ssh_user    => 'user',
-                              :ssh_key     => 'key',
-                              :config      => @config_mock,
-                              :stack       => @stack_mock }
+                              :ssh_key     => 'key' }
           SimpleDeploy::Stack::Execute.should_receive(:new).
                                        with(execute_options).
                                        and_return @execute_mock
@@ -120,6 +117,8 @@ describe SimpleDeploy do
           @status_mock.stub :clear_for_deployment? => true
           @status_mock.should_receive(:set_deployment_in_progress)
           @status_mock.should_receive(:unset_deployment_in_progress)
+          @stack_mock.should_receive(:raw_instances).at_least(:once).and_return(
+                      [{ 'instancesSet' => [ { 'privateIpAddress' => '10.1.2.3' } ] }])
           @deployment.execute(false).should be_true
         end
 
@@ -129,6 +128,8 @@ describe SimpleDeploy do
                             :clear_for_deployment? => true
           @status_mock.should_receive(:set_deployment_in_progress)
           @status_mock.should_receive(:unset_deployment_in_progress)
+          @stack_mock.should_receive(:raw_instances).at_least(:once).and_return(
+                      [{ 'instancesSet' => [ { 'privateIpAddress' => '10.1.2.3' } ] }])
           @deployment.execute(true).should be_true
         end
       end
@@ -143,6 +144,8 @@ describe SimpleDeploy do
           @status_mock.stub :clear_for_deployment? => true
           @status_mock.should_receive(:set_deployment_in_progress)
           @status_mock.should_receive(:unset_deployment_in_progress)
+          @stack_mock.should_receive(:raw_instances).at_least(:once).and_return(
+                      [{ 'instancesSet' => [ { 'privateIpAddress' => '10.1.2.3' } ] }])
           @deployment.execute(false).should be_true
         end
 
@@ -152,12 +155,14 @@ describe SimpleDeploy do
                             :clear_for_deployment? => true
           @status_mock.should_receive(:set_deployment_in_progress)
           @status_mock.should_receive(:unset_deployment_in_progress)
+          @stack_mock.should_receive(:raw_instances).at_least(:once).and_return(
+                      [{ 'instancesSet' => [ { 'privateIpAddress' => '10.1.2.3' } ] }])
           @deployment.execute(true).should be_true
         end
       end
     end
 
-    describe "when unsuccesful" do
+    describe "when unsuccessful" do
       it "should not deploy if the stack is not clear to deploy but forced however does not clear in time" do
         @status_mock.stub(:clear_for_deployment?) { false }
         @status_mock.should_receive(:clear_deployment_lock).

data/spec/stack/execute_spec.rb

@@ -1,16 +1,20 @@
 require 'spec_helper'
 
 describe SimpleDeploy::Stack::Execute do
+  include_context 'stubbed config'
+  include_context 'double stubbed stack', :name        => 'my_stack',
+                                          :environment => 'my_env'
+
   before do
     @ssh_mock = mock 'ssh'
-    options = { :config      => @config,
-                :instances   => @instances,
+    options = { :instances   => @instances,
                 :environment => @environment,
                 :ssh_user    => @ssh_user,
                 :ssh_key     => @ssh_key,
-                :stack       => @stack,
+                :stack       => @stack_stub,
                 :name        => @name }
 
+
     SimpleDeploy::Stack::SSH.should_receive(:new).
                              with(options).
                              and_return @ssh_mock