epitools 0.5.124 → 0.5.125

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ccc18312dec46b4af2100239be52ac5db3ce4aaf7c3cbdb8a325ec656fff6f9
-  data.tar.gz: 2e68f10fc0006ef3dec61493d8950103a24e05f1ed24afc967bcfdb38e758282
+  metadata.gz: 2fcf4b7e59aa4de44dc3a90da3cefb218d720f22cc6c9f2177c5a4f470eac016
+  data.tar.gz: 4bba5168cfdb15666abdaed22cbe26a8e762942cbaa5d575c9d732f7db8897c7
 SHA512:
-  metadata.gz: d65bbb00c1359e587f18399dbd952386f6beceae05c04201c8d0e97aec735c70b573cc337f56657ac372334202081b4c2c568a7753bc79f1e52f347fea1786e0
-  data.tar.gz: 07c4623c4bd5217ebdce11fcb373ad27406e0d5d6eb8c0bd8f6c0e087c39c281a1146b757b9606da37026d01c791d8462bf62966ace409535f7f21e7d1d4b2a5
+  metadata.gz: 4780af5b44481720d1bc6164d1fee44c6e2fdcd439df99a69ac874f45b748400dcdb8e4f6878a7f2e05031478855a262448e53e8955cd7ffc7be6195b4e47458
+  data.tar.gz: d03c86090738137ce74dc6cff4cb398a93080eb643893c4b89212e2bc874bd78cfdbe82964a7e878aa6500d09b209a9ff3451af35d9a2ac4cf01e41cd01c2111

data/VERSION

@@ -1 +1 @@
-0.5.124
+0.5.125

data/lib/epitools/autoloads.rb

@@ -1,7 +1,6 @@
 ## Standard library
 
 autoload :Set,        'set'
-autoload :URI,        'uri'
 autoload :Zlib,       'zlib'
 autoload :FileUtils,  'fileutils'
 autoload :Tempfile,   'tempfile'
@@ -23,6 +22,10 @@ autoload :CSV,        'csv'
 autoload :SDBM,       'sdbm'
 autoload :StringScanner, 'strscan'
 
+autoreq :URI do
+  require 'epitools/core_ext/uri'
+end
+
 module Digest
   autoload :SHA1,     'digest/sha1'
   autoload :SHA2,     'digest/sha2'
@@ -80,8 +83,13 @@ autoload :SemanticVersion, 'epitools/semantic_version'
 autoload :Matrix, 'epitools/core_ext/matrix'
 autoreq(:Vector) { Matrix }
 
-module Epi; autoload :Slop, 'epitools/slop'; end
-autoreq(:Slop) { Slop = Epi::Slop }
+## Bundled slop
+module Epi
+  autoload :Slop, 'epitools/slop'
+end
+autoreq(:Slop) do 
+  Slop = Epi::Slop
+end
 
 ## Gems (common)
 

data/lib/epitools/core_ext.rb

@@ -5,16 +5,23 @@ require 'epitools'
 require 'epitools/core_ext/object'
 require 'epitools/core_ext/class'
 require 'epitools/core_ext/module'
+
 require 'epitools/core_ext/string'
+
 require 'epitools/core_ext/array'
-require 'epitools/core_ext/file'
-require 'epitools/core_ext/io'
 require 'epitools/core_ext/enumerable'
 require 'epitools/core_ext/hash'
+
 require 'epitools/core_ext/numbers'
 require 'epitools/core_ext/truthiness'
 require 'epitools/core_ext/range'
 require 'epitools/core_ext/time'
+
+require 'epitools/core_ext/argv'
+require 'epitools/core_ext/file'
+require 'epitools/core_ext/io'
+require 'epitools/core_ext/uri'
+
 require 'epitools/core_ext/misc'
 
 ##############################################################################

data/lib/epitools/core_ext/argv.rb

@@ -0,0 +1,59 @@
+class << ARGV
+
+  def parse!
+    unless @opts or @args
+      @opts, @args = partition { |arg| arg[/^--?\w{1,2}/].nil? }
+      @opts = @opts.map { |opt| key, val = opt.strip(/^-+/).split("=") }.to_ostruct
+      if @opts.help
+        @help_handler.call
+        exit
+      end
+    end
+
+    [@opts, @args]
+  end
+
+  def parse
+    parse!
+    [@opts, @args]
+  end
+
+  def help?
+    !!@opts["help"]
+  end
+
+  def opts
+    parse! unless @opts
+    @opts
+  end
+
+  def args
+    @args ? @args : opts && @args
+  end
+
+  def paths
+    map(&:to_Path)
+  end
+
+  def paths_R
+    recursive_proc = proc do |paths|
+      paths.map { |path| path.dir? ? the_expander.(path.ls_R) : path }
+    end
+
+    recursive_proc.(paths)
+  end
+  alias_method :recursive_paths, :paths_R
+
+  def on_help(&block)
+    @help_handler = block
+  end
+
+  def regexes(escaped: true, case_sensitive: false)
+    if case_sensitive
+      map { |arg| /#{escaped ? Regexp.escape(arg) : arg}/ } # NO 'i'
+    else
+      map { |arg| /#{escaped ? Regexp.escape(arg) : arg}/i }
+    end
+  end
+
+end

data/lib/epitools/core_ext/misc.rb

@@ -128,79 +128,6 @@ end
 
 
 
-module URI
-
-  #
-  # Return a Hash of the variables in the query string
-  #
-  def params
-    query ? query.to_params : {}
-  end
-
-  #
-  # URIs are strings, dammit!
-  #
-  def to_str
-    to_s
-  end
-
-  #
-  # Default user agent for the 'get' method
-  #
-  # USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
-
-  #
-  # Get this URI using Net::HTTP
-  #
-  def get(headers={}, redirect_limit=10)
-    raise "Sorry, URI can't get from #{scheme.inspect} URIs yet" unless scheme =~ /^https?$/
-    raise 'Too many HTTP redirections' if redirect_limit == 0
-
-    # headers['User-Agent'] ||= USER_AGENT
-
-    # response = Net::HTTP.start(host, port) do |http|
-    #   # the_path = path.empty? ? "/" : path
-    #   req = Net::HTTP::Get.new(self, headers)
-    #   http.request(req)
-    # end
-
-    response = Net::HTTP.get_response(self)
-
-    case response
-    when Net::HTTPSuccess
-      response
-    when Net::HTTPRedirection
-      # puts "redirect: #{response['location']}"
-      URI(response['location']).get(headers, redirect_limit-1)
-    else
-      response.error!
-    end
-  end
-
-end
-
-#
-# Stupid workaround for URI blowing up when it receives a [ or ] character
-#
-module Better_URI_RFC3986_Parser # ::RFC3986_relative_ref
-  ESCAPE_ME_PLZ = "[]{}!"
-
-  def split(uri)
-    subsitutions = ESCAPE_ME_PLZ.chars.map { |c| [c, CGI.escape(c)] }
-    subsitutions << [" ", "%20"]
-
-    subsitutions.each do |find, replace|
-      uri = uri.gsub(find, replace)
-    end
-
-    super(uri)
-  end
-
-end
-
-URI::RFC3986_Parser.prepend(Better_URI_RFC3986_Parser)
-
-
 
 #
 # Give ObjectSpace Enumerable powers (select, map, etc.)

data/lib/epitools/core_ext/uri.rb

@@ -0,0 +1,88 @@
+require 'uri'
+
+module URI
+
+  #
+  # Return a Hash of the variables in the query string
+  #
+  def 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
+  #
+  def params=(key, value)
+    current      = params
+    current[key] = value
+    self.query   = current.to_query
+  end
+
+  def query
+    params.to_query
+  end
+
+  #
+  # URIs are strings, dammit!
+  #
+  def to_str
+    to_s
+  end
+
+  #
+  # Default user agent for the 'get' method
+  #
+  # USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"
+
+  #
+  # Get this URI using Net::HTTP
+  #
+  def get(headers={}, redirect_limit=10)
+    raise "Sorry, URI can't get from #{scheme.inspect} URIs yet" unless scheme =~ /^https?$/
+    raise 'Too many HTTP redirections' if redirect_limit == 0
+
+    # headers['User-Agent'] ||= USER_AGENT
+
+    # response = Net::HTTP.start(host, port) do |http|
+    #   # the_path = path.empty? ? "/" : path
+    #   req = Net::HTTP::Get.new(self, headers)
+    #   http.request(req)
+    # end
+
+    response = Net::HTTP.get_response(self)
+
+    case response
+    when Net::HTTPSuccess
+      response
+    when Net::HTTPRedirection
+      # puts "redirect: #{response['location']}"
+      URI(response['location']).get(headers, redirect_limit-1)
+    else
+      response.error!
+    end
+  end
+
+end
+
+#
+# Stupid workaround for URI blowing up when it receives a [ or ] character
+#
+module Better_URI_RFC3986_Parser # ::RFC3986_relative_ref
+  ESCAPE_ME_PLZ = "[]{}!"
+
+  def split(uri)
+    subsitutions = ESCAPE_ME_PLZ.chars.map { |c| [c, CGI.escape(c)] }
+    subsitutions << [" ", "%20"]
+
+    subsitutions.each do |find, replace|
+      uri = uri.gsub(find, replace)
+    end
+
+    super(uri)
+  end
+
+end
+
+URI::RFC3986_Parser.prepend(Better_URI_RFC3986_Parser)
+

data/lib/epitools/minimal.rb

@@ -1,8 +1,10 @@
+####################################################################################
 #
 # If you require 'epitools/minimal' instead of 'epitools',
 # this is what you get: core_ext monkeypatches and all the
 # autoloads; the barest essentials for survival.
 #
+####################################################################################
 
 if RUBY_VERSION[/^1.8/]
   require 'enumerator'
@@ -14,6 +16,7 @@ RbConfig = Config unless defined? RbConfig
 Infinity = Float::INFINITY
 Inf      = Float::INFINITY
 
+####################################################################################
 class Object
 
   unless defined?(__DIR__)
@@ -179,6 +182,7 @@ class Object
 end
 
 
+####################################################################################
 #
 # Patch 'Module#const_missing' to support 'autoreq' (which can autoload gems)
 #
@@ -213,6 +217,8 @@ class Module
 end
 
 
+
+####################################################################################
 module Kernel
 
   #
@@ -254,10 +260,8 @@ module Kernel
   end
 
 end
-####################################################################################
-
-
 
+####################################################################################
 class String
 
   #
@@ -270,6 +274,7 @@ class String
 
 end
 
+####################################################################################
 #
 # Path("/some/path") is an alias for Path["/some/path"]
 #
@@ -277,43 +282,7 @@ def Path(arg)
   Path[arg]
 end
 
-####################################################################
-
-# class << ARGV
-
-#   def opts
-#     @opts, @args ||= partition { |arg| arg[/^--?\w{1,2}/].nil? }
-#   end
-
-#   def args
-#     @args ? @args : opts && @args
-#   end
-
-#   def paths
-#     map(&:to_Path)
-#   end
-
-#   def paths_R
-#     recursive_proc = proc do |paths|
-#       paths.map { |path| path.dir? ? the_expander.(path.ls_R) : path }
-#     end
-
-#     recursive_proc.(paths)
-#   end
-#   alias_method :recursive_paths, :paths_R
-
-#   def regexes(escaped: true, case_sensitive: false)
-#     if case_sensitive
-#       map { |arg| /#{escaped ? Regexp.escape(arg) : arg}/ } # NO 'i'
-#     else
-#       map { |arg| /#{escaped ? Regexp.escape(arg) : arg}/i }
-#     end
-#   end
-
-# end
 
 ####################################################################
-
 require 'epitools/autoloads'
-
 ####################################################################

data/lib/epitools/wm.rb

@@ -61,7 +61,7 @@ module WM
 
     def self.all
       # FIXME: Windows owned by linux-namespaced processes (firejail) report their namspaced pid to X11. `window.process` ends up pointing at either nil, or the wrong process.
-      `wmctrl -lpG`.lines.map(&:strip).map { |line| Window.from_line(line) }
+      `wmctrl -lpG`.lines.map(&:strip).map { |line| Window.from_line(line) unless line.blank? }.compact
     end
 
     def self.from_line(line)
@@ -106,23 +106,6 @@ module WM
       system "wmctrl", "-i", "-a", window_id
     end
 
-    def maximized?
-    end
-
-    def maximize!
-      system "wmctrl", "-i", "-a", window_id
-    end
-
-
-    def unmazimize!
-    end
-
-    def minimized?
-    end
-
-    def minimize!
-    end
-
     #
     # string is made up of regular text, plus <>'d keypresses
     # eg: "Hello<Ctrl-T><Ctrl-L><Ctrl-Shift-K><Return>!!!"

data/spec/core_ext_spec.rb

@@ -1242,6 +1242,16 @@ describe File do
 
 end
 
+describe ARGV do
+
+#   it "parses args" do
+#     ARGV.clear
+#     ARGV << "-d"
+#     ARGV.parse!
+#     p ARGV.opts
+#   end
+
+end
 
 describe "Anything" do
 
@@ -1275,5 +1285,13 @@ describe URI do
     (response.size > 0).should == true
   end
 
+  it "params=" do
+    u = "http://butt.com/?q=1".to_uri
+    u.query.should == "q=1"
+    u.params["q"] = 2
+    u.params["q"].should == 2
+    u.query.should == "q=2"
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.124
+  version: 0.5.125
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -51,6 +51,7 @@ files:
 - lib/epitools/clitools.rb
 - lib/epitools/colored.rb
 - lib/epitools/core_ext.rb
+- lib/epitools/core_ext/argv.rb
 - lib/epitools/core_ext/array.rb
 - lib/epitools/core_ext/class.rb
 - lib/epitools/core_ext/enumerable.rb
@@ -66,6 +67,7 @@ files:
 - lib/epitools/core_ext/string.rb
 - lib/epitools/core_ext/time.rb
 - lib/epitools/core_ext/truthiness.rb
+- lib/epitools/core_ext/uri.rb
 - lib/epitools/daemonize.rb
 - lib/epitools/hexdump.rb
 - lib/epitools/iter.rb
@@ -139,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 3
 summary: Not utils... METILS!