lib/geordi.rb in geordi-0.9.3 vs lib/geordi.rb in geordi-0.9.4
- old
+ new
@@ -29,11 +29,11 @@
@lines += File.open("config/deploy.rb").readlines
@user = retrieve! "user", /^set :user,/
@server = retrieve! "server", /^server /
@path = retrieve!("deploy_to", /^set :deploy_to,/) + '/current'
- @env = retrieve! "environment", /^set :rails_env,/
+ @env = retrieve!("environment", /^set :rails_env,/, 'production')
# fix
%w[user server path env].each do |attr|
self.send(attr).gsub! /#\{site_id\}/, stage.sub(/_.*/, '')
end
@@ -48,13 +48,15 @@
current = Dir.pwd
end
current
end
- def retrieve!(name, regex)
+ def retrieve!(name, regex, default = nil)
if line = @lines.find{ |line| line =~ regex }
line.match(/["'](.*)["']/)
$1
+ elsif default
+ default
else
raise "Could not find :#{name} for stage '#{stage}'!\nAborting..."
end
end
\ No newline at end of file