caterer 0.3.1 → 0.4.0

data/lib/caterer/command/base.rb

@@ -16,6 +16,9 @@ module Caterer
         opts.on('-p PASSWORD', '--password PASSWORD', 'assumes key') do |p|
           options[:pass] = p
         end
+        opts.on('-k KEY', '--key KEY', 'path to private key') do |k|
+          options[:key] = k
+        end
         opts.on('-P PORT', '--port PORT', 'assumes 22') do |p|
           options[:port] = p
         end
@@ -91,6 +94,7 @@ module Caterer
         opts[:host]   = member.host || options[:host]
         opts[:port]   = options[:port] || member.port
         opts[:images] = image_list(options) || member.images || group.images
+        opts[:key]    = options[:key] || member.key || group.key
 
         opts[:data] = begin
           data = nil

data/lib/caterer/config/group.rb

@@ -3,7 +3,7 @@ module Caterer
     class Group
 
       attr_reader    :name
-      attr_accessor  :images, :members, :user, :password, :data
+      attr_accessor  :images, :members, :user, :password, :key, :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, :data
+      attr_accessor :host, :port, :user, :password, :key, :images, :data
       
       def initialize(name=nil)
         @name = name

data/lib/caterer/provisioner/chef_solo.rb

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

data/lib/caterer/server.rb

@@ -12,6 +12,7 @@ module Caterer
       @pass   = opts[:pass]
       @host   = opts[:host]
       @port   = opts[:port]
+      @key    = opts[:key]
       @images = opts[:images] || []
       @data   = opts[:data] || {}
     end
@@ -63,10 +64,12 @@ module Caterer
     end
 
     def ssh_opts
-      {
-        :port => port,
-        :password => password
-      }
+      {}.tap do |opts|
+        opts[:paranoid] = false
+        opts[:port]     = port
+        opts[:password] = password if password
+        opts[:keys]     = ["#{@key}"] if @key
+      end
     end
 
     def ui

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r