epitools 0.5.37 → 0.5.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b5a665bc66555050576a5aa863b79017d10e90
-  data.tar.gz: a860badfc15c9f1f44f7d8db7aa4f47d2ef32bd4
+  metadata.gz: 22d5dfb7f91836122b2c98f3699a61a95e564f93
+  data.tar.gz: e948af15b3b59d8c1d6fdb8d6077fb83abdcddf0
 SHA512:
-  metadata.gz: 1d19c2fd984f89485d8a00f7c2f8c5fb0cdeff916b1bf7fa8ea4a5922c447258a56ea21b610ae20e6c5e0b27d5e4679a4d9617b7263d9dbe1b36eaefff4a8f8e
-  data.tar.gz: db684ad10202d61c32167346cf6e3032316041308a0914bd3be5ac5b3ef535a687362966be703778f573686180c526ea3d4525957b9042669bb1cbd9d497e888
+  metadata.gz: a457026eed7f6db059cdf1638a63515034fec427e3fb61b5eed17f18bd163863175297eab9400bd0a91b030e0893da94173d94dad738df58b5be6eea1c5cb092
+  data.tar.gz: e5fe8275dfc204ca5772b33fd3ceae35735a398a073f7201f022a6fcff8c014190a25dd3d0bc39cd54dc1e52c2bc0761cc056a1fe80e00bd11e82d71449d78d3

data/README.rdoc

@@ -8,7 +8,7 @@ All epitools modules (and a bunch of Ruby's stdlib) are
 {loaded on demand with "autoload"}[https://github.com/epitron/epitools/blob/master/lib/epitools/autoloads.rb],
 so it's really fast. (Require this in your .irbrc or .pryrc, and you'll never have to require another Ruby stdlib module again!)
 
-Enhanced base classes: {Enumerable}[http://rdoc.info/github/epitron/epitools/master/Enumerable], {Hash}[http://rdoc.info/github/epitron/epitools/master/Hash], {String}[http://rdoc.info/github/epitron/epitools/master/String], {Array}[http://rdoc.info/github/epitron/epitools/master/Array], {Object}[http://rdoc.info/github/epitron/epitools/master/Object], {Integer}[http://rdoc.info/github/epitron/epitools/master/Integer], etc.
+Enhanced base classes: {Enumerable}[http://rdoc.info/github/epitron/epitools/master/Enumerable], {Hash}[http://rdoc.info/github/epitron/epitools/master/Hash], {String}[http://rdoc.info/github/epitron/epitools/master/String], {Array}[http://rdoc.info/github/epitron/epitools/master/Array], {File}[http://rdoc.info/github/epitron/epitools/master/File], {Object}[http://rdoc.info/github/epitron/epitools/master/Object], {Integer}[http://rdoc.info/github/epitron/epitools/master/Integer], etc.
 
 Extras:
 

data/VERSION

@@ -1 +1 @@
-0.5.37
+0.5.38

data/lib/epitools/core_ext/file.rb

@@ -8,7 +8,7 @@ class BOFError < Exception; end
 class File
 
   #
-  # A much faster `reverse_each` implementation.
+  # A streaming `reverse_each` implementation. (For large files, it's faster and uses less memory.)
   #
   def reverse_each(&block)
     return to_enum(:reverse_each) unless block_given?
@@ -18,20 +18,33 @@ class File
   end
 
   #
-  # Read the previous +length+ bytes. After the read, +pos+ will be at the beginning of the region that you just read.
+  # Read the previous `length` bytes. After the read, `pos` will be at the beginning of the region that you just read.
+  # Returns `nil` when the beginning of the file is reached.
   #
-  def read_backwards(length)
-    old_pos = pos
+  # If the `block_aligned` argument is `true`, reads will always be aligned to file positions which are multiples of 512 bytes.
+  # (This should increase performance slightly.)
+  #
+  def reverse_read(length, block_aligned=false)
+    raise "length must be a multiple of 512" if block_aligned and length % 512 != 0
+
+    end_pos = pos
+
+    if block_aligned
+      misalignment = end_pos % length
+      length      += misalignment
+    end
 
-    if length > pos
+    return nil if end_pos == 0
+
+    if length >= end_pos # this read will take us to the beginning of the file
       seek(0)
     else
       seek(-length, IO::SEEK_CUR)
     end
 
-    new_pos = pos
-    data = read(old_pos - new_pos)
-    seek(new_pos)
+    start_pos = pos
+    data      = read(end_pos - start_pos)
+    seek(start_pos)
 
     data
   end
@@ -42,22 +55,17 @@ class File
   def reverse_each_from_current_pos
     return to_enum(:reverse_each_from_current_pos) unless block_given?
 
+    # read the rest of the current line, in case we started in the middle of a line
+    start_pos = pos
     fragment = readline rescue ""
+    seek(start_pos)
 
-    loop do
-      data = read_backwards(4096) + fragment
-      loc  = data.size-1
-
-      # NOTE: `rindex(str, loc)` includes the character at `loc`
-      while index = data.rindex("\n", loc-1)
-        line = data[index+1..loc]
-        yield line
-        loc = index
-      end
+    while data = reverse_read(4096)
+      data    += fragment
+      lines    = data.lines
+      fragment = lines.shift
 
-      fragment = data[0..loc]
-
-      break if pos == 0 # we're done reading!
+      lines.reverse_each { |line| yield line }
     end
 
     yield fragment
@@ -70,6 +78,13 @@ class File
     seek(0, IO::SEEK_END)
   end
 
+  #
+  # Seek to `BOF`
+  #
+  def seek_start
+    seek(0)
+  end
+
   #
   # Read the previous line (leaving `pos` at the beginning of the string that was read.)
   #
@@ -88,7 +103,7 @@ class File
   # 
   def seek_backwards_to(string, blocksize=512, rindex_end=-1)
     loop do
-      data = read_backwards(blocksize)
+      data = reverse_read(blocksize)
 
       if index = data.rindex(string, rindex_end)
         seek(index+string.size, IO::SEEK_CUR)

data/lib/epitools/core_ext/string.rb

@@ -101,21 +101,32 @@ class String
   def wrap(width=nil, ignore=nil)
     if width.nil?
       require 'io/console'
-      height, width = STDIN.winsize
+      _, width = STDIN.winsize
+      width -= 1
     end
 
-    wrap_re = /(?:.{1,#{width}}[ \t]+|.{1,#{width}})/
+    return self if size <= width
 
-    # TODO: 'ignore' ignores characters matching some regexp
-    #
-    # if ignore
-    #   stripped = gsub(ignore, '') # remove whatever we're ignoring
-    #   lines = stripped.scan(wrap_re) # wrap the lines
-    #   lines.each do |line|
-    #     line.
-    #   end
-
-    scan(wrap_re).map(&:rstrip).join("\n")
+    strings   = []
+    start_pos = 0
+    end_pos   = width
+
+    loop do
+      split_pos = rindex(/\s/, end_pos) || end_pos
+
+      strings << self[start_pos...split_pos]
+
+      start_pos = index(/\S/, split_pos)
+      break if start_pos == nil
+      end_pos   = start_pos + width
+
+      if end_pos > size
+        strings << self[start_pos..-1]
+        break
+      end
+    end
+
+    strings.join("\n")
   end
 
   #

data/spec/core_ext_spec.rb

@@ -216,8 +216,10 @@ describe String do
   it "wraps" do
     s1 = "Hello there, I am a sentence or series of words."
     s2 = "012345678901234567890123456789012345678901234567"
+    s3 = "hello there"
     s1.wrap(14).should == "Hello there, I\nam a sentence\nor series of\nwords."
     s2.wrap(14).should == "01234567890123\n45678901234567\n89012345678901\n234567"
+    s3.wrap(80).should == "hello there"
   end
 
   it "indents" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.37
+  version: 0.5.38
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec