gclouder_undefined_resources 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40af15953719621949d13f39d2bee5d890ae2a55
-  data.tar.gz: b61d2d60aacd5c5023930fb938b7aaae13a3fcb2
+  metadata.gz: 6f77332989bb3d36e465dad1f4a13ff6bca51a8d
+  data.tar.gz: 6bacef5eff72edea0528d8aa238ec4804fb48ef0
 SHA512:
-  metadata.gz: 0cc34cdf89b64dfd75373010e14855b93aedb832cef7f8aed4115c45f1fc3fe841d2392477023a2f37cb0ec54325a238e6c7c5071a53ecf25fcb6f71821e4f5a
-  data.tar.gz: 8acc4dd94d2748f4608b5919b845a4dc7e0bb10d7c874650d7f9e63a3db493c3fd0f0da208a98b7baeb5875420df07df0e8ae412d36efb9190553026ebdf7b90
+  metadata.gz: 488372d684f5562b201b5604d084d5eefb6497032863bfaf12d6c9c8e860ee0dca8489a6a68f7b80b9f33b04888bcca32c45778fd4d612bf94a1b4cc98787eb0
+  data.tar.gz: 5622e9a870a3c7a30b4513a145bfda618d3e63104d1f7a2e6f03875e563e9941b984aace2dc083169f61c33d624287cb71c0524564138b17ca8fe98db8ef4486

data/lib/gclouder_undefined_resources/remote_resources.rb

@@ -63,8 +63,8 @@ module GClouderUndefinedResources
       end
     end
 
+    # display: region, zone, type, name
     def display_by_location
-      # display: region, zone, type, name
       regions = @resources.group_by { |resource| resource.region }
 
       regions.each do |region, resources_by_region|

data/lib/gclouder_undefined_resources/remote_resources/resource.rb

@@ -20,11 +20,20 @@ module GClouderUndefinedResources
       def_delegator :@data, :[]
 
       def region
+        # if location is set and its "global" then return..
+        return if (@data.key?("location") && @data["location"] == "global")
+
+        #match = @data["location"].downcase if @data.key?("location") && !match[1]
+        puts @data["location"] if @data.key?("location")
+
+        # if no selfLink exists then it's not possible to establish the region
         return unless @data.key?("selfLink")
+
+        # establish region from from selfLink
         match = @data["selfLink"].match(/.*\/regions\/([^\/]+)/)
-        match = @data["location"].downcase if @data.key?("location") && !match[1]
-        return unless @data.key?("location") && @data["location"] == "global"
         return match[1] if match
+
+        # if region cant be established but a zone exists, then take region from zone string
         zone[0..-3] if zone
       end
 
@@ -36,7 +45,7 @@ module GClouderUndefinedResources
 
       def global?
         return true if zone.nil? && region.nil?
-        return true if @data.key?("location") && @data["location"] == "global"
+        #return true if @data.key?("location") && @data["location"] == "global"
         return unless @data.key?("selfLink")
         !@data["selfLink"].match(/.*\/projects\/[^\/]+\/global/).nil?
       end

data/lib/gclouder_undefined_resources/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module GClouderUndefinedResources
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gclouder_undefined_resources
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Rob Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop