Merge pull request #545 from tas50/master

Additional Cookstyle fixes

(cherry picked from commit f1f2a19)

Conflicts:
	resources/erlang_zypper_repository_on_suse_factory.rb

resources/erlang_apt_repository_on_bintray.rb

@@ -21,7 +21,6 @@
 actions :add, :remove
 default_action :add
 
-attribute :name, String, name_attribute: true
 attribute :uri, String, default: 'https://dl.bintray.com/rabbitmq-erlang/debian'
 attribute :distribution, String
 # Available values: 'erlang', 'erlang-21.x', 'erlang-20.x', 'erlang-19.x'
@@ -30,4 +29,4 @@
 attribute :key, String, default: '6B73A36E6026DFCA', required: true
 attribute :keyserver, String
 
-attribute :trusted, [true, false], default: false
+attribute :trusted, [TrueClass, FalseClass], default: false

resources/erlang_package_from_bintray.rb

@@ -21,9 +21,8 @@
 actions :install, :remove
 default_action :install
 
-attribute :name, String, name_attribute: true
 attribute :version, String
-attribute :use_hipe, [true, false], default: false
+attribute :use_hipe, [TrueClass, FalseClass], default: false
 attribute :options, [String, Array]
 attribute :retries, Integer, default: 3
 attribute :retry_delay, Integer, default: 10

resources/erlang_yum_repository_on_bintray.rb

@@ -21,15 +21,14 @@
 actions :create, :remove
 default_action :create
 
-attribute :name, String, name_attribute: true
 attribute :baseurl, String, required: true
 
-attribute :gpgcheck, [true, false], default: true
+attribute :gpgcheck, [TrueClass, FalseClass], default: true
 attribute :gpgkey, String
 
-attribute :repo_gpgcheck, [true, false], default: true
+attribute :repo_gpgcheck, [TrueClass, FalseClass], default: true
 attribute :repositoryid, String
-attribute :enabled, [true, false], default: true
+attribute :enabled, [TrueClass, FalseClass], default: true
 attribute :priority, String
 
 attribute :proxy, String
@@ -39,6 +38,6 @@
 attribute :sslcacert, String
 attribute :sslclientcert, String
 attribute :sslclientkey, String
-attribute :sslverify, [true, false]
+attribute :sslverify, [TrueClass, FalseClass]
 
 attribute :timeout

test/cookbooks/rabbitmq_test/recipes/default.rb

@@ -19,10 +19,7 @@
 # limitations under the License.
 #
 
-case node['platform_family']
-when 'debian', 'ubuntu'
-  apt_update
-end
+apt_update if platform_family?('debian')
 
 chef_gem 'bunny' do
   action :install