epitools 0.5.57 → 0.5.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00896a8b88645780987dbb029e5f92e2e1d78f39
-  data.tar.gz: 6f3f6106e2ce3e098b3a375ded51071ae6681670
+  metadata.gz: f476bb597f8724e520b4d9c8dda3a051c4e3bb77
+  data.tar.gz: 3974e9c35019dc899060337650af381aac362c83
 SHA512:
-  metadata.gz: 85c104baa941fb1e57123be74950e41e9caa13496eff5282ad96ec0fe79425e1eeef22d0c3bf872cca79b51748a1e6b8cb48895ad319a27781f5acc0b24eaddd
-  data.tar.gz: 1d090bb3633b480f66fbbfcebc2557f379746a5a20145ed9809b211e002814932de98bb45053ef9ec71e2296897bc85382fcbbb5627e97fe6cbf03719c86a4c7
+  metadata.gz: ef2db918b34d5ecfc0ad79f3709947fd26c194488aa2371502cf69fffcf28c83c9a5949f8cba8230816abf38a31522bdd4e54f805e9f9e91f987304a6232af71
+  data.tar.gz: f02ee7dacfdb34acfefd48bde5112dd097d18470963fbbfa5a7aba8a6761e373ace0ed98e9896923ace059d1145bd82491ec12990c88b1ab6c877700bad67627

data/VERSION

@@ -1 +1 @@
-0.5.57
+0.5.58

data/lib/epitools/browser.rb

@@ -1,8 +1,10 @@
 require 'epitools'
-gem 'mechanize', '~> 1.0'
 require 'mechanize'
 require 'epitools/browser/cache'
-require 'epitools/browser/mechanize_progressbar'
+
+if Mechanize::VERSION[/^1\./]
+  require 'epitools/browser/mechanize_progressbar'
+end
 
 # TODO: Make socksify optional (eg: if proxy is specified)
 #require 'socksify'

data/lib/epitools/core_ext/enumerable.rb

@@ -147,6 +147,7 @@ module Enumerable
       reduce(:+)
     end
   end
+  alias_method :sum_by, :sum
 
   #
   # Average the elements

data/lib/epitools/core_ext/misc.rb

@@ -197,7 +197,7 @@ module URI
   # Return a Hash of the variables in the query string
   #
   def params
-    query.to_params
+    query ? query.to_params : {}
   end
 
   #

data/lib/epitools/core_ext/numbers.rb

@@ -187,6 +187,23 @@ class Numeric
     result
   end
 
+  def to_hms_in_words
+    seconds = self
+
+    days, seconds    = seconds.divmod(86400)
+    hours, seconds   = seconds.divmod(3600)
+    minutes, seconds = seconds.divmod(60)
+    seconds, frac    = seconds.divmod(1)
+
+    result = "#{seconds} sec"
+    result = "#{minutes} min, " + result if minutes > 0
+    result = "#{"hour".amount(hours)}, " + result if hours > 0 or days > 0
+    result = "#{"day".amount(days)}, "   + result if days > 0
+    # result += ("." + frac.round(2).to_s.split(".").last) if frac > 0
+
+    result
+  end
+
 end
 
 
@@ -304,19 +321,18 @@ end
       end
     end
     
-  end
-
-  #
-  # Convert the integer into its sequence of bytes (little endian format: lowest-order-byte first)
-  #
-  def bytes
-    nbytes = (bit_length / 8.0).ceil
+    #
+    # Convert the integer into its sequence of bytes (little endian format: lowest-order-byte first)
+    #
+    def bytes
+      nbytes = (bit_length / 8.0).ceil
 
-    (0..nbytes).map do |current_byte|
-      (self >> (8 * current_byte)) & 0xFF
+      (0..nbytes).map do |current_byte|
+        (self >> (8 * current_byte)) & 0xFF
+      end
     end
+
   end
-  
 end
 
 class Time

data/lib/epitools/core_ext/range.rb

@@ -8,11 +8,12 @@ class Range
   end
 
   #
-  # The middle element of this range.
+  # The number in the middle of this range.
   #
-  def middle
+  def mid
     (min + max) / 2
   end
+  alias_method :middle, :mid
 
   #
   # Return a new range which is the intersection of the two ranges

data/lib/epitools/core_ext/string.rb

@@ -387,6 +387,14 @@ class String
     nums_and_units.map { |num, units| num.send(units) }.sum
   end
   
+  #
+  # Print a hexdump of the string to STDOUT (coloured, if the terminal supports it)
+  #
+  def hexdump
+    Hex.dump(self)
+  end
+
+
   unless public_method_defined? :to_proc
   
     #  
@@ -462,12 +470,6 @@ class String
     
   end # unless public_method_defined? :to_proc
 
-
-  def highlight(type=nil)
-    # Coderay highlighting
-  end
-  alias_method :syntax_highlight, :highlight
-
 end
 
 

data/lib/epitools/hexdump.rb

@@ -1,7 +1,5 @@
 require 'epitools'
 
-ASCII_PRINTABLE = (33..126)
-
 =begin
 000352c0  ed 33 8c 85 6e cc f6 f7  72 79 1c e3 3a b4 c2 c6  |.3..n...ry..:...|
 000352d0  c8 8d d6 ee 3e 68 a1 a5  ae b2 b7 97 a4 1d 5f a7  |....>h........_.|
@@ -19,6 +17,8 @@ ASCII_PRINTABLE = (33..126)
 
 module Hex
 
+  ASCII_PRINTABLE = (33..126)
+
   DUMP_COLORS = Rash.new(
     /\d/ => 13,
     /\w/ => 3,
@@ -31,15 +31,15 @@ module Hex
     color         = options[:color].nil? ? true : options[:color]
     highlight     = options[:highlight]
 
-    p options
-    p color
+    # p options
+    # p color
 
     lines               = data.scan(/.{1,16}/m)
     max_offset          = (base_offset + data.size) / 16 * 16
     max_offset_width    = max_offset.to_s.size
     max_hex_width       = 3 * 16 + 1
 
-    p [max_offset, max_offset_width]
+    # p [max_offset, max_offset_width]
     lines.each_with_index do |line,n|
       offset    = base_offset + n*16
       bytes     = line.unpack("C*")
@@ -53,21 +53,21 @@ module Hex
         end
       end.join('')
 
-      puts "<11>#{offset.to_s.ljust(max_offset_width)}<3>:  <14>#{hex.ljust(max_hex_width)} <8>|<15>#{plain}<8>|".colorize
+      puts "<11>#{offset.to_s.ljust(max_offset_width)}<3>:  <14>#{hex.ljust(max_hex_width)} <8>|<15>#{plain}<8>|".colorize(:strip => !color)
     end
   end
 
 end
 
-def hexdump(*args)
-  Hex.dump(*args)
-end
-
 if $0 == __FILE__
   data = (0..64).map{ rand(255).chr }.join('')
-  Hex.dump(data)
-  puts
+
+  puts "Random data"
   Hex.dump(data, :color=>false)
+
+  puts "Random data (now in colour!):"
+  Hex.dump(data)
+  
   puts
 
   data = "1234567890"*10

data/lib/epitools/path.rb

@@ -10,48 +10,100 @@ require 'epitools/core_ext/string'
 #
 # Path: An object-oriented wrapper for files. (Combines useful methods from FileUtils, File, Dir, and more!)
 #
-# Each Path object has the following attributes:
+# To create a path object, or array of path objects, throw whatever you want into Path[]:
 #
-#    path            => the entire path
-#    filename        => just the name and extension
-#    basename        => just the filename (without extension)
-#    ext             => just the extension
-#    dir             => just the directory
-#    dirs            => an array of directories
+#  These returns a single path object:
+#    passwd      = Path["/etc/passwd"]
+#    also_passwd = Path["/etc"] / "passwd"         # joins two paths
+#    parent_dir  = Path["/usr/local/bin"] / ".."   # joins two paths (up one dir)
 #
-# Note: all of the above attributes can be modified to produce new paths!
-# Here's a useful example:
+#  These return an array of path objects:
+#    pictures   = Path["photos/*.{jpg,png}"]   # globbing
+#    notes      = Path["notes/2014/**/*.txt"]  # recursive globbing
+#    everything = Path["/etc"].ls
 #
-#   # Check if there's a '.git' directory in the current or parent directories.
-#   def inside_a_git_repository?
-#     path = Path.pwd # get the current directory
+# Each Path object has the following attributes, which can all be modified:
+#
+#    path     => the absolute path, as a string
+#    filename => just the name and extension
+#    basename => just the filename (without extension)
+#    ext      => just the extension
+#    dir      => just the directory
+#    dirs     => an array of directories
+#
+# Some commonly used methods:
+#
+#   path.file?
+#   path.exists?
+#   path.dir?
+#   path.mtime
+#   path.xattrs
+#   path.symlink?
+#   path.broken_symlink?
+#   path.symlink_target
+#   path.executable?
+#   path.chmod(0o666)
+#
+# Interesting examples:
+#
+#   Path["*.jpeg"].each { |path| path.rename(:ext=>"jpg") } # renames .jpeg to .jpg
+#
+#   files     = Path["/etc"].ls         # all files in directory
+#   morefiles = Path["/etc"].ls_R       # all files in directory tree
+#
+#   Path["*.txt"].each(&:gzip!)
+#
+#   Path["filename.txt"] << "Append data!"     # appends data to a file
+#
+#   string = Path["filename.txt"].read         # read all file data into a string
+#   json   = Path["filename.json"].read_json   # read and parse JSON
+#   doc    = Path["filename.html"].read_html   # read and parse HTML
+#   xml    = Path["filename.xml"].parse        # figure out the format and parse it (as XML)
+#
+#   Path["saved_data.marshal"].write(data.marshal)   # Save your data!
+#   data = Path["saved_data.marshal"].unmarshal      # Load your data!
+#
+#   Path["unknown_file"].mimetype              # sniff the file to determine its mimetype
+#   Path["unknown_file"].mimetype.image?       # ...is this some kind of image?
+#
+#   Path["otherdir/"].cd do                    # temporarily change to "otherdir/"
+#     p Path.ls
+#   end
+#   p Path.ls
+#
+# The `Path#dirs` attribute is a split up version of the directory
+# (eg: Path["/usr/local/bin"].dirs => ["usr", "local", "bin"]).
+#
+# You can modify the dirs array to change subsets of the directory. Here's an example that
+# finds out if you're in a git repo:
+#
+#   def inside_a_git_repo?
+#     path = Path.pwd # start at the current directory
 #     while path.dirs.any?
-#       return true if (path/".git").exists?
-#       path.dirs.pop
+#       if (path/".git").exists?
+#         return true
+#       else
+#         path.dirs.pop  # go up one level
+#       end
 #     end
 #     false
 #   end
 #
-# More examples:
-#
-#   Path["*.jpeg"].each { |path| path.rename(:ext=>"jpg") }
-#   Path["filename.txt"] << "Append data!"
-#   etcfiles = Path["/etc"].ls
-#   Path["*.txt"].each(&:gzip)
-#
 # Swap two files:
 #
 #   a, b = Path["file_a", "file_b"]
-#   temp = a.with(:ext=>a.ext+".swapping") # return a modified version of this object
+#   temp = a.with(:ext => a.ext+".swapping") # return a modified version of this object
 #   a.mv(temp)
 #   b.mv(a)
 #   temp.mv(b)
 #
-# Paths can be created for existant and non-existant files. If you want to create a nonexistant
-# directory, just add a '/' at the end, so Path knows. (eg: Path["/etc/nonexistant/"]).
+# Paths can be created for existant and non-existant files.
+#
+# To create a nonexistant path object that thinks it's a directory, just add a '/' at the end.
+# (eg: Path["/etc/nonexistant/"]).
 #
 # Performance has been an important factor in Path's design, so doing crazy things with Path
-# usually doesn't kill your machine. Go nuts!
+# usually doesn't kill performance. Go nuts!
 #
 #
 class Path
@@ -196,7 +248,7 @@ class Path
   end
 
   #
-  # Reload this path (update cached values.)
+  # Reload this path (updates cached values.)
   #
   def reload!
     temp = path
@@ -286,6 +338,14 @@ class Path
     extensions
   end
 
+  ###############################################################################
+  # inspect
+  ###############################################################################
+
+  def inspect
+    "#<Path:#{path}>"
+  end
+
   ###############################################################################
   # fstat
   ###############################################################################
@@ -546,8 +606,21 @@ class Path
   #
   # All the lines in this file, chomped.
   #
-  def lines
-    io.lines.map(&:chomp)
+  def each_line
+    io.each_line
+  end
+  alias_method :lines, :each_line
+
+  def grep(pat)
+    return to_enum(:grep, pat).to_a unless block_given?
+
+    each_line do |line|
+      yield line if line =~ pat
+    end
+  end
+
+  def nicelines
+    lines.map(&:chomp)
   end
 
   def unmarshal
@@ -733,7 +806,7 @@ class Path
   # Renames the file, but doesn't change the current Path object, and returns a Path that points at the new filename.
   #
   # Examples:
-  #   Path["file"].rename("newfile")      #=> Path["newfile"]
+  #   Path["file"].rename("newfile") #=> Path["newfile"]
   #   Path["SongySong.mp3"].rename(:basename=>"Songy Song")
   #   Path["Songy Song.mp3"].rename(:ext=>"aac")
   #   Path["Songy Song.aac"].rename(:dir=>"/music2")
@@ -851,8 +924,7 @@ class Path
   end
 
   def ln_s(dest)
-    dest = Path[dest]
-    FileUtils.ln_s(self, dest)
+    Path.ln_s(self, dest)
   end
 
   ## Owners and permissions
@@ -1179,10 +1251,13 @@ class Path
       orig = pwd
 
       Dir.chdir(dest)
-      yield
+      result = yield dest
       Dir.chdir(orig)
+
+      result
     else
       Dir.chdir(dest)
+      dest
     end
   end
 
@@ -1190,7 +1265,10 @@ class Path
 
   def self.ls_r(path); Path[path].ls_r; end
 
-  def self.ln_s(src, dest); Path[src].ln_s(dest); end
+  def self.ln_s(src, dest)
+    FileUtils.ln_s(src, dest)
+    Path[dest]
+  end
 
   ## TODO: Verbose mode
   #def self.verbose=(value); @@verbose = value; end

data/spec/path_spec.rb

@@ -460,7 +460,7 @@ describe Path do
     (path.mode & 0o666).should > 0
   end
 
-  it 'symlinks and symlink_targets' do
+  it 'symlinks files' do
     path = Path.tmpfile
     path << "some data"
 
@@ -474,6 +474,24 @@ describe Path do
     target.symlink_target.should == path
   end
 
+  it 'symlinks relative dirs' do
+    dir = Path["/tmp/dir/"]
+    dir.mkdir
+    tmp = Path["/tmp/symlinktarget"]
+    tmp << "data"
+
+
+    link = (dir/"symlink")
+    link.ln_s "../file"
+
+    link.symlink?.should == true
+    
+    tmp.read.should == 
+
+    tmp.rm
+    dir.rm
+  end
+
   it 'swaps two files' do
     # swap two regular files
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.57
+  version: 0.5.58
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec