From 29e2c1a969f226660eac316bd713c0c8c31e9133 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 3 May 2016 12:18:21 +0100 Subject: [PATCH] Updates for rubocop and foodcritic changes --- cookbooks/accounts/.foodcritic | 2 ++ cookbooks/apache/.foodcritic | 2 ++ cookbooks/apt/.foodcritic | 2 ++ cookbooks/backup/.foodcritic | 2 ++ cookbooks/bind/.foodcritic | 2 ++ cookbooks/blog/.foodcritic | 2 ++ cookbooks/cgiirc/.foodcritic | 2 ++ cookbooks/chef/.foodcritic | 2 ++ cookbooks/chef/libraries/subversion.rb | 2 +- cookbooks/civicrm/.foodcritic | 2 ++ cookbooks/clamav/.foodcritic | 2 ++ cookbooks/db/.foodcritic | 2 ++ cookbooks/dev/.foodcritic | 2 ++ cookbooks/devices/.foodcritic | 2 ++ cookbooks/dhcpd/.foodcritic | 2 ++ cookbooks/dns/.foodcritic | 2 ++ cookbooks/elasticsearch/.foodcritic | 2 ++ cookbooks/exim/.foodcritic | 2 ++ cookbooks/fail2ban/.foodcritic | 2 ++ cookbooks/forum/.foodcritic | 2 ++ cookbooks/foundation/.foodcritic | 2 ++ cookbooks/geodns/.foodcritic | 2 ++ cookbooks/git/.foodcritic | 2 ++ cookbooks/gps-tile/.foodcritic | 2 ++ cookbooks/hardware/.foodcritic | 2 ++ cookbooks/imagery/.foodcritic | 2 ++ cookbooks/incron/.foodcritic | 2 ++ cookbooks/kibana/.foodcritic | 2 ++ cookbooks/logstash/.foodcritic | 2 ++ cookbooks/mailman/.foodcritic | 2 ++ cookbooks/mediawiki/.foodcritic | 2 ++ cookbooks/memcached/.foodcritic | 2 ++ cookbooks/munin/.foodcritic | 2 ++ cookbooks/mysql/.foodcritic | 2 ++ cookbooks/networking/.foodcritic | 2 ++ cookbooks/nfs/.foodcritic | 2 ++ cookbooks/nginx/.foodcritic | 2 ++ cookbooks/nodejs/.foodcritic | 2 ++ cookbooks/nominatim/.foodcritic | 2 ++ cookbooks/ntp/.foodcritic | 2 ++ cookbooks/ohai/.foodcritic | 2 ++ cookbooks/openssh/.foodcritic | 2 ++ cookbooks/openvpn/.foodcritic | 2 ++ cookbooks/osmosis/.foodcritic | 2 ++ cookbooks/osqa/.foodcritic | 2 ++ cookbooks/otrs/.foodcritic | 2 ++ cookbooks/owl/.foodcritic | 2 ++ cookbooks/passenger/.foodcritic | 2 ++ cookbooks/piwik/.foodcritic | 2 ++ cookbooks/planet/.foodcritic | 2 ++ .../files/default/replication-bin/replicate-changesets | 8 ++++---- cookbooks/postgresql/.foodcritic | 2 ++ cookbooks/roundup/.foodcritic | 2 ++ cookbooks/rsyncd/.foodcritic | 2 ++ cookbooks/serverinfo/.foodcritic | 2 ++ cookbooks/snmpd/.foodcritic | 2 ++ cookbooks/spamassassin/.foodcritic | 2 ++ cookbooks/squid/.foodcritic | 2 ++ cookbooks/ssl/.foodcritic | 2 ++ cookbooks/stateofthemap/.foodcritic | 2 ++ cookbooks/stats/.foodcritic | 2 ++ cookbooks/subversion/.foodcritic | 2 ++ cookbooks/supybot/.foodcritic | 2 ++ cookbooks/switch2osm/.foodcritic | 2 ++ cookbooks/sysctl/.foodcritic | 2 ++ cookbooks/sysfs/.foodcritic | 2 ++ cookbooks/taginfo/.foodcritic | 2 ++ cookbooks/thinkup/.foodcritic | 2 ++ cookbooks/tile/.foodcritic | 2 ++ cookbooks/tilecache/.foodcritic | 2 ++ cookbooks/tilelog/.foodcritic | 2 ++ cookbooks/tools/.foodcritic | 2 ++ cookbooks/trac/.foodcritic | 2 ++ cookbooks/web/.foodcritic | 2 ++ cookbooks/wiki/.foodcritic | 2 ++ cookbooks/wordpress/.foodcritic | 2 ++ cookbooks/xinetd/.foodcritic | 2 ++ cookbooks/yournavigation/.foodcritic | 2 ++ hooks/pre-commit | 2 +- 79 files changed, 158 insertions(+), 6 deletions(-) diff --git a/cookbooks/accounts/.foodcritic b/cookbooks/accounts/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/accounts/.foodcritic +++ b/cookbooks/accounts/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/apache/.foodcritic b/cookbooks/apache/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/apache/.foodcritic +++ b/cookbooks/apache/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/apt/.foodcritic b/cookbooks/apt/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/apt/.foodcritic +++ b/cookbooks/apt/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/backup/.foodcritic b/cookbooks/backup/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/backup/.foodcritic +++ b/cookbooks/backup/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/bind/.foodcritic b/cookbooks/bind/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/bind/.foodcritic +++ b/cookbooks/bind/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/blog/.foodcritic b/cookbooks/blog/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/blog/.foodcritic +++ b/cookbooks/blog/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/cgiirc/.foodcritic b/cookbooks/cgiirc/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/cgiirc/.foodcritic +++ b/cookbooks/cgiirc/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/chef/.foodcritic b/cookbooks/chef/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/chef/.foodcritic +++ b/cookbooks/chef/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb index dd2c7ec49..4f2b1cd00 100644 --- a/cookbooks/chef/libraries/subversion.rb +++ b/cookbooks/chef/libraries/subversion.rb @@ -24,7 +24,7 @@ class Chef return {} unless ::File.exist?(::File.join(@new_resource.destination, ".svn")) @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs| - fail "Could not parse `svn info` data: #{line}" unless line =~ SVN_INFO_PATTERN + raise "Could not parse `svn info` data: #{line}" unless line =~ SVN_INFO_PATTERN property = Regexp.last_match[1] value = Regexp.last_match[2] diff --git a/cookbooks/civicrm/.foodcritic b/cookbooks/civicrm/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/civicrm/.foodcritic +++ b/cookbooks/civicrm/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/clamav/.foodcritic b/cookbooks/clamav/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/clamav/.foodcritic +++ b/cookbooks/clamav/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/db/.foodcritic b/cookbooks/db/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/db/.foodcritic +++ b/cookbooks/db/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/dev/.foodcritic b/cookbooks/dev/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/dev/.foodcritic +++ b/cookbooks/dev/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/devices/.foodcritic b/cookbooks/devices/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/devices/.foodcritic +++ b/cookbooks/devices/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/dhcpd/.foodcritic b/cookbooks/dhcpd/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/dhcpd/.foodcritic +++ b/cookbooks/dhcpd/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/dns/.foodcritic b/cookbooks/dns/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/dns/.foodcritic +++ b/cookbooks/dns/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/elasticsearch/.foodcritic b/cookbooks/elasticsearch/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/elasticsearch/.foodcritic +++ b/cookbooks/elasticsearch/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/exim/.foodcritic b/cookbooks/exim/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/exim/.foodcritic +++ b/cookbooks/exim/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/fail2ban/.foodcritic b/cookbooks/fail2ban/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/fail2ban/.foodcritic +++ b/cookbooks/fail2ban/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/forum/.foodcritic b/cookbooks/forum/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/forum/.foodcritic +++ b/cookbooks/forum/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/foundation/.foodcritic b/cookbooks/foundation/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/foundation/.foodcritic +++ b/cookbooks/foundation/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/geodns/.foodcritic b/cookbooks/geodns/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/geodns/.foodcritic +++ b/cookbooks/geodns/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/git/.foodcritic b/cookbooks/git/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/git/.foodcritic +++ b/cookbooks/git/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/gps-tile/.foodcritic b/cookbooks/gps-tile/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/gps-tile/.foodcritic +++ b/cookbooks/gps-tile/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/hardware/.foodcritic b/cookbooks/hardware/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/hardware/.foodcritic +++ b/cookbooks/hardware/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/imagery/.foodcritic b/cookbooks/imagery/.foodcritic index 913f038a4..435876eff 100644 --- a/cookbooks/imagery/.foodcritic +++ b/cookbooks/imagery/.foodcritic @@ -1 +1,3 @@ ~FC005 +~FC064 +~FC065 diff --git a/cookbooks/incron/.foodcritic b/cookbooks/incron/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/incron/.foodcritic +++ b/cookbooks/incron/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/kibana/.foodcritic b/cookbooks/kibana/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/kibana/.foodcritic +++ b/cookbooks/kibana/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/logstash/.foodcritic b/cookbooks/logstash/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/logstash/.foodcritic +++ b/cookbooks/logstash/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/mailman/.foodcritic b/cookbooks/mailman/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/mailman/.foodcritic +++ b/cookbooks/mailman/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/mediawiki/.foodcritic b/cookbooks/mediawiki/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/mediawiki/.foodcritic +++ b/cookbooks/mediawiki/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/memcached/.foodcritic b/cookbooks/memcached/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/memcached/.foodcritic +++ b/cookbooks/memcached/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/munin/.foodcritic b/cookbooks/munin/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/munin/.foodcritic +++ b/cookbooks/munin/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/mysql/.foodcritic b/cookbooks/mysql/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/mysql/.foodcritic +++ b/cookbooks/mysql/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/networking/.foodcritic b/cookbooks/networking/.foodcritic index e1f6fe65e..8addb0b76 100644 --- a/cookbooks/networking/.foodcritic +++ b/cookbooks/networking/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC003 ~FC015 +~FC064 +~FC065 diff --git a/cookbooks/nfs/.foodcritic b/cookbooks/nfs/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/nfs/.foodcritic +++ b/cookbooks/nfs/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/nginx/.foodcritic b/cookbooks/nginx/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/nginx/.foodcritic +++ b/cookbooks/nginx/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/nodejs/.foodcritic b/cookbooks/nodejs/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/nodejs/.foodcritic +++ b/cookbooks/nodejs/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/nominatim/.foodcritic b/cookbooks/nominatim/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/nominatim/.foodcritic +++ b/cookbooks/nominatim/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/ntp/.foodcritic b/cookbooks/ntp/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/ntp/.foodcritic +++ b/cookbooks/ntp/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/ohai/.foodcritic b/cookbooks/ohai/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/ohai/.foodcritic +++ b/cookbooks/ohai/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/openssh/.foodcritic b/cookbooks/openssh/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/openssh/.foodcritic +++ b/cookbooks/openssh/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/openvpn/.foodcritic b/cookbooks/openvpn/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/openvpn/.foodcritic +++ b/cookbooks/openvpn/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/osmosis/.foodcritic b/cookbooks/osmosis/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/osmosis/.foodcritic +++ b/cookbooks/osmosis/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/osqa/.foodcritic b/cookbooks/osqa/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/osqa/.foodcritic +++ b/cookbooks/osqa/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/otrs/.foodcritic b/cookbooks/otrs/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/otrs/.foodcritic +++ b/cookbooks/otrs/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/owl/.foodcritic b/cookbooks/owl/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/owl/.foodcritic +++ b/cookbooks/owl/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/passenger/.foodcritic b/cookbooks/passenger/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/passenger/.foodcritic +++ b/cookbooks/passenger/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/piwik/.foodcritic b/cookbooks/piwik/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/piwik/.foodcritic +++ b/cookbooks/piwik/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/planet/.foodcritic b/cookbooks/planet/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/planet/.foodcritic +++ b/cookbooks/planet/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets index 3c1aef151..fb3d6138a 100644 --- a/cookbooks/planet/files/default/replication-bin/replicate-changesets +++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets @@ -204,10 +204,10 @@ class Replicator # sanity check: the files we're moving into place # should be non-empty. - fail "Temporary gzip file should exist, but doesn't." unless File.exist?(tmp_data) - fail "Temporary state file should exist, but doesn't." unless File.exist?(tmp_state) - fail "Temporary gzip file should be non-empty, but isn't." if File.zero?(tmp_data) - fail "Temporary state file should be non-empty, but isn't." if File.zero?(tmp_state) + raise "Temporary gzip file should exist, but doesn't." unless File.exist?(tmp_data) + raise "Temporary state file should exist, but doesn't." unless File.exist?(tmp_state) + raise "Temporary gzip file should be non-empty, but isn't." if File.zero?(tmp_data) + raise "Temporary state file should be non-empty, but isn't." if File.zero?(tmp_state) FileUtils.mv(tmp_data, data_file) FileUtils.mv(tmp_state, @config["state_file"]) diff --git a/cookbooks/postgresql/.foodcritic b/cookbooks/postgresql/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/postgresql/.foodcritic +++ b/cookbooks/postgresql/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/roundup/.foodcritic b/cookbooks/roundup/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/roundup/.foodcritic +++ b/cookbooks/roundup/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/rsyncd/.foodcritic b/cookbooks/rsyncd/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/rsyncd/.foodcritic +++ b/cookbooks/rsyncd/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/serverinfo/.foodcritic b/cookbooks/serverinfo/.foodcritic index 698ef4c72..4081e3704 100644 --- a/cookbooks/serverinfo/.foodcritic +++ b/cookbooks/serverinfo/.foodcritic @@ -1 +1,3 @@ ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/snmpd/.foodcritic b/cookbooks/snmpd/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/snmpd/.foodcritic +++ b/cookbooks/snmpd/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/spamassassin/.foodcritic b/cookbooks/spamassassin/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/spamassassin/.foodcritic +++ b/cookbooks/spamassassin/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/squid/.foodcritic b/cookbooks/squid/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/squid/.foodcritic +++ b/cookbooks/squid/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/ssl/.foodcritic b/cookbooks/ssl/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/ssl/.foodcritic +++ b/cookbooks/ssl/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/stateofthemap/.foodcritic b/cookbooks/stateofthemap/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/stateofthemap/.foodcritic +++ b/cookbooks/stateofthemap/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/stats/.foodcritic b/cookbooks/stats/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/stats/.foodcritic +++ b/cookbooks/stats/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/subversion/.foodcritic b/cookbooks/subversion/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/subversion/.foodcritic +++ b/cookbooks/subversion/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/supybot/.foodcritic b/cookbooks/supybot/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/supybot/.foodcritic +++ b/cookbooks/supybot/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/switch2osm/.foodcritic b/cookbooks/switch2osm/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/switch2osm/.foodcritic +++ b/cookbooks/switch2osm/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/sysctl/.foodcritic b/cookbooks/sysctl/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/sysctl/.foodcritic +++ b/cookbooks/sysctl/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/sysfs/.foodcritic b/cookbooks/sysfs/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/sysfs/.foodcritic +++ b/cookbooks/sysfs/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/taginfo/.foodcritic b/cookbooks/taginfo/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/taginfo/.foodcritic +++ b/cookbooks/taginfo/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/thinkup/.foodcritic b/cookbooks/thinkup/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/thinkup/.foodcritic +++ b/cookbooks/thinkup/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/tile/.foodcritic b/cookbooks/tile/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/tile/.foodcritic +++ b/cookbooks/tile/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/tilecache/.foodcritic b/cookbooks/tilecache/.foodcritic index 37c7131e2..d8973b2fb 100644 --- a/cookbooks/tilecache/.foodcritic +++ b/cookbooks/tilecache/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC003 +~FC064 +~FC065 diff --git a/cookbooks/tilelog/.foodcritic b/cookbooks/tilelog/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/tilelog/.foodcritic +++ b/cookbooks/tilelog/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/tools/.foodcritic b/cookbooks/tools/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/tools/.foodcritic +++ b/cookbooks/tools/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/trac/.foodcritic b/cookbooks/trac/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/trac/.foodcritic +++ b/cookbooks/trac/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/web/.foodcritic b/cookbooks/web/.foodcritic index e9a7c9233..e32acd81f 100644 --- a/cookbooks/web/.foodcritic +++ b/cookbooks/web/.foodcritic @@ -1,2 +1,4 @@ ~FC001 ~FC015 +~FC064 +~FC065 diff --git a/cookbooks/wiki/.foodcritic b/cookbooks/wiki/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/wiki/.foodcritic +++ b/cookbooks/wiki/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/wordpress/.foodcritic b/cookbooks/wordpress/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/wordpress/.foodcritic +++ b/cookbooks/wordpress/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/xinetd/.foodcritic b/cookbooks/xinetd/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/xinetd/.foodcritic +++ b/cookbooks/xinetd/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/cookbooks/yournavigation/.foodcritic b/cookbooks/yournavigation/.foodcritic index 3907cff00..a085263c8 100644 --- a/cookbooks/yournavigation/.foodcritic +++ b/cookbooks/yournavigation/.foodcritic @@ -1 +1,3 @@ ~FC001 +~FC064 +~FC065 diff --git a/hooks/pre-commit b/hooks/pre-commit index 55d23300c..57c23a35a 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -3,7 +3,7 @@ ok = true if IO.popen(["git", "ls-files", "--unmerged"]).read.empty? - need_stash = IO.popen(%w(git diff)).read.length > 0 + need_stash = !IO.popen(%w(git diff)).read.empty? system("git", "stash", "save", "--keep-index", "--quiet") if need_stash -- 2.39.5