simple_deploy 0.4.8 → 0.5.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+*.swp

data/CHANGELOG

@@ -1,3 +1,13 @@
+## v0.5.0:
+
+* Updated the update command so it accepts a force option
+* Refactored deployments to read bucket_prefix and domain from attributes instead of the yaml file
+* Added a protect command that allows users to toggle whether stacks should be protected from destroy calls
+* Refactored the deployment locking logic
+* Corrected the destroy command so it no longer creates a deployment
+* Gracefully exit if the .simple_deploy.yml file is missing or corrupt
+* Corrected the update command so it now checks the deployment lock at the beginning of the process
+
 ## v0.4.8:
 
 * Added as_command_args option to attributes cli

data/Rakefile

@@ -1,10 +1,8 @@
 require "bundler/gem_tasks"
-
 require 'rspec/core/rake_task'
 
-task :default => [:spec]
-
 desc 'Run specs'
+
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = %w(-fs --color)
+    t.rspec_opts = %w(--color)
 end

data/lib/simple_deploy/artifact.rb

@@ -3,11 +3,10 @@ module SimpleDeploy
 
     def initialize(args)
       @bucket_prefix = args[:bucket_prefix]
-      @config = args[:config]
       @id = args[:id]
       @name = args[:name]
       @region = args[:region]
-      @domain = @config.artifact_domain @name
+      @domain = args[:domain]
 
       @bucket = "#{@bucket_prefix}-#{@region}"
       @key = "#{@id}.tar.gz"

data/lib/simple_deploy/cli/deploy.rb

@@ -41,7 +41,7 @@ EOS
                             :name        => name,
                             :logger      => logger
 
-          stack.update(:attributes => new_attributes) if new_attributes.any?
+          stack.update :force => opts[:force], :attributes => new_attributes if new_attributes.any?
 
           if stack.deploy opts[:force]
             notifier.send_deployment_complete_message unless opts[:quiet]

data/lib/simple_deploy/cli/destroy.rb

@@ -32,7 +32,11 @@ EOS
                           :config      => config,
                           :logger      => logger
 
-        stack.destroy
+        if stack.destroy
+          exit 0
+        else
+          exit 1
+        end
       end
     end
   end

data/lib/simple_deploy/cli/protect.rb

@@ -0,0 +1,42 @@
+
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Protect
+      def protect
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Protect a stack.
+
+simple_deploy protect -n STACK_NAME -e ENVIRONMENT -a PROTECTION=ON_OFF
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :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
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
+                                                  :logger     => logger
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+        stack.update :attributes => attributes
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/update.rb

@@ -17,6 +17,7 @@ EOS
           opt :attributes, "= seperated attribute and it's value", :type  => :string,
                                                                    :multi => true
           opt :environment, "Set the target environment", :type => :string
+          opt :force, "Force an update to proceed"
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
           opt :name, "Stack name(s) of stack to deploy", :type => :string,
@@ -38,7 +39,7 @@ EOS
                             :name        => name,
                             :config      => config,
                             :logger      => logger
-          stack.update :attributes => attributes
+          stack.update :force => opts[:force], :attributes => attributes
         end
       end
     end

data/lib/simple_deploy/cli.rb

@@ -11,6 +11,7 @@ require 'simple_deploy/cli/instances'
 require 'simple_deploy/cli/list'
 require 'simple_deploy/cli/outputs'
 require 'simple_deploy/cli/parameters'
+require 'simple_deploy/cli/protect'
 require 'simple_deploy/cli/resources'
 require 'simple_deploy/cli/ssh'
 require 'simple_deploy/cli/status'
@@ -43,6 +44,8 @@ module SimpleDeploy
         CLI::Outputs.new.show
       when 'parameters'
         CLI::Parameters.new.show
+      when 'protect'
+        CLI::Protect.new.protect
       when 'resources'
         CLI::Resources.new.show
       when 'status'

data/lib/simple_deploy/config.rb

@@ -26,14 +26,6 @@ module SimpleDeploy
       name_to_url_map[artifact]
     end 
 
-    def artifact_domain(artifact)
-      config['artifacts'][artifact]['domain'] ||= artifact
-    end
-
-    def artifact_bucket_prefix(artifact)
-      config['artifacts'][artifact]['bucket_prefix']
-    end
-
     def deploy_script
       '/opt/intu/admin/bin/configure.sh'
     end
@@ -59,7 +51,14 @@ module SimpleDeploy
 
     def load_config_file
       config_file = "#{ENV['HOME']}/.simple_deploy.yml"
-      self.config = YAML::load( File.open( config_file ) )
+
+      begin
+        self.config = YAML::load( File.open( config_file ) )
+      rescue Errno::ENOENT
+        raise "#{config_file} not found"
+      rescue Psych::SyntaxError => e
+        raise "#{config_file} is corrupt"
+      end
     end
 
     def env_home

data/lib/simple_deploy/stack/deployment/status.rb

@@ -11,14 +11,14 @@ module SimpleDeploy
           @logger = @config.logger
         end
 
-        def cleared_to_deploy?(force=false)
-          return true unless deployment_in_progress?
+        def clear_for_deployment?
+          !deployment_in_progress?
+        end
 
-          if force          
+        def clear_deployment_lock(force=false)
+          if deployment_in_progress? && force
             @logger.info "Forcing. Clearing deployment status."
             unset_deployment_in_progress
-          else
-            false
           end
         end
 

data/lib/simple_deploy/stack/deployment.rb

@@ -20,6 +20,10 @@ module SimpleDeploy
       end
 
       def create_deployment 
+        if @instances.nil? || @instances.empty?
+          raise "There are no running instances to deploy to"
+        end
+
         @deployment = Capistrano::Configuration.new :output => @logger
         @deployment.logger.level = 3
         @logger.info "Creating deployment to #{@name}."
@@ -32,7 +36,7 @@ module SimpleDeploy
       end
 
       def execute(force=false)
-        if status.cleared_to_deploy?(force)
+        if clear_for_deployment?
           status.set_deployment_in_progress
           @logger.info 'Starting deployment.'
           @deployment.simpledeploy
@@ -45,6 +49,14 @@ module SimpleDeploy
         end
       end
 
+      def clear_for_deployment?
+        status.clear_for_deployment?
+      end
+
+      def clear_deployment_lock(force=false)
+        status.clear_deployment_lock(force)
+      end
+
       def ssh
         @stack.instances.map do |instance|
           info = instance['instancesSet'].first
@@ -76,12 +88,13 @@ module SimpleDeploy
         h = {}
         @config.artifacts.each do |artifact|
           variable = @config.artifact_deploy_variable artifact
-          bucket_prefix = @config.artifact_bucket_prefix artifact
+          bucket_prefix = @attributes["#{artifact}_bucket_prefix"]
+          domain = @attributes["#{artifact}_domain"]
 
           artifact = Artifact.new :name          => artifact,
                                   :id            => @attributes[artifact],
                                   :region        => @region,
-                                  :config        => @config,
+                                  :domain        => domain,
                                   :bucket_prefix => bucket_prefix
 
           h[variable] = artifact.endpoints['s3']
@@ -108,7 +121,7 @@ module SimpleDeploy
           @deployment.set :gateway, ssh_gateway
           @logger.info "Proxying via gateway #{ssh_gateway}."
         else
-          @logger.info "Not using an ssh gateway."
+          @logger.debug "Not using an ssh gateway."
         end
       end
 

data/lib/simple_deploy/stack/stack_attribute_formater.rb

@@ -4,6 +4,7 @@ module SimpleDeploy
     def initialize(args)
       @config = args[:config]
       @environment = args[:environment]
+      @main_attributes = args[:main_attributes]
       @region = @config.region @environment
       @logger = @config.logger
     end
@@ -31,7 +32,7 @@ module SimpleDeploy
       id = attribute[name]
       a = @config.artifacts.select { |a| a['name'] == name }.first
 
-      bucket_prefix = @config.artifact_bucket_prefix name
+      bucket_prefix = @main_attributes["#{name}_bucket_prefix"]
       url_parameter = @config.artifact_cloud_formation_url name
 
       artifact = Artifact.new :name          => name,

data/lib/simple_deploy/stack.rb

@@ -19,10 +19,16 @@ module SimpleDeploy
     end
 
     def update(args)
-      @logger.info "Updating #{@name}."
-      attributes = stack_attribute_formater.updated_attributes args[:attributes]
-      stack.update :attributes => attributes
-      @logger.info "Update complete for #{@name}."
+      if !deployment.clear_for_deployment? && args[:force]
+        deployment.clear_deployment_lock true
+      end
+
+      if deployment.clear_for_deployment?
+        @logger.info "Updating #{@name}."
+        attributes = stack_attribute_formater.updated_attributes args[:attributes]
+        stack.update :attributes => attributes
+        @logger.info "Update complete for #{@name}."
+      end
     end
 
     def deploy(force = false)
@@ -35,9 +41,14 @@ module SimpleDeploy
     end
 
     def destroy
-      deployment.create_deployment
-      stack.destroy
-      @logger.info "#{@name} destroyed."
+      if attributes['protection'] != 'on'
+        stack.destroy
+        @logger.info "#{@name} destroyed."
+        true
+      else
+        @logger.warn "#{@name} could not be destroyed because it is protected. Run the protect subcommand to unprotect it"
+        false
+      end
     end
 
     def events(limit)
@@ -87,7 +98,8 @@ module SimpleDeploy
     
     def stack_attribute_formater
       @saf ||= StackAttributeFormater.new :config      => @config,
-                                          :environment => @environment
+                                          :environment => @environment,
+                                          :main_attributes => attributes
     end
 
     def deployment

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.4.8"
+  VERSION = "0.5.0"
 end

data/script/ci_setup

@@ -11,4 +11,4 @@ rvm use "1.9.3-p125@simple_deploy" --create
 bundle
 
 # Run spec tests
-rspec spec
+rake spec

data/spec/artifact_spec.rb

@@ -5,10 +5,8 @@ describe SimpleDeploy do
   describe "an artifact" do
 
     before do
-      @config_mock = mock 'config'
-      @config_mock.should_receive(:artifact_domain).and_return('us-west-1')
       @artifact = SimpleDeploy::Artifact.new :bucket_prefix => 'test_prefix',
-                                             :config        => @config_mock,
+                                             :domain        => 'us-west-1',
                                              :id            => 'abc123',
                                              :name          => 'myapp',
                                              :region        => 'us-west-1'

data/spec/cli/attributes_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'simple_deploy/cli'
 
 describe SimpleDeploy::CLI::Attributes do
 

data/spec/cli/deploy_spec.rb

