gclouder 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d5b7fc191f80a8781d50968f36e2e2d12158e6
-  data.tar.gz: 3edbc8c7847aa6f1c8e838c9e09fc6ca38597bc6
+  metadata.gz: b8e46cb82d233980a2b308eec883bb71d3e3a02f
+  data.tar.gz: 47b7bbc60e71464fcc02b8bb414a1e9181c224f3
 SHA512:
-  metadata.gz: 589f26c1eb2aac42cedac86f65597dcab009fa0411cfac0d0d3c8ee6af7f52fd4763a466a62a1197b394eb0c8dbd193cc04e82f7649e21c9347e8ac4686581ad
-  data.tar.gz: 3201256c58043d96d6bde5ae2a14d30c3576873cf7d8569b71b86b15a650b1cbb9ede0185bad7fdbdf4b2480111496303fe962f495486351956bcaa810382796
+  metadata.gz: e282a5a64a3630e34ad1bf65a1dfb49688a474ddbc9a34985c07b36afa4dc2deebfb11feddd7b6773c46e048dd156b33c234d57a77597b1f7de4db0cc097fbec
+  data.tar.gz: 2e87c04b249c6d299435fd7dae95f1220ff0a2b3b7a1110ade613bfa4bb1a929b92921b01a9e1e55ef1e7f68fd94e7f8d178348afceb4f53d5aad048a1462d2f

data/lib/gclouder/resource.rb

@@ -33,14 +33,14 @@ module GClouder
       gcloud "#{resource} describe #{name} #{args}", force: force, failure: failure, silent: silent, project_id: project_id
     end
 
-    def self.ensure(resource, name, args = nil, project_id: nil, extra_info: nil, silent: false, indent: 3, filter_key: "name")
-      return if resource?(resource, name, project_id: project_id, extra_info: extra_info, silent: silent, indent: indent, filter_key: filter_key)
+    def self.ensure(resource, name, args = nil, project_id: nil, extra_info: nil, silent: false, indent: 3, filter_key: "name", filter: nil)
+      return if resource?(resource, name, project_id: project_id, extra_info: extra_info, silent: silent, indent: indent, filter_key: filter_key, filter: filter)
       feedback("add", resource, name, extra_info: extra_info, indent: indent, silent: silent)
       gcloud "#{resource} create #{name} #{args}", project_id: project_id, silent: silent
     end
 
-    def self.purge(resource, name, args = nil, project_id: nil, silent: false, indent: 3)
-      return unless resource?(resource, name, project_id: project_id, silent: true, indent: indent)
+    def self.purge(resource, name, args = nil, project_id: nil, silent: false, indent: 3, filter: nil)
+      return unless resource?(resource, name, project_id: project_id, silent: true, indent: indent, filter: filter)
       extra_info = "[skipped] (--purge not specified)" unless cli_args[:purge]
       feedback("remove", resource, name, extra_info: extra_info, indent: indent, silent: silent)
       gcloud "#{resource} delete #{name} #{args}", project_id: project_id if cli_args[:purge]

data/lib/gclouder/resources/pubsub/subscriptions.rb

@@ -21,7 +21,7 @@ module GClouder
             info region, indent: 2, heading: true
             info
             subscriptions.each do |subscription|
-              Subscription.ensure(subscription)
+              Subscription.ensure(subscription['name'])
             end
           end
         end
@@ -87,11 +87,11 @@ module GClouder
           end
 
           def self.ensure(subscription)
-            Resource.ensure :"beta pubsub subscriptions", subscription["name"], args(subscription), filter_key: "subscriptionId", indent: 3
+            Resource.ensure :"beta pubsub subscriptions", subscription["name"], args(subscription), filter: "name ~ ^.*\/#{subscription}$", indent: 3
           end
 
           def self.purge(subscription)
-            Resource.purge :"beta pubsub subscriptions", subscription["name"]
+            Resource.purge :"beta pubsub subscriptions", subscription["name"], filter: "name ~ ^.*\/#{subscription}$"
           end
         end
       end

data/lib/gclouder/resources/pubsub/topics.rb

@@ -82,11 +82,11 @@ module GClouder
           include GClouder::GCloud
 
           def self.ensure(topic)
-            Resource.ensure :"beta pubsub topics", topic, filter_key: "topicId"
+            Resource.ensure :"beta pubsub topics", topic, filter: "name ~ ^.*\/#{topic}$"
           end
 
           def self.purge(topic)
-            Resource.purge :"beta pubsub topics", topic
+            Resource.purge :"beta pubsub topics", topic, filter: "name ~ ^.*\/#{topic}$"
           end
         end
       end

data/lib/gclouder/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module GClouder
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gclouder
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Rob Wilson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop