caterer 0.7.9 → 0.7.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/caterer/command/base.rb +4 -4
- data/lib/caterer/version.rb +1 -1
- metadata +1 -1
data/lib/caterer/command/base.rb
CHANGED
|
@@ -107,11 +107,11 @@ module Caterer
|
|
|
107
107
|
|
|
108
108
|
data = group.data.merge(member.data)
|
|
109
109
|
|
|
110
|
-
if
|
|
111
|
-
|
|
112
|
-
data.merge(
|
|
110
|
+
if options[:data]
|
|
111
|
+
json = MultiJson.load options[:data], :symbolize_keys => true rescue nil
|
|
112
|
+
data = data.merge(json) if json and json.is_a? Hash
|
|
113
113
|
end
|
|
114
|
-
|
|
114
|
+
|
|
115
115
|
data
|
|
116
116
|
end
|
|
117
117
|
|
data/lib/caterer/version.rb
CHANGED