Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/mixlib/install/product.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,14 @@ def initialize(key, &block)
# @return [String] value of the property
#
DSL_PROPERTIES.each do |prop|
# Build the instance variable name once here instead of interpolating a
# String and interning a Symbol on every property read and write.
ivar = :"@#{prop}"

define_method prop do |prop_string = nil, &block|
if block.nil?
if prop_string.nil?
value = instance_variable_get("@#{prop}".to_sym)
value = instance_variable_get(ivar)
return default_value_for(prop) if value.nil?

if value.is_a?(String) || value.is_a?(Symbol)
Expand All @@ -65,11 +69,11 @@ def initialize(key, &block)
value.call(version_for(version))
end
else
instance_variable_set("@#{prop}".to_sym, prop_string)
instance_variable_set(ivar, prop_string)
end
else
raise "Can not use String and Proc at the same time for #{prop}." if !prop_string.nil?
instance_variable_set("@#{prop}".to_sym, block)
instance_variable_set(ivar, block)
end
end
end
Expand Down
Loading