simple_deploy 0.7.6.beta.1 → 0.7.6.beta.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 05edf27f77f29c8d99c992b7736ba3393543e8a2
+  data.tar.gz: 51710aa5eac62c1943b959f4929962d53150c027
+SHA512:
+  metadata.gz: 38ecf0947147ad91ef5ba62d1ed7c8c077b14a10395e82f902e5817b07b5cf8eeb1bea171a90b71268a45059f98445b3216758faf12a93810796640c70b4a448
+  data.tar.gz: 21e5b0507a33b06b84d3a8ea21d50402c28d6f6c5ca8f062bd206b0c4a22b27e62c58433da27e579a1a0e5e0bbd29dd5d9e5009d2917787c5c184f6bc81cbd32

data/.gitignore

@@ -3,7 +3,6 @@
 Gemfile.lock
 pkg/*
 coverage
-.ruby-version
-.rvmrc
 *.swp
 .idea/*
+.DS_Store

data/.ruby-gemset

@@ -0,0 +1 @@
+simple_deploy

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p247

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## HEAD:
 
+* Added feature for issue 169 to remove values which are set to nil
+* Added feature for issue 191 to read in input stack for clone command
 * Fixed issue 176 where multiple deploys did not exit if first deploy failed
 * Fixed find_xml_file error when a blank exception is thrown from cloudformation.
 

data/lib/simple_deploy/aws/cloud_formation/error.rb

@@ -20,7 +20,8 @@ module SimpleDeploy
                 when 'No updates are to be performed.'
                   @logger.info msg
                 when /Template requires parameter(.*)/
-                  @logger.info msg
+                  @logger.error  msg
+                  raise Exceptions::CloudFormationError.new msg
                 when /^Stack:(.*) does not exist$/
                   @logger.error msg
                   raise Exceptions::UnknownStack.new msg

data/lib/simple_deploy/aws/simpledb.rb

@@ -47,6 +47,10 @@ module SimpleDeploy
         @connect.delete_attributes domain, key
       end
 
+      def delete_items(domain, key, attributes)
+        @connect.delete_attributes domain, key, attributes
+      end
+
     end
   end
 end

data/lib/simple_deploy/cli/clone.rb

@@ -19,6 +19,10 @@ simple_deploy clone -s SOURCE_STACK_NAME -n NEW_STACK_NAME -e ENVIRONMENT -a ATT
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
+          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 :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
           opt :source_name, "Stack name for the stack to clone", :type => :string
@@ -35,10 +39,7 @@ EOS
         SimpleDeploy.logger @opts[:log_level]
 
         override_attributes = parse_attributes :attributes => @opts[:attributes]
-
         cloned_attributes = filter_attributes source_stack.attributes
-        new_attributes = merge_attributes cloned_attributes, override_attributes
-        new_attributes += add_attributes cloned_attributes, override_attributes
 
         template_file = Tempfile.new("#{@opts[:new_name]}_template.json")
         template_file_path = template_file.path
@@ -49,6 +50,18 @@ EOS
           template_file.write source_stack.template
         end
 
+        if @opts[:input_stack]
+          input_attributes = mapper.map_outputs_from_stacks :stacks => @opts[:input_stack],
+                                                            :template => template_file_path
+          new_overrides = merge_attributes input_attributes, override_attributes
+          new_overrides += add_attributes input_attributes, override_attributes
+        else
+          new_overrides = override_attributes
+        end
+
+        new_attributes = merge_attributes cloned_attributes, new_overrides
+        new_attributes += add_attributes cloned_attributes, new_overrides
+
         rescue_exceptions_and_exit do
           new_stack.create :attributes => new_attributes,
                            :template   => template_file_path
@@ -83,6 +96,10 @@ EOS
         end.compact
       end
 
+      def mapper
+        @om ||= Stack::OutputMapper.new :environment => @opts[:environment]
+      end
+
       def source_stack
         @source_stack = Stack.new :name        => @opts[:source_name],
                                   :environment => @opts[:environment]

data/lib/simple_deploy/cli/deploy.rb

@@ -86,11 +86,11 @@ EOS
             if result
               notifier.send_deployment_complete_message unless @opts[:quiet]
             else
-              logger.error "Deployment to #{name} did not complete succesfully."
+              logger.error "Deployment to #{name} did not complete successfully."
               exit 1
             end
           else
-            logger.error "Update of #{name} did not complete succesfully."
+            logger.error "Update of #{name} did not complete successfully."
             exit 1
           end
 

data/lib/simple_deploy/entry.rb

@@ -28,26 +28,33 @@ module SimpleDeploy
     end
 
     def set_attributes(a)
-      a.each { |attribute| @custom_attributes.merge! attribute }
+      a.each do |attribute|
+        @custom_attributes.merge! attribute
+      end
     end
 
     def save
-      @custom_attributes.merge! 'Name' => name,
+      @custom_attributes.merge! 'Name'      => name,
                                 'CreatedAt' => Time.now.utc.to_s
 
-      current_attributes = attributes
-      current_attributes.each_pair do |key,value|
-        @logger.debug "Setting attribute #{key}=#{value}"
+      current_attributes = attributes.reject do |key,value|
+        if value == 'nil'
+          @logger.info "Removing attribute set to nil '#{key}'."
+          sdb_connect.delete_items 'stacks', name, key => nil
+          true
+        end
       end
 
-      sdb_connect.put_attributes('stacks', 
-                                  name, 
-                                  current_attributes, 
-                                 :replace => current_attributes.keys )
+      current_attributes.each_pair {|k,v| @logger.debug "Setting attribute #{k}=#{v}"}
 
-      @logger.debug "Save to SimpleDB successful."
-    end
+      sdb_connect.put_attributes 'stacks',
+                                  name,
+                                  current_attributes,
+                                 :replace => current_attributes.keys
 
+      @logger.debug "Save to SimpleDB successful." 
+    end
+ 
     def delete_attributes
       sdb_connect.delete('stacks', name)
       @logger.info "Delete from SimpleDB successful."

data/lib/simple_deploy/stack/output_mapper.rb

@@ -15,7 +15,6 @@ module SimpleDeploy
         merge_stacks_outputs
 
         pluralize_keys
-
         prune_unused_parameters
 
         @results.each_pair do |key, value|

data/lib/simple_deploy/stack/stack_updater.rb

@@ -51,6 +51,10 @@ module SimpleDeploy
       h = {}
       entry_attributes = @entry.attributes
       template_parameters.each do |p|
+        if entry_attributes[p] == 'nil'
+          @logger.debug "Skipping attribute #{p}"
+          next
+        end
         h[p] = entry_attributes[p] if entry_attributes[p]
       end
       h

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.7.6.beta.1"
+  VERSION = "0.7.6.beta.3"
 end

data/spec/aws/simpledb_spec.rb

@@ -85,5 +85,13 @@ describe SimpleDeploy::AWS::SimpleDB do
 
       @db.delete('domain1', 'item1').body['RequestId'].should == 'rid'
     end
+  end  
+  
+  describe 'delete_items' do
+    it 'should delete the specific attributes passed associated with domain and key' do
+      @db_mock.should_receive(:delete_attributes).with('domain1', 'item1', {'value'=>nil}).and_return(@response_stub)
+
+      @db.delete_items('domain1', 'item1', {'value'=>nil}).body['RequestId'].should == 'rid'
+    end
   end
 end

data/spec/cli/clone_spec.rb

@@ -186,6 +186,46 @@ describe SimpleDeploy::CLI::Clone do
 
         subject.clone
       end
+
+      it 'should create the new stack using existing input stack, but cmd line args win' do
+        options = { :environment  => 'my_env',
+                     :input_stack => 'input_stack',
+                     :template    => 'brand_new_template.json',
+                     :log_level   => 'debug',
+                     :source_name => 'source_stack',
+                     :new_name    => 'new_stack',
+                     :attributes  => ['chef_repo_bucket_prefix=updated-intu-lc',
+                                      'chef_repo_domain=updated_community_chef_repo',
+                                      'SolrClientTrafficContainer=solr-client-traffic-container', 
+                                      'InputStackOutputs=cmdline_value'] }
+
+        input_attributes = [{'InputStackOutputs' => 'inputvalue'}, {'OutputValue' => 'outputs'}]
+        input_stub = stub 'input', :map_outputs_from_stacks => input_attributes
+        SimpleDeploy::Stack::OutputMapper.stub :new => input_stub
+
+        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_mock.should_receive(:create) do |options|
+          options[:attributes].should == [{ 'AmiId' => 'ami-7b6a4e3e' },
+                                          { 'AppEnv' => 'pod-2-cd-1' },
+                                          { 'MaximumAppInstances' => 1 },
+                                          { 'MinimumAppInstances' => 1 },
+                                          { 'chef_repo_bucket_prefix' => 'updated-intu-lc' },
+                                          { 'chef_repo_domain' => 'updated_community_chef_repo' },
+                                          { 'InputStackOutputs' => 'cmdline_value' },
+                                          { 'OutputValue' => 'outputs'},
+                                          { 'SolrClientTrafficContainer' => 'solr-client-traffic-container' }]
+                                          
+          options[:template].should match /brand_new_template.json/
+        end
+
+        subject.clone
+      end
+
     end
   end
 end

data/spec/entry_spec.rb

@@ -73,6 +73,37 @@ describe SimpleDeploy::Entry do
       @entry.save
     end
 
+    it "should remove attributes set to nil" do
+      Timecop.travel Time.utc(2012, 10, 22, 13, 30)
+
+      @simple_db_mock.should_receive(:select).
+                      with("select * from stacks where itemName() = 'test-stack-us-west-1'").
+                      and_return('test-stack-us-west-1' => { 'key1' => ['value1'] }) 
+      
+      @simple_db_mock.should_receive(:delete_items).
+                      with("stacks",
+                           "test-stack-us-west-1",
+                           {'key2' => nil})
+
+      @simple_db_mock.should_receive(:delete_items).
+                      with("stacks",
+                           "test-stack-us-west-1",
+                           {'key3' => nil})
+
+
+      @simple_db_mock.should_receive(:put_attributes).
+                      with("stacks", 
+                           "test-stack-us-west-1", 
+                           { "key"       => "value",
+                             "key1"      => "value1",
+                             "Name"      => "test-stack-us-west-1",
+                             "CreatedAt" => "2012-10-22 13:30:00 UTC" }, 
+                           { :replace => ["key1", "key", "Name", "CreatedAt"] } )
+      @entry.set_attributes(['key' => 'value', 'key2' => 'nil', 'key3' => 'nil'])
+      
+      @entry.save
+    end
+
     it "should merge custom attributes" do
       @simple_db_mock.should_receive(:select).
                       with("select * from stacks where itemName() = 'test-stack-us-west-1'").

data/spec/stack/stack_updater_spec.rb

@@ -38,7 +38,7 @@ describe SimpleDeploy::StackUpdater do
   end
 
   it "should update the stack when parameters change and stack is stable" do
-    attributes = { "param1" => "value1", "param3" => "value3" }
+    attributes = { "param1" => "value1", "param3" => "value3" , "paramremove" => "nil" }
     entry_mock = mock 'entry mock'
     status_mock = mock 'status mock'
     cloud_formation_mock = mock 'cloud formation mock'
@@ -63,7 +63,7 @@ describe SimpleDeploy::StackUpdater do
   end
 
   it "should update the stack when only the template body changes and stack is stable" do
-    attributes = { "param1" => "value1", "param3" => "value3" }
+    attributes = { "param1" => "value1", "param3" => "value3" , "paramremove" => "nil" }
     entry_mock = mock 'entry mock'
     status_mock = mock 'status mock'
     cloud_formation_mock = mock 'cloud formation mock'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.7.6.beta.1
-  prerelease: 6
+  version: 0.7.6.beta.3
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: esbit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -181,6 +160,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -286,27 +267,26 @@ files:
 - spec/template_spec.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: simple_deploy
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Opinionated gem for AWS resource management.
 test_files:
 - spec/artifact_spec.rb