epitools 0.5.129 → 0.5.134

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b341f10e9697a2d9e93aad5aa91b7f799e75a3cd817d712bce3e15cd18428d
-  data.tar.gz: bce241006bd3b743410e3b6833145a5e72052637d7e918caa2562564b6ad4f5b
+  metadata.gz: 2aefbc7936ad578ce3f2ae8806e67be1815f4e2a55ddf43a915bcdaa0ca9f68a
+  data.tar.gz: 6d09789e434d7cda9b66e25ecf1ebf9db61d6236f1342b83743330e42d9ab09f
 SHA512:
-  metadata.gz: ef8edebf3480e814c17e90f5c200fe1dc70a45827d8c2e52d2d7834291f61fb67824c5c5b6f869805f8751ea53d0eb95aa83e86daba42eb748d34ea66061ad6a
-  data.tar.gz: 38abf237811351f91306dd1d1e66e9104040645aa3ff743d13609a155853aa6ffa80b9967961edda5f20e1ad67068ffc298beafac47857210eca9ebb6a4ec87f
+  metadata.gz: 4c98a36281937b7dd6e8f6154af595f5153d51803da0587eafc1a8dec26c96adac899e73c9ef49157b8fadcdf01fb845b60095d9ceb9722b5107c0eeaf6f8550
+  data.tar.gz: ccf09c13ef7df31e8d6994ba1c5550dc606fd61ac909c14f00c53788160a69cb53e7c425156a373732f4fbc7e021bde12c27e850be0ca1cf4735b86d9cf01285

data/VERSION

@@ -1 +1 @@
-0.5.129
+0.5.134

data/lib/epitools/autoloads.rb

@@ -98,8 +98,11 @@ autoreq  :Mechanize,    'mechanize'
 autoreq  :HTTP,         'http'
 
 autoreq  :Nokogiri,     'nokogiri'
-autoreq  :Oga,          'oga'
 autoreq  :Ox,           'ox'
+autoreq  :Oga do
+  require 'oga'
+  require 'epitools/gem_ext/oga'
+end
 
 autoreq  :ANSI,         'ansi'
 

data/lib/epitools/clitools.rb

@@ -247,3 +247,13 @@ end
 def curl_json(url)
   JSON.parse(curl(url))
 end
+
+def cached_curl(url)
+  cache = "/tmp/curl-#{url.sha1}.cache"
+  if File.exist?(cache)
+    $stderr.puts "cached! => #{cache}"
+  else
+    File.write(cache, curl(url))
+  end
+  File.read(cache)
+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/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,37 +1,47 @@
 require 'uri'
 
-module URI
+class URI::Generic
 
   #
-  # Return a Hash of the variables in the query string
+  # Get the query string
   #
-  def params
-    (@query ? @query.to_params : {})
+  def query
+    params.to_query
   end
 
   #
-  # Update all the params at once
+  # Set the query string
   #
-  def params=(new_params)
-    self.query = new_params.to_params
+  def query=(new_query)
+    @params = new_query&.to_params
+    @query  = new_query
   end
 
   #
-  # Update one URI parameter
+  # Return a Hash of the variables in the query string
   #
-  def set_param(key, value)
-    current      = params
-    current[key] = value
-    self.query   = current.to_query
+  def params
+    @params ||= (@query ? @query.to_params : {})
   end
 
   #
-  # Get the query string
+  # Update all the params at once
   #
-  def query
-    params.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
 
+  # #
+  # # Update one URI parameter
+  # #
+  # def set_param(key, value)
+  #   current      = params
+  #   current[key] = value
+  #   self.query   = current.to_query
+  # end
+
   #
   # URIs *are* strings, dammit!
   #
@@ -39,6 +49,10 @@ module URI
     to_s
   end
 
+end
+
+module URI
+
   #
   # Default user agent for the 'get' method
   #

data/lib/epitools/gem_ext/oga.rb

@@ -0,0 +1,31 @@
+
+module Oga
+  module XML
+    # Serialize this node to HAML
+    module ElementToHAML
+      def to_haml
+        require 'html2haml'
+        require 'html2haml/html'
+        Html2haml::HTML.new(to_xml, {}).render.rstrip
+      end
+      alias_method :haml, :to_haml
+
+      def pretty
+        require 'coderay'
+        puts CodeRay.scan(haml, :haml).term
+      end
+      #alias_method :pp, :pretty
+    end
+
+    module PrettyNodeSet
+      def pretty
+        require 'coderay'
+        lesspipe(wrap: true) { |less| each { |node| less.puts CodeRay.scan(node.to_haml, :haml).term; less.puts; less.puts } }
+      end
+    end
+ 
+  end
+end
+
+Oga::XML::Element.include Oga::XML::ElementToHAML
+Oga::XML::NodeSet.include Oga::XML::PrettyNodeSet

data/lib/epitools/job_runner.rb

@@ -26,11 +26,12 @@
 # end
 #
 class JobRunner
-  def initialize(*blocks)
+  def initialize(*blocks, debug: false)
     @threads = []
     @results = Thread::Queue.new
     @jobs    = []
     @started = false
+    @debug   = debug
 
     if blocks.any?
       blocks.each { |block| add &block }
@@ -39,20 +40,37 @@ class JobRunner
     end
   end
 
+  def dmsg(msg)
+    puts "[#{Time.now}] #{msg}" if @debug
+  end
+
   def add(&block)
+    dmsg("added job #{block}")
     @jobs << block
   end
 
   def reap!
-    @threads.delete_if { |t| not t.alive? } if @threads.any?
+    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!
-    raise "Error: already started" if @started
+    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
@@ -72,7 +90,7 @@ end
 
 
 if __FILE__ == $0
-  JobRunner.new do |jr|
+  JobRunner.new(debug: true) do |jr|
     jr.add { 3 }
     jr.add { sleep 0.1; 2 }
     jr.add { sleep 0.2; 1 }

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
@@ -930,7 +939,7 @@ class Path
 
   # Parse the file as CSV
   def read_csv(io=self.io, opts={})
-    open { |io| CSV.new(io.read, opts).each }
+    CSV.new(io.read, **opts).each
   end
   alias_method :from_csv, :read_csv
 
@@ -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
 
 
@@ -1311,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.129
+  version: 0.5.134
 platform: ruby
 authors:
 - epitron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -69,6 +69,7 @@ files:
 - lib/epitools/core_ext/truthiness.rb
 - lib/epitools/core_ext/uri.rb
 - lib/epitools/daemonize.rb
+- lib/epitools/gem_ext/oga.rb
 - lib/epitools/hexdump.rb
 - lib/epitools/iter.rb
 - lib/epitools/its.rb
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.21
 signing_key:
 specification_version: 3
 summary: Not utils... METILS!