simple_deploy 0.6.4 → 0.6.5

data/spec/cli/deploy_spec.rb

@@ -22,9 +22,9 @@ describe SimpleDeploy::CLI::Deploy do
                   :internal    => false,
                   :attributes  => [] }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -40,6 +40,7 @@ describe SimpleDeploy::CLI::Deploy do
                                :internal    => false).
                           and_return(@stack)
 
+      @stack.should_receive(:wait_for_stable)
       @stack.should_receive(:deploy).with(true).and_return(true)
       @notifier.should_receive(:send_deployment_start_message)
       @notifier.should_receive(:send_deployment_complete_message)
@@ -47,7 +48,6 @@ describe SimpleDeploy::CLI::Deploy do
       subject.deploy
     end
 
-
     it "should exit on error with a status of 1" do
       options = { :environment => 'my_env',
                   :log_level   => 'debug',
@@ -56,9 +56,9 @@ describe SimpleDeploy::CLI::Deploy do
                   :internal    => false,
                   :attributes  => [] }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -74,6 +74,7 @@ describe SimpleDeploy::CLI::Deploy do
                                :internal    => false).
                           and_return(@stack)
 
+      @stack.should_receive(:wait_for_stable)
       @stack.should_receive(:deploy).with(true).and_return(false)
       @notifier.should_receive(:send_deployment_start_message)
 
@@ -92,9 +93,9 @@ describe SimpleDeploy::CLI::Deploy do
                   :internal    => false,
                   :attributes  => ['foo=bah'] }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -111,6 +112,7 @@ describe SimpleDeploy::CLI::Deploy do
                           and_return(@stack)
 
       @stack.should_receive(:update).with(hash_including(:force => true, :attributes => [{'foo' => 'bah'}])).and_return(true)
+      @stack.should_receive(:wait_for_stable)
       @stack.should_receive(:deploy).with(true).and_return(true)
       @notifier.should_receive(:send_deployment_start_message)
       @notifier.should_receive(:send_deployment_complete_message)
@@ -126,9 +128,9 @@ describe SimpleDeploy::CLI::Deploy do
                   :internal    => false,
                   :attributes  => ['foo=bah'] }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -146,6 +148,7 @@ describe SimpleDeploy::CLI::Deploy do
 
       @stack.should_receive(:update).with(hash_including(:force => true,
                                                          :attributes => [{'foo' => 'bah'}])).and_return(false)
+      @stack.should_receive(:wait_for_stable)
 
       begin
         subject.deploy
@@ -162,9 +165,9 @@ describe SimpleDeploy::CLI::Deploy do
                   :internal    => false,
                   :attributes  => [] }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -181,6 +184,7 @@ describe SimpleDeploy::CLI::Deploy do
                           and_return(@stack)
 
       @stack.should_not_receive(:update)
+      @stack.should_receive(:wait_for_stable)
       @stack.should_receive(:deploy).with(true).and_return(true)
       @notifier.should_receive(:send_deployment_start_message)
       @notifier.should_receive(:send_deployment_complete_message)

data/spec/cli/destroy_spec.rb

@@ -21,9 +21,9 @@ describe SimpleDeploy::CLI::Destroy do
     end
 
     it "should exit with 0" do
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => @options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => @options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(@options)
 
       @stack.should_receive(:destroy).and_return(true)
@@ -43,9 +43,9 @@ describe SimpleDeploy::CLI::Destroy do
     end
 
     it "should exit with 1" do
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => @options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => @options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(@options)
 
       @stack.should_receive(:destroy).and_return(false)

data/spec/cli/protect_spec.rb

@@ -6,11 +6,11 @@ describe SimpleDeploy::CLI::Protect do
 
   describe 'protect' do
     before do
-      @config  = mock 'config'
+      @config_mock  = 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::Config.stub(:new).and_return(@config_mock)
+      @config_mock.should_receive(:environment).with('my_env').and_return(@config)
       SimpleDeploy::SimpleDeployLogger.should_receive(:new).
                                        with(:log_level => 'debug').
                                        and_return(@logger)
@@ -22,9 +22,9 @@ describe SimpleDeploy::CLI::Protect do
                   :name        => ['my_stack'],
                   :protection  => 'on' }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       stack   = stub :attributes => { 'protection' => 'on' }
@@ -46,9 +46,9 @@ describe SimpleDeploy::CLI::Protect do
                   :name        => ['my_stack1', 'my_stack2'],
                   :protection  => 'on' }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       stack   = stub :attributes => { 'protection' => 'on' }
@@ -77,9 +77,9 @@ describe SimpleDeploy::CLI::Protect do
                   :name        => ['my_stack'],
                   :protection  => 'off' }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       stack   = stub :attributes => { 'protection' => 'off' }
@@ -101,9 +101,9 @@ describe SimpleDeploy::CLI::Protect do
                   :name        => ['my_stack1', 'my_stack2'],
                   :protection  => 'off' }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(options)
 
       stack   = stub :attributes => { 'protection' => 'off' }

data/spec/cli/shared_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe SimpleDeploy::CLI::Shared do
+  before do
+    @object = Object.new
+    @object.extend SimpleDeploy::CLI::Shared
+  end
+
+  it "should parse the given attributes" do
+    logger_stub = stub 'logger stub', :info => true
+    attributes  = [ 'test1=value1', 'test2=value2==' ]
+
+    @object.stub :logger => logger_stub
+
+    @object.parse_attributes(:logger     => logger_stub,
+                             :attributes => attributes).
+           should == [ { "test1" => "value1" }, 
+                       { "test2" => "value2==" } ]
+  end
+
+  context "validating options " do
+    it "should exit if provided options passed do not include all required" do
+      logger_stub = stub 'logger stub', :error => true
+
+      provided = { :test1 => 'test1', :test2 => 'test2' }
+      required = [:test1, :test2, :test3]
+      @object.stub :logger => logger_stub
+
+      lambda { 
+        @object.valid_options? :provided => provided,
+                               :required => required
+             }.should raise_error SystemExit
+    end
+
+    it "should exit if environment does not exist" do
+      config_stub = stub 'config stub', :environments => { 'preprod' => 'data' }
+      logger_stub = stub 'logger stub', :error => true
+
+      provided = { :environment => 'prod' }
+      required = [:environment]
+
+      SimpleDeploy::Config.stub :new => config_stub
+      @object.stub :logger => logger_stub
+
+      lambda { 
+        @object.valid_options? :provided => provided,
+                               :required => required
+             }.should raise_error SystemExit
+    end
+
+    it "should not exit if all options passed and environment exists" do
+      config_stub = stub 'config stub', :environments => { 'prod' => 'data' }
+      logger_stub = stub 'logger stub', :error => true
+
+      provided = { :environment => 'prod', :test1 => 'value1' }
+      required = [:environment, :test1]
+
+      SimpleDeploy::Config.stub :new => config_stub
+
+      @object.valid_options? :provided => provided,
+                             :required => required,
+                             :logger   => logger_stub
+    end
+  end
+
+  it "should return the command name" do
+    @object.command_name.should == 'object'
+  end
+
+  it "should rescue stackster exceptions and exit 1" do
+    lambda { @object.rescue_stackster_exceptions_and_exit do
+               raise Stackster::Exceptions::Base
+             end 
+           }.should raise_error SystemExit
+  end
+end

data/spec/cli/update_spec.rb

@@ -23,9 +23,10 @@ describe SimpleDeploy::CLI::Update do
                   :force       => true,
                   :attributes  => ['chef_repo_bucket_prefix=intu-lc'] }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
+
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Stack.should_receive(:new).
@@ -47,9 +48,10 @@ describe SimpleDeploy::CLI::Update do
                   :force       => false,
                   :attributes  => ['chef_repo_bucket_prefix=intu-lc'] }
 
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => options,
+                   :required => [:environment, :name])
+
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Stack.should_receive(:new).

data/spec/stack/ssh_spec.rb

@@ -16,7 +16,7 @@ describe SimpleDeploy::Stack::SSH do
   end
 
   context "when unsuccessful" do
-    it "should notify the user there are no running instances" do
+    it "should return false when no running instances running" do
       options = { :config      => @config_mock,
                   :instances   => [],
                   :environment => 'test-env',
@@ -25,10 +25,7 @@ describe SimpleDeploy::Stack::SSH do
                   :stack       => @stack_mock,
                   :name        => 'test-stack' }
       @ssh = SimpleDeploy::Stack::SSH.new options
-      error = 'There are no running instances to execute this command.'
-      expect { @ssh.execute(:sudo    => true,
-                   :command => 'uname') }.to raise_error(RuntimeError, error)
- 
+      @ssh.execute(:sudo    => true, :command => 'uname').should be_false
     end
   end
 

data/spec/stack_spec.rb

@@ -15,8 +15,7 @@ describe SimpleDeploy do
                          at_least(:once).
                          with(:logger => 'my-logger').
                          and_return @config_stub
-    @stack = SimpleDeploy::Stack.new :environment => 'test-env',
-                                     :name        => 'test-stack',
+    @stack = SimpleDeploy::Stack.new :name        => 'test-stack',
                                      :logger      => 'my-logger',
                                      :config      => @config_stub
 
@@ -39,8 +38,7 @@ describe SimpleDeploy do
     end
 
     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',
+      Stackster::Stack.should_receive(:new).with(:name        => 'test-stack',
                                                  :config      => @environment_config_mock,
                                                  :logger      => @logger_stub).
                                             and_return @stack_mock
@@ -73,8 +71,7 @@ describe SimpleDeploy do
       deployment_stub = stub 'deployment', :clear_for_deployment? => true
       @stack.stub(:deployment).and_return(deployment_stub)
 
-      Stackster::Stack.should_receive(:new).with(:environment => 'test-env',
-                                                 :name        => 'test-stack',
+      Stackster::Stack.should_receive(:new).with(:name        => 'test-stack',
                                                  :config      => @environment_config_mock,
                                                  :logger      => @logger_stub).
                                             and_return @stack_mock
@@ -100,8 +97,7 @@ describe SimpleDeploy do
       @stack.stub(:deployment).and_return(deployment_mock)
       @stack.stub(:sleep).and_return(false)
 
-      Stackster::Stack.should_receive(:new).with(:environment => 'test-env',
-                                                 :name        => 'test-stack',
+      Stackster::Stack.should_receive(:new).with(:name        => 'test-stack',
                                                  :config      => @environment_config_mock,
                                                  :logger      => @logger_stub).
                                             and_return @stack_mock
@@ -272,17 +268,35 @@ describe SimpleDeploy do
     end
   end
 
+  describe "wait_for_stable" do
+    before do
+      @stack = SimpleDeploy::Stack.new :name        => 'test-stack',
+                                       :logger      => 'my-logger',
+                                       :config      => @config_stub,
+                                       :internal    => false
+      @stack_mock.stub(:attributes).and_return({})
+      Stackster::Stack.should_receive(:new).
+                       with(:name        => 'test-stack',
+                            :config      => @environment_config_mock,
+                            :logger      => @logger_stub).
+                       and_return @stack_mock
+    end
+
+    it "should call wait_for_stable on stackster stack" do
+      @stack_mock.should_receive(:wait_for_stable)
+      @stack.wait_for_stable
+    end
+  end
+
   describe "exists?" do
     before do
-      @stack = SimpleDeploy::Stack.new :environment => 'test-env',
-                                       :name        => 'test-stack',
+      @stack = SimpleDeploy::Stack.new :name        => 'test-stack',
                                        :logger      => 'my-logger',
                                        :config      => @config_stub,
                                        :internal    => false
       @stack_mock.stub(:attributes).and_return({})
       Stackster::Stack.should_receive(:new).
-                       with(:environment => 'test-env',
-                            :name        => 'test-stack',
+                       with(:name        => 'test-stack',
                             :config      => @environment_config_mock,
                             :logger      => @logger_stub).
                        and_return @stack_mock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70290261403920 !ruby/object:Gem::Requirement
+  requirement: &70114037824180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70290261403920
+  version_requirements: *70114037824180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70290261403200 !ruby/object:Gem::Requirement
+  requirement: &70114037823500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70290261403200
+  version_requirements: *70114037823500
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70290261402600 !ruby/object:Gem::Requirement
+  requirement: &70114037822780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,21 +43,21 @@ dependencies:
         version: 2.13.5
   type: :runtime
   prerelease: false
-  version_requirements: *70290261402600
+  version_requirements: *70114037822780
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70290261402060 !ruby/object:Gem::Requirement
+  requirement: &70114037822200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70290261402060
+  version_requirements: *70114037822200
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &70290261506180 !ruby/object:Gem::Requirement
+  requirement: &70114037821720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70290261506180
+  version_requirements: *70114037821720
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70290261505540 !ruby/object:Gem::Requirement
+  requirement: &70114037821120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,7 +76,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290261505540
+  version_requirements: *70114037821120
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -103,6 +103,7 @@ files:
 - lib/simple_deploy/cli/create.rb
 - lib/simple_deploy/cli/deploy.rb
 - lib/simple_deploy/cli/destroy.rb
+- lib/simple_deploy/cli/environments.rb
 - lib/simple_deploy/cli/events.rb
 - lib/simple_deploy/cli/execute.rb
 - lib/simple_deploy/cli/instances.rb
@@ -112,12 +113,12 @@ files:
 - lib/simple_deploy/cli/protect.rb
 - lib/simple_deploy/cli/resources.rb
 - lib/simple_deploy/cli/shared.rb
-- lib/simple_deploy/cli/ssh.rb
 - lib/simple_deploy/cli/status.rb
 - lib/simple_deploy/cli/template.rb
 - lib/simple_deploy/cli/update.rb
 - lib/simple_deploy/config.rb
 - lib/simple_deploy/env.rb
+- lib/simple_deploy/exceptions.rb
 - lib/simple_deploy/logger.rb
 - lib/simple_deploy/notifier.rb
 - lib/simple_deploy/notifier/campfire.rb
@@ -136,6 +137,7 @@ files:
 - spec/cli/deploy_spec.rb
 - spec/cli/destroy_spec.rb
 - spec/cli/protect_spec.rb
+- spec/cli/shared_spec.rb
 - spec/cli/update_spec.rb
 - spec/cli_spec.rb
 - spec/config_spec.rb
@@ -163,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 826964826445741436
+      hash: -1684484936951909770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 826964826445741436
+      hash: -1684484936951909770
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16
@@ -187,6 +189,7 @@ test_files:
 - spec/cli/deploy_spec.rb
 - spec/cli/destroy_spec.rb
 - spec/cli/protect_spec.rb
+- spec/cli/shared_spec.rb
 - spec/cli/update_spec.rb
 - spec/cli_spec.rb
 - spec/config_spec.rb

data/lib/simple_deploy/cli/ssh.rb

@@ -1,39 +0,0 @@
-require 'trollop'
-
-module SimpleDeploy
-  module CLI
-    class SSH
-      def show
-        opts = Trollop::options do
-          version SimpleDeploy::VERSION
-          banner <<-EOS
-
-Show ssh connection string.
-
-simple_deploy ssh -n STACK_NAME -e ENVIRONMENT
-
-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 => 'warn'
-          opt :name, "Stack name to manage", :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]
-
-        stack = Stack.new :environment => opts[:environment],
-                          :name        => opts[:name],
-                          :config      => config,
-                          :logger      => logger
-
-        puts stack.ssh
-      end
-    end
-  end
-end