epitools 0.5.126 → 0.5.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1368a1c1aa01948548b464ea158ae289a7055f0e55766edda4862d1c672d20
-  data.tar.gz: f51d54c3c41d14c09acf5e0c5f47a8602e2acb3df0a9d0d424fe15d61f806c70
+  metadata.gz: db1a5a887e1a937b76e39d061a8865503f7bfeb33f03094f5d7b8ce3749420e7
+  data.tar.gz: b5075843f8bd030de2e5313e9af3f53f97cae26fc0b52a609a06137fc015324c
 SHA512:
-  metadata.gz: 980029d3207e237d28b640c3c22dbedf99aa30121440e9350803f98d6c2564acb237066c5a62a1b03597430698b76d1c38e1c2e6bab44a7cd2b3f503f624848a
-  data.tar.gz: 8bb84dd89d32f3cb7694c737e5c5ac647e727f3105efb1a3fb0edb30649170cb44e7b6879c1df9b83b7ee9260d1a7fd1d65d6ecdf3626265e3a76086c2e78c9d
+  metadata.gz: 0f13ae895b759edc3612970e335b743301bd102a4c73f619c16028acab0792a1d229d65ff40626d6c11334f95b020b055f9a18e6afc70a37ae74824b439c2f24
+  data.tar.gz: 8bac272ee77ee4bd4c493b2b6f6c394e1143bd57e73b77196f9798326e73749b1c940622e22ea792875718b59e7a01380d2766296df5c19a3a259a3f7e34fcd3

data/VERSION

@@ -1 +1 @@
-0.5.126
+0.5.133

data/lib/epitools/autoloads.rb

@@ -65,19 +65,20 @@ autoload :IPAddr, 'ipaddr'
 
 ## Nonstandard library (epitools)
 
-autoload :Path,         'epitools/path'
-autoload :Ezdb,         'epitools/ezdb'
-autoload :Browser,      'epitools/browser'
-autoload :Rash,         'epitools/rash'
-autoload :Ratio,        'epitools/ratio'
-autoload :ProgressBar,  'epitools/progressbar'
-autoload :Trie,         'epitools/trie'
-autoload :MimeMagic,    'epitools/mimemagic'
-autoload :Term,         'epitools/term'
-autoload :Iter,         'epitools/iter'
-autoload :WM,           'epitools/wm'
-autoload :TypedStruct,  'epitools/typed_struct'
-autoload :Sys,          'epitools/sys'
+autoload :Path,            'epitools/path'
+autoload :Ezdb,            'epitools/ezdb'
+autoload :Browser,         'epitools/browser'
+autoload :Rash,            'epitools/rash'
+autoload :Ratio,           'epitools/ratio'
+autoload :ProgressBar,     'epitools/progressbar'
+autoload :Trie,            'epitools/trie'
+autoload :MimeMagic,       'epitools/mimemagic'
+autoload :Term,            'epitools/term'
+autoload :Iter,            'epitools/iter'
+autoload :WM,              'epitools/wm'
+autoload :TypedStruct,     'epitools/typed_struct'
+autoload :Sys,             'epitools/sys'
+autoload :JobRunner,       'epitools/job_runner'
 autoload :SemanticVersion, 'epitools/semantic_version'
 
 autoload :Matrix, 'epitools/core_ext/matrix'
@@ -87,7 +88,7 @@ autoreq(:Vector) { Matrix }
 module Epi
   autoload :Slop, 'epitools/slop'
 end
-autoreq(:Slop) do 
+autoreq(:Slop) do
   Slop = Epi::Slop
 end
 

data/lib/epitools/clitools.rb

@@ -230,3 +230,20 @@ def notify_send(title, body=nil, icon: nil, time: 5)
   fork { system *cmd }
 end
 
+def curl(url)
+  curl_open(url).read
+end
+
+def curl_open(url, headers={})
+  # headers["User-Agent"] ||= "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_5) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/85 Version/11.1.1 Safari/605.1.15"
+  cmd = ["curl", "-LSs"]
+  headers.each { |k,v| cmd += ["-H", "#{k}: #{v}"] }
+  cmd << url
+  IO.popen(cmd)
+rescue Errno::ENOENT
+  raise "Error: 'curl' isn't installed."
+end
+
+def curl_json(url)
+  JSON.parse(curl(url))
+end

data/lib/epitools/core_ext/array.rb

@@ -324,6 +324,33 @@ class Array
     super.to_a
   end
 
-end
+  module ToCSV
+    #
+    # Convert this enumerable into a CSV string (nb: enumerable must contain either all Hashes or all Arrays)
+    #
+    def to_csv(delimiter=",")
+      types = count_by(&:class)
+
+      unless types.size == 1 and (types[Array] > 0 or types[Hash] > 0)
+        raise "Error: this array must contain nothing but arrays, or nothing but hashes (actually contains: #{types.inspect})"
+      end
+
+      options = {}
+      options[:col_sep] = delimiter
+      options[:headers] = flat_map(&:keys).uniq if types[Hash] > 0
 
+      CSV.generate(nil, **options) do |csv|
+        each { |obj| csv << obj }
+      end
+    end
 
+    #
+    # Like #to_csv, but with tab-separated CSV fields
+    #
+    def to_tsv
+      to_csv("\t")
+    end
+  end
+
+  prepend ToCSV # dirty hack to stop the CSV module from clobbering the to_csv method
+end

data/lib/epitools/core_ext/class.rb

@@ -1,31 +1,17 @@
 class Class
 
-  #
-  # Return a copy of the class with modules mixed into it.
-  #
-  def self.using(*args)
-    if block_given?
-      yield using(*args)
-    else
-      copy = self.dup
-      args.each { |arg| copy.send(:include, arg) }
-      copy
-    end
-  end
-
-
   #
   # Trace the specified method calls (`meths`, as symbols) to descendends of this class (or all methods if `:*` is supplied).
   # Output is printed to $stderr.
   #
   def trace_messages_to(*meths)
     return unless $DEBUG
-    
+
     tracers = Module.new
     parent  = self
 
     $stderr.puts "[*] Tracing messages sent to #{parent} (messages: #{meths.join(", ")})"
-    
+
     meths.each do |meth|
       case meth
       when :*
@@ -35,9 +21,9 @@ class Class
         end
       else
         tracers.define_method(meth) do |*args, &block|
-          args = args.map(&:inspect)
-          args << "&block" if block
-          $stderr.puts "[*] #{parent}##{meth}(#{args.join(", ")})"
+          arg_names = args.map(&:inspect)
+          arg_names << "&block" if block
+          $stderr.puts "[*] #{parent}##{meth}(#{arg_names.join(", ")})"
           if block
             super(*args, &block)
           else

data/lib/epitools/core_ext/enumerable.rb

@@ -1,4 +1,7 @@
+require 'epitools/core_ext/array'
+
 module Enumerable
+  include Array::ToCSV
 
   #
   # 'true' if the Enumerable has no elements

data/lib/epitools/core_ext/numbers.rb

@@ -1,5 +1,5 @@
 
-Number = Numeric # "obj.is_a? Number" just sounds better.
+Number = Numeric # because "obj.is_a? Number" sounds better!
 
 class Numeric
 
@@ -84,7 +84,8 @@ class Numeric
     end
   end
 
-  [:cos,
+  [
+   :cos,
    :sin,
    :tan,
    :acos,
@@ -186,7 +187,8 @@ class Numeric
   end
 
   BYTE_SIZE_TABLE = {
-    # power    # units
+    # power
+    # of 1024  #  units
     0          => "",
     1          => "KB",
     2          => "MB",
@@ -213,8 +215,8 @@ class Numeric
   def to_hms
     seconds = self
 
-    days, seconds    = seconds.divmod(86400)
-    hours, seconds   = seconds.divmod(3600)
+    days,    seconds = seconds.divmod(86400)
+    hours,   seconds = seconds.divmod(3600)
     minutes, seconds = seconds.divmod(60)
     seconds, frac    = seconds.divmod(1)
 
@@ -229,8 +231,8 @@ class Numeric
   def to_hms_in_words
     seconds = self
 
-    days, seconds    = seconds.divmod(86400)
-    hours, seconds   = seconds.divmod(3600)
+    days,    seconds = seconds.divmod(86400)
+    hours,   seconds = seconds.divmod(3600)
     minutes, seconds = seconds.divmod(60)
     seconds, frac    = seconds.divmod(1)
 
@@ -243,6 +245,22 @@ class Numeric
     result
   end
 
+  def to_farenheit
+    (self * 9.0 / 5.0) + 32
+  end
+
+  def to_celcius
+    (self - 32) * 5.0 / 9.0
+  end
+
+  def to_lbs
+    self / 0.45359237
+  end
+
+  def to_kg
+    self * 0.45359237
+  end
+
 end
 
 
@@ -442,7 +460,8 @@ end
 class Prime
 
   #
-  # Return an array of prime numbers within the specified range
+  # Return an array of prime numbers within the specified range.
+  # (It still has to generate all the primes less than the lower bound, so, yeah... be warned.)
   #
   def [](range)
     ubound    = range.end

data/lib/epitools/core_ext/truthiness.rb

@@ -130,10 +130,9 @@ class String
   #
   # Is there anything in the string? (ignoring whitespace/newlines)
   #
-  def any?
+  def present?
     not blank?
   end
-  alias_method :present?, :any?
 
   #
   # Does this string contain something that means roughly "true"?

data/lib/epitools/core_ext/uri.rb

@@ -1,35 +1,58 @@
 require 'uri'
 
-module URI
+class URI::Generic
+
+  #
+  # Get the query string
+  #
+  def query
+    params.to_query
+  end
+
+  #
+  # Set the query string
+  #
+  def query=(new_query)
+    @params = new_query&.to_params
+    @query  = new_query
+  end
 
   #
   # Return a Hash of the variables in the query string
   #
   def params
-    (@query ? @query.to_params : {})
+    @params ||= (@query ? @query.to_params : {})
   end
 
   #
-  # Mutate the query
-  # NB: This is super slow. To make it faster, store params directly in a locally cached dict, and only call `to_query` when query is accesed, or to_s/inspect are called
+  # Update all the params at once
   #
-  def params=(key, value)
-    current      = params
-    current[key] = value
-    self.query   = current.to_query
+  def params=(new_params)
+    # self.query = new_params.to_params
+    raise "params must be a Hash" unless new_params.is_a? Hash
+    @params = new_params
   end
 
-  def query
-    params.to_query
-  end
+  # #
+  # # Update one URI parameter
+  # #
+  # def set_param(key, value)
+  #   current      = params
+  #   current[key] = value
+  #   self.query   = current.to_query
+  # end
 
   #
-  # URIs are strings, dammit!
+  # URIs *are* strings, dammit!
   #
   def to_str
     to_s
   end
 
+end
+
+module URI
+
   #
   # Default user agent for the 'get' method
   #

data/lib/epitools/job_runner.rb

@@ -0,0 +1,115 @@
+#
+# Runs many jobs in parallel, and returns their interleaved results.
+# (NOTE: The JobRunner can be run multiple times; each time the blocks
+#  will be executed again.)
+#
+# Examples:
+#
+# JobRunner.new do |jr|
+#   jr.add { 3 }
+#   jr.add { sleep 0.1; 2 }
+#   jr.add { sleep 0.2; 1 }
+#
+#   jr.each_result do |result|
+#     p result
+#   end
+# end
+#
+# jr = JobRunner.new(
+#   proc { 1 },
+#   proc { 2 },
+#   proc { 3 }
+# )
+#
+# 2.times do
+#   jr.each_result { |result| p result }
+# end
+#
+class JobRunner
+  def initialize(*blocks, debug: false)
+    @threads = []
+    @results = Thread::Queue.new
+    @jobs    = []
+    @started = false
+    @debug   = debug
+
+    if blocks.any?
+      blocks.each { |block| add &block }
+    else
+      yield self if block_given?
+    end
+  end
+
+  def dmsg(msg)
+    puts "[#{Time.now}] #{msg}" if @debug
+  end
+
+  def add(&block)
+    dmsg("added job #{block}")
+    @jobs << block
+  end
+
+  def reap!
+    if @threads.any?
+      dmsg("reaping #{@threads.size} threads")
+      @threads.delete_if { |t| not t.alive? }
+    else
+      dmsg("reap failed: no threads")
+    end
+  end
+
+  def go!
+    if @started
+      raise "Error: already started"
+    else
+      dmsg("starting #{@threads.size} jobs")
+    end
+
+    @started = true
+    @jobs.each do |job|
+      dmsg("adding #{job}")
+      @threads << Thread.new do
+        @results << job.call
+        dmsg("job #{job} complete")
+      end
+    end
+  end
+
+  def each_result
+    go! unless @started
+
+    loop do
+      yield @results.pop
+      reap!
+      break if @threads.empty? and @results.empty?
+    end
+
+    @started = false
+  end
+end
+
+
+if __FILE__ == $0
+  JobRunner.new(debug: true) do |jr|
+    jr.add { 3 }
+    jr.add { sleep 0.1; 2 }
+    jr.add { sleep 0.2; 1 }
+
+    jr.each_result do |result|
+      p result
+    end
+  end
+
+  puts
+
+  jr = JobRunner.new(
+    proc { 1 },
+    proc { 2 },
+    proc { 3 }
+  )
+
+  2.times do
+    jr.each_result { |r| p r }
+    puts
+  end
+end

data/lib/epitools/numwords.rb

@@ -24,7 +24,7 @@ class Numeric
 
   # 20-90
   NAMES_MEDIUM = [
-    "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", "eighty", "ninety"
+    "twenty", "thirty", "forty", "fifty", "sixty", "seventy", "eighty", "ninety"
   ]
 
   # >= 100

data/lib/epitools/path.rb

@@ -119,11 +119,20 @@ class Path
   # The file extension, including the . (eg: ".mp3")
   attr_reader :ext
 
+  URI_RE = %r{^[a-z\-]+://}i
 
   ###############################################################################
   # Initializers
   ###############################################################################
 
+  def self.new(*args)
+    if args.first =~ URI_RE and self != Path::URI
+      Path::URI.new(args.first)
+    else
+      super(*args)
+    end
+  end
+
   def initialize(newpath, hints={})
     send("path=", newpath, hints)
 
@@ -156,8 +165,8 @@ class Path
       path
     when String
 
-      if path =~ %r{^[a-z\-]+://}i # URL?
-        Path::URI.new(path)
+      if path =~ URI_RE
+        Path.new(path)
 
       else
         # TODO: highlight backgrounds of codeblocks to show indent level & put boxes (or rules?) around (between?) double-spaced regions
@@ -186,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={})
-    if hints[:type] or File.exists? newpath
+    if hints[:type] or File.exist? newpath
       if hints[:type] == :dir or File.directory? newpath
         self.dir = newpath
       else
@@ -357,7 +366,7 @@ class Path
   ###############################################################################
 
   def exists?
-    File.exists? path
+    File.exist? path
   end
 
   def size
@@ -430,7 +439,7 @@ class Path
   end
 
   def broken_symlink?
-    File.symlink?(path) and not File.exists?(path)
+    File.symlink?(path) and not File.exist?(path)
   end
 
   def symlink_target
@@ -1638,9 +1647,9 @@ class Path::URI < Path
   #
   # When this is: http://host.com:port/path/filename.ext?param1=value1&param2=value2&...
   #
-  def to_s
-    uri.to_s
-  end
+  def to_s; uri.to_s; end
+  def to_path; to_s; end
+  def to_str; to_s; end
 
   def inspect
     "#<Path::URI:#{to_s}>"
@@ -1693,9 +1702,9 @@ class Path::URI < Path
   def open(mode="r", &block)
     require 'open-uri'
     if block_given?
-      Kernel.open(to_s, mode, &block)
+      ::URI.open(to_s, mode, &block)
     else
-      Kernel.open(to_s, mode)
+      ::URI.open(to_s, mode)
     end
   end
 

data/lib/epitools/sys.rb

@@ -4,6 +4,7 @@ require 'epitools/minimal'
 # Cross-platform operating system functions.
 # Includes: process listing, platform detection, etc.
 #
+require 'epitools/sys/os'
 require 'epitools/sys/ps'
 require 'epitools/sys/mounts'
 require 'epitools/sys/misc'

data/spec/core_ext_spec.rb

@@ -127,26 +127,6 @@ end
 
 describe Class do
 
-  it "uses" do
-    module Test1
-      def test1; :test1; end
-    end
-
-    module Test2
-      def test2; :test2; end
-    end
-
-    Hash.using(Test1).new.test1.should == :test1
-    Hash.using(Test2).new.test2.should == :test2
-    h = Hash.using(Test1, Test2).new
-    h.test1.should == :test1
-    h.test2.should == :test2
-
-    Hash.using(Test1) do |h|
-      h.new.test1.should == :test1
-    end
-  end
-
   it "traces messages (when $DEBUG is set)" do
     $DEBUG = true
 
@@ -166,10 +146,10 @@ describe Class do
     class ButtTest
       trace_messages_to :*
 
-      def d
+      def a
       end
 
-      def e
+      def b
       end
     end
 
@@ -197,7 +177,7 @@ describe Numeric do
     -12983287123.commatize.should      == "-12,983,287,123"
     -12983287123.4411.commatize.should == "-12,983,287,123.4411"
     1111.1234567.commatize.should      == "1,111.1234567"
-    BigDecimal.new("1111.1234567").commatize.should == "1,111.1234567"
+    BigDecimal("1111.1234567").commatize.should == "1,111.1234567"
     -1234567.1234567.underscorize.should == "-1_234_567.1234567"
   end
 
@@ -237,6 +217,11 @@ describe Numeric do
     32583128.human_size(2).should == "31.07MB"
   end
 
+  it "temperatures" do
+    t = 18.0
+    t.to_farenheit.to_celcius.should be_within(0.001).of(t)
+  end
+
 end
 
 
@@ -795,6 +780,38 @@ describe Enumerable do
     ps.sort_numerically.map(&:filename).should == proper
   end
 
+  it "to_csvs and to_tsvs" do
+    data = [
+      ["1", "2", "3"],
+      ["4", "5", "6"],
+      ["7", "8", "9", "10"],
+    ]
+
+    hash_data = [
+      {a: 1, b: 2, c: 3},
+      {a: 4, b: 5, c: 6},
+      {a: 7, b: 8, c: 9, d: 10},
+    ]
+
+    class EnumedData
+      include Enumerable
+      def initialize(data); @data=data; end
+      def each(&block); @data.each(&block); end
+    end
+
+    [data, hash_data, EnumedData.new(data)].each do |a|
+      str = a.to_csv
+      str.each_line.count.should == 3
+      str.should_not be_nil
+      str["1,2,3"].should_not be_nil
+
+      str = a.to_tsv
+      str.should_not be_nil
+      str["1\t2\t3"].should_not be_nil
+    end
+
+  end
+
 end
 
 
@@ -1279,18 +1296,24 @@ describe URI do
     uri.params.should == opts
   end
 
-  it "gets" do
-    response = URI("http://google.com/").get
-    response.body.size
-    (response.size > 0).should == true
-  end
+  # it "gets" do
+  #   response = URI("http://google.com/").get
+  #   response.body.size
+  #   (response.size > 0).should == true
+  # end
 
   it "params=" do
-    u = "http://butt.com/?q=1".to_uri
+    u = "http://butt.cx/?q=1".to_uri
     u.query.should == "q=1"
+    u.params.should == {"q" => "1"}
     u.params["q"] = 2
     u.params["q"].should == 2
+    u.params.should == {"q" => 2}
     u.query.should == "q=2"
+
+    subbed = u.with(query: u.params.reject{|k,v| u.params.keys.include? 'q' }.to_query)
+    subbed.params.should == {}
+    subbed.query.should == ""
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.126
+  version: 0.5.133
 platform: ruby
 authors:
 - epitron
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,6 +72,7 @@ files:
 - lib/epitools/hexdump.rb
 - lib/epitools/iter.rb
 - lib/epitools/its.rb
+- lib/epitools/job_runner.rb
 - lib/epitools/lcs.rb
 - lib/epitools/mimemagic.rb
 - lib/epitools/mimemagic_tables.rb
@@ -126,7 +127,7 @@ homepage: http://github.com/epitron/epitools
 licenses:
 - WTFPL
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 3
 summary: Not utils... METILS!
 test_files: []