simple_deploy 0.2.6 → 0.2.7

data/README.md

@@ -13,9 +13,7 @@ Create a file **~/.simple_deploy.yml** and include within it:
 
 ```
 deploy:
-  gateway: ADMIN_IP_TO_YOUR_VPC
-  user: SSH_USER_TO_GATEWAY_AND_INSTANCES
-  key: PRIVATE_SSH_KEYFILE_FOR_USER
+  script: /opt/intu/admin/bin/configure.sh
   artifacts: 
     - name: live_community_chef_repo
       bucket_prefix: intu-lc
@@ -29,7 +27,6 @@ deploy:
       bucket_prefix: intu-artifacts
       variable: COOKBOOKS_URL
       cloud_formation_url: CookbooksURL
-  script: /opt/intu/admin/bin/configure.sh
 
 environments:
   preprod_shared_us_west_1:
@@ -71,3 +68,10 @@ simple_deploy create -t ~/my-template.json -e my-env -n test-stack -a arg1=val1
 ```
 
 For more information, run simple_deploy -h.
+
+Deploying
+---------
+
+By default simple deploy will use your user name and id_rsa key for deployments.  To override either these, set the **SIMPLE_DEPLOY_SSH_USER** & **SIMPLE_DEPLOY_SSH_KEY** respectively.
+
+The deployment gateway is ready from the **ssh_gateway** attribute for that stack.

data/lib/simple_deploy/cli/variables.rb

@@ -2,7 +2,7 @@ module SimpleDeploy
   module CLI
     def self.attributes
       attrs = []
-      puts "Read the following attributes:"
+      puts "\nRead the following attributes:\n\n"
       read_attributes.each do |attribs|
         key = attribs.split('=').first.gsub(/\s+/, "")
         value = attribs.gsub(/^.+?=/, '')

data/lib/simple_deploy/cli.rb

@@ -77,7 +77,6 @@ EOS
         puts "#{@opts[:name]} destroyed."
       when 'deploy'
         @stack.deploy
-        puts "#{@opts[:name]} deployed."
       when 'environments'
         Config.new.environments.keys.each { |e| puts e }
       when 'update'

data/lib/simple_deploy/config.rb

@@ -24,18 +24,6 @@ module SimpleDeploy
       config['environments']
     end
 
-    def gateway(name)
-      environments[name]['gateway']
-    end
-
-    def key(name)
-      environments[name]['key'] ||= "#{env_home}/.ssh/id_rsa"
-    end
-
-    def user(name)
-      environments[name]['user'] ||= "#{env_user}"
-    end
-
     def environment(name)
       environments[name]
     end

data/lib/simple_deploy/deployment.rb

@@ -6,6 +6,9 @@ module SimpleDeploy
     def initialize(args)
       @config = args[:config]
       @instances = args[:instances]
+      @ssh_gateway = args[:ssh_gateway]
+      @ssh_user = args[:ssh_user] ||= "#{env_user}"
+      @ssh_key = args[:ssh_key] ||= "#{env_home}/.ssh/id_rsa"
       @environment = args[:environment]
       @attributes = args[:attributes]
       @logger = @config.logger
@@ -18,8 +21,9 @@ module SimpleDeploy
     end
 
     def execute
-      @logger.info 'Starting Deployment.'
+      @logger.info 'Starting deployment.'
       @deployment.simpledeploy
+      @logger.info 'Deployment complete.'
     end
 
     private
@@ -56,32 +60,45 @@ module SimpleDeploy
     end
 
     def ssh_options
-      @logger.info "Setting key to #{@config.key(@environment)}."
+      @logger.info "Setting key to #{@ssh_key}."
       { 
-        :keys => @config.key(@environment),
+        :keys => @ssh_key,
         :paranoid => false
       }
     end
 
     def create_deployment 
       @deployment = Capistrano::Configuration.new
-      if @config.user(@environment)
-        @logger.info "Setting user to #{@config.user(@environment)}."
-        @deployment.set :user, @config.user(@environment)
+      if @ssh_user
+        @logger.info "Setting user to #{@ssh_user}."
+        @deployment.set :user, @ssh_user
       end
 
-      if @config.gateway(@environment)
-        @deployment.set :gateway, @config.gateway(@environment)
+      if @ssh_gateway
+        @deployment.set :gateway, @ssh_gateway
+        @logger.info "Proxying via gateway #{@ssh_gateway}."
+      else
+        @logger.info "Not using an ssh gateway."
       end
 
       @deployment.variables[:ssh_options] = ssh_options
-      @logger.info "Proxying via gateway #{@config.gateway(@environment)}."
       
       @instances.each do |i| 
         @logger.info "Adding instance #{i}."
         @deployment.server i, :instances
       end
     end
+
+    private
+
+    def env_home
+      ENV['HOME']
+    end
+
+    def env_user
+      ENV['USER']
+    end
+
   end
 end
 

data/lib/simple_deploy/stack.rb

@@ -33,10 +33,13 @@ module SimpleDeploy
     end
 
     def deploy
-      deployment = Deployment.new :config => @config,
+      deployment = Deployment.new :config      => @config,
                                   :environment => @environment,
-                                  :instances => instances,
-                                  :attributes => attributes
+                                  :instances   => instances,
+                                  :attributes  => attributes,
+                                  :ssh_gateway => stack.attributes['ssh_gateway'],
+                                  :ssh_user    => ENV['SIMPLE_DEPLOY_SSH_USER'],
+                                  :ssh_key     => ENV['SIMPLE_DEPLOY_SSH_KEY']
       deployment.execute
     end
 
@@ -85,7 +88,8 @@ module SimpleDeploy
     def stack
       @stack ||= Stackster::Stack.new :environment => @environment,
                                       :name        => @name,
-                                      :config      => @config.environment(@environment)
+                                      :config      => @config.environment(@environment),
+                                      :logger      => @config.logger
     end
 
   end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70297023524640 !ruby/object:Gem::Requirement
+  requirement: &70329905934420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297023524640
+  version_requirements: *70329905934420
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70297023523820 !ruby/object:Gem::Requirement
+  requirement: &70329905903420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297023523820
+  version_requirements: *70329905903420
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70297023523260 !ruby/object:Gem::Requirement
+  requirement: &70329905902740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70297023523260
+  version_requirements: *70329905902740
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70297023522820 !ruby/object:Gem::Requirement
+  requirement: &70329905902000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297023522820
+  version_requirements: *70329905902000
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4243280396597296498
+      hash: 2141148440395606588
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4243280396597296498
+      hash: 2141148440395606588
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16