octocatalog-diff 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f0b3862bc04c59a30e41e90cf689f508cb68dd6
-  data.tar.gz: 4e67157b3a0ba173d2d1099d1e0aec79027a8f3b
+  metadata.gz: 5486804b0688c2ffe926240984edc29adb1548c9
+  data.tar.gz: 31b6c0d0a659f8e9e02bed8d1a5e2bc8cd3c2892
 SHA512:
-  metadata.gz: aa208efdde5e60a3bfdd1ced747632bc00d0fec7f916fed1765f9c8e7fe8de99160a7ef673e694fa043a90713af3df2c6eec620f9e792d2c0332864d04baf694
-  data.tar.gz: 228113ef4f77899dfe3185b839b9d67f41db4ae9db0901f9aa7aa3307d0c67d8983982118c8e2dff433f37f428cccc8c1ca755f83c41e9a8a9965a6027bd4952
+  metadata.gz: 41e1c3d7d1a84b1a170cbc778257207da0f056d2b4e924ec455da0853fbfccb3c03c76e2f4b54b32c2f720e28252704a9b5ac30c7e7b99de80500afa5676e361
+  data.tar.gz: 7ef44432275da7754d00645fdb6c8ae2199881706703e30b5ec040dc35c1e33af7011e9e04c997f7aca3ba33a0a3680fd9bb8d1d129249c43a67e9d8c50c44aa

data/.version

@@ -1 +1 @@
-1.4.0
+1.4.1

data/doc/CHANGELOG.md

@@ -8,6 +8,13 @@
 </tr>
 </thead><tbody>
 <tr valign=top>
+<td>1.4.1</td>
+<td>2017-10-02</td>
+<td>
+<li><a href="https://github.com/github/octocatalog-diff/pull/149">#149</a>: (Internal) Set ports on PuppetDB URLs without altering constants</li>
+</td>
+</tr>
+<tr valign=top>
 <td>1.4.0</td>
 <td>2017-08-03</td>
 <td>

data/lib/octocatalog-diff/puppetdb.rb

@@ -5,16 +5,12 @@ require_relative 'util/httparty'
 
 require 'uri'
 
-# Redefine constants to match PuppetDB defaults.
-# This code avoids warnings about redefining constants.
-URI::HTTP.send(:remove_const, :DEFAULT_PORT) if URI::HTTP.const_defined?(:DEFAULT_PORT)
-URI::HTTP.const_set(:DEFAULT_PORT, 8080)
-URI::HTTPS.send(:remove_const, :DEFAULT_PORT) if URI::HTTPS.const_defined?(:DEFAULT_PORT)
-URI::HTTPS.const_set(:DEFAULT_PORT, 8081)
-
 module OctocatalogDiff
   # A standard way to connect to PuppetDB from the various scripts in this repository.
   class PuppetDB
+    DEFAULT_HTTPS_PORT = 8081
+    DEFAULT_HTTP_PORT = 8080
+
     # Allow connections to be read (used in tests for now)
     attr_reader :connections
 
@@ -54,7 +50,7 @@ module OctocatalogDiff
           urls.map { |url| parse_url(url) }
         elsif options.key?(:puppetdb_host)
           is_ssl = options.fetch(:puppetdb_ssl, true)
-          default_port = is_ssl ? URI::HTTPS::DEFAULT_PORT : URI::HTTP::DEFAULT_PORT
+          default_port = is_ssl ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT
           port = options.fetch(:puppetdb_port, default_port).to_i
           [{ ssl: is_ssl, host: options[:puppetdb_host], port: port }]
         elsif ENV['PUPPETDB_URL'] && !ENV['PUPPETDB_URL'].empty?
@@ -64,7 +60,7 @@ module OctocatalogDiff
           # This will get the env var and see if it equals 'true'; the result
           # of this == comparison is the true/false boolean we need.
           is_ssl = ENV.fetch('PUPPETDB_SSL', 'true') == 'true'
-          default_port = is_ssl ? URI::HTTPS::DEFAULT_PORT : URI::HTTP::DEFAULT_PORT
+          default_port = is_ssl ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT
           port = ENV.fetch('PUPPETDB_PORT', default_port).to_i
           [{ ssl: is_ssl, host: ENV['PUPPETDB_HOST'], port: port }]
         else
@@ -152,6 +148,10 @@ module OctocatalogDiff
     # @return [Hash] { ssl: true/false, host: <String>, port: <Integer> }
     def parse_url(url)
       uri = URI(url)
+      if URI.split(url)[3].nil?
+        uri.port = uri.scheme == 'https' ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT
+      end
+
       raise ArgumentError, "URL #{url} has invalid scheme" unless uri.scheme =~ /^https?$/
       { ssl: uri.scheme == 'https', host: uri.host, port: uri.port }
     rescue URI::InvalidURIError => exc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octocatalog-diff
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - GitHub, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.25.0b2
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.15.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.15.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -171,14 +185,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.10.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.10.8
 - !ruby/object:Gem::Dependency
   name: puppetdb-terminus
   requirement: !ruby/object:Gem::Requirement