simple_deploy 0.5.2 → 0.5.3

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p125@simple_deploy --create
+rvm use ruby-1.9.3-p194@simple_deploy --create

data/CHANGELOG

@@ -1,3 +1,10 @@
+## v0.5.3
+
+* Added a clone command that clones a stack
+* Updated the protect command so it allows multiple stacks
+* Updated the instances command so it tells the user when the stack does not exist
+* Updated the outputs command to make the output values easier to read
+
 ## v0.5.2
 
 * Upgrade to stackster 0.3.0

data/lib/simple_deploy/cli/clone.rb

@@ -0,0 +1,79 @@
+require 'trollop'
+require 'tempfile'
+
+module SimpleDeploy
+  module CLI
+    class Clone
+      def clone
+        @opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Clone a stack.
+
+simple_deploy clone -s SOURCE_STACK_NAME -n NEW_STACK_NAME -e ENVIRONMENT -a ATTRIB1=VALUE -a ATTRIB2=VALUE
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :source_name, "Stack name for the stack to clone", :type => :string
+          opt :new_name, "Stack name for the new stack", :type => :string
+          opt :attributes, "= separated attribute and it's value", :type  => :string,
+                                                                   :multi => true
+        end
+
+        CLI::Shared.valid_options? :provided => @opts,
+                                   :required => [:environment, :source_name, :new_name]
+
+        override_attributes = CLI::Shared.parse_attributes :attributes => @opts[:attributes],
+                                                           :logger     => logger
+
+        cloned_attributes = filter_attributes source_stack.attributes
+        new_attributes = merge_attributes cloned_attributes, override_attributes
+
+        template_file = Tempfile.new("#{@opts[:new_name]}_template.json").path
+        File::open(template_file, 'w') { |f| f.write source_stack.template.to_json }
+
+        new_stack.create :attributes => new_attributes,
+                         :template   => template_file
+      end
+
+      private
+
+      def filter_attributes(source_attributes)
+        selected = source_attributes.select { |k| k !~ /^deployment/ }
+        selected.map { |k,v| { k => v } }
+      end
+
+      def merge_attributes(cloned_attributes, override_attributes)
+        cloned_attributes.map do |clone|
+          key = clone.keys.first
+          override = override_attributes.find { |o| o.has_key? key }
+          override ? override : clone
+        end
+      end
+
+      def config
+        @config ||= Config.new.environment @opts[:environment]
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def source_stack
+        @source_stack ||= Stack.new :environment => @opts[:environment],
+                                    :name        => @opts[:source_name],
+                                    :config      => config,
+                                    :logger      => logger
+      end
+
+      def new_stack
+        @new_stack ||= Stack.new :environment => @opts[:environment],
+                                 :name        => @opts[:new_name],
+                                 :config      => config,
+                                 :logger      => logger
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/instances.rb

@@ -30,7 +30,12 @@ EOS
                           :config      => config,
                           :logger      => logger
 
-        jj stack.instances
+        instances = stack.instances
+        if instances.nil? || instances.empty?
+          puts "stack '#{opts[:name]}' does not exist"
+        else
+          jj stack.instances
+        end
       end
     end
   end

data/lib/simple_deploy/cli/outputs.rb

@@ -32,7 +32,10 @@ EOS
                           :config      => config,
                           :logger      => logger
 
-        puts stack.outputs
+        outputs = stack.outputs
+        outputs.each do |hash|
+          puts "%30s: %s" % [hash['OutputKey'], hash['OutputValue']]
+        end
       end
     end
   end

data/lib/simple_deploy/cli/protect.rb

@@ -9,9 +9,9 @@ module SimpleDeploy
           version SimpleDeploy::VERSION
           banner <<-EOS
 
-Protect a stack.
+Protect/Unprotect one or more stacks.
 
-simple_deploy protect -n STACK_NAME -e ENVIRONMENT -p on_off
+simple_deploy protect -n STACK_NAME1 -n STACK_NAME2 -e ENVIRONMENT -p on_off
 
 EOS
           opt :help, "Display Help"
@@ -19,7 +19,8 @@ EOS
           opt :protection, "Enable/Disable protection using on/off", :type  => :string
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
-          opt :name, "Stack name of stack to protect", :type => :string
+          opt :name, "Stack name(s) of stacks to protect", :type => :string,
+                                                           :multi => true
         end
 
         CLI::Shared.valid_options? :provided => opts,
@@ -29,11 +30,13 @@ EOS
 
         logger = SimpleDeployLogger.new :log_level => opts[:log_level]
 
-        stack = Stack.new :environment => opts[:environment],
-                          :name        => opts[:name],
-                          :config      => config,
-                          :logger      => logger
-        stack.update :attributes => [{ 'protection' => opts[:protection] }]
+        opts[:name].each do |name|
+          stack = Stack.new :environment => opts[:environment],
+                            :name        => name,
+                            :config      => config,
+                            :logger      => logger
+          stack.update :attributes => [{ 'protection' => opts[:protection] }]
+        end
       end
     end
   end

data/lib/simple_deploy/cli.rb

@@ -3,6 +3,7 @@ require 'trollop'
 require 'simple_deploy/cli/shared'
 
 require 'simple_deploy/cli/attributes'
+require 'simple_deploy/cli/clone'
 require 'simple_deploy/cli/create'
 require 'simple_deploy/cli/deploy'
 require 'simple_deploy/cli/destroy'
@@ -26,6 +27,8 @@ module SimpleDeploy
       case cmd
       when 'attributes'
         CLI::Attributes.new.show
+      when 'clone'
+        CLI::Clone.new.clone
       when 'create'
         CLI::Create.new.create
       when 'destroy', 'delete'
@@ -57,13 +60,13 @@ module SimpleDeploy
       when 'update'
         CLI::Update.new.update
       when '-h'
-        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|protect|resources|ssh|status|update] [options]"
+        puts "simple_deploy [attributes|clone|create|destroy|environments|events|instances|list|template|outputs|parameters|protect|resources|ssh|status|update] [options]"
         puts "Append -h for help on specific subcommand."
       when '-v'
         puts SimpleDeploy::VERSION
       else
         puts "Unknown command: '#{cmd}'."
-        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|protect|resources|ssh|status|update] [options]"
+        puts "simple_deploy [attributes|clone|create|destroy|environments|events|instances|list|template|outputs|parameters|protect|resources|ssh|status|update] [options]"
         puts "Append -h for help on specific subcommand."
         exit 1
       end

data/lib/simple_deploy/version.rb

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

data/script/ci_setup

@@ -3,11 +3,13 @@
 # Source RVM profile and set ruby / gemset
 . /etc/profile
 
+# Use simple deploy gemset
+rvm use "1.9.3-p194@simple_deploy" --create
+
 # Exit with error if any command returns non zero
 set -e
 
 # Bundle gems
-rvm use "1.9.3-p125@simple_deploy" --create
 bundle
 
 # Run spec tests

data/spec/cli/clone_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+require 'simple_deploy/cli'
+
+describe SimpleDeploy::CLI::Clone do
+
+  describe 'clone' do
+    context 'filter_attributes' do
+      before do
+        @source_attributes = {
+          'AmiId' => 'ami-7b6a4e3e',
+          'AppEnv' => 'pod-2-cd-1',
+          'MaximumAppInstances' => 1,
+          'MinimumAppInstances' => 1,
+          'chef_repo_bucket_prefix' => 'intu-lc',
+          'chef_repo_domain' => 'live_community_chef_repo',
+          'deployment_user' => 'rmendes'
+        }
+      end
+
+      it 'should filter out deployment attributes' do
+        new_attributes = subject.send(:filter_attributes, @source_attributes)
+
+        new_attributes.size.should == 6
+
+        new_attributes[0].has_key?('AmiId').should be_true
+        new_attributes[0]['AmiId'].should == 'ami-7b6a4e3e'
+        new_attributes[1].has_key?('AppEnv').should be_true
+        new_attributes[1]['AppEnv'].should == 'pod-2-cd-1'
+        new_attributes[2].has_key?('MaximumAppInstances').should be_true
+        new_attributes[2]['MaximumAppInstances'].should == 1
+        new_attributes[3].has_key?('MinimumAppInstances').should be_true
+        new_attributes[3]['MinimumAppInstances'].should == 1
+        new_attributes[4].has_key?('chef_repo_bucket_prefix').should be_true
+        new_attributes[4]['chef_repo_bucket_prefix'].should == 'intu-lc'
+        new_attributes[5].has_key?('chef_repo_domain').should be_true
+        new_attributes[5]['chef_repo_domain'].should == 'live_community_chef_repo'
+      end
+    end
+
+    context 'merge_attributes' do
+      before do
+        @cloned_attributes = [
+          { 'AmiId' => 'ami-7b6a4e3e' },
+          { 'AppEnv' => 'pod-2-cd-1' },
+          { 'MaximumAppInstances' => 1 },
+          { 'MinimumAppInstances' => 1 },
+          { 'chef_repo_bucket_prefix' => 'intu-lc' },
+          { 'chef_repo_domain' => 'live_community_chef_repo' },
+          { 'deployment_user' => 'rmendes' }
+        ]
+
+        @override_attributes = [
+          { 'chef_repo_bucket_prefix' => 'updated-intu-lc' },
+          { 'chef_repo_domain' => 'updated_community_chef_repo' }
+        ]
+      end
+
+      it 'should merge the override attributes' do
+        merged_attributes = subject.send(:merge_attributes, @cloned_attributes, @override_attributes)
+
+        merged_attributes.size.should == 7
+
+        merged_attributes[0].has_key?('AmiId').should be_true
+        merged_attributes[0]['AmiId'].should == 'ami-7b6a4e3e'
+        merged_attributes[1].has_key?('AppEnv').should be_true
+        merged_attributes[1]['AppEnv'].should == 'pod-2-cd-1'
+        merged_attributes[2].has_key?('MaximumAppInstances').should be_true
+        merged_attributes[2]['MaximumAppInstances'].should == 1
+        merged_attributes[3].has_key?('MinimumAppInstances').should be_true
+        merged_attributes[3]['MinimumAppInstances'].should == 1
+        merged_attributes[4].has_key?('chef_repo_bucket_prefix').should be_true
+        merged_attributes[4]['chef_repo_bucket_prefix'].should == 'updated-intu-lc'
+        merged_attributes[5].has_key?('chef_repo_domain').should be_true
+        merged_attributes[5]['chef_repo_domain'].should == 'updated_community_chef_repo'
+        merged_attributes[6].has_key?('deployment_user').should be_true
+        merged_attributes[6]['deployment_user'].should == 'rmendes'
+      end
+    end
+
+    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',
+                     :new_name    => 'new_stack',
+                     :attributes  => ['chef_repo_bucket_prefix=updated-intu-lc', 'chef_repo_domain=updated_community_chef_repo'] }
+
+        @source_stack   = stub :attributes => {
+          'AmiId' => 'ami-7b6a4e3e',
+          'AppEnv' => 'pod-2-cd-1',
+          'MaximumAppInstances' => 1,
+          'MinimumAppInstances' => 1,
+          '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)
+      end
+      
+      it 'should create the new stack using the filtered and merged attributes' do
+        SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                 with(:provided => @options,
+                                      :required => [:environment, :source_name, :new_name])
+        Trollop.stub(:options).and_return(@options)
+
+        @new_stack.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' }]
+          options[:template].should match /new_stack_template.json/
+        end
+
+        subject.clone
+      end
+    end
+  end
+end

data/spec/cli/protect_spec.rb

@@ -19,7 +19,7 @@ describe SimpleDeploy::CLI::Protect do
     it "should enable protection" do
       options = { :environment => 'my_env',
                   :log_level   => 'debug',
-                  :name        => 'my_stack',
+                  :name        => ['my_stack'],
                   :protection  => 'on' }
 
       SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
@@ -40,10 +40,41 @@ describe SimpleDeploy::CLI::Protect do
       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' }
+
+      SimpleDeploy::CLI::Shared.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
+
     it "should disable protection" do
       options = { :environment => 'my_env',
                   :log_level   => 'debug',
-                  :name        => 'my_stack',
+                  :name        => ['my_stack'],
                   :protection  => 'off' }
 
       SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
@@ -63,5 +94,36 @@ describe SimpleDeploy::CLI::Protect do
 
       subject.protect
     end
+
+    it "should disable protection for multiple stacks" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => ['my_stack1', 'my_stack2'],
+                  :protection  => 'off' }
+
+      SimpleDeploy::CLI::Shared.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
+    end
   end 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164719400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164719400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2164718320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164718320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &2164716240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164716240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &2164728520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164728520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2164727880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164727880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -86,6 +111,7 @@ files:
 - lib/simple_deploy/artifact.rb
 - lib/simple_deploy/cli.rb
 - lib/simple_deploy/cli/attributes.rb
+- lib/simple_deploy/cli/clone.rb
 - lib/simple_deploy/cli/create.rb
 - lib/simple_deploy/cli/deploy.rb
 - lib/simple_deploy/cli/destroy.rb
@@ -114,6 +140,7 @@ files:
 - simple_deploy.gemspec
 - spec/artifact_spec.rb
 - spec/cli/attributes_spec.rb
+- spec/cli/clone_spec.rb
 - spec/cli/deploy_spec.rb
 - spec/cli/destroy_spec.rb
 - spec/cli/protect_spec.rb
@@ -148,13 +175,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_deploy
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: I help with deployments
 test_files:
 - spec/artifact_spec.rb
 - spec/cli/attributes_spec.rb
+- spec/cli/clone_spec.rb
 - spec/cli/deploy_spec.rb
 - spec/cli/destroy_spec.rb
 - spec/cli/protect_spec.rb