epitools 0.5.133 → 0.5.136

data/lib/epitools/path.rb

@@ -125,16 +125,17 @@ class Path
   # Initializers
   ###############################################################################
 
+  alias_class_method :old_new, :new
   def self.new(*args)
     if args.first =~ URI_RE and self != Path::URI
       Path::URI.new(args.first)
     else
-      super(*args)
+      old_new(*args)
     end
   end
 
-  def initialize(newpath, hints={})
-    send("path=", newpath, hints)
+  def initialize(newpath, **hints)
+    send("path=", newpath, **hints)
 
     # if hints[:unlink_when_garbage_collected]
     #   backup_path = path.dup
@@ -155,8 +156,8 @@ class Path
     Shellwords.escape(str)
   end
 
-  def self.glob(str, hints={})
-    Dir[str].map { |entry| new(entry, hints) }
+  def self.glob(str, **hints)
+    Dir[str].map { |entry| new(entry, **hints) }
   end
 
   def self.[](path)
@@ -194,7 +195,7 @@ class Path
   #
   # Note: The `hints` parameter contains options so `path=` doesn't have to touch the filesytem as much.
   #
-  def path=(newpath, hints={})
+  def path=(newpath, **hints)
     if hints[:type] or File.exist? newpath
       if hints[:type] == :dir or File.directory? newpath
         self.dir = newpath
@@ -816,7 +817,7 @@ class Path
   #    zopen("otherfile.gz", "w") #=> #<Zlib::GzipWriter:0x7fe30448>>
   #    zopen("test.txt.gz") { |f| f.read } # read the contents of the .gz file, then close the file handle automatically.
   #
-  def zopen(mode="rb", &block)
+  def zopen(mode="rb", **opts, &block)
     # if ext == "gz"
     #   io = open(mode)
     #   case mode
@@ -829,7 +830,7 @@ class Path
     #     raise "Unknown mode: #{mode.inspect}. zopen only supports 'r' and 'w'."
     #   end
     # elsif bin = COMPRESSORS[ext]
-    if bin = COMPRESSORS[ext]
+    if bin = (opts[:format] || COMPRESSORS[ext])
       if which(bin)
         case mode
         when "w", "wb"
@@ -868,18 +869,25 @@ class Path
 
   end
 
+  def self.zopen(filename, mode, &block)
+    Path.new(filename).zopen(mode, &block)
+  end
+
   ###############################################################################
   # Parsing files
   ###############################################################################
 
   #
   # Parse the file based on the file extension.
-  # (Handles json, html, yaml, xml, csv, marshal, and bson.)
+  # (Handles json, html, yaml, xml, csv, tsv, marshal, and bson.)
+  #
+  # The "format" option lets you specify the file format (eg: `Path["something.conf"].parse(format: "yaml")`)
+  # You can also pass CSV parsing options (eg: `Path["thing.csv"].parse(col_sep: "\t")`)
   #
-  def parse(io=self.io, forced_ext=nil, opts={})
-    case (forced_ext or ext.downcase)
+  def parse(io=self.io, **opts)
+    case (opts[:format] || ext.downcase)
     when 'gz', 'bz2', 'xz'
-      parse(zopen, exts[-2])
+      parse(zopen, format: exts[-2])
     when 'json'
       read_json(io)
     when 'html', 'htm'
@@ -889,7 +897,10 @@ class Path
     when 'xml', 'rdf', 'rss'
       read_xml(io)
     when 'csv'
-      read_csv(io, opts)
+      read_csv(io, **opts)
+    when 'tsv'
+      opts[:col_sep] ||= "\t"
+      read_csv(io, **opts)
     when 'marshal'
       read_marshal(io)
     when 'bson'
@@ -920,7 +931,8 @@ class Path
 
 
   def read_html(io=self.io)
-    Nokogiri::HTML(io)
+    #Nokogiri::HTML(io)
+    Oga.parse_html(io)
   end
   alias_method :from_html, :read_html
 
@@ -938,14 +950,15 @@ class Path
 
 
   # Parse the file as CSV
