line_ender 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: bc0949d7421ee2d59e9b66c7c8e283add063a350aa984007bd448df84e0ab7bfe469f8570327f9c98b2b88c5ef28708667f259bfb08874b1bfce3508c15fdddc
-  metadata.gz: 4eb928bd0f1aa81e6421b4979fbf5295ed035e9f12abb848f9dda8d06661d8937f2ec04d42f32d6b2b855ff294c9ff54006dfc3887493af23fb470da6e511f72
+  data.tar.gz: 9186cd233ab899bfb47b425f4039fda71d7d840692e20bdc355ee0bc878c0ab3b945f5905a10bfbf0b1d74974b0b8d917e1c5ee7e37955f978e6a2ac89aff24e
+  metadata.gz: 3394b3cdaa70f8a5d7542251a514d45ff1f04338c5f58a99dffe920c9cf97d4e0856ca7dd35dc81be9b8eb541ef07f128e3d8330a1133a967bb921b7cd69d724
 SHA1: 
-  data.tar.gz: f87a113ebfe033f1cdd1c307d51e9823ed3e48ad
-  metadata.gz: e8606ceac15be785b5aeec4dab2aded01e557bb1
+  data.tar.gz: ea6ae3546c2020c688b55afcc63dcd37a043f294
+  metadata.gz: 0ae0ea43faecf40c84ce5f6d8610733bfdd2030f

data/lib/le

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby
+# == Synopsis
+# le: This is program that replaces line endings of a file. It either does an inplace update or  will write to another file with (-o) switch.
+# The default line ending is Unix (-u), but other line endings are Windows (-w) or Mac (-m).
+#    
+# == Note
+#  The -u, -m, and -w flags are mutually exclusive. (Can only choose one).
+#
+# == Usage
+# le [OPTION] ... INPUTFILE
+#
+# -h, --help:    show help
+#
+# -w, --windows: gives the file line endings of carriage return + line feed (\r\n)
+#
+# -u, --unix:    gives the file line endings of line feed (\n) (default)
+#
+# -m, --mac:     gives the file line endings of carriage return (\r)
+#
+# -o, --out:     will write the output to a file with this name
+#
+# INPUTFILE: The file you want to modify the line endings for.
+
+require 'rubygems'
+require 'getoptlong'
+require 'rdoc/usage'
+require 'line_ender'
+
+include LineEnder
+
+opts = GetoptLong.new(
+  [ '--windows', '-w', GetoptLong::OPTIONAL_ARGUMENT ],
+  [ '--mac', '-m', GetoptLong::OPTIONAL_ARGUMENT ],
+  [ '--unix', '-u', GetoptLong::OPTIONAL_ARGUMENT ],
+  [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+  [ '--out', '-o', GetoptLong::OPTIONAL_ARGUMENT ]
+)
+
+outfile = nil
+infile = nil
+ending = nil
+opts.each do |opt, arg|
+  case opt
+	  when '--windows'
+		  RDoc::usage if ending
+			ending = LineEnder::Ending::Windows
+	  when '--unix'
+		  RDoc::usage if ending
+			ending = LineEnder::Ending::Unix
+	  when '--mac'
+		  RDoc::usage if ending
+			ending = LineEnder::Ending::Mac
+    when '--help'
+      RDoc::usage
+    when '--out'
+		  outfile = arg
+  end
+end
+
+ending = LineEnder::Ending::Unix unless ending
+
+if ARGV.length != 1
+  puts "***---Missing INPUTFILE argument---***"
+	puts
+	RDoc::usage
+  exit 0
+end
+
+infile = ARGV.shift
+
+if outfile
+	 output_to_file( infile, ending, outfile )
+else
+	 output_to_file( infile, ending )
+end
+
+
+

data/lib/line_ender.rb

@@ -27,6 +27,8 @@ module LineEnder
    raise RuntimeError, "Something is wrong with the 'Ending' parameter passed in!" unless valid_ending?(ending)
    output_filepath = get_output_filepath(input_filepath, output_filename)
    puts "output filepath = #{output_filepath}" if @debug
+
+   #this will only happen for an inplace file update
    if (output_filepath == input_filepath)
      raise RuntimeError, "File is not writeable!" unless File.writable?(output_filepath)
    end
@@ -67,7 +69,7 @@ module LineEnder
          puts "in get_output_filepath ... output_filepath = #{output_filepath}" if @debug
        end
      else
-       #the path provided in output_filename is a path ... lets expand it
+       #the output_filename is a path ... lets expand it
        output_path = File.expand_path(output_filename).split(::File::Separator)     
        output_filepath = File.join(output_path)
      end
@@ -90,9 +92,9 @@ module LineEnder
 
  def file_to_string(filepath)
    file = File.open(filepath, "rb")
-   file_to_string = file.read
+   file_string = file.read
    file.close
-   file_to_string.chomp
+   file_string
  end
 
  def valid_ending?(ending) 

data/lib/test_line_ender.rb

@@ -11,14 +11,10 @@ class TestLineEnder < Test:: Unit::TestCase
 
   def setup
     puts 'setup'
-    @debug = false
+    @debug = true
     @tle = TLE.new
     @file1 = "file1.txt"
     @file2 = "file2.txt"
-    @le_mac = "a\\\\rb\\\\rc"
-    @le_windows = "a\r\nb\r\nc"
-    @le_unix = "a\nb\nc"
-    system "echo #{@le_mac} > #{@file1}"
   end
 
   def teardown
@@ -28,36 +24,69 @@ class TestLineEnder < Test:: Unit::TestCase
     system "rm #{@file2}" if File.exists?(@file2)
   end
   
-  def test_new_file
-    puts "from test_new_file ..."
-    @tle.output_to_file( @file1, LineEnder::Ending::Unix, @file2 )
-    assert(File.exists?(@file2))
-    system "hexdump -C #{@file2} | head -n 40" if @debug
-    puts "" if @debug
-    puts "compare le_unix to #{@le_unix}" if @debug
-    fl = File.open(@file2, "rb")
-    fs = fl.read
-    puts "to file_to_string ... #{fs}" if @debug
-    assert(fs == @le_unix)
-  end
-
-  def test_inplace_fix
-    puts "from test_inplace_fix ..."
-    @tle.output_to_file( @file1, LineEnder::Ending::Windows)
-    system "hexdump -C #{@file1} | head -n 40" if @debug
-    puts "" if @debug
-    puts "compare le_windows to #{@le_windows}" if @debug
-    fl = File.open(@file1, "rb")
-    fs = fl.read
-    puts "to file_to_string ... #{fs}" if @debug
-    assert(fs == @le_windows)
-  end
-
-
-  def test_string_convert_to_windows
-    puts "from test_string_convert_to_windows ..."
+  def test_mac_to_unix_written_to_new_file
+    puts "in test: #{__method__} ..."
+    start_value = "a\rb\rc\r"
+    fixed_value = "a\nb\nc\n"
+    fs = helper_for_file_test(start_value, fixed_value , LineEnder::Ending::Unix, true)
+    assert(File.exists?(@file2), "#{__method__} ... has not written to new file")
+    assert(fs == fixed_value, "#{__method__} ... fixed file is not a match to expected value") if File.exists?(@file2)
+  end
+
+  def test_mac_to_windows_write_to_same_file
+    puts "in test: #{__method__} ..."
+    start_value = "a\rb\rc\r\r\r"
+    fixed_value = "a\r\nb\r\nc\r\n\r\n\r\n"
+    fs = helper_for_file_test(start_value, fixed_value , LineEnder::Ending::Windows)
+    assert(fs == fixed_value, "#{__method__} ... fixed file is not a match to expected value")
+  end
+
+  def test_mac_to_windows_string_dump
+    puts "in test: #{__method__} ..."
+    start_value = "a\rb\rc\r\r"
+    fixed_value = "a\r\nb\r\nc\r\n\r\n"
+    helper_write_file(@file1, start_value)
+    helper_for_hexdump("start", @file1) if @debug
     fs= @tle.output_to_string(@file1, LineEnder::Ending::Windows)
-    assert(fs == @le_windows)
+    assert(fs == fixed_value, "#{__method__} ... fixed file is not a match to expected value")
   end
 
+  def helper_for_file_test(start_value, fixed_value, ending_to_use, new_output_file = false)
+    helper_write_file(@file1, start_value)
+    helper_for_hexdump("start", @file1) if @debug
+    if new_output_file
+      @tle.output_to_file( @file1, ending_to_use, @file2 )
+      fixed_file = @file2
+    else
+      @tle.output_to_file( @file1, ending_to_use)
+      fixed_file = @file1
+    end
+    helper_for_hexdump("fixed", fixed_file) if File.exists?(fixed_file) && @debug
+    helper_read_file(fixed_file)
+  end
+
+  def helper_write_file(file_name, value)
+    file = File.new(file_name, "wb")
+    file.binmode
+    file.write(value)
+    file.close
+  end
+
+  def helper_read_file(file_name)
+    file_string = ""
+    if File.exists?(file_name)
+      file = File.open(file_name, "rb")
+      file.binmode
+      file_string = file.read
+      puts "contents of file #{file_name} as a string ... #{file_string.inspect}" if @debug
+    end
+    file_string
+  end
+
+  def helper_for_hexdump(which_file, file_name)
+    puts "#{which_file} file looks like this ..."
+    system "hexdump -C #{file_name}"
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: line_ender
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Rich Krueger
@@ -9,10 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-22 00:00:00 Z
+date: 2013-08-28 00:00:00 Z
 dependencies: []
 
-description: A little mixin to change line-endings of files. Supports Mac, Unix, and Windows line ending conversions.
+description: A little mixin to change the line endings of files. Supports Mac, Unix, and Windows line ending conversions.
 email: 
 - rkrueger@gmail.com
 executables: []
@@ -24,6 +24,7 @@ extra_rdoc_files: []
 files: 
 - lib/line_ender.rb
 - lib/test_line_ender.rb
+- lib/le
 homepage: http://www.hqual.net
 licenses: []
 
@@ -49,6 +50,6 @@ rubyforge_project:
 rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: Mixin to fix LineEndings of files
+summary: Mixin to fix line endings of files
 test_files: []