Updates for rubocop and foodcritic changes

diff --git a/cookbooks/accounts/.foodcritic b/cookbooks/accounts/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/accounts/.foodcritic
+++ b/cookbooks/accounts/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/apache/.foodcritic b/cookbooks/apache/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/apache/.foodcritic
+++ b/cookbooks/apache/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/apt/.foodcritic b/cookbooks/apt/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/apt/.foodcritic
+++ b/cookbooks/apt/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/backup/.foodcritic b/cookbooks/backup/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/backup/.foodcritic
+++ b/cookbooks/backup/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/bind/.foodcritic b/cookbooks/bind/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/bind/.foodcritic
+++ b/cookbooks/bind/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/blog/.foodcritic b/cookbooks/blog/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/blog/.foodcritic
+++ b/cookbooks/blog/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/cgiirc/.foodcritic b/cookbooks/cgiirc/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/cgiirc/.foodcritic
+++ b/cookbooks/cgiirc/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/chef/.foodcritic b/cookbooks/chef/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/chef/.foodcritic
+++ b/cookbooks/chef/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index dd2c7ec4925abaf9d26d578feebb9295e4188653..4f2b1cd0093dac58e3ce18040f257ab04eb9f2fc 100644 (file)
--- 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|
         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]
 
           property = Regexp.last_match[1]
           value = Regexp.last_match[2]

diff --git a/cookbooks/civicrm/.foodcritic b/cookbooks/civicrm/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/civicrm/.foodcritic
+++ b/cookbooks/civicrm/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/clamav/.foodcritic b/cookbooks/clamav/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/clamav/.foodcritic
+++ b/cookbooks/clamav/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/db/.foodcritic b/cookbooks/db/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/db/.foodcritic
+++ b/cookbooks/db/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/dev/.foodcritic b/cookbooks/dev/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/dev/.foodcritic
+++ b/cookbooks/dev/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/devices/.foodcritic b/cookbooks/devices/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/devices/.foodcritic
+++ b/cookbooks/devices/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/dhcpd/.foodcritic b/cookbooks/dhcpd/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/dhcpd/.foodcritic
+++ b/cookbooks/dhcpd/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/dns/.foodcritic b/cookbooks/dns/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/dns/.foodcritic
+++ b/cookbooks/dns/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/elasticsearch/.foodcritic b/cookbooks/elasticsearch/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/elasticsearch/.foodcritic
+++ b/cookbooks/elasticsearch/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/exim/.foodcritic b/cookbooks/exim/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/exim/.foodcritic
+++ b/cookbooks/exim/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/fail2ban/.foodcritic b/cookbooks/fail2ban/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/fail2ban/.foodcritic
+++ b/cookbooks/fail2ban/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/forum/.foodcritic b/cookbooks/forum/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/forum/.foodcritic
+++ b/cookbooks/forum/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/foundation/.foodcritic b/cookbooks/foundation/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/foundation/.foodcritic
+++ b/cookbooks/foundation/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/geodns/.foodcritic b/cookbooks/geodns/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/geodns/.foodcritic
+++ b/cookbooks/geodns/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/git/.foodcritic b/cookbooks/git/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/git/.foodcritic
+++ b/cookbooks/git/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/gps-tile/.foodcritic b/cookbooks/gps-tile/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/gps-tile/.foodcritic
+++ b/cookbooks/gps-tile/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/hardware/.foodcritic b/cookbooks/hardware/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/hardware/.foodcritic
+++ b/cookbooks/hardware/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/imagery/.foodcritic b/cookbooks/imagery/.foodcritic
index 913f038a416e769b47e960ef729cff3b6f17e333..435876eff3558e2722f5c74b15bb26d27c172954 100644 (file)
--- a/cookbooks/imagery/.foodcritic
+++ b/cookbooks/imagery/.foodcritic
@@ -1 +1,3 @@
 ~FC005
 ~FC005

+~FC064
+~FC065

