epitools 0.5.130 → 0.5.131

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5b52f237d17762dca9dfa53fa0cbdae372f867f84fb455ca97656a9863d6763
-  data.tar.gz: 25f2741a4a12dc257ef1d540dcbfea1e6fa7945267de324e1ddba4e860d44334
+  metadata.gz: 467e7148825ac612d6b8acc25da6c09e89521d734c38f64568b189f4c7df8b6e
+  data.tar.gz: 3319cb92d01f19e597cc00c4b30eb0b847e652e2fa53f8e63a96fff2dc6f2bc5
 SHA512:
-  metadata.gz: 264e9ab8322afd8b6e08b3445dde07c4bf214a9da6e0b087e2c1117a5f0366edd5db361afd64a91faa24988618cf6fccf940ab7bfa7e76b63d8d53a905ef32ae
-  data.tar.gz: 0bb9e187d248d149e60c05fbf7a5757a79d560e1452a6ccf808294fc0cb0816d6e9de53d997e2fdeba49056c09a0d55bb8de6b06332174bcdfafe2c6fc004fbb
+  metadata.gz: 518b4e0a4014fa2a0dbdeed3d2a3656887035526398062c29acfaf62b3acaf8a3fba81b55a15dc33efdc77818d359bf63c2dcb1cc1ecec0f14772052fadb25a2
+  data.tar.gz: f888b96dd3f917eb45977567bcd66b1a9972bae7ccaf3a8d82902964b7af569e1474dccbaade2379fa2ebb6e4073b74114e1c6b548a826481e6462de6979607a

data/VERSION

@@ -1 +1 @@
-0.5.130
+0.5.131

data/lib/epitools/core_ext/numbers.rb

@@ -253,6 +253,14 @@ class Numeric
     (self - 32) * 5.0 / 9.0
   end
 
+  def to_lbs
+    self / 0.45359237
+  end
+
+  def to_kg
+    self * 0.45359237
+  end
+
 end
 
 

data/lib/epitools/core_ext/uri.rb

@@ -9,6 +9,14 @@ class URI::Generic
     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
   #

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/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/spec/core_ext_spec.rb

@@ -1296,11 +1296,11 @@ 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.cx/?q=1".to_uri
@@ -1310,6 +1310,10 @@ describe URI do
     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.130
+  version: 0.5.131
 platform: ruby
 authors:
 - epitron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec