lib/fulmar/domain/service/configuration_service.rb in fulmar-1.6.1 vs lib/fulmar/domain/service/configuration_service.rb in fulmar-1.6.2
- old
+ new
@@ -73,10 +73,14 @@
def ssh_user_and_host
self[:user].blank? ? self[:hostname] : self[:user] + '@' + self[:hostname]
end
def dependencies(env = nil)
- env.nil? ? @config[:dependencies][:all] : @config[:dependencies][:all].deep_merge(@config[:dependencies][env])
+ if env.nil? || !@config[:dependencies].has_key?(env)
+ @config[:dependencies][:all]
+ else
+ @config[:dependencies][:all].deep_merge(@config[:dependencies][env])
+ end
end
def ready?
return false if @environment.nil? || @target.nil?
fail 'Environment is invalid' if configuration[:environments][@environment].nil?