caterer 0.2.0 → 0.3.0

data/lib/caterer/command/base.rb

@@ -1,3 +1,6 @@
+require 'oj'
+require 'multi_json'
+
 module Caterer
   module Command
     class Base < Vli::Command::Base
@@ -16,6 +19,9 @@ module Caterer
         opts.on('-P PORT', '--port PORT', 'assumes 22') do |p|
           options[:port] = p
         end
+        opts.on('-d JSON', '--data JSON', 'json data that the provisioner may use' )do |d|
+          options[:data] = d
+        end
         opts.on('-i IMAGE', '--image IMAGE', 'corresponds to a image in Caterfile') do |i|
           options[:image] = i
         end
@@ -86,6 +92,14 @@ module Caterer
         opts[:port]   = options[:port] || member.port
         opts[:images] = image_list(options) || member.images || group.images
 
+        opts[:data] = begin
+          data = nil
+          if json = options[:data]
+            data = MultiJson.load json rescue nil
+          end
+          data || member.data || group.data
+        end
+
         Server.new(@env, opts)
       end
 

data/lib/caterer/config/group.rb

@@ -3,7 +3,7 @@ module Caterer
     class Group
 
       attr_reader    :name
-      attr_accessor  :images, :members, :user, :password
+      attr_accessor  :images, :members, :user, :password, :data
 
       def initialize(name=nil)
         @name    = name

data/lib/caterer/config/member.rb

@@ -3,7 +3,7 @@ module Caterer
     class Member
 
       attr_reader :name
-      attr_accessor :host, :port, :user, :password, :images
+      attr_accessor :host, :port, :user, :password, :images, :data
       
       def initialize(name=nil)
         @name = name

data/lib/caterer/provisioner/chef_solo.rb

@@ -197,7 +197,11 @@ module Caterer
       end
 
       def json_config
-        MultiJson.dump(config.json.merge({:run_list => config.run_list}))
+        MultiJson.dump(config_data)
+      end
+
+      def config_data
+        config.json.merge(server.data).merge({:run_list => config.run_list})
       end
 
       def json_config_path

data/lib/caterer/server.rb

@@ -13,6 +13,7 @@ module Caterer
       @host   = opts[:host]
       @port   = opts[:port]
       @images = opts[:images] || []
+      @data   = opts[:data] || {}
     end
 
     def bootstrap(opts={})
@@ -96,6 +97,12 @@ module Caterer
       @port || 22
     end
 
+    def data
+      @data_hash ||= begin
+        (@data.is_a? Hash) ? @data : {}
+      end
+    end
+
     def run_action(name, options=nil)
       options = {
         :server => self,

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

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