@@ -0,0 +1,112 @@
+
+require 'spec_helper'
+require 'simple_deploy/cli'
+
+describe SimpleDeploy::CLI::Deploy do
+  describe 'deploy' do
+    before do
+      @logger   = stub 'logger', 'info' => 'true', 'error' => 'true'
+      @stack    = stub :attributes => {}
+      @notifier = stub
+
+      SimpleDeploy::SimpleDeployLogger.should_receive(:new).
+                                       with(:log_level => 'debug').
+                                       and_return(@logger)
+    end
+
+    it "should notify on success" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => ['my_stack'],
+                  :force       => true,
+                  :attributes  => [] }
+
+      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                with(:provided => options,
+                                     :required => [:environment, :name])
+      Trollop.stub(:options).and_return(options)
+
+      SimpleDeploy::Notifier.should_receive(:new).
+                          with(:stack_name  => 'my_stack',
+                               :environment => 'my_env',
+                               :logger      => @logger).
+                          and_return(@notifier)
+
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'my_env',
+                               :logger      => @logger,
+                               :name        => 'my_stack').
+                          and_return(@stack)
+
+      @stack.should_receive(:deploy).with(true).and_return(true)
+      @notifier.should_receive(:send_deployment_complete_message)
+
+      subject.deploy
+    end
+
+
+    it "should exit on error with a status of 1" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => ['my_stack'],
+                  :force       => true,
+                  :attributes  => [] }
+
+      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                with(:provided => options,
+                                     :required => [:environment, :name])
+      Trollop.stub(:options).and_return(options)
+
+      SimpleDeploy::Notifier.should_receive(:new).
+                          with(:stack_name  => 'my_stack',
+                               :environment => 'my_env',
+                               :logger      => @logger).
+                          and_return(@notifier)
+
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'my_env',
+                               :logger      => @logger,
+                               :name        => 'my_stack').
+                          and_return(@stack)
+
+      @stack.should_receive(:deploy).with(true).and_return(false)
+
+      begin
+        subject.deploy
+      rescue SystemExit => e
+        e.status.should == 1
+      end
+    end
+
+    it "should update the deploy attributes if any are passed" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => ['my_stack'],
+                  :force       => true,
+                  :attributes  => ['foo=bah'] }
+
+      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                with(:provided => options,
+                                     :required => [:environment, :name])
+      Trollop.stub(:options).and_return(options)
+
+      SimpleDeploy::Notifier.should_receive(:new).
+                          with(:stack_name  => 'my_stack',
+                               :environment => 'my_env',
+                               :logger      => @logger).
+                          and_return(@notifier)
+
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'my_env',
+                               :logger      => @logger,
+                               :name        => 'my_stack').
+                          and_return(@stack)
+
+      @stack.should_receive(:update).with(hash_including(:force => true, :attributes => [{'foo' => 'bah'}]))
+      @stack.should_receive(:deploy).with(true).and_return(true)
+      @notifier.should_receive(:send_deployment_complete_message)
+
+      subject.deploy
+    end
+  end
+end

data/spec/cli/destroy_spec.rb

@@ -0,0 +1,67 @@
+
+require 'spec_helper'
+require 'simple_deploy/cli'
+
+describe SimpleDeploy::CLI::Destroy do
+
+  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)
+    end
+
+    it "should exit with 0" do
+      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                with(:provided => @options,
+                                     :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)
+
+      begin
+        subject.destroy
+      rescue SystemExit => e
+        e.status.should == 0
+      end
+    end
+
+    it "should exit with 1" do
+      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                with(:provided => @options,
+                                     :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)
+
+      begin
+        subject.destroy
+      rescue SystemExit => e
+        e.status.should == 1
+      end
+    end
+  end 
+end

data/spec/cli/protect_spec.rb

@@ -0,0 +1,67 @@
+
+require 'spec_helper'
+require 'simple_deploy/cli'
+
+describe SimpleDeploy::CLI::Protect do
+
+  describe 'protect' do
+    before do
+      @config  = mock 'config'
+      @logger  = stub 'logger', 'info' => 'true'
+
+      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)
+    end
+
+    it "should enable protection" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => 'my_stack',
+                  :attributes  => ['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).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 disable protection" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => 'my_stack',
+                  :attributes  => ['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).with(hash_including(:attributes => [{ 'protection' => 'off' }]))
+
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:config      => @config,
+                               :environment => 'my_env',
+                               :logger      => @logger,
+                               :name        => 'my_stack').
+                          and_return(stack)
+
+      subject.protect
+    end
+  end 
+end

data/spec/cli/update_spec.rb

@@ -0,0 +1,67 @@
+
+require 'spec_helper'
+require 'simple_deploy/cli'
+
+describe SimpleDeploy::CLI::Update do
+  describe 'update' do
+    before do
+      @config  = mock 'config'
+      @logger  = stub 'logger', 'info' => 'true'
+      @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)
+    end
+
+    it "should pass force true" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => ['my_stack'],
+                  :force       => true,
+                  :attributes  => ['chef_repo_bucket_prefix=intu-lc'] }
+
+      SimpleDeploy::CLI::Shared.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.should_receive(:update).with(hash_including(:force => true))
+
+      subject.update
+    end
+
+    it "should pass force false" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => ['my_stack'],
+                  :force       => false,
+                  :attributes  => ['chef_repo_bucket_prefix=intu-lc'] }
+
+      SimpleDeploy::CLI::Shared.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.should_receive(:update).with(hash_including(:force => false))
+
+      subject.update
+    end
+  end
+end

data/spec/config_spec.rb

@@ -42,18 +42,6 @@ describe SimpleDeploy do
       @config.artifact_cloud_formation_url('app').should == 'AppArtifactURL'
     end
 
-    it "should return the domain (the folder in the s3 bucket) for an artifact" do
-      @config.artifact_domain('test_repo').should == 'test_domain'
-    end
-
-    it "should return the name of an artifact for those without a set domain" do
-      @config.artifact_domain('test_repo2').should == 'test_repo2'
-    end
-
-    it "should return the bucket prefix for the artifact" do
-      @config.artifact_bucket_prefix('test_repo').should == 'test_prefix'
-    end
-
     it "should return the environment requested" do
       @config.environment('test_env').should == ({ 'secret_key' => 'secret', 'access_key' => 'access', 'region' => 'us-west-1' })
     end
@@ -72,4 +60,37 @@ describe SimpleDeploy do
 
   end
 
+  describe "gracefully handling yaml file errors" do
+    before do
+      if File.exists? "#{ENV['HOME']}/.simple_deploy.yml"
+        FileUtils.mv("#{ENV['HOME']}/.simple_deploy.yml",
+                     "#{ENV['HOME']}/.simple_deploy.yml.bak")
+      end
+    end
+
+    after do
+      if File.exists? "#{ENV['HOME']}/.simple_deploy.yml.bak"
+        FileUtils.mv("#{ENV['HOME']}/.simple_deploy.yml.bak",
+                     "#{ENV['HOME']}/.simple_deploy.yml")
+      end
+    end
+
+    it "should handle a missing file gracefully" do
+      expect {
+        config = SimpleDeploy::Config.new
+      }.to raise_error(RuntimeError, "#{ENV['HOME']}/.simple_deploy.yml not found")
+    end
+
+    it "should handle a corrupt file gracefully" do
+      s = "--\nport:\t80\t80"
+      File.open("#{ENV['HOME']}/.simple_deploy.yml", 'w') do |out|
+        out.write(s)
+      end
+
+      expect {
+        config = SimpleDeploy::Config.new
+      }.to raise_error(RuntimeError, "#{ENV['HOME']}/.simple_deploy.yml is corrupt")
+      FileUtils.rm "#{ENV['HOME']}/.simple_deploy.yml"
+    end
+  end
 end

data/spec/stack/deployment_spec.rb

@@ -4,16 +4,25 @@ describe SimpleDeploy do
 
   before do
     @attributes = { 'key'         => 'val',
-                    'ssh_gateway' => '1.2.3.4' }
-    @config_mock = mock 'config mock'
+                    'ssh_gateway' => '1.2.3.4',
+                    'chef_repo' => 'chef_repo',
+                    'chef_repo_bucket_prefix' => 'chef_repo_bp',
+                    'chef_repo_domain' => 'chef_repo_d',
+                    'app' => 'app',
+                    'app_bucket_prefix' => 'app_bp',
+                    'app_domain' => 'app_d',
+                    'cookbooks' => 'cookbooks',
+                    'cookbooks_bucket_prefix' => 'cookbooks_bp',
+                    'cookbooks_domain' => 'cookbooks_d' }
     @logger_stub = stub 'logger stub'
     @logger_stub.stub :debug => 'true', :info => 'true'
-    @stack_mock = mock 'stack mock'
 
-    @stack_mock.should_receive(:attributes).and_return @attributes
-    @config_mock.should_receive(:logger).and_return @logger_stub
-    @config_mock.should_receive(:region).with('test-us-west-1').
-                                         and_return 'us-west-1'
+    @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 }
 
     options = { :config      => @config_mock,
                 :instances   => ['1.2.3.4', '4.3.2.1'],
@@ -30,6 +39,23 @@ describe SimpleDeploy do
   end
 
   describe "creating a deploy" do
+    it "should gracefully tell the user there are no running instances" do
+      options = { :config      => @config_mock,
+                 :instances   => [],
+                 :environment => 'test-us-west-1',
+                 :ssh_user    => 'user',
+                 :ssh_key     => 'key',
+                 :stack       => @stack_mock,
+                 :name        => 'stack-name' }
+      stack = SimpleDeploy::Stack::Deployment.new options
+
+      expect {
+        stack.create_deployment
+      }.to raise_error(RuntimeError, 'There are no running instances to deploy to')
+    end
+  end
+
+  describe "executing a deploy" do
     before do
       @deployment_mock = mock 'cap config'
       @variables_mock = mock 'variables mock'
@@ -50,8 +76,6 @@ describe SimpleDeploy do
                    and_return ['cookbooks']
       @config_mock.should_receive(:artifact_deploy_variable).with('cookbooks').
                    and_return 'deploy_var'
-      @config_mock.should_receive(:artifact_bucket_prefix).with('cookbooks').
-                   and_return 'bucket_prefix'
       SimpleDeploy::Artifact.should_receive(:new).and_return @artifact_mock
       @artifact_mock.should_receive(:endpoints).
                      and_return('s3' => 's3://bucket/dir/key')
@@ -67,7 +91,7 @@ describe SimpleDeploy do
       status_mock = mock 'status mock'
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               and_return status_mock
-      status_mock.should_receive(:cleared_to_deploy?).with(false).and_return true
+      status_mock.should_receive(:clear_for_deployment?).and_return true
       status_mock.should_receive(:set_deployment_in_progress)
       @deployment_mock.should_receive(:simpledeploy)
       status_mock.should_receive(:unset_deployment_in_progress)
@@ -78,21 +102,37 @@ describe SimpleDeploy do
       status_mock = mock 'status mock'
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               and_return status_mock
-      status_mock.should_receive(:cleared_to_deploy?).with(true).and_return true
+      status_mock.should_receive(:clear_for_deployment?).and_return true
       status_mock.should_receive(:set_deployment_in_progress)
       @deployment_mock.should_receive(:simpledeploy)
       status_mock.should_receive(:unset_deployment_in_progress)
       @stack.execute(true).should == true
     end
 
-    it "should deploy if the stack is not clear to deploy but forced" do
+    it "should not deploy if the stack is not clear to deploy and not forced" do
       status_mock = mock 'status mock'
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               and_return status_mock
-      status_mock.should_receive(:cleared_to_deploy?).with(false).and_return false
+      status_mock.should_receive(:clear_for_deployment?).and_return false
       @logger_stub.should_receive(:error)
       @stack.execute.should == false
     end
   end
 
+  describe "get_artifact_endpoints" do
+    before do
+      @config_mock.stub(:artifacts) { ['chef_repo', 'cookbooks', 'app'] }
+      @config_mock.should_receive(:artifact_deploy_variable).with('chef_repo').and_return('CHEF_REPO_URL')
+      @config_mock.should_receive(:artifact_deploy_variable).with('app').and_return('APP_URL')
+      @config_mock.should_receive(:artifact_deploy_variable).with('cookbooks').and_return('COOKBOOKS_URL')
+    end
+
+    it "should create S3 endpoints" do
+      endpoints = @stack.send :get_artifact_endpoints
+
+      endpoints['CHEF_REPO_URL'].should == 's3://chef_repo_bp-test-us-west-1/chef_repo_d/chef_repo.tar.gz'
+      endpoints['APP_URL'].should == 's3://app_bp-test-us-west-1/app_d/app.tar.gz'
+      endpoints['COOKBOOKS_URL'].should == 's3://cookbooks_bp-test-us-west-1/cookbooks_d/cookbooks.tar.gz'
+    end
+  end
 end

data/spec/stack/stack_attribute_formater_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe SimpleDeploy do
   before do
     @config_mock = mock 'config mock'
@@ -7,7 +9,8 @@ describe SimpleDeploy do
     @config_mock.should_receive(:logger).and_return @logger_mock
 
     options = { :config      => @config_mock,
-                :environment => 'preprod' }
+                :environment => 'preprod',
+                :main_attributes => { 'chef_repo_bucket_prefix' => 'test-prefix' } }
     @formater = SimpleDeploy::StackAttributeFormater.new options
   end
 
@@ -20,9 +23,6 @@ describe SimpleDeploy do
                                 :config => @config_mock,
                                 :bucket_prefix => 'test-prefix').
                            and_return artifact_mock
-    @config_mock.should_receive(:artifact_bucket_prefix).with('chef_repo').
-                 exactly(2).times.
-                 and_return('test-prefix')
     @config_mock.should_receive(:artifact_cloud_formation_url).with('chef_repo').
                  exactly(2).times.
                  and_return('CookBooksURL')

data/spec/stack_spec.rb

@@ -2,35 +2,41 @@ require 'spec_helper'
 
 describe SimpleDeploy do
 
-  describe "A stack" do
+  before do
+    @logger_stub = stub 'logger stub', :info => 'true', :warn => 'true'
     
-    before do
-      @config_mock = mock 'config mock'
-      @logger_mock = mock 'logger mock'
-      @config_mock.should_receive(:logger).and_return @logger_mock
-      SimpleDeploy::Config.should_receive(:new).
-                           with(:logger => 'my-logger').
-                           and_return @config_mock
-      @stack = SimpleDeploy::Stack.new :environment => 'test-env',
-                                       :name        => 'test-stack',
-                                       :logger      => 'my-logger',
-                                       :config      => @config_mock
-    end
+    @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)
+
+    SimpleDeploy::Config.should_receive(:new).
+                         with(:logger => 'my-logger').
+                         and_return @config_mock
+    @stack = SimpleDeploy::Stack.new :environment => 'test-env',
+                                     :name        => 'test-stack',
+                                     :logger      => 'my-logger',
+                                     :config      => @config_mock
+
+    @main_attributes = { 'arg1_bucket_prefix' => 'arg1_bp' }
+  end
 
+  describe "A stack" do
     it "should call create stack" do
       saf_mock = mock 'stack attribute formater mock'
       stack_mock = mock 'stackster stack mock'
-      environment_config_mock = mock 'environment config mock'
+      stack_mock.stub(:attributes).and_return(@main_attributes)
       @config_mock.should_receive(:environment).with('test-env').
-                   and_return environment_config_mock
+                   and_return @environment_config_mock
       SimpleDeploy::StackAttributeFormater.should_receive(:new).
                                            with(:config      => @config_mock,
-                                                :environment => 'test-env').
+                                                :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_mock).
+                                                 :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')
@@ -41,20 +47,51 @@ describe SimpleDeploy do
     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
+      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' }
+    end
+
+  end
+
+  describe "updating a stack" do
+    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'
-      environment_config_mock = mock 'environment config mock'
-      @logger_mock.should_receive(:info).exactly(2).times
+      stack_mock.stub(:attributes).and_return(@main_attributes)
       @config_mock.should_receive(:environment).with('test-env').
-                   and_return environment_config_mock
+                   and_return @environment_config_mock
       SimpleDeploy::StackAttributeFormater.should_receive(:new).
                                            with(:config      => @config_mock,
-                                                :environment => 'test-env').
+                                                :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_mock).
+                                                 :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')
@@ -62,5 +99,88 @@ describe SimpleDeploy do
       @stack.update :attributes => { 'arg1' => 'val' }
     end
 
+    it "should not update when the deployment is locked and force is not set" do
+      deployment_stub = stub 'deployment', :clear_for_deployment? => false
+      @stack.stub(:deployment).and_return(deployment_stub)
+
+      SimpleDeploy::StackAttributeFormater.should_not_receive(:new)
+      Stackster::Stack.should_not_receive(:new)
+
+      @stack.update :attributes => { 'arg1' => 'val' }
+    end
+
+    it "should update when the deployment is locked and force is set true" do
+      deployment_mock = mock 'deployment'
+      deployment_mock.should_receive(:clear_for_deployment?).and_return(false, true)
+      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' }
+    end
+
+    it "should not update when the deployment is locked and force is set false" do
+      deployment_stub = stub 'deployment', :clear_for_deployment? => false
+      @stack.stub(:deployment).and_return(deployment_stub)
+
+      SimpleDeploy::StackAttributeFormater.should_not_receive(:new)
+      Stackster::Stack.should_not_receive(:new)
+
+      @stack.update :force => false, :attributes => { 'arg1' => 'val' }
+    end
+  end
+
+  describe "destroying a stack" do
+    it "should destroy if the stack is not protected" do
+      stack_mock = mock 'stackster stack mock', :attributes => { 'protection' => 'off' }
+      @stack.stub(:stack) { stack_mock }
+
+      stack_mock.should_receive(:destroy)
+
+      @stack.destroy.should be_true
+    end
+
+    it "should not destroy if the stack is protected" do
+      stack_mock = mock 'stackster stack mock', :attributes => { 'protection' => 'on' }
+      @stack.stub(:stack) { stack_mock }
+
+      stack_mock.should_not_receive(:destroy)
+
+      @stack.destroy.should_not be_true
+    end
+
+    it "should destroy if protection is undefined" do
+      stack_mock = mock 'stackster stack mock', :attributes => {}
+      @stack.stub(:stack) { stack_mock }
+
+      stack_mock.should_receive(:destroy)
+
+      @stack.destroy.should be_true
+    end
+
+    it "should not create a deployment" do
+      @stack.should_not_receive(:deployment)
+
+      stack_mock = mock 'stackster stack mock', :attributes => { 'protection' => 'off' }
+      @stack.stub(:stack) { stack_mock }
+      stack_mock.should_receive(:destroy)
+
+      @stack.destroy.should be_true
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70332846279420 !ruby/object:Gem::Requirement
+  requirement: &2152015560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332846279420
+  version_requirements: *2152015560
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70332846278440 !ruby/object:Gem::Requirement
+  requirement: &2152014980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332846278440
+  version_requirements: *2152014980
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70332846256720 !ruby/object:Gem::Requirement
+  requirement: &2152014180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70332846256720
+  version_requirements: *2152014180
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &70332846255020 !ruby/object:Gem::Requirement
+  requirement: &2152176220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332846255020
+  version_requirements: *2152176220
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70332846253680 !ruby/object:Gem::Requirement
+  requirement: &2152175540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332846253680
+  version_requirements: *2152175540
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -94,6 +94,7 @@ files:
 - lib/simple_deploy/cli/list.rb
 - lib/simple_deploy/cli/outputs.rb
 - lib/simple_deploy/cli/parameters.rb
+- lib/simple_deploy/cli/protect.rb
 - lib/simple_deploy/cli/resources.rb
 - lib/simple_deploy/cli/shared.rb
 - lib/simple_deploy/cli/ssh.rb
@@ -113,6 +114,10 @@ files:
 - simple_deploy.gemspec
 - spec/artifact_spec.rb
 - spec/cli/attributes_spec.rb
+- spec/cli/deploy_spec.rb
+- spec/cli/destroy_spec.rb
+- spec/cli/protect_spec.rb
+- spec/cli/update_spec.rb
 - spec/cli_spec.rb
 - spec/config_spec.rb
 - spec/logger_spec.rb
@@ -135,27 +140,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2975550354035595728
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2975550354035595728
 requirements: []
 rubyforge_project: simple_deploy
-rubygems_version: 1.8.16
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: I help with deployments
 test_files:
 - spec/artifact_spec.rb
 - spec/cli/attributes_spec.rb
+- spec/cli/deploy_spec.rb
+- spec/cli/destroy_spec.rb
+- spec/cli/protect_spec.rb
+- spec/cli/update_spec.rb
 - spec/cli_spec.rb
 - spec/config_spec.rb
 - spec/logger_spec.rb