chef-handler-sns 0.2.0 → 0.2.1

data/README.md

@@ -8,6 +8,7 @@ This Chef Handler is heavily based on [Joshua Timberman](https://github.com/jtim
 
 [![Gem Version](https://badge.fury.io/rb/chef-handler-sns.png)](http://badge.fury.io/rb/chef-handler-sns)
 [![Dependency Status](https://gemnasium.com/onddo/chef-handler-sns.png)](https://gemnasium.com/onddo/chef-handler-sns)
+[![Code Climate](https://codeclimate.com/github/onddo/chef-handler-sns.png)](https://codeclimate.com/github/onddo/chef-handler-sns)
 
 ## Requirements
 

data/lib/chef/handler/sns/config.rb

@@ -0,0 +1,113 @@
+#
+# Author:: Xabier de Zuazo (<xabier@onddo.com>)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/mixin/params_validate'
+require 'chef/exceptions'
+
+class Chef
+  class Handler
+    class Sns
+      module Config
+        include ::Chef::Mixin::ParamsValidate
+      
+        def config_init(config={})
+          config.each do |key, value|
+            if self.respond_to?(key)
+              self.send(key, value)
+            else
+              Chef::Log.warn("#{self.class.to_s}: cnofiguration method not found: #{key}.")
+            end
+          end
+        end
+      
+        def config_check
+          required = [ 'access_key', 'secret_key', 'topic_arn' ]
+          opts = {}
+          map = {}
+          required.each do |key|
+            opts[key] = self.send(key)
+            map[key] = { :required => true }
+          end
+          validate(opts, map)
+      
+          if body_template and not ::File.exists?(body_template)
+            raise Exceptions::ValidationFailed,
+              "Template file not found: #{body_template}."
+          end
+        end
+      
+        def access_key(arg=nil)
+          set_or_return(
+            :access_key,
+            arg,
+            :kind_of => String
+          )
+        end
+      
+        def secret_key(arg=nil)
+          set_or_return(
+            :secret_key,
+            arg,
+            :kind_of => String
+          )
+        end
+      
+        def region(arg=nil)
+          set_or_return(
+            :region,
+            arg,
+            :kind_of => String
+          )
+        end
+      
+        def token(arg=nil)
+          set_or_return(
+            :token,
+            arg,
+            :kind_of => String
+          )
+        end
+      
+        def topic_arn(arg=nil)
+          set_or_return(
+            :topic_arn,
+            arg,
+            :kind_of => String
+          )
+        end
+      
+        def subject(arg=nil)
+          set_or_return(
+            :subject,
+            arg,
+            :kind_of => String
+          )
+        end
+      
+        def body_template(arg=nil)
+          set_or_return(
+            :body_template,
+            arg,
+            :kind_of => String
+          )
+        end
+      
+      end
+    end 
+  end 
+end 

data/lib/chef/handler/sns/version.rb

@@ -1,7 +1,7 @@
 class Chef
   class Handler
     class Sns
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
     end
   end
 end

data/lib/chef/handler/sns.rb

@@ -23,56 +23,36 @@ require 'erubis'
 class Chef
   class Handler
     class Sns < ::Chef::Handler
-      attr_writer :access_key, :secret_key, :region, :token, :topic_arn, :subject, :body_template
+      require 'chef/handler/sns/config'
+      include ::Chef::Handler::Sns::Config
   
       def initialize(config={})
         Chef::Log.debug("#{self.class.to_s} initialized.")
-        @access_key = config[:access_key]
-        @secret_key = config[:secret_key]
-        @region = config[:region] if config.has_key?(:region)
-        @token = config[:token] if config.has_key?(:token)
-        @topic_arn = config[:topic_arn]
-        @subject = config[:subject] if config.has_key?(:subject)
-        @body_template = config[:body_template] if config.has_key?(:body_template)
+        config_init(config)
       end
   
       def report
-        check_config
-        Chef::Log.debug("#{self.class.to_s} reporting.")
-        sns.publish(@topic_arn, sns_body, sns_subject)
+        config_check
+        sns.publish(topic_arn, sns_body, sns_subject)
       end
   
       protected
-  
-      def check_config
-        Chef::Log.debug("#{self.class.to_s} checking handler configuration.")
-        raise "access_key not properly set" unless @access_key.kind_of?(String)
-        raise "secret_key not properly set" unless @secret_key.kind_of?(String)
-        raise "region not properly set" unless @region.kind_of?(String) or @region.nil?
-        raise "token not properly set" unless @token.kind_of?(String) or @token.nil?
-        raise "topic_arn not properly set" unless @topic_arn.kind_of?(String)
-        raise "subject not properly set" unless @subject.kind_of?(String) or @subject.nil?
-        unless @body_template.nil?
-          raise "body_template not properly set" unless @body_template.kind_of?(String)
-          raise "body_template file not found: #{@body_template}" unless ::File.exists?(@body_template)
-        end
-      end
 
       def sns
         @sns ||= begin
           params = {
             :logger => Chef::Log,
-            :region => @region || node.ec2.placement_availability_zone.chop
+            :region => region || node.ec2.placement_availability_zone.chop
           }
-          params[:token] = @token if @token
-          RightAws::SnsInterface.new(@access_key, @secret_key, params)
+          params[:token] = token if token
+          RightAws::SnsInterface.new(access_key, secret_key, params)
         end
       end
   
       def sns_subject
-        if @subject
+        if subject
           context = self
-          eruby = Erubis::Eruby.new(@subject)
+          eruby = Erubis::Eruby.new(subject)
           eruby.evaluate(context)
         else
           chef_client = Chef::Config[:solo] ? 'Chef Solo' : 'Chef Client'
@@ -82,7 +62,7 @@ class Chef
       end
   
       def sns_body
-        template = IO.read(@body_template || "#{File.dirname(__FILE__)}/sns/templates/body.erb")
+        template = IO.read(body_template || "#{File.dirname(__FILE__)}/sns/templates/body.erb")
         context = self
         eruby = Erubis::Eruby.new(template)
         eruby.evaluate(context)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-sns
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -51,6 +51,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- lib/chef/handler/sns/config.rb
 - lib/chef/handler/sns/templates/body.erb
 - lib/chef/handler/sns/version.rb
 - lib/chef/handler/sns.rb