simple_deploy 0.4.6 → 0.4.7

data/CHANGELOG

@@ -1,3 +1,9 @@
+## v0.4.7:
+
+* Added specs
+* Updated deployment to set primary host properly in classic
+* Updated ssh to return classic commands properly
+
 ## v0.4.6:
 
 * Added spec tests

data/lib/simple_deploy/stack/deployment.rb

@@ -46,15 +46,21 @@ module SimpleDeploy
       end
 
       def ssh
-        @instances.map do |i|
-          "\nssh -i #{@ssh_key} -l #{@ssh_user} -L 9998:#{i}:22 -N #{@ssh_gateway} &\nssh -p 9998 localhost"
+        @stack.instances.map do |instance|
+          info = instance['instancesSet'].first
+          if info['vpcId']
+            gw = @attributes['ssh_gateway']
+            "\nssh -i #{@ssh_key} -l #{@ssh_user} -L 9998:#{info['privateIpAddress']}:22 -N #{gw} &\nssh -p 9998 localhost"
+          else
+            "\nssh -i #{@ssh_key} -l #{@ssh_user} #{info['ipAddress']}"
+          end
         end
       end
 
       private
 
       def set_deploy_command
-        cmd = get_artifact_endpoints.any? ? "env " : ""
+        cmd = 'env '
         get_artifact_endpoints.each_pair do |key,value|
           cmd += "#{key}=#{value} "
         end
@@ -112,7 +118,9 @@ module SimpleDeploy
       end
 
       def primary_instance 
-        @instances.first
+        if @stack.instances.any?
+          @stack.instances.first['instancesSet'].first['privateIpAddress']
+        end
       end
 
       def deploy_script

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/spec/stack/deployment_spec.rb

@@ -3,12 +3,15 @@ require 'spec_helper'
 describe SimpleDeploy do
 
   before do
-    @attributes = { 'key' => 'val' }
+    @attributes = { 'key'         => 'val',
+                    'ssh_gateway' => '1.2.3.4' }
     @config_mock = mock 'config mock'
+    @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_mock
+    @config_mock.should_receive(:logger).and_return @logger_stub
     @config_mock.should_receive(:region).with('test-us-west-1').
                                          and_return 'us-west-1'
 
@@ -26,8 +29,70 @@ describe SimpleDeploy do
     @stack.class.should == SimpleDeploy::Stack::Deployment
   end
 
-  it "should deploy if the stack is clear to deploy"
-  it "should deploy if the stack is not clear to deploy but forced"
-  it "should deploy if the stack is not clear to deploy but forced"
+  describe "creating a deploy" do
+    before do
+      @deployment_mock = mock 'cap config'
+      @variables_mock = mock 'variables mock'
+      @artifact_mock = mock 'artifact mock'
+      level_stub = stub 'level'
+      level_stub.should_receive(:level=).with(3)
+      Capistrano::Configuration.should_receive(:new).and_return @deployment_mock
+      @deployment_mock.should_receive(:logger).and_return level_stub
+      @deployment_mock.should_receive(:set).with :gateway, '1.2.3.4'
+      @deployment_mock.should_receive(:set).with :user, 'user'
+      @deployment_mock.should_receive(:variables).and_return @variables_mock
+      @variables_mock.should_receive(:[]=).
+                      with :ssh_options, ( { :keys     => 'key',
+                                             :paranoid => false } )
+      @deployment_mock.should_receive(:server).with '1.2.3.4', :instances
+      @deployment_mock.should_receive(:server).with '4.3.2.1', :instances
+      @config_mock.should_receive(:artifacts).
+                   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')
+      @stack_mock.should_receive(:instances).exactly(2).times.
+                  and_return [ { 'instancesSet' => 
+                                 [ { 'privateIpAddress' => '10.1.2.3' } ] } ]
+      @config_mock.should_receive(:deploy_script).and_return 'script.sh'
+      @deployment_mock.should_receive(:load).with({:string=>"task :simpledeploy do\n        sudo 'env deploy_var=s3://bucket/dir/key PRIMARY_HOST=10.1.2.3 script.sh'\n        end"}).and_return true
+      @stack.create_deployment
+    end
+
+    it "should deploy if the stack is clear to deploy" 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(:set_deployment_in_progress)
+      @deployment_mock.should_receive(:simpledeploy)
+      status_mock.should_receive(:unset_deployment_in_progress)
+      @stack.execute.should == true
+    end
+
+    it "should deploy if the stack is not clear to deploy but 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(true).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
+      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
+      @logger_stub.should_receive(:error)
+      @stack.execute.should == false
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70150787913560 !ruby/object:Gem::Requirement
+  requirement: &70353611776560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150787913560
+  version_requirements: *70353611776560
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70150787912240 !ruby/object:Gem::Requirement
+  requirement: &70353611775520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70150787912240
+  version_requirements: *70353611775520
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70150787911000 !ruby/object:Gem::Requirement
+  requirement: &70353611735820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70150787911000
+  version_requirements: *70353611735820
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &70150787909440 !ruby/object:Gem::Requirement
+  requirement: &70353611734300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70150787909440
+  version_requirements: *70353611734300
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70150787878560 !ruby/object:Gem::Requirement
+  requirement: &70353611732160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70150787878560
+  version_requirements: *70353611732160
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -5787533256512322
+      hash: -4377497411000345519
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -5787533256512322
+      hash: -4377497411000345519
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16