-  def read_csv(io=self.io, opts={})
-    open { |io| CSV.new(io.read, opts).each }
+  def read_csv(io=self.io, **opts)
+    CSV.new(io.read, **opts).each
   end
   alias_method :from_csv, :read_csv
 
   # Parse the file as XML
   def read_xml(io=self.io)
-    Nokogiri::XML(io)
+    # Nokogiri::XML(io)
+    Oga.parse_xml(io)
   end
 
   # Parse the file as a Ruby Marshal dump
@@ -1024,6 +1037,7 @@ class Path
     dest
   end
   alias_method :ren, :rename
+  alias_method :rename_to, :rename
 
   #
   # Works the same as "rename", but the destination can be on another disk.
@@ -1502,7 +1516,8 @@ class Path
   # TODO: Remove the tempfile when the Path object is garbage collected or freed.
   #
   def self.tmpfile(prefix="tmp")
-    path = Path.new(Tempfile.new(prefix).path, unlink_when_garbage_collected: true)
+    # path = Path.new(Tempfile.new(prefix).path, unlink_when_garbage_collected: true)
+    path = Path.new(Tempfile.new(prefix).path)
     yield path if block_given?
     path
   end
@@ -1633,7 +1648,7 @@ class Path::URI < Path
   # TODO: only include certain methods from Path (delegate style)
   #       (eg: remove commands that write)
 
-  def initialize(uri, hints={})
+  def initialize(uri, **hints)
     @uri = ::URI.parse(uri)
     self.path = @uri.path
   end

data/lib/epitools/pretty_backtrace.rb

@@ -67,7 +67,7 @@ end
 
 
 
-def color_backtrace_2(lines, options={})
+def color_backtrace_2(lines, **options)
 
   groups = lines.reverse.split_at { |line,nextline| line.path != nextline.path }
 

data/lib/epitools/rash.rb

@@ -11,7 +11,7 @@ class Rash
 
   attr_accessor :optimize_every
 
-  def initialize(initial={})
+  def initialize(initial)
     @hash           = {}
     @regexes        = []
     @ranges         = []

data/lib/epitools/term.rb

@@ -29,26 +29,62 @@ module Term
   # Return the [width,height] of the terminal.
   #
   def size
-    $stdout.winsize.reverse
+    $stdout.winsize.reverse rescue [80,25]
   end
 
   def width;  size[0]; end
   def height; size[1]; end
-  def goto(x,y); @x, @y = x, y; end
-  def pos; [@x, @y]; end
+  # def goto(x,y); @x, @y = x, y; end
+  # def pos; [@x, @y]; end
 
-  def clear
-    print "\e[H\e[J"
-  end
 
+  ##################################################################################
+  ### ANSI Stuff (see: ttps://en.wikipedia.org/wiki/ANSI_escape_code)
+  ##################################################################################
+
+  ##################################################################################
+  ## <n>K = Clear (part of) the line
+  ##################################################################################
+
+  # 2 = clear entire line
   def clear_line
     print "\e[2K"
   end
 
+  # 0 = clear to end of line
   def clear_eol
     print "\e[0K"
   end
 
+  ##################################################################################
+  ## <n>J = Clear (part of) the screen.
+  ##################################################################################
+
+  def clear
+    # If n is 2, clear entire screen (and moves cursor to upper left on DOS ANSI.SYS).
+    print "\e[2J\e[H"
+  end
+
+  def clear_all_above
+    # If n is 1, clear from cursor to beginning of the screen.
+    print "\e[1J"
+  end
+
+  def clear_all_below
+    # If n is 0 (or missing), clear from cursor to end of screen.
+    print "\e[0J"
+  end
+
+  def clear_scrollback_buffer!
+    # If n is 3, clear entire screen and delete all lines saved in the scrollback buffer (this feature was added for xterm and is supported by other terminal applications).
+    print "\e[3J"
+  end
+
+
+  ##################################################################################
+  ## <n>;<m>H = Move!
+  ##################################################################################
+
   def move_to(row: 1, col: 1)
     print "\e[#{row};#{col}H"
   end
@@ -82,11 +118,15 @@ module Term
     @back = back if back
   end
 
-  def puts(s)
-    # some curses shit
-  end
-
+  #
+  # curses-style scrollable terminal window
+  #
   class Window
+
+    # work in progress. probably requires an event loop and a higher order container for having multiple windows and a text-input and stuff.
+
+    attr_accessor :wrap
+
     def initialize
     end
 
@@ -94,21 +134,39 @@ module Term
     end
   end
 
+
   class Table
 
     # TODO:
     #
     # * make Table's configuration eaiser to remember by putting the formatting parameters in initialize
     #   eg: Table.new(elements, :sort=>:vertical).to_s
+    # * strip ansi
+    # * wrap contents
+    # * rounded corners
+    # * [far future] dynamic sortable filterable toggleable table
     #
 
     attr_accessor :border, :columns, :padding, :strip_color, :indent, :width, :height
 
-    def self.[](data)
-      self.new(data)
+    def self.print(thing, **opts)
+      raise "Can't tablize a #{thing.class}" unless thing.class < Enumerable
+      puts new(thing, **opts).display
+    end
+
+    def self.hprint(thing)
+      puts new(thing).in_rows
+    end
+
+    def self.vprint(thing)
+      puts new(thing).in_columns
+    end
+
+    def self.[](data, **opts)
+      new(data, **opts)
     end
 
-    def initialize(data, options={})
+    def initialize(data, **options)
       @data         = data.map(&:to_s)
       @strip_color = options[:ansi] || options[:colorized] || options[:colored] || options[:strip_color] || options[:strip_ansi]
 
@@ -185,7 +243,7 @@ module Term
     end
     alias_method :by_rows, :in_rows
 
-    def display #(opts={})
+    def display #(**opts)
       case @direction
       when :horizontal
         puts in_rows
@@ -198,7 +256,7 @@ module Term
       by_rows
     end
 
-    def render(rows, options={})
+    def render(rows, **options)
       num_cols  = rows.first.size
       result    = []
 

data/spec/core_ext_spec.rb

@@ -404,6 +404,15 @@ describe String do
     ]
   end
 
+  it "parses units" do
+    "50%".parse_units.should == 0.5
+    "1b".parse_units.should == 1.billion
+    "1gb".parse_units.should == 2**30
+
+    lambda { "whee".parse_units }.should raise_error
+    lambda { "57 butts".parse_units }.should raise_error
+  end
+
 end
 
 
@@ -491,15 +500,30 @@ describe Float do
     end
   end
 
-  it "percent" do
+  it "percents" do
     f = 0.716237
-    f.percent.should == "72%"
+    f.percent.should == "71.6%"
+    f.percent(0).should == "72%"
+    f.percent(1).should == "71.6%"
     f.percent(2).should == "71.62%"
     f.percent(3).should == "71.624%"
   end
 
 end
 
+describe Rational do
+
+  it "makes em" do
+    lambda { Rational[1,2] }.should_not raise_error
+  end
+
+  it "percents" do
+    Rational(1,2).percent.should == "50.0%"
+    Rational(1,3).percent(3).should == "33.333%"
+  end
+
+end
+
 describe Number do
 
   it "number?" do

data/spec/fraction_spec.rb

@@ -0,0 +1,53 @@
+require 'epitools/fraction'
+
+describe Fraction do
+
+#  before :each do
+#    @a = Fraction[1,1]
+#    @b = Fraction[1,2]
+#  end
+
+  it "adds normally" do
+    ( Fraction[1,1] + Fraction[1,2] ).should == Fraction[3,2]
+  end
+
+  it "doesn't let you add weird stuff together" do
+    -> { Fraction[1,2] + :splunge }.should raise_error(TypeError)
+  end
+
+  it "timeses normally" do
+    ( Fraction[1,1] * 2 ).should == Fraction[2,2]
+    ( Fraction[1,2] * 2 ).should == Fraction[2,4]
+    ( Fraction[1,1] * Fraction[1,2] ).should == Fraction[1,2]
+    ( Fraction[5,3] * Fraction[1,2] ).should == Fraction[5*1, 2*3]
+    ( Fraction[5,3] * Fraction[1,2] ).should == Fraction[5, 6]
+    ( Fraction[1,2] * Fraction[1,2] ).should == Fraction[1, 4]
+  end
+
+  it "doesn't let you times it with weird stuff" do
+    -> { Fraction[1,2] * ([:ayeeee]*100) }.should raise_error(TypeError)
+  end
+
+  it "floats" do
+    Fraction[1,1].to_f.should == 1.0
+    Fraction[1,2].to_f.should == 0.5
+
+    -> { Fraction[1,0].to_f }.should raise_error(ZeroDivisionError)
+  end
+
+  it "percents" do
+    Fraction[1,1].percent.should == "100.0%"
+    Fraction[1,2].percent.should == "50.0%"
+  end
+
+  it "simplifies" do
+    Fraction[2,4].simplify.should == Fraction[1,2]
+    Fraction[4,2].simplify.should == Fraction[2,1]
+  end
+
+  it "has a function-style wrapper! (for paren fans)" do
+    Fraction(1,2).should == Fraction[1,2]
+    Fraction(1,2).should == Fraction.new(1,2)
+  end
+
+end

data/spec/numwords_spec.rb

@@ -7,17 +7,14 @@ describe Numeric do
       10 => "ten",
       3_123 => "three thousand, one-hundred and twenty-three",
       123_124 => "one-hundred and twenty-three thousand, one-hundred and twenty-four",
-
       8_128_937_981_273_987_129_837_174_612_897_638_613 => "eight undecillion, one-hundred and twenty-eight decillion, nine-hundred and thirty-seven nonillion, nine-hundred and eighty-one octillion, two-hundred and seventy-three septillion, nine-hundred and eighty-seven sextillion, one-hundred and twenty-nine quintillion, eight-hundred and thirty-seven quadrillion, one-hundred and seventy-four trillion, six-hundred and twelve billion, eight-hundred and ninety-seven million, six-hundred and thirty-eight thousand, six-hundred and thirteen",
-
-      3_486_597_230_495_871_304_981_320_498_123_498_263_984_739_841_834_091_823_094_812_039_481_231_623_987_461_293_874_698_123_649_817_236 => "three duotrigintillion, four-hundred and eighty-six untrigintillion, five-hundred and ninety-seven trigintillion, two-hundred and thirty novemvigintillion, four-hundred and ninety-five octovigintillion, eight-hundred and seventy-one septenvigintillion, three-hundred and four sexvigintillion, nine-hundred and eighty-one quinvigintillion, three-hundred and twenty quattuorvigintillion, four-hundred and ninety-eight trevigintillion, one-hundred and twenty-three duovigintillion, four-hundred and ninety-eight unvigintillion, two-hundred and sixty-three vigintillion, nine-hundred and eighty-four novemdecillion, seven-hundred and thirty-nine octodecillion, eight-hundred and fourty-one septendecillion, eight-hundred and thirty-four sexdecillion, ninety-one quindecillion, eight-hundred and twenty-three quattuordecillion, ninety-four tredecillion, eight-hundred and twelve duodecillion, thirty-nine undecillion, four-hundred and eighty-one decillion, two-hundred and thirty-one nonillion, six-hundred and twenty-three octillion, nine-hundred and eighty-seven septillion, four-hundred and sixty-one sextillion, two-hundred and ninety-three quintillion, eight-hundred and seventy-four quadrillion, six-hundred and ninety-eight trillion, one-hundred and twenty-three billion, six-hundred and fourty-nine million, eight-hundred and seventeen thousand, two-hundred and thirty-six",
-
+      3_486_597_230_495_871_304_981_320_498_123_498_263_984_739_841_834_091_823_094_812_039_481_231_623_987_461_293_874_698_123_649_817_236 => "three duotrigintillion, four-hundred and eighty-six untrigintillion, five-hundred and ninety-seven trigintillion, two-hundred and thirty novemvigintillion, four-hundred and ninety-five octovigintillion, eight-hundred and seventy-one septenvigintillion, three-hundred and four sexvigintillion, nine-hundred and eighty-one quinvigintillion, three-hundred and twenty quattuorvigintillion, four-hundred and ninety-eight trevigintillion, one-hundred and twenty-three duovigintillion, four-hundred and ninety-eight unvigintillion, two-hundred and sixty-three vigintillion, nine-hundred and eighty-four novemdecillion, seven-hundred and thirty-nine octodecillion, eight-hundred and forty-one septendecillion, eight-hundred and thirty-four sexdecillion, ninety-one quindecillion, eight-hundred and twenty-three quattuordecillion, ninety-four tredecillion, eight-hundred and twelve duodecillion, thirty-nine undecillion, four-hundred and eighty-one decillion, two-hundred and thirty-one nonillion, six-hundred and twenty-three octillion, nine-hundred and eighty-seven septillion, four-hundred and sixty-one sextillion, two-hundred and ninety-three quintillion, eight-hundred and seventy-four quadrillion, six-hundred and ninety-eight trillion, one-hundred and twenty-three billion, six-hundred and forty-nine million, eight-hundred and seventeen thousand, two-hundred and thirty-six",
       1763241823498172490817349807213409238409123409128340981234781236487126348791263847961238794612839468917236489712364987162398746129834698172364987123 => "more than a googol! (148 digits)"
     }.each do |num, result|
       num.to_words.should == result
     end
 
-    lambda{ 1.523.million.billion.to_words }.should_not raise_error
+    lambda { 1.523.million.billion.to_words }.should_not raise_error
   end
 
   it "has .thousand, .million, etc." do

data/spec/path_spec.rb

@@ -147,7 +147,9 @@ describe Path do
     data = "<h1>The best webpage in the universe.</h1>"
     html = Path.tmpfile
     html.write data
-    html.read_html.at("h1").to_s.should == data
+
+    # html.read_html.at("h1").to_s.should == data
+    html.read_html.at_css("h1").to_s.should == data
 
   ensure
     yaml.rm
@@ -243,7 +245,7 @@ describe Path do
 
     old_name = path.to_s
 
-    dest = path.rename(:ext=>".dat")
+    dest = path.rename(path.with(ext: ".dat"))
 
     dest.to_s.should == old_name+".dat"
     path.to_s.should == old_name
@@ -253,10 +255,10 @@ describe Path do
     path.exists?.should == false
 
     path.touch
-    lambda { path.rename(:ext=>".dat") }.should raise_error(RuntimeError)
+    lambda { path.rename(path.with(ext: ".dat")) }.should raise_error(RuntimeError)
 
     dest.rm
-    path.rename!(:ext=>".dat")
+    path.rename!(path.with(ext: ".dat"))
     path.to_s.should_not == old_name
     path.exists?.should == true
 
@@ -413,6 +415,14 @@ describe Path do
 
     # system("gzip -c < #{tmpjson} > #{tmpjson}.gz")
 
+    # class method version
+    Path.zopen("#{tmpjson}.gz", "w") { |io| io.write(JSON.dump(hash)) }
+    tmpgzip = Path["#{tmpjson}.gz"]
+    tmpgzip.exists?.should == true
+    tmpgzip.size.should be > 0
+    tmpgzip&.rm
+
+    # instance method version
     tmpgzip = Path["#{tmpjson}.gz"]
     tmpgzip.zopen("w") { |io| io.write(JSON.dump(hash)) }
     tmpgzip.exists?.should == true

data/spec/sys_spec.rb

@@ -30,6 +30,11 @@ describe Sys::ProcessInfo do
       if p2 = p2s[p1.pid]
         matches += 1
         p1.command.should == p2.command
+
+        # FIXME: this behaves weirdly with kernel processes, eg:
+        # expected: "[kworker/u8:1-phy5]"
+        #      got: "[kworker/u8:1-events_unbound]" (using ==)
+
       end
     end
 

data/spec/zopen_spec.rb

@@ -1,49 +1,49 @@
-require 'epitools/zopen'
-require 'tempfile'
+# require 'epitools/zopen'
+# require 'tempfile'
 
-describe "zopen()" do
+# describe "zopen()" do
 
-  before :all do
-    @data = ("x"*100+"\n") * 1000
-    @tmp = Tempfile.new("zopen_spec")
+#   before :all do
+#     @data = ("x"*100+"\n") * 1000
+#     @tmp = Tempfile.new("zopen_spec")
 
