Merge pull request #10 from kotiri/foodcritic

Resolve foodcritic warnings

attributes/default.rb

@@ -1,32 +1,31 @@
 # being nil, the rabbitmq defaults will be used
-default[:rabbitmq][:nodename]  = nil
-default[:rabbitmq][:address]  = nil
-default[:rabbitmq][:port]  = nil
-default[:rabbitmq][:config] = nil
-default[:rabbitmq][:logdir] = nil
-default[:rabbitmq][:mnesiadir] = nil
+default['rabbitmq']['nodename']  = nil
+default['rabbitmq']['address']  = nil
+default['rabbitmq']['port']  = nil
+default['rabbitmq']['config'] = nil
+default['rabbitmq']['logdir'] = nil
+default['rabbitmq']['mnesiadir'] = nil
 
-# RabbitMQ version to install for "redhat", "centos", "scientific", and "amazon". We default to
-# 2.6.1, because that was what was installed in the previous version of the cookbook.
-default[:rabbitmq][:version] = '2.8.4'
+# RabbitMQ version to install for "redhat", "centos", "scientific", and "amazon".
+default['rabbitmq']['version'] = '2.8.4'
 
 # config file location
 # http://www.rabbitmq.com/configure.html#define-environment-variables
 # "The .config extension is automatically appended by the Erlang runtime."
-default[:rabbitmq][:config] = "/etc/rabbitmq/rabbitmq"
+default['rabbitmq']['config'] = "/etc/rabbitmq/rabbitmq"
 
 # rabbitmq.config defaults
-default[:rabbitmq][:default_user] = 'guest'
-default[:rabbitmq][:default_pass] = 'guest'
+default['rabbitmq']['default_user'] = 'guest'
+default['rabbitmq']['default_pass'] = 'guest'
 
 #clustering
-default[:rabbitmq][:cluster] = false
-default[:rabbitmq][:cluster_disk_nodes] = []
-default[:rabbitmq][:erlang_cookie] = 'AnyAlphaNumericStringWillDo'
+default['rabbitmq']['cluster'] = false
+default['rabbitmq']['cluster_disk_nodes'] = []
+default['rabbitmq']['erlang_cookie'] = 'AnyAlphaNumericStringWillDo'
 
 #ssl
-default[:rabbitmq][:ssl] = false
-default[:rabbitmq][:ssl_port] = '5671'
-default[:rabbitmq][:ssl_cacert] = '/path/to/cacert.pem'
-default[:rabbitmq][:ssl_cert] = '/path/to/cert.pem'
-default[:rabbitmq][:ssl_key] = '/path/to/key.pem'
+default['rabbitmq']['ssl'] = false
+default['rabbitmq']['ssl_port'] = '5671'
+default['rabbitmq']['ssl_cacert'] = '/path/to/cacert.pem'
+default['rabbitmq']['ssl_cert'] = '/path/to/cert.pem'
+default['rabbitmq']['ssl_key'] = '/path/to/key.pem'

metadata.rb

@@ -21,7 +21,7 @@
 attribute "rabbitmq/nodename",
   :display_name => "RabbitMQ Erlang node name",
   :description => "The Erlang node name for this server.",
-  :default => "node[:hostname]"
+  :default => "node['hostname']"
 
 attribute "rabbitmq/address",
   :display_name => "RabbitMQ server IP address",

recipes/default.rb

@@ -40,7 +40,7 @@
   notifies :restart, "service[rabbitmq-server]"
 end
 
-case node[:platform]
+case node['platform']
 when "debian", "ubuntu"
   # use the RabbitMQ repository instead of Ubuntu or Debian's
   # because there are very useful features in the newer versions
@@ -53,16 +53,16 @@
   end
   package "rabbitmq-server"
 when "redhat", "centos", "scientific", "amazon"
-  remote_file "/tmp/rabbitmq-server-#{node[:rabbitmq][:version]}-1.noarch.rpm" do
-    source "https://www.rabbitmq.com/releases/rabbitmq-server/v#{node[:rabbitmq][:version]}/rabbitmq-server-#{node[:rabbitmq][:version]}-1.noarch.rpm"
+  remote_file "#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{node['rabbitmq']['version']}-1.noarch.rpm" do
+    source "https://www.rabbitmq.com/releases/rabbitmq-server/v#{node['rabbitmq']['version']}/rabbitmq-server-#{node['rabbitmq']['version']}-1.noarch.rpm"
     action :create_if_missing
   end
-  rpm_package "/tmp/rabbitmq-server-#{node[:rabbitmq][:version]}-1.noarch.rpm" do
+  rpm_package "#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{node['rabbitmq']['version']}-1.noarch.rpm" do
     action :install
   end
 end
 
