Standardise on double quoted strings

diff --git a/.rubocop.yml b/.rubocop.yml
index f11a7d911ffd033ca98829ec8699376be1b1d895..f9eb7394239a2bdf5e00a9347398ce61e5a1de00 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -7,3 +7,6 @@ Style/AlignParameters:
 Style/SingleSpaceBeforeFirstArg:
   Exclude:
     - '**/metadata.rb'
 Style/SingleSpaceBeforeFirstArg:
   Exclude:
     - '**/metadata.rb'

+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 07185ec2ccc9e53c8dbd84c9fcb14fd8b7262fdb..eab32f0ddaf7eaf8cb61c060353dd4fa163d8ccf 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -61,9 +61,3 @@ Style/MultilineOperationIndentation:
 # Cop supports --auto-correct.
 Style/NumericLiterals:
   MinDigits: 11
 # Cop supports --auto-correct.
 Style/NumericLiterals:
   MinDigits: 11

-
-# Offense count: 6548
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false

diff --git a/Gemfile b/Gemfile
index d1ca205099a58dc5600ad6a5e2ecf3364785d0a2..47ac10107871db0b1174a15bfea771933d92ea6d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"

 
 

-gem 'rubocop'
-gem 'foodcritic'
+gem "rubocop"
+gem "foodcritic"

diff --git a/cookbooks/accounts/metadata.rb b/cookbooks/accounts/metadata.rb
index 5ee363947c8a11a9c193eecaff9a01538b7c0170..f85cff46527228c71481104b3aa8aa665cc0b4b2 100644 (file)
--- a/cookbooks/accounts/metadata.rb
+++ b/cookbooks/accounts/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Accounts management"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Accounts management"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 
 attribute "accounts",
 version           "1.0.0"
 
 attribute "accounts",

diff --git a/cookbooks/apache/metadata.rb b/cookbooks/apache/metadata.rb
index 6da0ce647c1566d70353b8d1c2531b4641d81e45..24c69d703a3f08edb25d7f78c62588a5d55ecd23 100644 (file)
--- a/cookbooks/apache/metadata.rb
+++ b/cookbooks/apache/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures apache"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures apache"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "ssl"
 version           "1.0.0"
 depends           "ssl"

diff --git a/cookbooks/apt/metadata.rb b/cookbooks/apt/metadata.rb
index 51281db29814b52bd0f3dd65a0f864b9e4fd6ece..ee74103b92ad35d4b11fda24926de6b921441511 100644 (file)
--- a/cookbooks/apt/metadata.rb
+++ b/cookbooks/apt/metadata.rb
@@ -3,7 +3,7 @@ maintainer       "Tom Hughes"
 maintainer_email "tom@compton.nu"
 license          "Apache 2.0"
 description      "Installs/Configures apt"
 maintainer_email "tom@compton.nu"
 license          "Apache 2.0"
 description      "Installs/Configures apt"

-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version          "0.1"
 supports         "debian"
 supports         "ubuntu"
 version          "0.1"
 supports         "debian"
 supports         "ubuntu"

diff --git a/cookbooks/backup/metadata.rb b/cookbooks/backup/metadata.rb
index bba2572c2435cd380ca5695ffa11c555085680d9..ed57e3616aee1a69329b27cab275cae1cb90472a 100644 (file)
--- a/cookbooks/backup/metadata.rb
+++ b/cookbooks/backup/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures backup.openstreetmap.org"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures backup.openstreetmap.org"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/bind/metadata.rb b/cookbooks/bind/metadata.rb
index 67a7e44bce1f0f8925fbf45b52c84d56dae36c20..3488028c291d13eaa7e601c8f4f1ef5b82e1d11c 100644 (file)
--- a/cookbooks/bind/metadata.rb
+++ b/cookbooks/bind/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures bind"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures bind"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "networking"
 
 version           "1.0.0"
 depends           "networking"
 

diff --git a/cookbooks/blog/metadata.rb b/cookbooks/blog/metadata.rb
index 64060a9c10b157c49e935c923d11756b0d2298b4..0ac7d090374806ecf7bae0248c76dc0a5949ba35 100644 (file)
--- a/cookbooks/blog/metadata.rb
+++ b/cookbooks/blog/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures Blog services"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures Blog services"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "wordpress"
 version           "1.0.0"
 depends           "wordpress"

diff --git a/cookbooks/cgiirc/metadata.rb b/cookbooks/cgiirc/metadata.rb
index 7f1bd145dda5511ee5cef07e9cbb19c0b8c42cd7..444522c49063758e82e407611d4cadef85cf5c8a 100644 (file)
--- a/cookbooks/cgiirc/metadata.rb
+++ b/cookbooks/cgiirc/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures cgiirc"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures cgiirc"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 version           "1.0.0"
 depends           "apache"

diff --git a/cookbooks/chef/files/default/knife.rb b/cookbooks/chef/files/default/knife.rb
index a65cba956b7c230bafb700a1d87bd8c9281bb78c..c6b83f06afba9003640507ce1a5bf61169ca570b 100644 (file)
--- a/cookbooks/chef/files/default/knife.rb
+++ b/cookbooks/chef/files/default/knife.rb
@@ -1,11 +1,11 @@
-node_name 'chef-git'
-client_key 'client.pem'
-validation_client_name 'chef-validator'
-validation_key '/etc/chef/validation.pem'
-chef_server_url 'https://chef.openstreetmap.org'
-cache_type 'BasicFile'
-cache_options :path => '.chef/checksums'
-cookbook_path ['cookbooks']
-cookbook_copyright 'OpenStreetMap Administrators'
-cookbook_email 'admins@openstreetmap.org'
-cookbook_license 'apachev2'
+node_name "chef-git"
+client_key "client.pem"
+validation_client_name "chef-validator"
+validation_key "/etc/chef/validation.pem"
+chef_server_url "https://chef.openstreetmap.org"
+cache_type "BasicFile"
+cache_options :path => ".chef/checksums"
+cookbook_path ["cookbooks"]
+cookbook_copyright "OpenStreetMap Administrators"
+cookbook_email "admins@openstreetmap.org"
+cookbook_license "apachev2"

diff --git a/cookbooks/chef/libraries/remote_directory.rb b/cookbooks/chef/libraries/remote_directory.rb
index 730535d445445f6cbe0a7446661bebea39c2bc56..959eb29409445514cf376d133d26cdadfbb7e83c 100644 (file)
--- a/cookbooks/chef/libraries/remote_directory.rb
+++ b/cookbooks/chef/libraries/remote_directory.rb
@@ -15,7 +15,7 @@ class Chef
         return unless @new_resource.purge
 
         files_to_purge = Set.new(
         return unless @new_resource.purge
 
         files_to_purge = Set.new(

-          Dir.glob(::File.join(@new_resource.path, '**', '*'), ::File::FNM_DOTMATCH).select do |name|
+          Dir.glob(::File.join(@new_resource.path, "**", "*"), ::File::FNM_DOTMATCH).select do |name|

             name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
           end
         )
             name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
           end
         )

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index 25485f4bb8780b6ead4170647ee6eee0cb71fa19..86597458ad6461b40bedc96f34d7edea4e92f5a4 100644 (file)
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -13,7 +13,7 @@ class Chef
       end
 
       def current_repository
       end
 
       def current_repository

-        @current_repository ||= repo_attrs['URL']
+        @current_repository ||= repo_attrs["URL"]

       end
 
       def current_repository_matches_target_repository?
       end
 
       def current_repository_matches_target_repository?

diff --git a/cookbooks/chef/metadata.rb b/cookbooks/chef/metadata.rb
index 83bb6013cd2ac7971675fd01437f217c7324d773..08f2c330e8871ea46489fe91a16e4d89a91a25fe 100644 (file)
--- a/cookbooks/chef/metadata.rb
+++ b/cookbooks/chef/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures chef"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures chef"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "apt"
 version           "1.0.0"
 depends           "apache"
 depends           "apt"

diff --git a/cookbooks/civicrm/metadata.rb b/cookbooks/civicrm/metadata.rb
index ad57baf1e5820c4186ff5991e598dac7babf6cf4..9b47426d08435899b87ea5c880276268f4d91122 100644 (file)
--- a/cookbooks/civicrm/metadata.rb
+++ b/cookbooks/civicrm/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures CiviCRM"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures CiviCRM"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "wordpress"
 depends           "mysql"
 version           "1.0.0"
 depends           "wordpress"
 depends           "mysql"

diff --git a/cookbooks/clamav/metadata.rb b/cookbooks/clamav/metadata.rb
index 847d10bd9c06cecdbc2e52affc484ed7e7230548..c144002b0f0ea8c316b900f6cd356bef6db3ab0c 100644 (file)
--- a/cookbooks/clamav/metadata.rb
+++ b/cookbooks/clamav/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures clamav"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures clamav"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/db/metadata.rb b/cookbooks/db/metadata.rb
index 1dd2e9c80ea1b8986823b94df9be004ac2020051..a93bc90348bba5e2b1e32314831bee541b3c7f99 100644 (file)
--- a/cookbooks/db/metadata.rb
+++ b/cookbooks/db/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures database servers"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures database servers"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "postgresql"
 depends           "web"
 version           "1.0.0"
 depends           "postgresql"
 depends           "web"

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 6362520c6927bb5b6aa77853250236ecf241d11e..361e9f628081cfbb5c02667a168e00fb3a06be45 100644 (file)
--- a/cookbooks/dev/metadata.rb
+++ b/cookbooks/dev/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures dev services"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures dev services"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "passenger"
 version           "1.0.0"
 depends           "apache"
 depends           "passenger"

diff --git a/cookbooks/devices/metadata.rb b/cookbooks/devices/metadata.rb
index ba8f311250adb344fa23567f3139e08c673ba3c1..8c75714846f43cda1da9b6742dc4a395a806a359 100644 (file)
--- a/cookbooks/devices/metadata.rb
+++ b/cookbooks/devices/metadata.rb
@@ -3,7 +3,7 @@ maintainer       "Tom Hughes"
 maintainer_email "tom@compton.nu"
 license          "Apache 2.0"
 description      "Configures devices"
 maintainer_email "tom@compton.nu"
 license          "Apache 2.0"
 description      "Configures devices"

-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version          "0.1"
 
 attribute "devices",
 version          "0.1"
 
 attribute "devices",

diff --git a/cookbooks/dhcpd/metadata.rb b/cookbooks/dhcpd/metadata.rb
index 369d9fca7ce69271fd02e3b0eecc3e74790b38e8..7f661d662e7ce9e2a2a0711b0f812a7a5e51086b 100644 (file)
--- a/cookbooks/dhcpd/metadata.rb
+++ b/cookbooks/dhcpd/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures dhcpd"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures dhcpd"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "networking"
 
 version           "1.0.0"
 depends           "networking"
 

diff --git a/cookbooks/dns/metadata.rb b/cookbooks/dns/metadata.rb
index 96d9153b79a0c49c09f7ca143963a0e5e3777741..6a0eef09a66e38e55ab8449a226f22c43dc49d96 100644 (file)
--- a/cookbooks/dns/metadata.rb
+++ b/cookbooks/dns/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configure DNS management"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configure DNS management"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "git"
 depends           "apache"
 version           "1.0.0"
 depends           "git"
 depends           "apache"

diff --git a/cookbooks/elasticsearch/metadata.rb b/cookbooks/elasticsearch/metadata.rb
index 330273c7a338142979e5b81a469b2b69b3b53316..bf14fba3af05feca04723776227acdcd4cd45cc3 100644 (file)
--- a/cookbooks/elasticsearch/metadata.rb
+++ b/cookbooks/elasticsearch/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a elasticsearch server"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a elasticsearch server"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/exim/metadata.rb b/cookbooks/exim/metadata.rb
index df68d456877a0e711381ee0d961d963351756494..ed1d59da5e32046646b974a1d4aa36bab7ec3a1c 100644 (file)
--- a/cookbooks/exim/metadata.rb
+++ b/cookbooks/exim/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures exim"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures exim"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "networking"
 
 version           "1.0.0"
 depends           "networking"
 

diff --git a/cookbooks/fail2ban/metadata.rb b/cookbooks/fail2ban/metadata.rb
index 3f4b45f7fd72f26c9c8a389e8cd59ac9324e42e1..8f62b08cd8388f310c5e4f6907e82f27cd9402ca 100644 (file)
--- a/cookbooks/fail2ban/metadata.rb
+++ b/cookbooks/fail2ban/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures fail2ban"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures fail2ban"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/forum/metadata.rb b/cookbooks/forum/metadata.rb
index 797c0cb8c5c4c170b37261664e5db6bc4e881ffe..ea3407d02b2236314a4a0490392f8e42608f4920 100644 (file)
--- a/cookbooks/forum/metadata.rb
+++ b/cookbooks/forum/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a roundup server"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a roundup server"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "git"
 version           "1.0.0"
 depends           "apache"
 depends           "git"

diff --git a/cookbooks/foundation/metadata.rb b/cookbooks/foundation/metadata.rb
index fb40d15f451ab7b69481fa7e3d775ab0e86f133b..f048278be3040620100b3f5b5f4e10464227e918 100644 (file)
--- a/cookbooks/foundation/metadata.rb
+++ b/cookbooks/foundation/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures foundation services"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures foundation services"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "mediawiki"
 version           "1.0.0"
 depends           "mediawiki"

diff --git a/cookbooks/geodns/metadata.rb b/cookbooks/geodns/metadata.rb
index 3f658ed3da8bf2204286c55c7aa5c1d49b01de9d..9dd9a0a3701fed9991e068697c21063c5478225e 100644 (file)
--- a/cookbooks/geodns/metadata.rb
+++ b/cookbooks/geodns/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a geographic DNS server"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a geographic DNS server"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/git/metadata.rb b/cookbooks/git/metadata.rb
index c9e5245811d9b1e0f3a606fc7cce7abe3bd0b8ed..fa82a439c5db02c11da7d821c72f824ad7fc1f40 100644 (file)
--- a/cookbooks/git/metadata.rb
+++ b/cookbooks/git/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures git"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures git"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "networking"
 depends           "xinetd"
 version           "1.0.0"
 depends           "networking"
 depends           "xinetd"

