zapwhite 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 038fda06031093bd065f07b36c8f3061f93d50a2
-  data.tar.gz: 5c3d7877a7b4f36b7bfb147f0e1592baddd873bb
+  metadata.gz: 8435f3678c780c9f8c20c3f01fb6e10593589090
+  data.tar.gz: 51ec2d14cba5a0d3b52e41a7c2115cd68ddfdef8
 SHA512:
-  metadata.gz: 971949b8bb3b86b2679a233701f3f6dbf285457b3bbc8575b21551231511ffd65abcb6e48eee37d36f6cc759a33cebd7af69f5285f1ce25b92fa5c4edf4b1833
-  data.tar.gz: cc09800fc1a734a2d85175960eb3ac8c798746ef7a35d0a79da793ed08e17289b9f3ea603d8b02a02cadca7532ade00726cd82be7f1d00bf1b3489ff601818cb
+  metadata.gz: a250a0c649f15cac854399eb8ee4a53a8a750065d2f2bbe79a2ad99d285d3e21ecbe66a1d3a350255f99aca653d2675db3d454e070652118381624827a117a2e
+  data.tar.gz: 63566b1ce95451e78a39cbcb1ba33f550dc231f22c12802e6d817d456ffc1c5ec00d8f51f9577d5312a05c2c34226460d2da026aa7dcae6f4c01bdfe9b6db1d2

data/lib/reality/zapwhite.rb

@@ -80,8 +80,8 @@ module Reality
 
         content =
           config[:dos] ?
-            clean_dos_whitespace(filename, content, config[:eofnl]) :
-            clean_whitespace(filename, content, config[:eofnl])
+            clean_dos_whitespace(filename, content, config[:eofnl], config[:allow_empty]) :
+            clean_whitespace(filename, content, config[:eofnl], config[:allow_empty])
         if config[:nodupnl]
           while content.gsub!(/\n\n\n/, "\n\n")
             # Keep removing duplicate new lines till they have gone
@@ -136,6 +136,7 @@ module Reality
             files[f] = {
               :dos => (attr['eol'] == 'crlf'),
               :encoding => attr['encoding'],
+              :allow_empty => attr['allow_empty'].nil? ? false : !!attr['allow_empty'],
               :nodupnl => attr['dupnl'].nil? ? false : !attr['dupnl'],
               :eofnl => attr['eofnl'].nil? ? true : !!attr['eofnl']
             }
@@ -154,7 +155,7 @@ module Reality
       end
     end
 
-    def clean_whitespace(filename, content, eofnl)
+    def clean_whitespace(filename, content, eofnl, allow_empty)
       begin
         content.gsub!(/\r\n/, "\n")
         content.gsub!(/[ \t]+\n/, "\n")
@@ -163,10 +164,11 @@ module Reality
       rescue
         puts "Skipping whitespace cleanup: #{filename}"
       end
+      return '' if allow_empty && content.strip.length == 0
       content
     end
 
-    def clean_dos_whitespace(filename, content, eofnl)
+    def clean_dos_whitespace(filename, content, eofnl, allow_empty)
       begin
         content.gsub!(/\r\n/, "\n")
         content.gsub!(/[ \t]+\n/, "\n")
@@ -176,6 +178,7 @@ module Reality
       rescue
         puts "Skipping dos whitespace cleanup: #{filename}"
       end
+      return '' if allow_empty && content.strip.length == 0
       content
     end
 
@@ -206,7 +209,8 @@ module Reality
       # Bazel defaults
       attributes.text_rule('.bazelrc')
       attributes.text_rule('WORKSPACE')
-      attributes.text_rule('BUILD')
+      attributes.text_rule('BUILD', :allow_empty => true)
+      attributes.text_rule('BUILD.bazel', :allow_empty => true)
       attributes.text_rule('*.bzl')
 
       # Ruby defaults

data/test/reality/test_zapwhite.rb

@@ -150,6 +150,18 @@ TEXT
     end
   end
 
+  def test_allow_empty
+    dir = create_git_repo do
+      write_file('BUILD', "\n")
+    end
+    in_dir(dir) do
+      output = run_command("#{ZAPWHITE_BIN}", 2)
+      assert_equal "Fixing: .gitattributes\nFixing: BUILD\n", output
+      assert_equal "", IO.binread("#{dir}/BUILD")
+      assert_equal "# DO NOT EDIT: File is auto-generated\n* -text\nBUILD text allow_empty\n", IO.binread("#{dir}/.gitattributes")
+    end
+  end
+
   def test_generate_gitattributes_matches
     dir = create_git_repo do
       write_gitattributes_file(<<TEXT)

data/zapwhite.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{zapwhite}
-  s.version            = '2.12.0'
+  s.version            = '2.13.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapwhite
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitattributes