zapwhite 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 677ac315bf9fc59519513f0bd2ca5342d65ad8e2
-  data.tar.gz: 530f4202a1219f64804591ac586fbc421c97de08
+  metadata.gz: 0fb0eada69b01c2b889300dec91a617488d6b4a6
+  data.tar.gz: c8ef49b445687b197fdfaafda74b5c02bbec23e1
 SHA512:
-  metadata.gz: ca3ba0ad1a9c1464ebb8af02db54074d3bfbe07897b9bcea18933cc1eb58c5e6fe44978c97ec940ae0b7d0935ef269a8a0e8d03a302098b05581d7977ab6949e
-  data.tar.gz: 199e6210ff898f3ac64019b57984a24bedd40d06de00dd1d513065ee1f3ace7fb6b60429f23fc6a6b9459a8ff1a29e88231b81b5f80af1594ca50e5933c17891
+  metadata.gz: b2954ff2cc652657e0311b57a6a452ade7225b1837ba60bc880d958cbf69d0b2e333e232e492c558d77b42f915944d0324c68d2904e0bd3940250b08b52a09c9
+  data.tar.gz: 7d1beea31dc78a152408ac33371369c88fd3de8b6bac349185c6d0e57602a8814d47fda980903a35703ee15b9f5bd87ae3d07cfc7d0b4d1b2822de5ea1820a09

data/README.md

@@ -6,7 +6,7 @@ A simple tool to normalize whitespace in git repositories. The tool:
 
 * removes trailing whitespace from each line
 * ensures files end with a new line
-* ensure files are in UTF-8 format with no invalid UTF sequences
+* ensure files are in ASCII format with no invalid UTF sequences
 * ensures dos files use dos line endings and all other files do not.
 
 Files that are part of the repository are candidates for normalization.
@@ -15,8 +15,13 @@ patterns supplied either in the command line or in the `.gitattributes`
 file associated with the repository.
 
 The tool will ensure files annotated with `text` will be processed and
-files with the `crlf` flag as true will be treated as dos files. If the
+files with the `eol=crlf` attribute will be treated as dos files. If the
 file has an `encoding` attribute, the tool will not try to convert to
-UTF-8. The tool will also scan and remove duplicate new lines if any file
+ASCII. The tool will also scan and remove duplicate new lines if any file
 has a attribute `-dupnl`. The tool will not enforce end of file new
 lines if attribute `-eofnl` is set.
+
+## TODO
+
+* Next version should generate `.gitattributes` based on scanning project
+  and then follow up with normal zapwhite process.

data/lib/reality/zapwhite.rb

@@ -19,7 +19,7 @@ module Reality
 
     def initialize(base_directory)
       @base_directory = base_directory
-      @attributes = Reality::GitAttributes.new(@base_directory)
+      @attributes = Reality::Git::Attributes.parse(@base_directory)
       @exclude_patterns = %w(vendor/.* node_modules/.*)
       @check_only = false
     end
@@ -85,7 +85,7 @@ module Reality
             attr = @attributes.attributes(f)
             if attr['text']
               files[f] = {
-                :dos => (!!attr['crlf']),
+                :dos => (attr['eol'] == 'crlf'),
                 :encoding => attr['encoding'],
                 :nodupnl => attr['dupnl'].nil? ? false : !attr['dupnl'],
                 :eofnl => attr['eofnl'].nil? ? true : !!attr['eofnl']

data/test/reality/test_zapwhite.rb

@@ -31,7 +31,7 @@ TEXT
   def test_fixing_trailing_whitespace_not_crlf_specified
     dir = create_git_repo do
       write_gitattributes_file(<<TEXT)
-*.md text -crlf
+*.md text eol=lf
 TEXT
       write_file('README.md', "Hello \n")
     end
@@ -59,7 +59,7 @@ TEXT
   def test_dos_eol
     dir = create_git_repo do
       write_gitattributes_file(<<TEXT)
-*.bat text crlf
+*.bat text eol=crlf
 TEXT
       write_file('run.bat', "echo hi\n")
     end

data/zapwhite.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{zapwhite}
-  s.version            = '1.0.0'
+  s.version            = '2.0.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']
   s.email              = %q{peter@realityforge.org}
 
   s.homepage           = %q{https://github.com/realityforge/zapwhite}
-  s.summary            = %q{A simple tool to normalize whitespace.}
-  s.description        = %q{A simple tool to normalize whitespace.}
+  s.summary            = %q{A simple tool to normalize whitespace in git repositories.}
+  s.description        = %q{A simple tool to normalize whitespace in git repositories.}
 
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- {spec}/*`.split("\n")
@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths      = %w(lib)
 
   s.has_rdoc           = false
-  s.rdoc_options       = %w(--line-numbers --inline-source --title gitattributes)
+  s.rdoc_options       = %w(--line-numbers --inline-source --title zapwhite)
 
-  s.add_dependency 'gitattributes', '= 1.1.0'
+  s.add_dependency 'gitattributes', '= 2.0.0'
 
   s.add_development_dependency(%q<minitest>, ['= 5.9.1'])
   s.add_development_dependency(%q<test-unit>, ['= 3.1.5'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapwhite
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitattributes
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.1.5
-description: A simple tool to normalize whitespace.
+description: A simple tool to normalize whitespace in git repositories.
 email: peter@realityforge.org
 executables:
 - zapwhite
@@ -81,7 +81,7 @@ rdoc_options:
 - "--line-numbers"
 - "--inline-source"
 - "--title"
-- gitattributes
+- zapwhite
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -99,5 +99,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A simple tool to normalize whitespace.
+summary: A simple tool to normalize whitespace in git repositories.
 test_files: []