git-newline-at-eof 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c6e6d61f60fe176e7572301535d5368577d4e1
-  data.tar.gz: 3f5c8d4371cbed33fbb57228215af0a1489471b8
+  metadata.gz: 52dbec81b82c6356e2c62eaa606a85246c76cc7f
+  data.tar.gz: bcadbad61f03381f7733f3292fd1836b11ee0688
 SHA512:
-  metadata.gz: 1bdccffa9f74e689fb437770c6f0143bc9b608e24ddf759095281b7d54347462ec482ee7da9bda43dbd25c5ffe284344db5f3aef340b0ae019a4b15bbd42d284
-  data.tar.gz: f1d4d448f5d2c9d81d79902502931504d517e1f23b31bcff7cf3af87505532af8c187c47afe45921834762642388f73017c755124fe68c9d6db3b86dbae833e5
+  metadata.gz: 12563f3d33eef269da7a5bd6beae3b488b43054c0f180195f2ea6ed14fbb8a55db85f842fb6743f1d0f76ddeb77e3d0d792dbd6b050b5ba6b48f65aeb96165a9
+  data.tar.gz: 28bc68fa388e4218add3496e2815292b3667ebea6998e00ef57786f5bb21921ddde76decdff33d2ed65bcfb4bb84819eb91433bb813854eff38e08885b0e8b13

data/README.md

@@ -133,11 +133,13 @@ Help.
 
 ```bash
 $ git newline-at-eof --help
-Usage: git-newline-at-eof [options]
-    -f, --feed-last-line             Add newline to line what is not terminated by newline at end of file.
-    -d, --discard-last-newline       Remove discarded newline at end of file.
-    -a, --treat-all                  This is identical with --feed-last-line --discard-last-newline.
-    -c, --check-all                  Check and show warning about newline at end of file.
+Usage: git newline-at-eof [options]
+    -f, --feed-last-line        Add newline to not terminated line at end of file.
+    -d, --discard-last-newline  Remove discarded newline at end of file.
+    -a, --treat-all             This is identical with -f -d.
+    -c, --check-all             Check and show warning about newline at end of file.
+    -h, --help                  Show this message.
+    -v, --version               Show version.
 ```
 
 ## Supported Versions
@@ -163,4 +165,5 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 ## Badges
 
-[![Build Status](https://travis-ci.org/aycabta/git-newline-at-eof.svg)](https://travis-ci.org/aycabta/git-newline-at-eof)
+- [![Build Status](https://travis-ci.org/aycabta/git-newline-at-eof.svg)](https://travis-ci.org/aycabta/git-newline-at-eof)
+- [![Build Status](https://ci.appveyor.com/api/projects/status/github/aycabta/git-newline-at-eof?branch=master&svg=true)](https://ci.appveyor.com/project/aycabta/git-newline-at-eof)

data/appveyor.yml

@@ -0,0 +1,13 @@
+---
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - gem install bundler --no-document
+  - bundle install
+build: off
+test_script:
+  - bundle exec rake
+deploy: off
+environment:
+  matrix:
+    - ruby_version: "23"
+    - ruby_version: "23-x64"

data/lib/git-newline-at-eof.rb

@@ -1,5 +1,6 @@
 require 'git-newline-at-eof/version'
 require 'optparse'
+require 'shellwords'
 
 module GitNewlineAtEof
   class Application
@@ -176,11 +177,15 @@ module GitNewlineAtEof
     private :discarded_newline?
 
     def files
-      `git ls-files`.split("\n").map { |filename|
+      `git ls-files`.split("\n").select{ |filename|
+        # check text file
+        `git grep -I --name-only --untracked -e . -- #{Shellwords.shellescape(filename)}`
+        $? == 0
+      }.map { |filename|
         filepath = current_dir(filename)
         num = 0
         begin
-          num = File.open(filepath, 'rt') { |f| count_last_newlines(f) }
+          num = File.open(filepath, 'rb') { |f| count_last_newlines(f) }
         rescue
           num = nil
         end
@@ -196,12 +201,19 @@ module GitNewlineAtEof
       if f.size == 0
         nil
       else
+        prev_char = nil
         count = 0
         f.size.step(1, -1) do |offset|
           offset -= 1
           f.seek(offset, IO::SEEK_SET)
-          if f.getc == "\n"
+          if (c = f.getc) == "\n"
             count += 1
+            prev_char = c
+          elsif c == "\r"
+            unless prev_char == "\n"
+              count += 1
+            end
+            prev_char = c
           else
             break
           end

data/lib/git-newline-at-eof/version.rb

@@ -1,3 +1,3 @@
 module GitNewlineAtEof
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-newline-at-eof
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/console
 - bin/setup
 - exe/git-newline-at-eof