diff --git a/cookbooks/gps-tile/metadata.rb b/cookbooks/gps-tile/metadata.rb
index 2d944c06ee373ddad43851f7ff2ef4219ba25147..4ce457d420262f4a0bd0665d14a8f5129acfbe44 100644 (file)
--- a/cookbooks/gps-tile/metadata.rb
+++ b/cookbooks/gps-tile/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures a GPS tile server"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures a GPS tile server"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 version           "1.0.0"
 depends           "apache"

diff --git a/cookbooks/hardware/metadata.rb b/cookbooks/hardware/metadata.rb
index 635d7b036ee5e5717206dbfc1324a221677a0baf..aa292111bc21d346660d2ef5f65394c8839ad323 100644 (file)
--- a/cookbooks/hardware/metadata.rb
+++ b/cookbooks/hardware/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures hardware"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures hardware"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "git"
 version           "1.0.0"
 depends           "git"

diff --git a/cookbooks/incron/metadata.rb b/cookbooks/incron/metadata.rb
index 3e21a533e7ddc4a4d793bef47877674307f30459..42d6738a61943e8e4bf3d5847dcfad6870207f0c 100644 (file)
--- a/cookbooks/incron/metadata.rb
+++ b/cookbooks/incron/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures incron"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures incron"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/mailman/metadata.rb b/cookbooks/mailman/metadata.rb
index d2f15f54aaee677da6801ce085c91eaafadde310..0ba3d6a2163261e0a7c2c8ad170c51ddfd865653 100644 (file)
--- a/cookbooks/mailman/metadata.rb
+++ b/cookbooks/mailman/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures mailman"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures mailman"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 version           "1.0.0"
 depends           "apache"

diff --git a/cookbooks/mediawiki/definitions/mediawiki_site.rb b/cookbooks/mediawiki/definitions/mediawiki_site.rb
index 017d77b30cf1ac52f1bf046428dab2145fc15aff..8b0ddaccbcd2345b296f403a8cc6b9300292da03 100644 (file)
--- a/cookbooks/mediawiki/definitions/mediawiki_site.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_site.rb
@@ -95,7 +95,7 @@ define :mediawiki_site, :action => [:create, :enable] do
     not_if do
       File.exist?("#{mediawiki[:directory]}/LocalSettings-install.php")
     end
     not_if do
       File.exist?("#{mediawiki[:directory]}/LocalSettings-install.php")
     end

-    notifies :create, 'ruby_block[rename-installer-localsettings]', :immediately
+    notifies :create, "ruby_block[rename-installer-localsettings]", :immediately

   end
 
   execute "#{mediawiki[:directory]}/maintenance/update.php" do
   end
 
   execute "#{mediawiki[:directory]}/maintenance/update.php" do

diff --git a/cookbooks/mediawiki/metadata.rb b/cookbooks/mediawiki/metadata.rb
index 602db82c92deece4c54c24e75234fc252aa36e6d..46daf9a65b4657af8450bffe544b6406fe69f8fa 100644 (file)
--- a/cookbooks/mediawiki/metadata.rb
+++ b/cookbooks/mediawiki/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures mediawiki"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures mediawiki"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "memcached"
 depends           "apache"
 version           "1.0.0"
 depends           "memcached"
 depends           "apache"

diff --git a/cookbooks/memcached/metadata.rb b/cookbooks/memcached/metadata.rb
index 374c15f744d348067cf310d761658519d7338ef5..7abd699a4c4c70b1af0f489091a4dddbc6531a1f 100644 (file)
--- a/cookbooks/memcached/metadata.rb
+++ b/cookbooks/memcached/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures memcached"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures memcached"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/munin/files/default/plugins/api_calls_ b/cookbooks/munin/files/default/plugins/api_calls_
index 689f5120c26c7db1960fc7a11297e23a380f29e7..8b4dd770da199b8e63271a39c4c57827eb5f2232 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_calls_
+++ b/cookbooks/munin/files/default/plugins/api_calls_
@@ -1,16 +1,16 @@
 #!/usr/bin/ruby
 
 #!/usr/bin/ruby
 

-require 'rubygems'
-require 'date'
-require 'hpricot'
-require 'open-uri'
+require "rubygems"
+require "date"
+require "hpricot"
+require "open-uri"

 
 def uris_from_status(server)
   file = open("http://#{server}/server-status").read
   doc = Hpricot.parse(file)
 
 def uris_from_status(server)
   file = open("http://#{server}/server-status").read
   doc = Hpricot.parse(file)

-  tables = doc / 'table'
-  rows = (tables[0] / 'tr')[1..-1]
-  data = rows.collect { |r| (r  / 'td').collect(&:inner_html) }
+  tables = doc / "table"
+  rows = (tables[0] / "tr")[1..-1]
+  data = rows.collect { |r| (r  / "td").collect(&:inner_html) }

   # filter where the PID is numeric, status is 'W' and host matches the server
   matching_data = data.select { |r| (r[1].to_i > 0) && r[3].match(/W/) && r[11].match(server) }
   # return only the URI part
   # filter where the PID is numeric, status is 'W' and host matches the server
   matching_data = data.select { |r| (r[1].to_i > 0) && r[3].match(/W/) && r[11].match(server) }
   # return only the URI part


@@ -45,7 +45,7 @@ end
 
 server = $PROGRAM_NAME.match("api_calls_(.*)")[1]
 
 
 server = $PROGRAM_NAME.match("api_calls_(.*)")[1]
 

-if ARGV[0] == 'config'
+if ARGV[0] == "config"

   puts "graph_title Active requests"
   puts "graph_vlabel Number of requests"
   puts "graph_category api"
   puts "graph_title Active requests"
   puts "graph_vlabel Number of requests"
   puts "graph_category api"

diff --git a/cookbooks/munin/files/default/plugins/api_calls_num b/cookbooks/munin/files/default/plugins/api_calls_num
index 1c3a28e05536c1ceec46c453830e18983199bb0b..fbc64f387df3ce29bfcf43d94cb7e57a8f4a4efc 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_calls_num
+++ b/cookbooks/munin/files/default/plugins/api_calls_num
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
 #!/usr/bin/ruby
 

-require 'rubygems'
-require 'date'
-gem 'home_run', '>= 0'
-require 'apache_log_regex'
+require "rubygems"
+require "date"
+gem "home_run", ">= 0"
+require "apache_log_regex"

 
 NUM_LINES = 10000
 
 
 NUM_LINES = 10000
 


@@ -53,7 +53,7 @@ def categorise_uri(line)
   end
 end
 
   end
 end
 

-if ARGV[0] == 'config'
+if ARGV[0] == "config"

   puts "graph_title Requests processed"
   puts "graph_vlabel Number of requests per minute"
   puts "graph_category api"
   puts "graph_title Requests processed"
   puts "graph_vlabel Number of requests per minute"
   puts "graph_category api"

diff --git a/cookbooks/munin/files/default/plugins/api_waits_ b/cookbooks/munin/files/default/plugins/api_waits_
index eb2a636863ec55551f3742fd4ac7c28cdcbf1e05..e4a991a4c2511d57544b450168195985ceb57cfd 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_waits_
+++ b/cookbooks/munin/files/default/plugins/api_waits_
@@ -1,16 +1,16 @@
 #!/usr/bin/ruby
 
 #!/usr/bin/ruby
 

-require 'rubygems'
-require 'date'
-require 'hpricot'
-require 'open-uri'
+require "rubygems"
+require "date"
+require "hpricot"
+require "open-uri"

 
 def uri_and_times_from_status(server)
   file = open("http://#{server}/server-status").read
   doc = Hpricot.parse(file)
 
 def uri_and_times_from_status(server)
   file = open("http://#{server}/server-status").read
   doc = Hpricot.parse(file)

-  tables = doc / 'table'
-  rows = (tables[0] / 'tr')[1..-1]
-  data = rows.collect { |r| (r  / 'td').collect(&:inner_html) }
+  tables = doc / "table"
+  rows = (tables[0] / "tr")[1..-1]
+  data = rows.collect { |r| (r  / "td").collect(&:inner_html) }

   # filter where the PID is numeric, status is 'W' and host matches the server
   matching_data = data.select { |r| (r[1].to_i > 0) && r[3].match(/W/) && r[11].match(server) }
   # return URI and number of seconds processing for each request
   # filter where the PID is numeric, status is 'W' and host matches the server
   matching_data = data.select { |r| (r[1].to_i > 0) && r[3].match(/W/) && r[11].match(server) }
   # return URI and number of seconds processing for each request


@@ -45,7 +45,7 @@ end
 
 server = $PROGRAM_NAME.match("api_waits_(.*)")[1]
 
 
 server = $PROGRAM_NAME.match("api_waits_(.*)")[1]
 

-if ARGV[0] == 'config'
+if ARGV[0] == "config"

   puts "graph_title Wait times for active requests"
   puts "graph_vlabel Average time of requests"
   puts "graph_category api"
   puts "graph_title Wait times for active requests"
   puts "graph_vlabel Average time of requests"
   puts "graph_category api"

diff --git a/cookbooks/munin/metadata.rb b/cookbooks/munin/metadata.rb
index 1c54293836c770618c5af18a505880ba050e13da..b45c7575cfe20783097a75484c6476649a9d7208 100644 (file)
--- a/cookbooks/munin/metadata.rb
+++ b/cookbooks/munin/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures munin"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures munin"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "networking"
 version           "1.0.0"
 depends           "apache"
 depends           "networking"

diff --git a/cookbooks/mysql/metadata.rb b/cookbooks/mysql/metadata.rb
index 81d54e013ae91648985cfc46c05e6ee2b8429fea..547f5e4528093ba7f02928419119cf97c9c7e744 100644 (file)
--- a/cookbooks/mysql/metadata.rb
+++ b/cookbooks/mysql/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures mysql"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures mysql"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 
 attribute "mysql",
 version           "1.0.0"
 
 attribute "mysql",

diff --git a/cookbooks/networking/metadata.rb b/cookbooks/networking/metadata.rb
index e74507192f05433e471fd7b7252d4271f390873d..bbe92adce0954b78acc8c12e8849ffdfd36c9f08 100644 (file)
--- a/cookbooks/networking/metadata.rb
+++ b/cookbooks/networking/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures networking"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures networking"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 recipe            "networking", "Configures networking via attributes"
 supports          "ubuntu"
 version           "1.0.0"
 recipe            "networking", "Configures networking via attributes"
 supports          "ubuntu"

diff --git a/cookbooks/nfs/metadata.rb b/cookbooks/nfs/metadata.rb
index 4e2ae496695a84cbcd7eddae998f0e0a77878f3c..b2038e83208e280da3a28ae2e5cfb17ed39ca474 100644 (file)
--- a/cookbooks/nfs/metadata.rb
+++ b/cookbooks/nfs/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures nfs"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures nfs"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/nginx/metadata.rb b/cookbooks/nginx/metadata.rb
index 17a364c915fff9cf044ccd421e6e23d96cd7241e..2710e6c54b7e7f8c18651f1678f6324438566e62 100644 (file)
--- a/cookbooks/nginx/metadata.rb
+++ b/cookbooks/nginx/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures nginx"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures nginx"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "ssl"
 version           "1.0.0"
 depends           "ssl"

diff --git a/cookbooks/nodejs/metadata.rb b/cookbooks/nodejs/metadata.rb
index a146f6347566be342988da62ba96b21ea0bbda44..702c77c3b8e4e5989c9ad53d76983d2f1ab68247 100644 (file)
--- a/cookbooks/nodejs/metadata.rb
+++ b/cookbooks/nodejs/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures Node.js"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures Node.js"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/nominatim/metadata.rb b/cookbooks/nominatim/metadata.rb
index 6914af1c8093876f575071a78dc71cf216ca632b..c587054c079e6c1cc8afce74172a4bae32a9d848 100644 (file)
--- a/cookbooks/nominatim/metadata.rb
+++ b/cookbooks/nominatim/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures nominatim servers"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures nominatim servers"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "postgresql"
 version           "1.0.0"
 depends           "apache"
 depends           "postgresql"

diff --git a/cookbooks/ntp/metadata.rb b/cookbooks/ntp/metadata.rb
index adcfc75ca36a05409d68a33a0a5a91502da1d0df..d1906c34cc279f1bd423deb0c46d2a9a07804745 100644 (file)
--- a/cookbooks/ntp/metadata.rb
+++ b/cookbooks/ntp/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs and configures ntp as a client or server"
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs and configures ntp as a client or server"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "0.8.2"
 
 recipe "ntp", "Installs and configures ntp either as a server or client"
 version           "0.8.2"
 
 recipe "ntp", "Installs and configures ntp either as a server or client"

diff --git a/cookbooks/ohai/metadata.rb b/cookbooks/ohai/metadata.rb
index 9706391fe9a844fefb319d84aca208b5b3a1be33..426a1ad5c946b71b183823267519fcd9da8144f9 100644 (file)
--- a/cookbooks/ohai/metadata.rb
+++ b/cookbooks/ohai/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures ohai"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures ohai"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/openvpn/metadata.rb b/cookbooks/openvpn/metadata.rb
index 7580e30cf0e1e4ff806bc3b8694dfd8b3c2d26f1..7478cdec4e8d0a6711c8e92239310d74ba37a942 100644 (file)
--- a/cookbooks/openvpn/metadata.rb
+++ b/cookbooks/openvpn/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures OpenVPN"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures OpenVPN"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/osmosis/metadata.rb b/cookbooks/osmosis/metadata.rb
index 3a78801f40cae1f9db3d9d14d79705d54a4af322..b5c22ec53f483d4fb3ee8a91c8589ec075f4a96e 100644 (file)
--- a/cookbooks/osmosis/metadata.rb
+++ b/cookbooks/osmosis/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures osmosis"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures osmosis"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "chef"
 version           "1.0.0"
 depends           "chef"

diff --git a/cookbooks/osqa/metadata.rb b/cookbooks/osqa/metadata.rb
index 5239f2e69a4c13e7dbdbd23a30faed0a2215b2b4..eb9898710a673c0da812154896ce90801c59b632 100644 (file)
--- a/cookbooks/osqa/metadata.rb
+++ b/cookbooks/osqa/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures OSQA"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures OSQA"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "memcached"
 version           "1.0.0"
 depends           "apache"
 depends           "memcached"

