epitools 0.5.103 → 0.5.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37053f6a5bb1b1406914ce14114703107679b60f
-  data.tar.gz: 7a309d8da2d15f2f73021680cb0de08846089db3
+  metadata.gz: d427d1b5d8c2314e24298cf32b86887e9f4592c3
+  data.tar.gz: 7e4ba5fbe4bdb2b3f07484f63f53fec7dba23389
 SHA512:
-  metadata.gz: 6008b6abf95ac50f0ce55974b0378a3a03eee78f94d9a71967b75b482b1bdd9b99993d702dbb432c55da127fdafcb12b42e30a674d734d8baa610116254f69e6
-  data.tar.gz: b0ba59178f118c8d857fe7d853ba47d224c74806ac5be870e6d7203cabcc5a588615e0913d7a7e703b0a9748875e7f003a28b7438ba02ac9eab6b08323e907ea
+  metadata.gz: 56cfdcaf9cc2b1d56e41a0eacad29c004cdf675f996a4281074f714dee52435c5dcd062b61d7ba0f32930b10044d7cbfb318670eea8b1a6a6d8f970953fdcd61
+  data.tar.gz: 442b4209f5caf2d85b3a90980d15e4a7114d2521eda593e8f641c29674617e5f6914f33a445c014dd35887fb3c88193d336b3f9c4327c50e3dd648b84864db5b

data/README.rdoc

@@ -4,7 +4,7 @@ Useful miscellaneous improvements for base Ruby objects, plus some extra
 data structures and handy wrappers. You can think of it as a light-weight
 ActiveSupport.
 
-All epitools modules (and a bunch of Ruby's stdlib) are 
+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!)
 

data/Rakefile

@@ -3,7 +3,7 @@ gem_version = File.read("VERSION").strip
 task :build do
   system "gem build .gemspec"
 end
- 
+
 task :release => :build do
   system "gem push epitools-#{gem_version}.gem"
 end
@@ -18,7 +18,7 @@ end
 
 task :spec do
   cmd = %w[rspec -fd -c spec]
-  
+
   if system *%w[which rescue]
     system *(["rescue"]+cmd)
   else

data/TODO

@@ -24,4 +24,4 @@
      |_ eg: [file:line:method]
   |_ "gsmartcontrol" has good warning messages
       ie: "|13<warn>  |07[hz] Warning: exit: The device error log contains records of errors."
- 
+

data/VERSION

@@ -1 +1 @@
-0.5.103
+0.5.105

data/lib/epitools.rb

@@ -15,7 +15,7 @@ end
 # Load the things that can't be autoloaded
 #
 %w[
-  core_ext 
+  core_ext
   zopen
   colored
   clitools

data/lib/epitools/colored.rb

@@ -32,7 +32,7 @@
 #
 # Since the presence of a terminal is detected automatically, the colors will be
 # disabled when you pipe your program to another program. However, if you want to
-# show colors when piped (eg: when you pipe to `less -R`), you can force it: 
+# show colors when piped (eg: when you pipe to `less -R`), you can force it:
 #
 #   >> Colored.enable!
 #   >> Colored.disable!
@@ -49,10 +49,10 @@ module Colored
 
   @@is_tty = STDOUT.isatty
 
-  COLORS = { 
+  COLORS = {
     'black'   => 30,
-    'red'     => 31, 
-    'green'   => 32, 
+    'red'     => 31,
+    'green'   => 32,
     'yellow'  => 33,
     'blue'    => 34,
     'magenta' => 35,
@@ -62,13 +62,13 @@ module Colored
   }
 
   EXTRAS = {
-    'clear'     => 0, 
+    'clear'     => 0,
     'bold'      => 1,
     'light'     => 1,
     'underline' => 4,
     'reversed'  => 7
   }
-  
+
   #
   # BBS-style numeric color codes.
   #
@@ -99,9 +99,9 @@ module Colored
 
     Set.new(normal + lights + brights + on_backgrounds + ["grey", "gray"])
   end
-  
+
   COLORS.each do |color, value|
-    define_method(color) do 
+    define_method(color) do
       colorize(self, :foreground => color)
     end
 
@@ -133,10 +133,10 @@ module Colored
 
   alias_method :gray, :light_black
   alias_method :grey, :light_black
-  
+
   EXTRAS.each do |extra, value|
     next if extra == 'clear'
-    define_method(extra) do 
+    define_method(extra) do
       colorize(self, :extra => extra)
     end
   end
@@ -173,7 +173,7 @@ module Colored
     if string == nil
       return self.tagged_colors
     end
-    
+
     if @@is_tty
       colored = [color(options[:foreground]), color("on_#{options[:background]}"), extra(options[:extra])].compact * ''
       colored << string
@@ -221,7 +221,7 @@ module Colored
     background = color_name.to_s =~ /on_/
     color_name = color_name.to_s.sub('on_', '')
     return unless color_name && COLORS[color_name]
-    "\e[#{COLORS[color_name] + (background ? 10 : 0)}m" 
+    "\e[#{COLORS[color_name] + (background ? 10 : 0)}m"
   end
 
   #
@@ -231,7 +231,7 @@ module Colored
     @@is_tty
   end
 
-  alias_method :is_tty?, :enabled? 
+  alias_method :is_tty?, :enabled?
 
   #
   # Color commands will always produce colored strings, regardless
@@ -240,7 +240,7 @@ module Colored
   def enable!
     @@is_tty = true
   end
-  
+
   alias_method :force!, :enable!
 
   #
@@ -263,12 +263,12 @@ module Colored
 
   #
   # Is this string legal?
-  #     
+  #
   def valid_tag?(tag)
     VALID_COLORS.include?(tag) or
       (tag =~ /^\d+$/ and BBS_COLOR_TABLE.include?(tag.to_i) )
   end
-    
+
   #
   # Colorize a string that has "color tags".
   #
@@ -278,18 +278,18 @@ module Colored
     # split the string into tags and literal strings
     tokens          = self.split(/(<\/?[\w\d_]+>)/)
     tokens.delete_if { |token| token.size == 0 }
-    
+
     result        = ""
 
     tokens.each do |token|
 
       # token is an opening tag!
-      
+
       if /<([\w\d_]+)>/ =~ token and valid_tag?($1)
         stack.push $1
 
-      # token is a closing tag!      
-      
+      # token is a closing tag!
+
       elsif /<\/([\w\d_]+)>/ =~ token and valid_tag?($1)
 
         # if this color is on the stack somwehere...
@@ -301,19 +301,19 @@ module Colored
         end
 
       # token is a literal string!
-      
+
       else
 
         color = (stack.last || "white")
         color = BBS_COLOR_TABLE[color.to_i] if color =~ /^\d+$/
         result << token.send(color)
-        
+
       end
-      
+
     end
-    
+
     result
-  end  
+  end
 
 end unless Object.const_defined? :Colored
 

data/lib/epitools/core_ext/enumerable.rb

@@ -607,4 +607,4 @@ class Enumerator
   end
   alias_method :cross, :cross_product
 
-end
+end

data/lib/epitools/core_ext/file.rb

@@ -102,7 +102,7 @@ class File
   # Scan through the file until `string` is found, and set the IO's +pos+ to the first character of the matched string.
   #
   def seek_to(string, blocksize=512)
-    raise "Error: blocksize must be at least as large as the string" if string.size < blocksize
+    raise "Error: blocksize must be at least as large as the string" if blocksize < string.size
 
     loop do
       data = read(blocksize)
@@ -116,13 +116,15 @@ class File
         seek(-(string.size - 1), IO::SEEK_CUR)
       end
     end
+
+    pos
   end
 
   #
   # Scan backwards in the file until `string` is found, and set the IO's +pos+ to the first character after the matched string.
   #
   def seek_backwards_to(string, blocksize=512, rindex_end=-1)
-    raise "Error: blocksize must be at least as large as the string" if string.size < blocksize
+    raise "Error: blocksize must be at least as large as the string" if blocksize < string.size
 
     loop do
       data = reverse_read(blocksize)
@@ -136,6 +138,8 @@ class File
         seek(string.size - 1, IO::SEEK_CUR)
       end
     end
+
+    pos
   end
   alias_method :reverse_seek_to, :seek_backwards_to
 

data/lib/epitools/core_ext/hash.rb

@@ -7,15 +7,15 @@ class Hash
   def blank?
     not any?
   end
-  
+
   #
   # Runs "remove_blank_values" on self.
-  #  
+  #
   def remove_blank_values!
     delete_if{|k,v| v.blank?}
     self
   end
-  
+
   #
   # Returns a new Hash where blank values have been removed.
   # (It checks if the value is blank by calling #blank? on it)
@@ -23,10 +23,10 @@ class Hash
   def remove_blank_values
     dup.remove_blank_values!
   end
-  
+
+  #
+  # Runs map_values on self.
   #
-  # Runs map_values on self. 
-  #  
   def map_values!(&block)
     keys.each do |key|
       value = self[key]
@@ -34,7 +34,7 @@ class Hash
     end
     self
   end
-  
+
   #
   # Transforms the values of the hash by passing them into the supplied
   # block, and then using the block's result as the new value.
@@ -45,7 +45,7 @@ class Hash
 
   #
   # Runs map_keys on self.
-  #  
+  #
   def map_keys!(&block)
     keys.each do |key|
       value = delete(key)
@@ -53,7 +53,7 @@ class Hash
     end
     self
   end
-  
+
   #
   # Transforms the keys of the hash by passing them into the supplied block,
   # and then using the blocks result as the new key.
@@ -62,6 +62,20 @@ class Hash
     dup.map_keys!(&block)
   end
 
+  #
+  # Convert the keys to symbols in-place, for fun and profit
+  #
+  def symbolize_keys!
+    map_keys! { |k| k.to_sym }
+  end
+
+  #
+  # Return a hash with its keys converted to symbols, for great justice
+  #
+  def symbolize_keys
+    dup.symbolize_keys!
+  end
+
   #
   # Returns a hash containing only the keys passed as arguments.
   #
@@ -140,14 +154,14 @@ class Hash
         end
       end
     end
-  end  
-  
+  end
+
   #
   # `key?` and `includes?` is an alias for `include?`
-  #  
+  #
   alias_method :key?,       :include?
   alias_method :includes?,  :include?
-  
+
   #
   # Makes each element in the `path` array point to a hash containing the next element in the `path`.
   # Useful for turning a bunch of strings (paths, module names, etc.) into a tree.
@@ -164,7 +178,7 @@ class Hash
     self[dir].mkdir_p(path[1..-1])
     self
   end
-  
+
   #
   # Turn some nested hashes into a tree (returns an array of strings, padded on the left with indents.)
   #
@@ -176,8 +190,8 @@ class Hash
       result += val.tree(level+1) if val.any?
     end
     result
-  end  
-  
+  end
+
   #
   # Print the result of `tree`
   #
@@ -188,15 +202,15 @@ class Hash
       puts block_given? ? yield(key, level) : "#{dent}#{key}"
       val.print_tree(level+1, indent, &block) if val.any?
     end
-  end  
-  
+  end
+
   #
   # Convert the hash into a GET query.
   #
   def to_query
     params = ''
     stack = []
-  
+
     each do |k, v|
       if v.is_a?(Hash)
         stack << [k,v]
@@ -204,7 +218,7 @@ class Hash
         params << "#{k}=#{v}&"
       end
     end
-  
+
     stack.each do |parent, hash|
       hash.each do |k, v|
         if v.is_a?(Hash)
@@ -214,15 +228,15 @@ class Hash
         end
       end
     end
-  
+
     params.chop! # trailing &
     params
   end
-  
+
   #
   # Query a hash using MQL (see: http://wiki.freebase.com/wiki/MQL_operators for reference)
   #
-  # Examples: 
+  # Examples:
   #   > query(name: /steve/)
   #   > query(/title/ => ??)
   #   > query(articles: [{title: ??}])
@@ -230,21 +244,21 @@ class Hash
   #   > query("date_of_birth<" => "2000")
   #
   def query(template)
-    results = [] 
+    results = []
     template.each do |key,val|
       case key
       when Regexp, String
       when Array
       when Hash
-        results += hash.query(template)  
+        results += hash.query(template)
       end
     end
-    
+
     map do |key,val|
-    end    
+    end
   end
   alias_method :mql, :query
-  
+
 
   #
   # Return all the changes necessary to transform `self` into `other`. (Works on nested hashes.) The result is a hash of {:key => [old value, new value]} pairs.
@@ -257,7 +271,7 @@ class Hash
         if self[key].kind_of?(Hash) && other[key].kind_of?(Hash)
           memo[key] = self[key].diff(other[key])
         else
-          memo[key] = [self[key], other[key]] 
+          memo[key] = [self[key], other[key]]
         end
       end
       memo