tdi 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9a0d9fe3d2c55157bf1325ae42fc3d45267ac7b
-  data.tar.gz: f906bb2932414a454186274dd20b023275207d88
+  metadata.gz: 0e6fc4a82220e7b7f08df36ca5a3dbec9ddfad78
+  data.tar.gz: a32a31b63d166a4d393ce938150a0a638184fa05
 SHA512:
-  metadata.gz: d016f3065038436c8cc0d33e28608f4dca67efd1c1bd9bb4959fbf4c93c14b3e8f871f23509d797d8e5bb01169e3ab0a624dacb31b6c69408616de54118e5fdb
-  data.tar.gz: 3a434135f4873c087ccfa564a1ea7f30c4abf994bd22f623739d4191365ae773f65cd7290401cd080ffc2632e0bb9039a0f688b23321aac3fe20509e8c1cf4d0
+  metadata.gz: a0df029163ad2e1c7feb61e12bf60df0047c67f150f34541667f5b17ae8241b3e68067754c5935ae7f0f321e90688f932bc07e034ab54884f503a949a9d83bfe
+  data.tar.gz: 974109ed37a65653edaa53750b5a76ab9dd8c5cf495d5787186c8e1ca0e3af478a2954d35039a378d76be71d4c958f7a83010cb6e8aea613508fa848997abb59

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    tdi (0.1.8)
+    tdi (0.1.9)
       awesome_print
       colorize
+      dnsruby
       etc
       ipaddress
       net-ssh
@@ -16,11 +17,12 @@ GEM
   specs:
     awesome_print (1.6.1)
     colorize (0.7.7)
+    dnsruby (1.59.2)
     etc (0.2.0)
-    ipaddress (0.8.0)
-    net-ssh (2.9.2)
+    ipaddress (0.8.3)
+    net-ssh (3.1.1)
     os (0.9.6)
-    rake (10.4.2)
+    rake (11.1.2)
     slop (3.6.0)
     timeout (0.0.0)
 

data/doc/json/acl.json

@@ -17,6 +17,10 @@
         "timeout": 3
       },
 
+      "127.0.0.1": {
+        "port": [22, 31337]
+      },
+
       "localhost": {
         "port": [22, 31337]
       }

data/helper/acl.rb

@@ -20,7 +20,6 @@
 require_relative '../lib/util'
 require 'socket'
 require 'timeout'
-require 'resolv'
 
 class TDIPlan < TDI
   def acl(role_name, plan_name, plan_content)
@@ -43,7 +42,7 @@ class TDIPlan < TDI
         res_dict = {host: host, addr: addr, port: port, net: origin_network(host)}
 
         begin
-          addr = Resolv.getaddress(host)
+          addr = getaddress(host).to_s
           res_str = "#{host}/#{addr}:#{port}"
           res_dict = {host: host, addr: addr, port: port, net: origin_network(host)}
 

data/helper/http.rb

@@ -22,7 +22,6 @@ require 'net/http'
 require 'net/https'
 require 'timeout'
 require 'uri'
-require 'resolv'
 
 class TDIPlan < TDI
   def _parse(uri, params)
@@ -78,10 +77,10 @@ class TDIPlan < TDI
       response = nil
 
       begin
-        addr = Resolv.getaddress(host)
+        addr = getaddress(host).to_s
 
         if not proxy.nil? and not proxy_port.nil?
-          proxy_addr = Resolv.getaddress(proxy)
+          proxy_addr = getaddress(proxy).to_s
           http = Net::HTTP::Proxy(proxy, proxy_port)
           timeout(timeout_limit) do
             begin

data/helper/ssh.rb

@@ -19,7 +19,6 @@
 
 require_relative '../lib/util'
 require 'net/ssh'
-require 'resolv'
 
 class TDIPlan < TDI
   def ssh(role_name, plan_name, plan_content)
@@ -65,7 +64,7 @@ class TDIPlan < TDI
         res_dict = {local_user: local_user, remote_user: remote_user, host: host, addr: addr, net: origin_network(host)}
 
         begin
-          addr = Resolv.getaddress(host)
+          addr = getaddress(host).to_s
           res_str = "#{remote_user}@#{host}/#{addr}"
           res_dict = {local_user: local_user, remote_user: remote_user, host: host, addr: addr, net: origin_network(host)}
 

data/lib/tdi/version.rb

@@ -18,5 +18,5 @@
 # along with TDI.  If not, see <http://www.gnu.org/licenses/>.
 
 module Tdi
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/util.rb

@@ -20,7 +20,7 @@
 require 'awesome_print'
 require 'socket'
 require 'ipaddress'
-require 'resolv'
+require 'dnsruby'
 
 # Awesome Print config.
 def a_p(obj)
@@ -85,11 +85,7 @@ def origin_network(remote)
   orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true
 
   host = remote # host (name or IP)
-  if IPAddress.valid?(remote)
-    addr = remote # use address (already IP)
-  else
-    addr = Resolv.getaddress(remote) rescue nil # get address (resolve name to IP)
-  end
+  addr = getaddress(remote, raise_exception: false)
 
   UDPSocket.open do |s|
     begin
@@ -107,3 +103,18 @@ def origin_network(remote)
 ensure
   Socket.do_not_reverse_lookup = orig
 end
+
+# Return IP address.
+def getaddress(host, raise_exception: true)
+  if IPAddress.valid?(host)
+    return host # use address (already IP)
+  else
+    dns = Dnsruby::DNS.new # get address (resolve name to IP)
+    dns.config.apply_domain = false
+    if raise_exception
+      return dns.getaddress(host).to_s
+    else
+      return dns.getaddress(host).to_s rescue nil
+    end
+  end
+end

data/tdi.gemspec

@@ -31,4 +31,5 @@ validating your deployed infrastructure and external dependencies.)
   spec.add_runtime_dependency 'net-ssh'
   spec.add_runtime_dependency 'awesome_print'
   spec.add_runtime_dependency 'ipaddress'
+  spec.add_runtime_dependency 'dnsruby'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdi
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Rogério Carvalho Schneider
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dnsruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Test Driven Infrastructure acceptance helpers for
   validating your deployed infrastructure and external dependencies.