Add support for optional AS=user variable.

kjohnston · Sep 30, 2011 · 1a20e29 · 1a20e29
1 parent 00fbb34
commit 1a20e29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/porter/capistrano.rb b/lib/porter/capistrano.rb
@@ -5,7 +5,7 @@
     stage  = ARGV[0]
 
     task :db do
-      set :user, ENV["USER"]
+      set :user, ENV["AS"] || ENV["USER"]
 
       s = ""
       run "cat #{config[stage]["app_dir"]}/config/database.yml" do |channel, stream, data|

diff --git a/lib/tasks/porter.rake b/lib/tasks/porter.rake
@@ -7,7 +7,7 @@ namespace :porter do
     namespace stage do
       task :db => :environment do
         src_db     = ActiveRecord::Base.configurations[Rails.env]["database"].split("_").first+"_"+stage
-        src_user   = ENV["USER"]
+        src_user   = ENV["AS"] || ENV["USER"]
 
         src_domain = config[stage]["domain"]
 
@@ -52,7 +52,7 @@ namespace :porter do
 
       task :assets => :environment do
         root           = Rails.root
-        user           = ENV["USER"]
+        user           = ENV["AS"] || ENV["USER"]
         domain         = config[stage]['domain']
         app_dir        = config[stage]['app_dir']
         asset_dirs     = config[stage]['asset_dirs'].blank? ? '' : config[stage]['asset_dirs'].gsub(/,/,'').split(' ').map { |i| i.strip }