lib/fig/environment.rb in fig-0.1.52 vs lib/fig/environment.rb in fig-0.1.53
- old
+ new
@@ -17,28 +17,25 @@
class Environment
DEFAULT_VERSION_NAME = 'current'
def initialize(repository, variables_override, retriever)
@repository = repository
- @variables = variables_override || get_environment_variables
+ @variables = variables_override || get_system_environment_variables
@retrieve_vars = {}
@packages = {}
@retriever = retriever
end
- def get_environment_variables
- vars = {}
- ENV.each { |key,value| vars[key]=value }
-
- return vars
- end
-
# Returns the value of an envirionment variable
def [](name)
return @variables[name]
end
+ def variables
+ return @variables.clone
+ end
+
# Indicates that the values from a particular envrionment variable path
def add_retrieve(name, path)
@retrieve_vars[name] = path
return
@@ -164,9 +161,16 @@
return
end
private
+
+ def get_system_environment_variables
+ vars = {}
+ ENV.each { |key,value| vars[key]=value }
+
+ return vars
+ end
def set_variable(base_package, name, value)
@variables[name] = expand_and_retrieve_variable_value(base_package, name, value)
return