simple_deploy 0.2.5 → 0.2.6

data/lib/simple_deploy/config.rb

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

data/lib/simple_deploy/deployment.rb

@@ -56,22 +56,26 @@ module SimpleDeploy
     end
 
     def ssh_options
-      @logger.info "Setting key to #{@config.key}." if @config.key
+      @logger.info "Setting key to #{@config.key(@environment)}."
       { 
-        :keys => @config.key,
+        :keys => @config.key(@environment),
         :paranoid => false
       }
     end
 
     def create_deployment 
       @deployment = Capistrano::Configuration.new
-      if @config.user
-        @logger.info "Setting user to #{@config.user}."
-        @deployment.set :user, @config.user
+      if @config.user(@environment)
+        @logger.info "Setting user to #{@config.user(@environment)}."
+        @deployment.set :user, @config.user(@environment)
       end
-      @deployment.set :gateway, @config.gateway if @config.gateway
+
+      if @config.gateway(@environment)
+        @deployment.set :gateway, @config.gateway(@environment)
+      end
+
       @deployment.variables[:ssh_options] = ssh_options
-      @logger.info "Proxying via gateway #{@config.gateway}."
+      @logger.info "Proxying via gateway #{@config.gateway(@environment)}."
       
       @instances.each do |i| 
         @logger.info "Adding instance #{i}."

data/lib/simple_deploy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70295135734160 !ruby/object:Gem::Requirement
+  requirement: &70297023524640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295135734160
+  version_requirements: *70297023524640
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70295135769860 !ruby/object:Gem::Requirement
+  requirement: &70297023523820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295135769860
+  version_requirements: *70297023523820
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70295135769300 !ruby/object:Gem::Requirement
+  requirement: &70297023523260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70295135769300
+  version_requirements: *70297023523260
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70295135768840 !ruby/object:Gem::Requirement
+  requirement: &70297023522820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295135768840
+  version_requirements: *70297023522820
 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: 596885880715204085
+      hash: -4243280396597296498
 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: 596885880715204085
+      hash: -4243280396597296498
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16