diff --git a/cookbooks/otrs/metadata.rb b/cookbooks/otrs/metadata.rb
index 4bc7d721d25cf50f26b2e956491f605254e37ec3..bb738af7669197617c84899003106ab5f00b087d 100644 (file)
--- a/cookbooks/otrs/metadata.rb
+++ b/cookbooks/otrs/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures OTRS"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures OTRS"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "postgresql"
 version           "1.0.0"
 depends           "apache"
 depends           "postgresql"

diff --git a/cookbooks/owl/metadata.rb b/cookbooks/owl/metadata.rb
index ba455cfdac85255d8c2466dfae91bc519329e652..86976a6f9ac1915e4fa99f7cb7c311619883760b 100644 (file)
--- a/cookbooks/owl/metadata.rb
+++ b/cookbooks/owl/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures OWL servers"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures OWL servers"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "postgresql"
 version           "1.0.0"
 depends           "apache"
 depends           "postgresql"

diff --git a/cookbooks/passenger/metadata.rb b/cookbooks/passenger/metadata.rb
index bad97ca8b59b97b087615e28ddd433d4b9311014..937c95fe92b89c3aca3104a6f2841ba28b546ea5 100644 (file)
--- a/cookbooks/passenger/metadata.rb
+++ b/cookbooks/passenger/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures passenger"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures passenger"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "munin"
 version           "1.0.0"
 depends           "apache"
 depends           "munin"

diff --git a/cookbooks/piwik/metadata.rb b/cookbooks/piwik/metadata.rb
index ab859e6d144a074e32d4753c820ddaecf36d6fd3..fd4f289651004b207097ffd514160fc4bb0afcc8 100644 (file)
--- a/cookbooks/piwik/metadata.rb
+++ b/cookbooks/piwik/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures Piwik"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures Piwik"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "mysql"
 version           "1.0.0"
 depends           "apache"
 depends           "mysql"

diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets
index 87acbcccb0862b74a33b765df28672fd8c824e4f..59233847b2034b20c8a8cef8ff0c352f5826e0af 100644 (file)
--- a/cookbooks/planet/files/default/replication-bin/replicate-changesets
+++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets
@@ -1,12 +1,12 @@
 #!/usr/bin/ruby
 
 #!/usr/bin/ruby
 

-require 'rubygems'
-require 'pg'
-require 'yaml'
-require 'time'
-require 'fileutils'
-require 'xml/libxml'
-require 'zlib'
+require "rubygems"
+require "pg"
+require "yaml"
+require "time"
+require "fileutils"
+require "xml/libxml"
+require "zlib"

 
 # after this many changes, a changeset will be closed
 CHANGES_LIMIT = 50000
 
 # after this many changes, a changeset will be closed
 CHANGES_LIMIT = 50000


@@ -22,10 +22,10 @@ class Changeset
   attr_reader :id, :created_at, :closed_at, :num_changes
 
   def initialize(row)
   attr_reader :id, :created_at, :closed_at, :num_changes
 
   def initialize(row)

-    @id = row['id'].to_i
-    @created_at = Time.parse(row['created_at'])
-    @closed_at = Time.parse(row['closed_at'])
-    @num_changes = row['num_changes'].to_i
+    @id = row["id"].to_i
+    @created_at = Time.parse(row["created_at"])
+    @closed_at = Time.parse(row["closed_at"])
+    @num_changes = row["num_changes"].to_i

   end
 
   def closed?(t)
   end
 
   def closed?(t)


@@ -47,15 +47,15 @@ end
 class Replicator
   def initialize(config)
     @config = YAML.load(File.read(config))
 class Replicator
   def initialize(config)
     @config = YAML.load(File.read(config))

-    @state = YAML.load(File.read(@config['state_file']))
-    @conn = PGconn.connect(@config['db'])
+    @state = YAML.load(File.read(@config["state_file"]))
+    @conn = PGconn.connect(@config["db"])

     @now = Time.now.getutc
   end
 
   def open_changesets
     @now = Time.now.getutc
   end
 
   def open_changesets

-    last_run = @state['last_run']
+    last_run = @state["last_run"]

     last_run = (@now - 60) if last_run.nil?
     last_run = (@now - 60) if last_run.nil?

-    @state['last_run'] = @now
+    @state["last_run"] = @now

     # pretty much all operations on a changeset will modify its closed_at
     # time (see rails_port's changeset model). so it is probably enough
     # for us to look at anything that was closed recently, and filter from
     # pretty much all operations on a changeset will modify its closed_at
     # time (see rails_port's changeset model). so it is probably enough
     # for us to look at anything that was closed recently, and filter from


@@ -71,40 +71,40 @@ class Replicator
   def changeset_dump(changesets)
     doc = XML::Document.new
     doc.root = XML::Node.new("osm")
   def changeset_dump(changesets)
     doc = XML::Document.new
     doc.root = XML::Node.new("osm")

-    { 'version' => '0.6',
-      'generator' => 'replicate_changesets.rb',
-      'copyright' => "OpenStreetMap and contributors",
-      'attribution' => "http://www.openstreetmap.org/copyright",
-      'license' => "http://opendatacommons.org/licenses/odbl/1-0/" }
+    { "version" => "0.6",
+      "generator" => "replicate_changesets.rb",
+      "copyright" => "OpenStreetMap and contributors",
+      "attribution" => "http://www.openstreetmap.org/copyright",
+      "license" => "http://opendatacommons.org/licenses/odbl/1-0/" }

       .each { |k, v| doc.root[k] = v }
 
     changesets.each do |cs|
       xml = XML::Node.new("changeset")
       .each { |k, v| doc.root[k] = v }
 
     changesets.each do |cs|
       xml = XML::Node.new("changeset")

-      xml['id'] = cs.id.to_s
-      xml['created_at'] = cs.created_at.getutc.xmlschema
-      xml['closed_at'] = cs.closed_at.getutc.xmlschema if cs.closed?(@now)
-      xml['open'] = cs.open?(@now).to_s
-      xml['num_changes'] = cs.num_changes.to_s
+      xml["id"] = cs.id.to_s
+      xml["created_at"] = cs.created_at.getutc.xmlschema
+      xml["closed_at"] = cs.closed_at.getutc.xmlschema if cs.closed?(@now)
+      xml["open"] = cs.open?(@now).to_s
+      xml["num_changes"] = cs.num_changes.to_s

 
       res = @conn.exec("select u.id, u.display_name, c.min_lat, c.max_lat, c.min_lon, c.max_lon from users u join changesets c on u.id=c.user_id where c.id=#{cs.id}")
 
       res = @conn.exec("select u.id, u.display_name, c.min_lat, c.max_lat, c.min_lon, c.max_lon from users u join changesets c on u.id=c.user_id where c.id=#{cs.id}")

-      xml['user'] = res[0]['display_name']
-      xml['uid'] = res[0]['id']
-
-      unless res[0]['min_lat'].nil? ||
-             res[0]['max_lat'].nil? ||
-             res[0]['min_lon'].nil? ||
-             res[0]['max_lon'].nil?
-        xml['min_lat'] = (res[0]['min_lat'].to_f / GEO_SCALE).to_s
-        xml['max_lat'] = (res[0]['max_lat'].to_f / GEO_SCALE).to_s
-        xml['min_lon'] = (res[0]['min_lon'].to_f / GEO_SCALE).to_s
-        xml['max_lon'] = (res[0]['max_lon'].to_f / GEO_SCALE).to_s
+      xml["user"] = res[0]["display_name"]
+      xml["uid"] = res[0]["id"]
+
+      unless res[0]["min_lat"].nil? ||
+             res[0]["max_lat"].nil? ||
+             res[0]["min_lon"].nil? ||
+             res[0]["max_lon"].nil?
+        xml["min_lat"] = (res[0]["min_lat"].to_f / GEO_SCALE).to_s
+        xml["max_lat"] = (res[0]["max_lat"].to_f / GEO_SCALE).to_s
+        xml["min_lon"] = (res[0]["min_lon"].to_f / GEO_SCALE).to_s
+        xml["max_lon"] = (res[0]["max_lon"].to_f / GEO_SCALE).to_s

       end
 
       res = @conn.exec("select k, v from changeset_tags where changeset_id=#{cs.id}")
       res.each do |row|
         tag = XML::Node.new("tag")
       end
 
       res = @conn.exec("select k, v from changeset_tags where changeset_id=#{cs.id}")
       res.each do |row|
         tag = XML::Node.new("tag")

-        tag['k'] = row['k']
-        tag['v'] = row['v']
+        tag["k"] = row["k"]
+        tag["v"] = row["v"]

         xml << tag
       end
 
         xml << tag
       end
 


@@ -116,12 +116,12 @@ class Replicator
 
   # saves new state (including the changeset dump xml)
   def save!
 
   # saves new state (including the changeset dump xml)
   def save!

-    File.open(@config['state_file'], "r") do |fl|
+    File.open(@config["state_file"], "r") do |fl|

       fl.flock(File::LOCK_EX)
 
       fl.flock(File::LOCK_EX)
 

-      sequence = (@state.key?('sequence') ? @state['sequence'] + 1 : 0)
-      data_file = @config['data_dir'] + format("/%03d/%03d/%03d.osm.gz", sequence / 1000000, (sequence / 1000) % 1000, (sequence % 1000))
-      tmp_state = @config['state_file'] + ".tmp"
+      sequence = (@state.key?("sequence") ? @state["sequence"] + 1 : 0)
+      data_file = @config["data_dir"] + format("/%03d/%03d/%03d.osm.gz", sequence / 1000000, (sequence / 1000) % 1000, (sequence % 1000))
+      tmp_state = @config["state_file"] + ".tmp"

       tmp_data = "/tmp/changeset_data.osm.tmp"
       # try and write the files to tmp locations and then
       # move them into place later, to avoid in-progress
       tmp_data = "/tmp/changeset_data.osm.tmp"
       # try and write the files to tmp locations and then
       # move them into place later, to avoid in-progress


@@ -131,12 +131,12 @@ class Replicator
         Zlib::GzipWriter.open(tmp_data) do |fh|
           fh.write(changeset_dump(open_changesets))
         end
         Zlib::GzipWriter.open(tmp_data) do |fh|
           fh.write(changeset_dump(open_changesets))
         end

-        @state['sequence'] = sequence
+        @state["sequence"] = sequence

         File.open(tmp_state, "w") do |fh|
           fh.write(YAML.dump(@state))
         end
         FileUtils.mv(tmp_data, data_file)
         File.open(tmp_state, "w") do |fh|
           fh.write(YAML.dump(@state))
         end
         FileUtils.mv(tmp_data, data_file)

-        FileUtils.mv(tmp_state, @config['state_file'])
+        FileUtils.mv(tmp_state, @config["state_file"])

         fl.flock(File::LOCK_UN)
 
       rescue
         fl.flock(File::LOCK_UN)
 
       rescue

diff --git a/cookbooks/planet/metadata.rb b/cookbooks/planet/metadata.rb
index c84c69023686e6add363cc63b3790ff3fe5abca9..d26c7ff8cfea6ff26832fc8e10c5d475240285eb 100644 (file)
--- a/cookbooks/planet/metadata.rb
+++ b/cookbooks/planet/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a planet server"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a planet server"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "git"
 version           "1.0.0"
 depends           "apache"
 depends           "git"

diff --git a/cookbooks/postgresql/libraries/postgresql.rb b/cookbooks/postgresql/libraries/postgresql.rb
index 0b405e89bc609eaabebd317f75b53d85f1b763dd..f80efe15a669dac45f988c89e838c4d07094b555 100644 (file)
--- a/cookbooks/postgresql/libraries/postgresql.rb
+++ b/cookbooks/postgresql/libraries/postgresql.rb
@@ -1,4 +1,4 @@
-require 'chef/mixin/command'
+require "chef/mixin/command"

 
 class Chef
   class PostgreSQL
 
 class Chef
   class PostgreSQL

diff --git a/cookbooks/postgresql/metadata.rb b/cookbooks/postgresql/metadata.rb
index 87074a93becf1598c91e7dd05c004f0c60a827fb..07dbc4d45688929526eb44c6a5c265d0193af4a8 100644 (file)
--- a/cookbooks/postgresql/metadata.rb
+++ b/cookbooks/postgresql/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures postgresql"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures postgresql"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "ohai"
 
 version           "1.0.0"
 depends           "ohai"
 

diff --git a/cookbooks/roundup/metadata.rb b/cookbooks/roundup/metadata.rb
index 2058133d7a1dd4f4c03225791a516e1458754240..8b1be50f19b99a7c0d545753edb4dc035c670553 100644 (file)
--- a/cookbooks/roundup/metadata.rb
+++ b/cookbooks/roundup/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a roundup server"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a roundup server"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 version           "1.0.0"
 depends           "apache"

diff --git a/cookbooks/rsyncd/metadata.rb b/cookbooks/rsyncd/metadata.rb
index 9b412fe2cb4bfe60d3e54400a51a3afc6c6bea80..0aeda0cf1d4a610d740f7fe34bda8a73ea365f36 100644 (file)
--- a/cookbooks/rsyncd/metadata.rb
+++ b/cookbooks/rsyncd/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures rsyncd"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures rsyncd"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "networking"
 
 version           "1.0.0"
 depends           "networking"
 

diff --git a/cookbooks/snmpd/metadata.rb b/cookbooks/snmpd/metadata.rb
index b2cbf92be6fcf7e956c3cf354a852c62cd20424b..58dfbb217fda4c86ad9087c77429c8258464c8d5 100644 (file)
--- a/cookbooks/snmpd/metadata.rb
+++ b/cookbooks/snmpd/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures snmpd"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures snmpd"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "networking"
 
 version           "1.0.0"
 depends           "networking"
 

