dgd-tools 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6b6f5495201cda1059723bc87848c81ef6d112449fd147aed1a6c08873b13f
-  data.tar.gz: f5adb6e0b687e71002c25fdf694375b06b1c3e400a6a5adaa0f759ae502abea8
+  metadata.gz: 838abb7957cb56eb3f096e8e345b3afda6d12db91a6110b7fa07029d589124d5
+  data.tar.gz: aa0a2551b3763eb418f99352cb0d40d58bcae92ff50bfce31bff22c644ae7019
 SHA512:
-  metadata.gz: 91624cda3d356f2dc5d17e7a003a1ef21bf989c94ef5761e6c265d0fffc08fac932a59dd4e1da9f824e6f9cf79d9746eb9a33bff44a87d7693f9b34476852ecd
-  data.tar.gz: 2a3efbd628524723b1f7e15982dea8077088fd305a68cfd186a0a0396ac3f321c117e6d1301398b9b80c922524f479a4b6b97c8736b3116d9d7f7793f8fa38b1
+  metadata.gz: a661db27d13a97f9086c7802769e1a08ac3f21f7c120f8bea6a6efe6e332a3d2ecb7e2571e0020dd36c8188019af907023662e248c1c1ffadfd9ee3c1b9c5b2a
+  data.tar.gz: 15e3742398cb16222e176dc5bc9385445219e23fce1a0cdf9205ced86ad47570c4c422d637734386f6f79e154282c3f57cf02784f9e4238f1ec8208dc4944878

data/lib/dgd-tools/manifest.rb

@@ -562,15 +562,18 @@ FILE_CONTENTS
 
         def config_to_ports(data)
             if data.is_a?(Hash)
-                # TODO: verify that keys are IP addr strings and values are legal port numbers
-                return data
+                return data.map { |ip, port| [ip, Integer(port) ] }
             elsif data.is_a?(Array)
-                # TODO: verify that data is an array of legal integer port numbers
-                ports = {}
-                data.each { |p| ports["*"] = p }
+                if data[0].is_a?(Array)
+                    ports = data.map { |ip, port| [ip, Integer(port) ] }
+                    return ports
+                end
+
+                ports = data.map { |p| [ "*", Integer(p) ] }
+                STDERR.puts "Arrayified: #{ports.inspect}"
                 return ports
             elsif data.is_a?(Integer)
-                return { "*": data }
+                return [ [ "*", data ] ]
             else
                 raise "dgd-manifest: not sure how to get port data from a #{data.class.name} -- #{data.inspect}!"
             end

data/lib/dgd-tools/version.rb

@@ -1,3 +1,3 @@
 module DGD
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dgd-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Noah Gibbs