Make rubocop happy

till · Oct 8, 2014 · 4220e2c · 4220e2c
1 parent c510423
commit 4220e2c
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 24 deletions.
diff --git a/aptly/attributes/default.rb b/aptly/attributes/default.rb
@@ -4,14 +4,4 @@
 default['aptly']['s3_mirror_prefix'] = 'prefix'
 default['aptly']['mirror_dir']   = '/tmp/ppa'
 default['aptly']['sign_pass']    = 'heythere'
-default["aptly"]["gpgkeys"]      = [
-  "66E3A9B7",
-  "63561DC6",
-  "5D50B6BA",
-  "C7917B12",
-  "06ED541C",
-  "C3173AA6",
-  "B6AC7E8C",
-  "0737E5F5",
-  "E93F5328"
-]
+default['aptly']['gpgkeys']      = %w(66E3A9B7 63561DC6 5D50B6BA C7917B12 06ED541C C3173AA6 B6AC7E8C 0737E5F5 E93F5328)
diff --git a/aptly/recipes/gpg.rb b/aptly/recipes/gpg.rb
@@ -1,7 +1,7 @@
 node['aptly']['gpgkeys'].each do |key|
   execute "install-key #{key}" do
     command "apt-key adv --keyserver keyserver.ubuntu.com --recv #{key}"
-    only_if {node["lsb"]["codename"] == "trusty" and node["ppa"]["enable_trusty_mirror"]}
+    only_if { node['lsb']['codename'] == 'trusty' && node['ppa']['enable_trusty_mirror'] }
     action :run
   end
-end 
+end
diff --git a/hhvm-fcgi/attributes/default.rb b/hhvm-fcgi/attributes/default.rb
@@ -2,7 +2,7 @@
 
 default['hhvm-fcgi']['build'] = '' # -nightly, -dbg
 
-if (node["lsb"]["codename"] == "trusty" and node["ppa"]["enable_trusty_mirror"])
+if node['lsb']['codename'] == 'trusty' && node['ppa']['enable_trusty_mirror']
   default['hhvm-fcgi']['apt']['repo'] = 'http://ppa.ezbib.com/trusty55'
 else
   default['hhvm-fcgi']['apt'] = {
@@ -11,7 +11,6 @@
   }
 end
 
-
 default['hhvm-fcgi']['boost'] = {
   'ppa' => 'ppa:mapnik/boost'
 }

diff --git a/hhvm-fcgi/metadata.rb b/hhvm-fcgi/metadata.rb
@@ -7,5 +7,6 @@
 recipe            'hhvm-fcgi::default', 'Set-up and start the hhvm fcgi server'
 supports 'ubuntu'
 
+depends 'apt'
 depends 'aptly'
 depends 'easybib'
diff --git a/nginx-app/attributes/default.rb b/nginx-app/attributes/default.rb
@@ -6,7 +6,7 @@
 default['nginx-app']['config_dir']         = '/etc/nginx'
 default['nginx-app']['conf_file']          = 'easybib.com.conf.erb'
 
-if (node["lsb"]["codename"] == "trusty" and node["ppa"]["enable_trusty_mirror"])
+if node['lsb']['codename'] == 'trusty' && node['ppa']['enable_trusty_mirror']
   default['ningx-app']['ppa'] = 'http://ppa.ezbib.com/trusty55'
 else
   default['nginx-app']['ppa'] = 'ppa:easybib/remote-mirrors'

diff --git a/nginx-app/recipes/ppa.rb b/nginx-app/recipes/ppa.rb
@@ -1,6 +1,6 @@
 include_recipe 'aptly::gpg'
 
-apt_repository "nginx-ppa" do
+apt_repository 'nginx-ppa' do
   uri           node['nginx-app']['ppa']
   distribution  node['lsb']['codename']
 end
diff --git a/nodejs/attributes/default.rb b/nodejs/attributes/default.rb
@@ -16,7 +16,7 @@
   'install_url' => 'https://www.npmjs.org/install.sh'
 }
 
-if (node["lsb"]["codename"] == "trusty" and node["ppa"]["enable_trusty_mirror"])
+if node['lsb']['codename'] == 'trusty' && node['ppa']['enable_trusty_mirror']
   default['nodejs']['ppa'] = 'http://ppa.ezbib.com/trusty55'
 else
   default['nodejs']['ppa'] = 'ppa:chris-lea/node.js-devel'

diff --git a/nodejs/recipes/ppa.rb b/nodejs/recipes/ppa.rb
@@ -1,6 +1,6 @@
 include_recipe 'aptly::gpg'
 
-apt_repository "easiybib-ppa" do
+apt_repository 'easiybib-ppa' do
   uri           node['nodejs']['ppa']
   distribution  node['lsb']['codename']
 end

diff --git a/php-fpm/attributes/default.rb b/php-fpm/attributes/default.rb
@@ -22,7 +22,7 @@
 
 default['php-fpm']['packages'] = 'php5-easybib,php5-easybib-mbstring,php5-easybib-memcache'
 
-if (node["lsb"]["codename"] == "trusty" and node["ppa"]["enable_trusty_mirror"])
+if node['lsb']['codename'] == 'trusty' && node['ppa']['enable_trusty_mirror']
   default['php-fm']['ppa'] = 'http://ppa.ezbib.com/trusty55'
 else
   default['php-fm']['ppa'] = 'ppa:easybib/php55'

diff --git a/php-fpm/recipes/55.rb b/php-fpm/recipes/55.rb
@@ -1,6 +1,6 @@
 include_recipe 'aptly::gpg'
 
-apt_repository "easiybib-ppa" do
+apt_repository 'easiybib-ppa' do
   uri           node['php55']['ppa']
   distribution  node['lsb']['codename']
 end
diff --git a/redis/attributes/default.rb b/redis/attributes/default.rb
@@ -19,8 +19,7 @@
   'keys_changed' => 0
 }
 
-if (node["lsb"]["codename"] == "trusty" and node["ppa"]["enable_trusty_mirror"])
-  puts "trusty mirror"
+if node['lsb']['codename'] == 'trusty' && node['ppa']['enable_trusty_mirror']
   default['redis']['ppa'] = 'http://ppa.ezbib.com/trusty55'
 else
   default['redis']['ppa'] = 'ppa:chris-lea/redis-server'

diff --git a/ruby-brightbox/attributes/default.rb b/ruby-brightbox/attributes/default.rb
@@ -1,7 +1,7 @@
 default['ruby-brightbox'] = {}
 default['ruby-brightbox']['version'] = '1.9.1'
 
-if (node["lsb"]["codename"] == "trusty" and node["ppa"]["enable_trusty_mirror"])
+if node['lsb']['codename'] == 'trusty' && node['ppa']['enable_trusty_mirror']
   default['ruby-brightbox']['ppa'] = 'http://ppa.ezbib.com/trusty55'
 else
   default['ruby-brightbox']['ppa'] = 'ppa:brightbox/ruby-ng'