diff --git a/cookbooks/spamassassin/metadata.rb b/cookbooks/spamassassin/metadata.rb
index 67a81e0ab1501f5e6814d9f205b281352adc3598..19f335ba885701ce002ea46a4884d963b6599e96 100644 (file)
--- a/cookbooks/spamassassin/metadata.rb
+++ b/cookbooks/spamassassin/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures spamassassin"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures spamassassin"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/squid/metadata.rb b/cookbooks/squid/metadata.rb
index 4a2c79a4a19102c263ea0f5eb0bf59d62584d363..87a76677660beaccad3d70c3c446ee207654e060 100644 (file)
--- a/cookbooks/squid/metadata.rb
+++ b/cookbooks/squid/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures squid"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures squid"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/ssl/metadata.rb b/cookbooks/ssl/metadata.rb
index ad136317d1da3ff0c456b1de742064e0d609c657..89f6df9d2231a3d2e41dd190dbc6ac3631e5bee7 100644 (file)
--- a/cookbooks/ssl/metadata.rb
+++ b/cookbooks/ssl/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures basic SSL support"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures basic SSL support"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/stateofthemap/metadata.rb b/cookbooks/stateofthemap/metadata.rb
index 2e61410065c5ba72717f1bbe50673bcd2689b326..fcc8589a2bfd27b89f7d1cb70d1fd796f07cab21 100644 (file)
--- a/cookbooks/stateofthemap/metadata.rb
+++ b/cookbooks/stateofthemap/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures State of the Map services"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures State of the Map services"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "wordpress"
 version           "1.0.0"
 depends           "wordpress"

diff --git a/cookbooks/stats/metadata.rb b/cookbooks/stats/metadata.rb
index 80dd31d7efcdee6b8f2305569aae512d8d25cfbd..9ef4ba68824cfbd9b0687632fdb2ba5f7c77a39c 100644 (file)
--- a/cookbooks/stats/metadata.rb
+++ b/cookbooks/stats/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures stats.openstreetmap.org"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures stats.openstreetmap.org"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 version           "1.0.0"
 depends           "apache"

diff --git a/cookbooks/subversion/metadata.rb b/cookbooks/subversion/metadata.rb
index af8bec922e40124fef4aab745358f6e6d5b41be8..8886f6b938ae3efd85b7925bbb8aa14971ba1b15 100644 (file)
--- a/cookbooks/subversion/metadata.rb
+++ b/cookbooks/subversion/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures subversion servers"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures subversion servers"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 version           "1.0.0"
 depends           "apache"

diff --git a/cookbooks/supybot/metadata.rb b/cookbooks/supybot/metadata.rb
index 6af497867e83c58ed458737a0ff991fd2df397c6..ee6d1c4630949023c9538c889246c7a6082d97b1 100644 (file)
--- a/cookbooks/supybot/metadata.rb
+++ b/cookbooks/supybot/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures supybot"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures supybot"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/switch2osm/metadata.rb b/cookbooks/switch2osm/metadata.rb
index 32cbcb653d252b3abc48f9aec26e0f530be10843..e5a82aba059d0eb90cc3cea46af0e07500dd896a 100644 (file)
--- a/cookbooks/switch2osm/metadata.rb
+++ b/cookbooks/switch2osm/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures servers for switch2osm"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures servers for switch2osm"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "wordpress"
 version           "1.0.0"
 depends           "wordpress"

diff --git a/cookbooks/sysctl/metadata.rb b/cookbooks/sysctl/metadata.rb
index 6d0db322955ec790cc31721583d97b285fe9afc5..8d12ccdc92f5bbabce402675210c9c92230cd24f 100644 (file)
--- a/cookbooks/sysctl/metadata.rb
+++ b/cookbooks/sysctl/metadata.rb
@@ -3,7 +3,7 @@ maintainer       "Tom Hughes"
 maintainer_email "tom@compton.nu"
 license          "Apache 2.0"
 description      "Configures kernel parameters"
 maintainer_email "tom@compton.nu"
 license          "Apache 2.0"
 description      "Configures kernel parameters"

-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version          "0.1"
 %w(redhat centos debian ubuntu).each do |os|
   supports os
 version          "0.1"
 %w(redhat centos debian ubuntu).each do |os|
   supports os

diff --git a/cookbooks/sysfs/metadata.rb b/cookbooks/sysfs/metadata.rb
index 50ab584babfeeb1d20c59466e6aeac46bb21fb64..d1853f120f40bb14425ef5f842ec7e3b015a6591 100644 (file)
--- a/cookbooks/sysfs/metadata.rb
+++ b/cookbooks/sysfs/metadata.rb
@@ -3,5 +3,5 @@ maintainer       "Tom Hughes"
 maintainer_email "tom@compton.nu"
 license          "Apache 2.0"
 description      "Configures kernel parameters"
 maintainer_email "tom@compton.nu"
 license          "Apache 2.0"
 description      "Configures kernel parameters"

-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version          "1.0.0"
 version          "1.0.0"

diff --git a/cookbooks/taginfo/metadata.rb b/cookbooks/taginfo/metadata.rb
index 2ba1d35bef1c3042af91fa2a18aef9dd940521c4..9a747ef52c06da64fa904e339ec7ec265b3b32fa 100644 (file)
--- a/cookbooks/taginfo/metadata.rb
+++ b/cookbooks/taginfo/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures taginfo"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures taginfo"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "passenger"
 version           "1.0.0"
 depends           "apache"
 depends           "passenger"

diff --git a/cookbooks/thinkup/metadata.rb b/cookbooks/thinkup/metadata.rb
index 3a613cd4843320839a8dc64b504c93702faefe47..580905f470815dbb4578b5501c671b3729647815 100644 (file)
--- a/cookbooks/thinkup/metadata.rb
+++ b/cookbooks/thinkup/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures ThinkUp"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures ThinkUp"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "mysql"
 version           "1.0.0"
 depends           "apache"
 depends           "mysql"

diff --git a/cookbooks/tile/files/default/ruby/expire.rb b/cookbooks/tile/files/default/ruby/expire.rb
index f99d646e0397974bca51b5a0a3345fe5dcc69fc0..f129e35104012a74a65540f6595151650b1f0efb 100755 (executable)
--- a/cookbooks/tile/files/default/ruby/expire.rb
+++ b/cookbooks/tile/files/default/ruby/expire.rb
@@ -1,11 +1,11 @@
 #!/usr/bin/ruby
 
 #!/usr/bin/ruby
 

-require 'rubygems'
-require 'proj4'
-require 'xml/libxml'
-require 'set'
-require 'time'
-require 'mmap'
+require "rubygems"
+require "proj4"
+require "xml/libxml"
+require "set"
+require "time"
+require "mmap"

 
 module Expire
   # projection object to go from latlon -> spherical mercator
 
 module Expire
   # projection object to go from latlon -> spherical mercator


@@ -50,8 +50,8 @@ module Expire
     # generate the path
     hash_path = (0..4).collect do |i|
       (((x >> 4 * i) & 0xf) << 4) | ((y >> 4 * i) & 0xf)
     # generate the path
     hash_path = (0..4).collect do |i|
       (((x >> 4 * i) & 0xf) << 4) | ((y >> 4 * i) & 0xf)

-    end.reverse.join('/')
-    z.to_s + '/' + hash_path + ".meta"
+    end.reverse.join("/")
+    z.to_s + "/" + hash_path + ".meta"

   end
 
   # time to reset to, some very stupidly early time, before OSM started
   end
 
   # time to reset to, some very stupidly early time, before OSM started


@@ -102,17 +102,17 @@ module Expire
 
     # we put all the nodes into the hash, as it doesn't matter whether the node was
     # added, deleted or modified - the tile will need updating anyway.
 
     # we put all the nodes into the hash, as it doesn't matter whether the node was
     # added, deleted or modified - the tile will need updating anyway.

-    doc.find('//node').each do |node|
-      lat = node['lat'].to_f
+    doc.find("//node").each do |node|
+      lat = node["lat"].to_f

       if lat < -85
         lat = -85
       end
       if lat > 85
         lat = 85
       end
       if lat < -85
         lat = -85
       end
       if lat > 85
         lat = 85
       end

-      point = Proj4::Point.new(Math::PI * node['lon'].to_f / 180,
+      point = Proj4::Point.new(Math::PI * node["lon"].to_f / 180,

                                Math::PI * lat / 180)
                                Math::PI * lat / 180)

-      nodes[node['id'].to_i] = tile_from_latlon(point, max_zoom)
+      nodes[node["id"].to_i] = tile_from_latlon(point, max_zoom)

     end
 
     # now we look for all the ways that have changed and put all of their nodes into
     end
 
     # now we look for all the ways that have changed and put all of their nodes into


@@ -124,8 +124,8 @@ module Expire
     # itself deleted and the coverage of the point set isn't enough to encompass the
     # change.
     node_cache = NodeCache.new(NODE_CACHE_FILE)
     # itself deleted and the coverage of the point set isn't enough to encompass the
     # change.
     node_cache = NodeCache.new(NODE_CACHE_FILE)

-    doc.find('//way/nd').each do |node|
-      node_id = node['ref'].to_i
+    doc.find("//way/nd").each do |node|
+      node_id = node["ref"].to_i

 
       next if nodes.include? node_id
 
 
       next if nodes.include? node_id
 

diff --git a/cookbooks/tile/metadata.rb b/cookbooks/tile/metadata.rb
index 32579802e1e27c6ac4c327a165de66135f2e2c1c..666f9d812dfdde10ace1f31b10f87e9395a6f510 100644 (file)
--- a/cookbooks/tile/metadata.rb
+++ b/cookbooks/tile/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures tile servers"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures tile servers"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "git"
 version           "1.0.0"
 depends           "apache"
 depends           "git"

diff --git a/cookbooks/tilecache/metadata.rb b/cookbooks/tilecache/metadata.rb
index ed816a97b9e95a1e9d2194d1dbd149a1b2f61c54..6faf8717411617f76198d260183f8f0097c3df24 100644 (file)
--- a/cookbooks/tilecache/metadata.rb
+++ b/cookbooks/tilecache/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a tile cache"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures a tile cache"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "ssl"
 depends           "squid"
 version           "1.0.0"
 depends           "ssl"
 depends           "squid"

diff --git a/cookbooks/tilelog/metadata.rb b/cookbooks/tilelog/metadata.rb
index 0c75d9eb39c6afc6732638360755a0b7269a4b7e..df11c69aa5bddb3aedc9f07b2beee1636787aef3 100644 (file)
--- a/cookbooks/tilelog/metadata.rb
+++ b/cookbooks/tilelog/metadata.rb
@@ -1,9 +1,9 @@
-name             'tilelog'
-maintainer       'OpenStreetMap Administrators'
-maintainer_email 'admins@openstreetmap.org'
-license          'Apache 2.0'
-description      'Installs and configures tile log analysis'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.0'
-depends          'git'
-depends          'tools'
+name             "tilelog"
+maintainer       "OpenStreetMap Administrators"
+maintainer_email "admins@openstreetmap.org"
+license          "Apache 2.0"
+description      "Installs and configures tile log analysis"
+long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))
+version          "1.0.0"
+depends          "git"
+depends          "tools"

diff --git a/cookbooks/tools/metadata.rb b/cookbooks/tools/metadata.rb
index b9b4d5bd3b3d0cb62045fcdb0616620735b6f3bc..a34657f761bde0a9757d0a0bea39284ecb2d7919 100644 (file)
--- a/cookbooks/tools/metadata.rb
+++ b/cookbooks/tools/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs system administration tools"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs system administration tools"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/trac/metadata.rb b/cookbooks/trac/metadata.rb
index 2b1a75ad5b85330ad92355eb690174f0af2c6c1d..442b55a1dba872041052fe9820691f1ee9abc3d1 100644 (file)
--- a/cookbooks/trac/metadata.rb
+++ b/cookbooks/trac/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures trac servers"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures trac servers"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 version           "1.0.0"
 depends           "apache"

diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb
index 1ef28bbbb071ed4afeda7c56e99cd486f022fa8b..780e9307f91a9b48ae1d8d756df7c7ee1b6af00c 100644 (file)
--- a/cookbooks/web/metadata.rb
+++ b/cookbooks/web/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures www.openstreetmap.org servers"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures www.openstreetmap.org servers"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "passenger"
 version           "1.0.0"
 depends           "apache"
 depends           "passenger"

diff --git a/cookbooks/wiki/metadata.rb b/cookbooks/wiki/metadata.rb
index b93706b8efaa3b4c14b3b0b9110413cde4cc2459..0bf885ab2e9f2e805933f37a1df80199c6a3deae 100644 (file)
--- a/cookbooks/wiki/metadata.rb
+++ b/cookbooks/wiki/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures servers for wiki.openstreetmap.org"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures servers for wiki.openstreetmap.org"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "mediawiki"
 depends           "squid"
 version           "1.0.0"
 depends           "mediawiki"
 depends           "squid"

diff --git a/cookbooks/wordpress/libraries/wordpress.rb b/cookbooks/wordpress/libraries/wordpress.rb
index 06a375fe931935f726dc5f336da44878abbbb537..f4f17e2202b0391879c1ed9e10519ba6e235989a 100644 (file)
--- a/cookbooks/wordpress/libraries/wordpress.rb
+++ b/cookbooks/wordpress/libraries/wordpress.rb
@@ -1,4 +1,4 @@
-require 'chef/mixin/command'
+require "chef/mixin/command"

 
 class Chef
   module Wordpress
 
 class Chef
   module Wordpress

diff --git a/cookbooks/wordpress/metadata.rb b/cookbooks/wordpress/metadata.rb
index 757b72a8fa945689d188da8c27a33068a0f34020..eaf4976da73272f4cd8e92ebfbf83248e1cc060c 100644 (file)
--- a/cookbooks/wordpress/metadata.rb
+++ b/cookbooks/wordpress/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures Wordpress"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures Wordpress"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 depends           "chef"
 version           "1.0.0"
 depends           "apache"
 depends           "chef"

diff --git a/cookbooks/xinetd/metadata.rb b/cookbooks/xinetd/metadata.rb
index 56f62330ac2b642e82abebec055f7fb45cb3dd34..79f029256a742b6be25633ade4fd367f7f2fd309 100644 (file)
--- a/cookbooks/xinetd/metadata.rb
+++ b/cookbooks/xinetd/metadata.rb
@@ -3,5 +3,5 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures xinetd"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Configures xinetd"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

diff --git a/cookbooks/yournavigation/metadata.rb b/cookbooks/yournavigation/metadata.rb
index c976f41d9b460467e5eab498958b9d238f842e27..24c6cc843b2189e3c46d4593f2645188beda754d 100644 (file)
--- a/cookbooks/yournavigation/metadata.rb
+++ b/cookbooks/yournavigation/metadata.rb
@@ -3,6 +3,6 @@ maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures yournavigation servers"
 maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures yournavigation servers"

-long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 depends           "apache"
 version           "1.0.0"
 depends           "apache"