line-detector 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7429071fc4b90421939e9f2efa635af6706ffd
-  data.tar.gz: 62d454bedea6b374d17ff18aa29aa5b7148ca624
+  metadata.gz: c363e46237d48d94fe3081fbfc6541f90febaabb
+  data.tar.gz: 487364d2c3cd7c916fea9d71a12043034d15b53f
 SHA512:
-  metadata.gz: d1ef12f759a63cf88182305b5eb334d7fff9accf0fe08968084e7ac9a35be8844962a7ab473793b741477dc26b4887dc59b714255a8fd8ec5c78c343448834ed
-  data.tar.gz: 0097e756cd16d68987f7a56fabb23f4cde41050de9d63dc86408f97d8b86c6634a35654cb423311c06b9188c07a39b3b79f2a2cd5d32e228a38287ffe95d110a
+  metadata.gz: 6fbac38b0ae97d7b874185df209847f45c1ecf574cad889358ad48c20111c4bdcbd3afc867a6e5c47648f4cecc4c760d21cef33e70e0b105f22a9bdf94704763
+  data.tar.gz: 0c2edf9190fc65496a7f7296ac4eb59395b3e056f7cf156597e095c98bbfec42c81299df7e36a1b3f64ede57da0dc58f4bc0b680f35d02681dd1c5ef42fa7062

data/bin/line-detector

@@ -28,11 +28,14 @@ def main
   filename = ARGV.first unless ARGV.empty?
 
   if filename == '-'
-    puts LineDetector.detect_line_ending_of_text(STDIN.read).to_s
+    text = STDIN.read
+    report = LineDetector.report_of_text(text)
+    puts report
   elsif !File.exists?(filename)
     puts "#{filename} does not exist"
   else
-    puts "#{filename}: #{LineDetector.detect_line_ending_of_file(filename).to_s}"
+    report = LineDetector.report_of_file(filename)
+    puts "#{filename}: #{report}"
   end
 end
 

data/lib/line-detector.rb

@@ -53,6 +53,28 @@ module LineDetector
     end
   end
 
+  #
+  # Detects presence of final end of line in arbitrary text
+  #
+  # "abc\ndef\n"     => true
+  # "abc\r\ndef\r\n" => true
+  # "abc\ndef"       => false
+  # "abc\r\ndef\r"   => false
+  # "abcdef"         => false
+  # ""               => false
+  #
+  def self.detect_final_eol_of_text(text)
+    line_ending = detect_line_ending_of_text(text)
+
+    if line_ending == :none
+      false
+    elsif line_ending == :mix
+      false
+    else
+      text.end_with?(NAME2EOL[line_ending])
+    end
+  end
+
   #
   # Detect line ending format of a file
   #
@@ -62,6 +84,54 @@ module LineDetector
     detect_line_ending_of_text(open(filename).read)
   end
 
+  #
+  # Detect presence of final end of line in a file
+  #
+  # Assumes file is a text file.
+  #
+  def self.detect_final_eol_of_file(filename)
+    detect_final_eol_of_text(open(filename).read)
+  end
+
+  class Report
+    attr_accessor :line_ending, :final_eol
+
+    def initialize(line_ending, final_eol)
+      @line_ending = line_ending
+      @final_eol = final_eol
+    end
+
+    def to_s
+      final_eol_piece =
+        if @final_eol
+          ', with final eol'
+        else
+          ', without final eol'
+        end
+
+      "#{@line_ending.to_s}#{final_eol_piece}"
+    end
+  end
+
+  #
+  # Report line ending and presence of final line ending of arbitrary text
+  #
+  def self.report_of_text(text)
+    Report.new(
+      detect_line_ending_of_text(text),
+      detect_final_eol_of_text(text)
+    )
+  end
+
+  #
+  # Detect presence of final end of line in a file
+  #
+  # Assumes file is a text file.
+  #
+  def self.report_of_file(filename)
+    report_of_text(open(filename).read)
+  end
+
   #
   # A more capable version of String#lines,
   # that handles some of the more obscure line ending formats.

data/lib/version.rb

@@ -2,5 +2,5 @@
 # LineDetector
 #
 module LineDetector
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: line-detector
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Andrew Pennebaker