-if node[:rabbitmq][:cluster]
+if node['rabbitmq']['cluster']
     # If this already exists, don't do anything
     # Changing the cookie will stil have to be a manual process
     template "/var/lib/rabbitmq/.erlang.cookie" do

resources/user.rb

@@ -23,3 +23,8 @@
 attribute :password, :kind_of => String
 attribute :vhost, :kind_of => String
 attribute :permissions, :kind_of => String
+
+def initialize(*args)
+  super
+  @action = :add
+end

resources/vhost.rb

@@ -20,3 +20,8 @@
 actions :add, :delete
 
 attribute :vhost, :kind_of => String, :name_attribute => true
+
+def initialize(*args)
+  super
+  @action = :add
+end

templates/default/doterlang.cookie.erb

@@ -1 +1 @@
-<%= node[:rabbitmq][:erlang_cookie] %>
+<%= node['rabbitmq']['erlang_cookie'] %>

templates/default/rabbitmq-env.conf.erb

@@ -2,9 +2,9 @@
 # Generated by Chef
 ###
 
-<% if node[:rabbitmq][:nodename] -%>NODENAME=<%= node[:rabbitmq][:nodename] %><% end %>
-<% if node[:rabbitmq][:address] -%>NODE_IP_ADDRESS=<%= node[:rabbitmq][:address] %><% end %>
-<% if node[:rabbitmq][:port] -%>NODE_PORT=<%= node[:rabbitmq][:port] %><% end %>
-<% if node[:rabbitmq][:config] -%>CONFIG_FILE=<%= node[:rabbitmq][:config] %><% end %>
-<% if node[:rabbitmq][:logdir] -%>LOG_BASE=<%= node[:rabbitmq][:logdir] %><% end %>
-<% if node[:rabbitmq][:mnesiadir] -%>MNESIA_BASE=<%= node[:rabbitmq][:mnesiadir] %><% end %>
+<% if node['rabbitmq']['nodename'] -%>NODENAME=<%= node['rabbitmq']['nodename'] %><% end %>
+<% if node['rabbitmq']['address'] -%>NODE_IP_ADDRESS=<%= node['rabbitmq']['address'] %><% end %>
+<% if node['rabbitmq']['port'] -%>NODE_PORT=<%= node['rabbitmq']['port'] %><% end %>
+<% if node['rabbitmq']['config'] -%>CONFIG_FILE=<%= node['rabbitmq']['config'] %><% end %>
+<% if node['rabbitmq']['logdir'] -%>LOG_BASE=<%= node['rabbitmq']['logdir'] %><% end %>
+<% if node['rabbitmq']['mnesiadir'] -%>MNESIA_BASE=<%= node['rabbitmq']['mnesiadir'] %><% end %>

templates/default/rabbitmq.config.erb

@@ -4,18 +4,18 @@
 
 [
   {rabbit, [
-<% if node[:rabbitmq][:cluster] && node[:rabbitmq][:cluster_disk_nodes] -%>
-    {cluster_nodes, [<%= node[:rabbitmq][:cluster_disk_nodes].map{|n| "\'#{n}\'"}.join(',') %>]},
+<% if node['rabbitmq']['cluster'] && node['rabbitmq']['cluster_disk_nodes'] -%>
+    {cluster_nodes, [<%= node['rabbitmq']['cluster_disk_nodes'].map{|n| "\'#{n}\'"}.join(',') %>]},
 <% end %>
-<% if node[:rabbitmq][:ssl] -%>
-    {ssl_listeners, [<%= node[:rabbitmq][:ssl_port] %>]},
-    {ssl_options, [{cacertfile,"<%= node[:rabbitmq][:ssl_cacert] %>"},
-                    {certfile,"<%= node[:rabbitmq][:ssl_cert] %>"},
-                    {keyfile,"<%= node[:rabbitmq][:ssl_key] %>"},
+<% if node['rabbitmq']['ssl'] -%>
+    {ssl_listeners, [<%= node['rabbitmq']['ssl_port'] %>']},
+    {ssl_options, [{cacertfile,"<%= node['rabbitmq']['ssl_cacert'] %>"},
+                    {certfile,"<%= node['rabbitmq']['ssl_cert'] %>"},
+                    {keyfile,"<%= node['rabbitmq']['ssl_key'] %>"},
                     {verify,verify_none},
                     {fail_if_no_peer_cert,false}]},
 <% end %>
-    {default_user, <<"<%= node[:rabbitmq][:default_user] %>">>},
-    {default_pass, <<"<%= node[:rabbitmq][:default_pass] %>">>}
+    {default_user, <<"<%= node['rabbitmq']['default_user'] %>">>},
+    {default_pass, <<"<%= node['rabbitmq']['default_pass'] %>">>}
   ]}
-].
+].