caterer 0.7.7 → 0.7.8

data/lib/caterer/command/base.rb

@@ -104,11 +104,14 @@ module Caterer
         end
 
         opts[:data] = begin
-          data = nil
+
+          data = group.data.merge(member.data)
+
           if json = options[:data]
-            data = MultiJson.load json, :symbolize_keys => true rescue nil
+            data = data.merge(MultiJson.load(json, :symbolize_keys => true) rescue {})
           end
-          data || member.data || group.data
+
+          data
         end
 
         Server.new(@env, opts)

data/lib/caterer/config/group.rb

@@ -9,6 +9,7 @@ module Caterer
         @name    = name
         @images  = []
         @members = {}
+        @data    = {}
       end
 
       def add_image(image)

data/lib/caterer/config/member.rb

@@ -7,6 +7,7 @@ module Caterer
       
       def initialize(name=nil)
         @name = name
+        @data = {}
       end
 
     end

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
   prerelease: 
 platform: ruby
 authors: