chef-handler-users 0.1.0 → 0.1.1

data/chef-handler-users.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "chef-handler-users"
-  gem.version     = "0.1.0"
+  gem.version     = "0.1.1"
   gem.authors     = ["Heavy Water Operations, LLC. (OR)"]
   gem.email       = ["ops@hw-ops.com"]
   gem.homepage    = "http://github.com/heavywater/chef-handler-users"

data/lib/chef-handler-users.rb

@@ -20,21 +20,22 @@ require 'rubygems'
 require 'chef/handler'
 require 'pony'
 
-
-
 class Chef::Handler::Users < Chef::Handler
   attr_reader :config
   class ConfigurationError < StandardError; end
 
   def initialize(config={})
     @config = config
-    @config
 
-    %w[to_address from_address].map(&:to_sym).each do |key|
+    %w[to from].each do |key|
       unless @config.has_key? key
         raise ConfigurationError.new("Required configuration #{key} not passed to handler")
       end
     end
+
+    if @config[:via] == 'smtp' && !@config[:via_options]
+      raise ConfigurationError.new("via_options is required for smtp")
+    end
   end
 
   def report
@@ -46,17 +47,19 @@ class Chef::Handler::Users < Chef::Handler
       Chef::Log.info "Users handler detected no user changes"
       return
     else
-      Chef::Log.info "Users handler detected #{updated_users.length} user changes. Generating summary email for #{@config[:to_address]}"
+      Chef::Log.info "Users handler detected #{updated_users.length} user changes. Generating summary email for #{@config[:to]}"
     end
 
     subject = "Chef run on #{node.name} at #{Time.now} resulted in change of #{updated_users.length} users"
 
     message = generate_email_body(updated_users)
 
-    Pony.mail(:to => @config[:to_address],
-              :from => @config[:from_address],
-              :subject => subject,
-              :body => message)
+    Pony.mail(
+      ensure_hash(@config).update(
+        :subject => subject,
+        :body => message
+      )
+    )
   end
 
   def generate_email_body users
@@ -79,4 +82,11 @@ User #{user.name} updated:
     EOH
   end
 
+  def ensure_hash(hash_thing)
+    new_h = {}
+    hash_thing.each do |k,v|
+      new_h[k.to_sym] = v.kind_of?(Hash) || v.kind_of?(Node::Attribute) ? to_hash(v) : v
+    end
+    new_h
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-users
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Chef Handler to report changes in users