diff --git a/cookbooks/incron/.foodcritic b/cookbooks/incron/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/incron/.foodcritic
+++ b/cookbooks/incron/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/kibana/.foodcritic b/cookbooks/kibana/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/kibana/.foodcritic
+++ b/cookbooks/kibana/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/logstash/.foodcritic b/cookbooks/logstash/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/logstash/.foodcritic
+++ b/cookbooks/logstash/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/mailman/.foodcritic b/cookbooks/mailman/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/mailman/.foodcritic
+++ b/cookbooks/mailman/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/mediawiki/.foodcritic b/cookbooks/mediawiki/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/mediawiki/.foodcritic
+++ b/cookbooks/mediawiki/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/memcached/.foodcritic b/cookbooks/memcached/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/memcached/.foodcritic
+++ b/cookbooks/memcached/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/munin/.foodcritic b/cookbooks/munin/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/munin/.foodcritic
+++ b/cookbooks/munin/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/mysql/.foodcritic b/cookbooks/mysql/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/mysql/.foodcritic
+++ b/cookbooks/mysql/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/networking/.foodcritic b/cookbooks/networking/.foodcritic
index e1f6fe65ef209e7425c50eb05ad19feed4dd21d9..8addb0b7626e938b705f401400d3bd313bab7e4b 100644 (file)
--- a/cookbooks/networking/.foodcritic
+++ b/cookbooks/networking/.foodcritic
@@ -1,3 +1,5 @@
 ~FC001
 ~FC003
 ~FC015
 ~FC001
 ~FC003
 ~FC015

+~FC064
+~FC065

diff --git a/cookbooks/nfs/.foodcritic b/cookbooks/nfs/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/nfs/.foodcritic
+++ b/cookbooks/nfs/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/nginx/.foodcritic b/cookbooks/nginx/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/nginx/.foodcritic
+++ b/cookbooks/nginx/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/nodejs/.foodcritic b/cookbooks/nodejs/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/nodejs/.foodcritic
+++ b/cookbooks/nodejs/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/nominatim/.foodcritic b/cookbooks/nominatim/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/nominatim/.foodcritic
+++ b/cookbooks/nominatim/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/ntp/.foodcritic b/cookbooks/ntp/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/ntp/.foodcritic
+++ b/cookbooks/ntp/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/ohai/.foodcritic b/cookbooks/ohai/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/ohai/.foodcritic
+++ b/cookbooks/ohai/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/openssh/.foodcritic b/cookbooks/openssh/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/openssh/.foodcritic
+++ b/cookbooks/openssh/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/openvpn/.foodcritic b/cookbooks/openvpn/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/openvpn/.foodcritic
+++ b/cookbooks/openvpn/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/osmosis/.foodcritic b/cookbooks/osmosis/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/osmosis/.foodcritic
+++ b/cookbooks/osmosis/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/osqa/.foodcritic b/cookbooks/osqa/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/osqa/.foodcritic
+++ b/cookbooks/osqa/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/otrs/.foodcritic b/cookbooks/otrs/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/otrs/.foodcritic
+++ b/cookbooks/otrs/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/owl/.foodcritic b/cookbooks/owl/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/owl/.foodcritic
+++ b/cookbooks/owl/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/passenger/.foodcritic b/cookbooks/passenger/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/passenger/.foodcritic
+++ b/cookbooks/passenger/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/piwik/.foodcritic b/cookbooks/piwik/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/piwik/.foodcritic
+++ b/cookbooks/piwik/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/planet/.foodcritic b/cookbooks/planet/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/planet/.foodcritic
+++ b/cookbooks/planet/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets
index 3c1aef151c93816539e5fc246dcbae0b928a40b6..fb3d6138af0dc0686c8b19b0c2f30847ffefe4a5 100644 (file)
--- 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.
 
         # 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"])
 
         FileUtils.mv(tmp_data, data_file)
         FileUtils.mv(tmp_state, @config["state_file"])

diff --git a/cookbooks/postgresql/.foodcritic b/cookbooks/postgresql/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/postgresql/.foodcritic
+++ b/cookbooks/postgresql/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/roundup/.foodcritic b/cookbooks/roundup/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/roundup/.foodcritic
+++ b/cookbooks/roundup/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/rsyncd/.foodcritic b/cookbooks/rsyncd/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/rsyncd/.foodcritic
+++ b/cookbooks/rsyncd/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/serverinfo/.foodcritic b/cookbooks/serverinfo/.foodcritic
index 698ef4c72d872a3155a9cfd4ab212dda08603e56..4081e370419f07c5764a7667d257696405491a0f 100644 (file)
--- a/cookbooks/serverinfo/.foodcritic
+++ b/cookbooks/serverinfo/.foodcritic
@@ -1 +1,3 @@
 ~FC003
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/snmpd/.foodcritic b/cookbooks/snmpd/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/snmpd/.foodcritic
+++ b/cookbooks/snmpd/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/spamassassin/.foodcritic b/cookbooks/spamassassin/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/spamassassin/.foodcritic
+++ b/cookbooks/spamassassin/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/squid/.foodcritic b/cookbooks/squid/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/squid/.foodcritic
+++ b/cookbooks/squid/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/ssl/.foodcritic b/cookbooks/ssl/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/ssl/.foodcritic
+++ b/cookbooks/ssl/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/stateofthemap/.foodcritic b/cookbooks/stateofthemap/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/stateofthemap/.foodcritic
+++ b/cookbooks/stateofthemap/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/stats/.foodcritic b/cookbooks/stats/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/stats/.foodcritic
+++ b/cookbooks/stats/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/subversion/.foodcritic b/cookbooks/subversion/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/subversion/.foodcritic
+++ b/cookbooks/subversion/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/supybot/.foodcritic b/cookbooks/supybot/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/supybot/.foodcritic
+++ b/cookbooks/supybot/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/switch2osm/.foodcritic b/cookbooks/switch2osm/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/switch2osm/.foodcritic
+++ b/cookbooks/switch2osm/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/sysctl/.foodcritic b/cookbooks/sysctl/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/sysctl/.foodcritic
+++ b/cookbooks/sysctl/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/sysfs/.foodcritic b/cookbooks/sysfs/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/sysfs/.foodcritic
+++ b/cookbooks/sysfs/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/taginfo/.foodcritic b/cookbooks/taginfo/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/taginfo/.foodcritic
+++ b/cookbooks/taginfo/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/thinkup/.foodcritic b/cookbooks/thinkup/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/thinkup/.foodcritic
+++ b/cookbooks/thinkup/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/tile/.foodcritic b/cookbooks/tile/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/tile/.foodcritic
+++ b/cookbooks/tile/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/tilecache/.foodcritic b/cookbooks/tilecache/.foodcritic
index 37c7131e2614ac5837ba1c22aa6c59c15608c9f8..d8973b2fb531e67e4180a611498f340246d1ab3f 100644 (file)
--- a/cookbooks/tilecache/.foodcritic
+++ b/cookbooks/tilecache/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC003
 ~FC001
 ~FC003

+~FC064
+~FC065

diff --git a/cookbooks/tilelog/.foodcritic b/cookbooks/tilelog/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/tilelog/.foodcritic
+++ b/cookbooks/tilelog/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/tools/.foodcritic b/cookbooks/tools/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/tools/.foodcritic
+++ b/cookbooks/tools/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/trac/.foodcritic b/cookbooks/trac/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/trac/.foodcritic
+++ b/cookbooks/trac/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/web/.foodcritic b/cookbooks/web/.foodcritic
index e9a7c92333039bf61f4f9c6ba263b883432b67ef..e32acd81f21cfca311201edf4042971a9f41981b 100644 (file)
--- a/cookbooks/web/.foodcritic
+++ b/cookbooks/web/.foodcritic
@@ -1,2 +1,4 @@
 ~FC001
 ~FC015
 ~FC001
 ~FC015

+~FC064
+~FC065

diff --git a/cookbooks/wiki/.foodcritic b/cookbooks/wiki/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/wiki/.foodcritic
+++ b/cookbooks/wiki/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/wordpress/.foodcritic b/cookbooks/wordpress/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/wordpress/.foodcritic
+++ b/cookbooks/wordpress/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/xinetd/.foodcritic b/cookbooks/xinetd/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/xinetd/.foodcritic
+++ b/cookbooks/xinetd/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/cookbooks/yournavigation/.foodcritic b/cookbooks/yournavigation/.foodcritic
index 3907cff00016cb7234f45853f10398815db197e8..a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6 100644 (file)
--- a/cookbooks/yournavigation/.foodcritic
+++ b/cookbooks/yournavigation/.foodcritic
@@ -1 +1,3 @@
 ~FC001
 ~FC001

+~FC064
+~FC065

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 55d23300cee8c20ff844da2a421821cd7bd7da7b..57c23a35a1026fa3c805278c392fd36b2e3aff62 100755 (executable)
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -3,7 +3,7 @@
 ok = true
 
 if IO.popen(["git", "ls-files", "--unmerged"]).read.empty?
 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
 
 
   system("git", "stash", "save", "--keep-index", "--quiet") if need_stash