simple_deploy 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+## v0.5.2
+
+* Upgrade to stackster 0.3.0
+* Corrected handling of attributes on stack creation
+
 ## v0.5.1:
 
 * Corrected the use of the domain attribute in URLs during deployments

data/lib/simple_deploy/stack/stack_attribute_formater.rb

@@ -11,11 +11,12 @@ module SimpleDeploy
 
     def updated_attributes(attributes)
       updates = []
-      attributes.each do |attribute|
-        key = attribute.keys.first
+      attributes.each do |attrhash|
+        key = attrhash.keys.first
         if artifact_names.include? key
-          updates << cloud_formation_url(attribute)
-          @logger.info "Adding artifact attribute: #{cloud_formation_url(attribute)}"
+          url_hash = cloud_formation_url attrhash, attributes
+          updates << url_hash
+          @logger.info "Adding artifact attribute: #{url_hash}"
         end
       end
       attributes + updates
@@ -26,13 +27,12 @@ module SimpleDeploy
     def artifact_names
       @config.artifacts
     end
-    
-    def cloud_formation_url(attribute)
-      name = attribute.keys.first
-      id = attribute[name]
 
-      bucket_prefix = @main_attributes["#{name}_bucket_prefix"]
-      domain = @main_attributes["#{name}_domain"]
+    def cloud_formation_url(selected_attribute, updated_attributes)
+      name = selected_attribute.keys.first
+      id = selected_attribute[name]
+
+      bucket_prefix, domain = find_bucket_prefix_and_domain selected_attribute, updated_attributes
       artifact = Artifact.new :name          => name,
                               :id            => id,
                               :region        => @region,
@@ -44,5 +44,24 @@ module SimpleDeploy
       { url_parameter => artifact.endpoints['s3'] }
     end
 
+    def find_bucket_prefix_and_domain(selected_attribute, updated_attributes)
+      name = selected_attribute.keys.first
+
+      bucket_match = updated_attributes.find { |h| h.has_key? "#{name}_bucket_prefix" }
+      if bucket_match
+        bucket_prefix = bucket_match["#{name}_bucket_prefix"]
+      else
+        bucket_prefix = @main_attributes["#{name}_bucket_prefix"]
+      end
+
+      domain_match = updated_attributes.find { |h| h.has_key? "#{name}_domain" }
+      if domain_match
+        domain = domain_match["#{name}_domain"]
+      else
+        domain = @main_attributes["#{name}_domain"]
+      end
+
+      [bucket_prefix, domain]
+    end
   end
 end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/simple_deploy.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
 
   s.add_runtime_dependency "capistrano"
-  s.add_runtime_dependency "stackster", '= 0.2.9'
+  s.add_runtime_dependency "stackster", '= 0.3.0'
   s.add_runtime_dependency "tinder"
   s.add_runtime_dependency "trollop"
 end

data/spec/stack_spec.rb

@@ -4,99 +4,82 @@ describe SimpleDeploy do
 
   before do
     @logger_stub = stub 'logger stub', :info => 'true', :warn => 'true'
-    
     @environment_config_mock = mock 'environment config mock'
-    @config_mock = mock 'config mock'
-    @config_mock.should_receive(:logger).and_return @logger_stub
-    @config_mock.stub(:environment).and_return(@environment_config_mock)
+
+    @config_stub = stub 'config stub', :region => 'us-west-1', :logger => @logger_stub
+    @config_stub.stub(:environment).and_return(@environment_config_mock)
+    @config_stub.stub(:artifacts).and_return(['chef_repo', 'cookbooks', 'app'])
+    @config_stub.stub(:artifact_cloud_formation_url).and_return('CookBooksURL')
 
     SimpleDeploy::Config.should_receive(:new).
                          with(:logger => 'my-logger').
-                         and_return @config_mock
+                         and_return @config_stub
     @stack = SimpleDeploy::Stack.new :environment => 'test-env',
                                      :name        => 'test-stack',
                                      :logger      => 'my-logger',
