infoblox 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2adc338dbb18becd75ccbc3583871e36aac7668
-  data.tar.gz: 389cbe8d4d6887e8f098f112f3ef3b83e453eb6f
+SHA256:
+  metadata.gz: d60af69c0405939bbd3ca3066e5e2b2ea525abc27ce6a1bdb2444aca51698766
+  data.tar.gz: 444b7a9f3e893182237f236b85a42d02b74c471f1bf9ca0554be91ca3afbf14f
 SHA512:
-  metadata.gz: 5d91c6e7fecb484852ca5698043f98077e4f6561c4c5ff263c53d5d39e9c6486077831f8e6e5a7fa7ad8c87adb31d2bbc3819e96af297bbabb6a3b99ec03ffc2
-  data.tar.gz: 8ce3f9d1467209f38342daacbf0327dcd2ec32ba3ad67be4306d355427a5ffabe88a983a421378397d983193d445d6b486d4f9d83a74dd4b69f69afdfbb410dc
+  metadata.gz: cdca7064bae06646b53afc88dfc65e905e918e0324dfcf6ed0416962dbb159c3f2e0369d21a27bb8a7f33b4821a333c4df7085de3c04903ecd70685fdaad5f3e
+  data.tar.gz: e131968c658ab557ea6e61a5ad832861045eab12b526b48a8e7e2bb81037a8dcc5cf2a679bb7af75be511b0e638845953a27fa339a7c0bd01c0725616d3c0dc1

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.6.3

data/.travis.yml

@@ -1,11 +1,18 @@
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
+  - 2.3.8
+  - 2.2.10
   - 2.1.10
   - 1.9.3
-  - jruby-19mode
-  - 1.8.7
-before_install: gem install bundler
+  - jruby-9.2.7.0
+# https://docs.travis-ci.com/user/languages/ruby/
+# https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem uninstall bundler -v '>= 2' || true
+  - gem install bundler -v '< 2'
+  - gem list | grep bundler
 script: bundle exec rspec

data/README.md

@@ -32,6 +32,10 @@ You can supply a logger to get debugging information:
 
     connection = Infoblox::Connection.new(username: '', password: '', host: '', logger: Logger.new(STDOUT))
 
+It is possible to set timeout, read and write timeout:
+
+    connection = Infoblox::Connection.new(username: '', password: '', host: '', timeout: 120)
+
 ## Reading
 Each resource class implements `.all`, `.find`, and `#get`.   
 
@@ -196,7 +200,9 @@ The default version is 2.0.
 
 ## Ruby Version Compatibility
 
-This gem is tested against Ruby versions 1.8.7, 1.9.3, 2.1.6, JRuby-head, and JRuby in 1.9 mode.
+This gem is tested against Ruby versions 1.9.3, 2.1.6, JRuby-head, and JRuby in 1.9 mode.
+
+The last compatible version with Ruby 1.8.x is 2.0.5.
 
 ## Development / testing
 

data/RELEASES.md

@@ -1,3 +1,7 @@
+## 3.0.0 - June 26, 2019
+* Removed 1.8.7 support (should still work, but no longer supported in CI)
+* Added new connection timeout option with 60-second default value
+
 ## 2.0.5 - August 28 2017
 * Added ZoneForward resource
 

data/lib/infoblox/connection.rb

@@ -10,7 +10,8 @@ module Infoblox
                   :logger,
                   :password,
                   :ssl_opts,
-                  :username
+                  :username,
+                  :timeout
 
     def get(href, params={})
       wrap do
@@ -48,10 +49,14 @@ module Infoblox
       self.host     = opts[:host]
       self.logger   = opts[:logger]
       self.ssl_opts = opts[:ssl_opts] || {}
+      self.timeout  = opts[:timeout] || 60
     end
 
     def connection
-      @connection ||= Faraday.new(:url => self.host, :ssl => self.ssl_opts) do |faraday|
+      @connection ||= Faraday.new(
+        :request => {:timeout => self.timeout, :open_timeout => self.timeout},
+        :url => self.host,
+        :ssl => self.ssl_opts) do |faraday|
         faraday.use Faraday::Response::Logger, logger if logger
         faraday.request :json
         faraday.basic_auth(self.username, self.password)

data/lib/infoblox/version.rb

@@ -1,3 +1,3 @@
 module Infoblox
-  VERSION = "2.0.5"
+  VERSION = "3.0.0"
 end

data/spec/integration/connection_timeout_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'socket'
+
+describe 'Infoblox::Connection' do
+  it "should timeout in defined time" do
+    begin
+      server = TCPServer.new('localhost', 8813)
+      host = 'localhost:8813'
+      conn_params = {
+        :host => host,
+        :timeout => 4
+      }
+      uri = "/wapi/v1.0"
+
+      ic = Infoblox::Connection.new(conn_params)
+      start = Time.now
+      if RUBY_VERSION < "2.0"
+        # old pinned version of faraday gem throws a different exception
+        expect { ic.get(uri) }.to raise_error(Faraday::TimeoutError)
+      else
+        expect { ic.get(uri) }.to raise_error(Faraday::ConnectionFailed)
+      end
+      finish = Time.now
+      # this should take approx. 4 seconds but let's be safe
+      expect(finish - start).to be_between(3, 55)
+    ensure
+      server.close
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infoblox
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Billy Reisinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -140,6 +140,7 @@ files:
 - spec/host_spec.rb
 - spec/integration/arecord_spec.rb
 - spec/integration/cname_spec.rb
+- spec/integration/connection_timeout_spec.rb
 - spec/integration/host_ipv4addr_spec.rb
 - spec/integration/host_spec.rb
 - spec/integration/ptr_spec.rb
@@ -167,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This gem is a Ruby interface to the Infoblox WAPI. Using the gem, you can
@@ -179,6 +179,7 @@ test_files:
 - spec/host_spec.rb
 - spec/integration/arecord_spec.rb
 - spec/integration/cname_spec.rb
+- spec/integration/connection_timeout_spec.rb
 - spec/integration/host_ipv4addr_spec.rb
 - spec/integration/host_spec.rb
 - spec/integration/ptr_spec.rb
@@ -187,4 +188,3 @@ test_files:
 - spec/resource_spec.rb
 - spec/search_spec.rb
 - spec/spec_helper.rb
-has_rdoc: