sentofu 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cf89a26a83c77e1de102c5281a142ef68883f7f5a3b6074deddc4b4699c4b75
-  data.tar.gz: b3e1cf4e374db9a2e4ad7e909151b1914c5dcb9503f25000b5bb66e08766114e
+  metadata.gz: e4bdbc0cd6c6f9f448467ce9852c4f0fc75f42be7a23c30d4e21cb15ed943852
+  data.tar.gz: fff901df109eeddcea4186d8874414e5bfb71d2b6bae43820c3573b674dec6ab
 SHA512:
-  metadata.gz: 7871ee50c8e327317c41d604217e2e8fbecb62930adba09d7b53e3ad9268cfd9deb07cbaccb8f33ee62e080d000cb6d72ea6251213d40ab6e5baf224d10af819
-  data.tar.gz: afa1bf96c6fca1142c4d1e60e4e5af1256d891e8c3c8abe0a5ae06d1c07eb2a796d95aa2c59d266343c7dab6e97b83e345663214f21579f22d068d48a9d83752
+  metadata.gz: 4f250597779464a2a1637163e3bb19178e202e06d02075d7b59e67d1ae73e3a7836794782eb727182e54455d5a9512d0f196ebf02476007859daa0281386f6c0
+  data.tar.gz: 7bd0df3633514ad9d3932c17f4eda4791b9ed164bd492b091a77a7bbe9b396e5fb3efcf3d95cd3de039cb91a6674dd244a79e890d182792430f8a90e5312ae01

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## sentofu 0.4.1  released 2019-07-26
+
+* Refine 'sentofu_http_proxy' parsing
+
+
 ## sentofu 0.4.0  released 2019-07-26
 
 * Accept `ENV['sentofu_http_proxy']`

data/lib/sentofu/http.rb

@@ -3,6 +3,8 @@ module Sentofu
 
   module Http
 
+    PROXY_REX = /\A(https?:\/\/)?(([^:@]+)(:([^@]+))?@)?([^:]+)(:(\d+))?\z/
+
     class << self
 
       def fetch_token(credentials=nil)
@@ -26,16 +28,18 @@ module Sentofu
         request(uri, make_get_req(uri, token))
       end
 
-      PROXY_REX = /\A(([^:@]+)(:([^@]+))?@)?([^:]+)(:(\d+))?\z/
-
       def make_net_http(uri)
 
         http =
           if pm = PROXY_REX.match(ENV['sentofu_http_proxy'] || '')
+
+            port = m[8] ? m[8].to_i : nil
+            port ||= 443 if m[1] && m[1] == 'https://'
+
             Net::HTTP.new(
               uri.host, uri.port,
-              pm[5], pm[7] ? pm[7].to_i : nil,  # proxy host and port
-              pm[2], pm[4])                     # proxy user and pass
+              pm[6], port,   # proxy host and port
+              pm[3], pm[5])  # proxy user and pass
           else
             Net::HTTP.new(
               uri.host, uri.port)

data/lib/sentofu.rb

@@ -14,7 +14,7 @@ require 'sentofu/explo'
 
 module Sentofu
 
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 
   USER_AGENT =
     "Sentofu #{Sentofu::VERSION} - " +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentofu
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec