Merge pull request #3 from hw-cookbooks/cookstyle_bot/cookstyle_6_17_5

Signed-off-by: Tim Smith <[email protected]>

Author: tas50

Gemfile

@@ -1,14 +1,14 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'emeril', :group => :release
+gem 'emeril', group: :release
 gem 'rake'
 
 group :integration do
-  gem "test-kitchen"
-  gem "kitchen-vagrant"
-  gem "librarian-chef"
-  gem "serverspec"
-  gem "chefspec"
-  gem "foodcritic"
-  gem "guard-rspec"
+  gem 'test-kitchen'
+  gem 'kitchen-vagrant'
+  gem 'librarian-chef'
+  gem 'serverspec'
+  gem 'chefspec'
+  gem 'foodcritic'
+  gem 'guard-rspec'
 end

Rakefile

@@ -5,11 +5,11 @@ require 'rspec/core/rake_task'
 begin
   require 'emeril/rake'
 rescue LoadError
-  puts ">>>>> Emeril gem not loaded, omitting tasks" unless ENV['CI']
+  puts '>>>>> Emeril gem not loaded, omitting tasks' unless ENV['CI']
 end
 
-task :spec    => 'spec:all'
-task :default => :spec
+task spec: 'spec:all'
+task default: :spec
 
 namespace :spec do
   targets = []
@@ -18,8 +18,8 @@ namespace :spec do
     targets << File.basename(dir)
   end
 
-  task :all     => targets
-  task :default => :all
+  task all: targets
+  task default: :all
 
   targets.each do |target|
     desc "Run serverspec tests to #{target}"
@@ -34,5 +34,5 @@ begin
   require 'kitchen/rake_tasks'
   Kitchen::RakeTasks.new
 rescue LoadError
-  puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
+  puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
 end

attributes/default.rb

@@ -1,8 +1,8 @@
-default[:csync2][:source][:version] = "csync2-1.34"
+default[:csync2][:source][:version] = 'csync2-1.34'
 default[:csync2][:source][:downloads] = {
-  "csync2-1.34.tar.gz" => 'http://oss.linbit.com/csync2/csync2-1.34.tar.gz',
-  "librsync-0.9.7.tar.gz" => 'http://autobuild.itoc.com.au/csync2/librsync-0.9.7.tar.gz',
-  "sqlite-2.8.17.tar.gz" => 'http://autobuild.itoc.com.au/csync2/sqlite-2.8.17.tar.gz'
+  'csync2-1.34.tar.gz' => 'http://oss.linbit.com/csync2/csync2-1.34.tar.gz',
+  'librsync-0.9.7.tar.gz' => 'http://autobuild.itoc.com.au/csync2/librsync-0.9.7.tar.gz',
+  'sqlite-2.8.17.tar.gz' => 'http://autobuild.itoc.com.au/csync2/sqlite-2.8.17.tar.gz',
 }
 
 default[:csync2][:build_packages][:rhel] = [
@@ -17,19 +17,19 @@
   'openssl-devel',
   'openssl-static',
   'rng-tools',
-  'xinetd'
-]
-default[:csync2][:build_packages][:ubuntu] = [
-  'build-essential',
-  'libtool',
-  'byacc',
-  'flex',
-  'openssl',
-  'rng-tools',
-  'xinetd'
+  'xinetd',
 ]
+default[:csync2][:build_packages][:ubuntu] = %w(
+  build-essential
+  libtool
+  byacc
+  flex
+  openssl
+  rng-tools
+  xinetd
+)
 
 default[:csync2][:src][:configure_opts] = './configure  --prefix=/usr --localstatedir=/var --with-librsync-source=../librsync-0.9.7.tar.gz --with-libsqlite-source=../sqlite-2.8.17.tar.gz --sysconfdir=/etc --disable-gnutls'
 
-default[:csync2][:hosts] = [ "localhost" ]
-default[:csync2][:directories] = [ "/tmp/csync2" ]
+default[:csync2][:hosts] = [ 'localhost' ]
+default[:csync2][:directories] = [ '/tmp/csync2' ]

metadata.rb

@@ -1,8 +1,7 @@
-name             "csync2"
-maintainer       "Heavy Water Operations, LLC"
-maintainer_email "[email protected]"
-license          "Apache 2.0"
-description      "Installs/Configures csync2"
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.1.0"
+name             'csync2'
+maintainer       'Heavy Water Operations, LLC'
+maintainer_email '[email protected]'
+license          'Apache-2.0'
+description      'Installs/Configures csync2'
+version          '0.1.0'
 

recipes/default.rb

@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: csync2
+# Cookbook:: csync2
 # Recipe:: default
 #
-# Copyright 2014, Heavy Water Operations, LLC
+# Copyright:: 2014, Heavy Water Operations, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,67 +18,67 @@
 #
 
 case node['platform']
-when "redhat", "centos", "fedora", "amazon"
-  install_packages = node[:csync2][:build_packages][:rhel]
-when "debian", "ubuntu"
-  install_packages = node[:csync2][:build_packages][:ubuntu]
+when 'redhat', 'centos', 'fedora', 'amazon'
+  install_packages = node['csync2']['build_packages']['rhel']
+when 'debian', 'ubuntu'
+  install_packages = node['csync2']['build_packages']['ubuntu']
 end
 install_packages.each do |pkg|
   package pkg
 end
 
-node[:csync2][:source][:downloads].each do |k, v|
+node['csync2']['source']['downloads'].each do |k, v|
   remote_file "#{Chef::Config[:file_cache_path]}/#{k}" do
     source v
   end
 end
 
 csync2_command = '/usr/sbin/csync2'
 
-execute "Install csync2" do
+execute 'Install csync2' do
   cwd Chef::Config[:file_cache_path]
   command <<-EOF
-    tar -xzvf #{node[:csync2][:source][:version]}.tar.gz
-    cd #{node[:csync2][:source][:version]}
-    #{node[:csync2][:src][:configure_opts]}
+    tar -xzvf #{node['csync2']['source']['version']}.tar.gz
+    cd #{node['csync2']['source']['version']}
+    #{node['csync2']['src']['configure_opts']}
     make
     make install
   EOF
-  not_if { ::File.exists?(csync2_command) }
+  not_if { ::File.exist?(csync2_command) }
 end
 
-ssl_conf = Chef::EncryptedDataBagItem.load('csync2', node.chef_environment)
-[ "csync2.key", "csync2_ssl_cert.csr", "csync2_ssl_cert.pem", "csync2_ssl_key.pem" ].each do |name|
+ssl_conf = data_bag_item('csync2', node.chef_environment)
+[ 'csync2.key', 'csync2_ssl_cert.csr', 'csync2_ssl_cert.pem', 'csync2_ssl_key.pem' ].each do |name|
   file "/etc/#{name}" do
     content ssl_conf["#{name}"]
-    mode 00644
+    mode '644'
   end
 end
 
-[ "/var/log/csync2", "/var/spool/csync2" ].each do |dir|
+[ '/var/log/csync2', '/var/spool/csync2' ].each do |dir|
   directory dir
 end
 
-template "/etc/csync2.cfg" do
-  source "csync2.cfg.erb"
+template '/etc/csync2.cfg' do
+  source 'csync2.cfg.erb'
   variables({
-    :hosts => node[:csync2][:hosts],
-    :directories => node[:csync2][:directories]
+    hosts: node['csync2']['hosts'],
+    directories: node['csync2']['directories'],
   })
-  notifies :restart, "service[xinetd]", :delayed
+  notifies :restart, 'service[xinetd]', :delayed
 end
 
-execute "Configure service port" do
+execute 'Configure service port' do
   command "echo 'csync2     30865/tcp' >> /etc/services"
-  notifies :restart, "service[xinetd]", :delayed
-  not_if "grep csync2 /etc/services"
+  notifies :restart, 'service[xinetd]', :delayed
+  not_if 'grep csync2 /etc/services'
 end
 
-template "/etc/xinetd.d/csync2" do
-  source "csync2.xinetd.erb"
-  notifies :restart, "service[xinetd]", :delayed
+template '/etc/xinetd.d/csync2' do
+  source 'csync2.xinetd.erb'
+  notifies :restart, 'service[xinetd]', :delayed
 end
 
-service "xinetd" do
+service 'xinetd' do
   action :nothing
 end

test/integration/default/serverspec/spec_helper.rb

@@ -2,4 +2,4 @@
 require 'pathname'
 
 set :backend, :exec
-set :path, "/sbin:/usr/local/sbin:$PATH"
+set :path, '/sbin:/usr/local/sbin:$PATH'