-                                     :config      => @config_mock
+                                     :config      => @config_stub
+
+    @main_attributes = {
+      'chef_repo_bucket_prefix' => 'test-prefix',
+      'chef_repo_domain' => 'test-domain' 
+    }
+
+    @stack_mock = mock 'stackster stack'
 
-    @main_attributes = { 'arg1_bucket_prefix' => 'arg1_bp' }
+    @expected_attributes = [
+      { 'chef_repo' => 'test123' },
+      { 'CookBooksURL' => 's3://test-prefix-us-west-1/test-domain/test123.tar.gz' }
+    ]
   end
 
-  describe "A stack" do
-    it "should call create stack" do
-      saf_mock = mock 'stack attribute formater mock'
-      stack_mock = mock 'stackster stack mock'
-      stack_mock.stub(:attributes).and_return(@main_attributes)
-      @config_mock.should_receive(:environment).with('test-env').
-                   and_return @environment_config_mock
-      SimpleDeploy::StackAttributeFormater.should_receive(:new).
-                                           with(:config      => @config_mock,
-                                                :environment => 'test-env',
-                                                :main_attributes => @main_attributes).
-                                           and_return saf_mock
-      Stackster::Stack.should_receive(:new).with(:environment => 'test-env',
-                                                 :name        => 'test-stack',
-                                                 :config      => @environment_config_mock,
-                                                 :logger      => @logger_stub).
-                                            and_return stack_mock
-      saf_mock.should_receive(:updated_attributes).with({'arg1' => 'val'}).
-               and_return('arg1' => 'new_val')
-      stack_mock.should_receive(:create).with :attributes => { 'arg1' => 'new_val' },
-                                              :template   => 'some_json'
-      @stack.create(:attributes => { 'arg1' => 'val' }, 
-                    :template => 'some_json')
+  describe "creating a stack" do
+    before do
+      @stack_mock.stub(:attributes).and_return({})
     end
 
-    it "should call update stack" do
-      deployment_stub = stub 'deployment', :clear_for_deployment? => true
-      @stack.stub(:deployment).and_return(deployment_stub)
-
-      saf_mock = mock 'stack attribute formater mock'
-      stack_mock = mock 'stackster stack mock'
-      stack_mock.stub(:attributes).and_return(@main_attributes)
-      @config_mock.should_receive(:environment).with('test-env').
-                   and_return @environment_config_mock
-      SimpleDeploy::StackAttributeFormater.should_receive(:new).
-                                           with(:config      => @config_mock,
-                                                :environment => 'test-env',
-                                                :main_attributes => @main_attributes).
-                                           and_return saf_mock
+    it "should set the attributes using what is passed to the create command" do
       Stackster::Stack.should_receive(:new).with(:environment => 'test-env',
                                                  :name        => 'test-stack',
                                                  :config      => @environment_config_mock,
                                                  :logger      => @logger_stub).
-                                            and_return stack_mock
-      saf_mock.should_receive(:updated_attributes).with({'arg1' => 'val'}).
-               and_return('arg1' => 'new_val')
-      stack_mock.should_receive(:update).with :attributes => { 'arg1' => 'new_val' }
-      @stack.update :attributes => { 'arg1' => 'val' }
+                                            and_return @stack_mock
+
+      expecteds = [
+        { 'chef_repo' => 'test123' },
+        { 'chef_repo_bucket_prefix' => 'test-prefix' },
+        { 'chef_repo_domain' => 'test-domain' },
+        { 'CookBooksURL' => 's3://test-prefix-us-west-1/test-domain/test123.tar.gz' }
+      ]
+      @stack_mock.should_receive(:create).with :attributes => expecteds,
+                                               :template   => 'some_json'
+
+      attributes = [
+        { 'chef_repo' => 'test123' },
+        { 'chef_repo_bucket_prefix' => 'test-prefix' },
+        { 'chef_repo_domain' => 'test-domain' }
+      ]
+
+      @stack.create :attributes => attributes, :template => 'some_json'
     end
-
   end
 
   describe "updating a stack" do
+    before do
+      @stack_mock.stub(:attributes).and_return(@main_attributes)
+    end
+
     it "should update when the deployment is not locked" do
       deployment_stub = stub 'deployment', :clear_for_deployment? => true
       @stack.stub(:deployment).and_return(deployment_stub)
 
-      saf_mock = mock 'stack attribute formater mock'
-      stack_mock = mock 'stackster stack mock'
-      stack_mock.stub(:attributes).and_return(@main_attributes)
-      @config_mock.should_receive(:environment).with('test-env').
-                   and_return @environment_config_mock
-      SimpleDeploy::StackAttributeFormater.should_receive(:new).
-                                           with(:config      => @config_mock,
-                                                :environment => 'test-env',
-                                                :main_attributes => @main_attributes).
-                                           and_return saf_mock
       Stackster::Stack.should_receive(:new).with(:environment => 'test-env',
                                                  :name        => 'test-stack',
                                                  :config      => @environment_config_mock,
                                                  :logger      => @logger_stub).
-                                            and_return stack_mock
-      saf_mock.should_receive(:updated_attributes).with({'arg1' => 'val'}).
-               and_return('arg1' => 'new_val')
-      stack_mock.should_receive(:update).with :attributes => { 'arg1' => 'new_val' }
-      @stack.update :attributes => { 'arg1' => 'val' }
+                                            and_return @stack_mock
+      @stack_mock.should_receive(:update).with :attributes => @expected_attributes
+
+      @stack.update :attributes => [{ 'chef_repo' => 'test123' }]
     end
 
     it "should not update when the deployment is locked and force is not set" do
@@ -115,23 +98,14 @@ describe SimpleDeploy do
       deployment_mock.should_receive(:clear_deployment_lock).with(true)
       @stack.stub(:deployment).and_return(deployment_mock)
 
-      saf_mock = mock 'stack attribute formater mock'
-      stack_mock = mock 'stackster stack mock'
-      stack_mock.stub(:attributes).and_return(@main_attributes)
-      SimpleDeploy::StackAttributeFormater.should_receive(:new).
-                                           with(:config      => @config_mock,
-                                                :environment => 'test-env',
-                                                :main_attributes => @main_attributes).
-                                           and_return saf_mock
       Stackster::Stack.should_receive(:new).with(:environment => 'test-env',
                                                  :name        => 'test-stack',
                                                  :config      => @environment_config_mock,
                                                  :logger      => @logger_stub).
-                                            and_return stack_mock
-      saf_mock.should_receive(:updated_attributes).with({'arg1' => 'val'}).
-               and_return('arg1' => 'new_val')
-      stack_mock.should_receive(:update).with :attributes => { 'arg1' => 'new_val' }
-      @stack.update :force => true, :attributes => { 'arg1' => 'val' }
+                                            and_return @stack_mock
+      @stack_mock.should_receive(:update).with :attributes => @expected_attributes
+
+      @stack.update :force => true, :attributes => [{ 'chef_repo' => 'test123' }]
     end
 
     it "should not update when the deployment is locked and force is set false" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155888560 !ruby/object:Gem::Requirement
+  requirement: &2164719400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155888560
+  version_requirements: *2164719400
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2155887980 !ruby/object:Gem::Requirement
+  requirement: &2164718320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155887980
+  version_requirements: *2164718320
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &2155887300 !ruby/object:Gem::Requirement
+  requirement: &2164716240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155887300
+  version_requirements: *2164716240
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &2155886560 !ruby/object:Gem::Requirement
+  requirement: &2164728520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155886560
+  version_requirements: *2164728520
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2156048720 !ruby/object:Gem::Requirement
+  requirement: &2164727880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156048720
+  version_requirements: *2164727880
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net