-    @plainfile = @tmp.path
-    @gzfile    = "#{@tmp.path}.gz"
-  end
+#     @plainfile = @tmp.path
+#     @gzfile    = "#{@tmp.path}.gz"
+#   end
 
-  after :all do
-    File.unlink @plainfile
-    File.unlink @gzfile
-  end
+#   after :all do
+#     File.unlink @plainfile
+#     File.unlink @gzfile
+#   end
 
-  it "writes/reads a gz" do
-    f = zopen(@gzfile, "w")
-    f.write(@data).should == @data.size
-    f.close
+#   it "writes/reads a gz" do
+#     f = zopen(@gzfile, "w")
+#     f.write(@data).should == @data.size
+#     f.close
 
-    f = zopen(@gzfile, "r")
-    f.read.should == @data
-    f.close
-  end
+#     f = zopen(@gzfile, "r")
+#     f.read.should == @data
+#     f.close
+#   end
 
-  it "writes/reads non-gz files" do
-    zopen(@plainfile, "w") {|f| f.write(@data) }
+#   it "writes/reads non-gz files" do
+#     zopen(@plainfile, "w") {|f| f.write(@data) }
 
-    # readstyle
-    File.read(@plainfile).should == zopen(@plainfile).read
+#     # readstyle
+#     File.read(@plainfile).should == zopen(@plainfile).read
 
-    # blockstyle
-    open(@plainfile){|f| f.read }.should == zopen(@plainfile){|f| f.read }
-  end
+#     # blockstyle
+#     open(@plainfile){|f| f.read }.should == zopen(@plainfile){|f| f.read }
+#   end
 
-  it "is enumerable" do
-    zopen(@gzfile) do |f|
-      f.respond_to?(:each).should == true
-      f.respond_to?(:map).should == true
-      f.respond_to?(:inject).should == true
+#   it "is enumerable" do
+#     zopen(@gzfile) do |f|
+#       f.respond_to?(:each).should == true
+#       f.respond_to?(:map).should == true
+#       f.respond_to?(:inject).should == true
 
-      f.all?{|line| line =~ /^x+$/ }
-    end
-  end
+#       f.all?{|line| line =~ /^x+$/ }
+#     end
+#   end
 
-end
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.133
+  version: 0.5.136
 platform: ruby
 authors:
 - epitron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -69,6 +69,8 @@ files:
 - lib/epitools/core_ext/truthiness.rb
 - lib/epitools/core_ext/uri.rb
 - lib/epitools/daemonize.rb
+- lib/epitools/fraction.rb
+- lib/epitools/gem_ext/oga.rb
 - lib/epitools/hexdump.rb
 - lib/epitools/iter.rb
 - lib/epitools/its.rb
@@ -85,7 +87,6 @@ files:
 - lib/epitools/progressbar.rb
 - lib/epitools/rails.rb
 - lib/epitools/rash.rb
-- lib/epitools/ratio.rb
 - lib/epitools/semantic_version.rb
 - lib/epitools/slop.rb
 - lib/epitools/slop/LICENSE
@@ -104,14 +105,16 @@ files:
 - lib/epitools/wm.rb
 - spec/.rspec
 - spec/autoreq_spec.rb
-- spec/browser_spec.rb
 - spec/btree_spec.rb
 - spec/clitools_spec.rb
 - spec/colored_spec.rb
 - spec/core_ext_spec.rb
+- spec/fraction_spec.rb
 - spec/histogram_spec.rb
 - spec/iter_spec.rb
 - spec/lcs_spec.rb
+- spec/manual/browser_spec.rb
+- spec/manual/wm_spec.rb
 - spec/numwords_spec.rb
 - spec/path_spec.rb
 - spec/permutations_spec.rb
@@ -121,7 +124,6 @@ files:
 - spec/sys_spec.rb
 - spec/term_spec.rb
 - spec/typed_struct_spec.rb
-- spec/wm_spec.rb
 - spec/zopen_spec.rb
 homepage: http://github.com/epitron/epitools
 licenses:
@@ -142,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 3
 summary: Not utils... METILS!