gclouder 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c883949702bd5ebf5955dd329f1270ab98029010
-  data.tar.gz: aa2a1d13fb78f58ce04db2e2065a1c54319741c7
+  metadata.gz: f7311a9316efc730260a93a0b835151265579e08
+  data.tar.gz: eda71d3ca4b1001f2ef5bd1e0e7f913f66b7d99c
 SHA512:
-  metadata.gz: 2587dbcdb61c10507a2bd0613f13cce975752734acce1c72c046148bf2ae1b995ec04a211a32479f3cc02a0f1b485addf665a4096f8387e198ecd0b6442c0167
-  data.tar.gz: e7142be85907d2b90b6875cc08bab66c0169a1bab8c1084ba6caf39ebf3039be09015feb56bbbe14a2a065d3f3230845aaec6ed231353b3bb94ad29442d3ff4f
+  metadata.gz: 57f1d9ecd8560d94f2a542deb5c78fc4ece8e435b153ad19980ad1fdc0e267be1c0f081019eb69396600bb21d8dc0d27b0b4c95c6f2f96f89fcd1518a1a80b1c
+  data.tar.gz: 403efac259b7d0036365ea05fd0bba0f22a44d644056eb313a7182a18e5f0e6930e2bfd8232fa2f29cf0d113de73fb898540329e59b16e5d71f0083e343b7dde

data/README.md

@@ -119,5 +119,10 @@ To build and install a gem run:
 ```
 rake build
 gem install pkg/gclouder-<version>.gem
-gem push pkg/gclouder-<version>.gem
+```
+
+To perform a release
+```
+# adjust version in lib/gclouder/version.rb then run:
+rake release
 ```

data/lib/gclouder/resources/storage/buckets.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+
+module GClouder
+  module Resources
+    module Storage
+      module Buckets
+        include GClouder::Logging
+        include GClouder::Shell
+        include GClouder::Resource::Cleaner
+
+        def self.header(stage = :ensure)
+          info "[#{stage}] storage / buckets", title: true, indent: 1
+        end
+
+        def self.validate
+          return if Local.list.empty?
+          header :validate
+          Local.validate
+        end
+
+        def self.ensure
+          return if Local.list.empty?
+          header
+
+          Local.list.each do |region, region_config|
+            info region, heading: true, indent: 2
+            region_config.each do |bucket|
+              info
+              Bucket.ensure(region, bucket)
+            end
+          end
+        end
+
+        module Local
+          def self.list
+            instances
+          end
+
+          def self.validate
+            # Validation knowledge included here because we don't have arguments parser for gsutil.
+            # We also don't support every key that gsutil does. See Bucket.ensure() below.
+            permitted_and_required_keys = {
+              "default_access"=>{"type"=>"String", "required"=>true}
+            }
+
+            Resources::Validate::Region.instances(
+              instances,
+              permitted_keys: permitted_and_required_keys
+            )
+          end
+
+          def self.instances
+            Resources::Region.instances(path: ["storage", "buckets"])
+          end
+        end
+
+        module Remote
+          include GClouder::GSUtil
+
+          # FIXME: make more robust(!)
+          def self.list
+            gsutil("ls", "-L").to_s.split("gs://").delete_if(&:empty?).each_with_object({}) do |data, collection|
+              normalized = data.split("\n").map! { |b| b.delete("\t") }
+              bucket_name = normalized[0].delete("/ :")
+              region = normalized.select { |e| e.match("^Location constraint:") }.last.split(":").last.downcase
+              collection[region] ||= []
+              collection[region] << { "name" => bucket_name }
+            end
+          end
+        end
+
+        module Bucket
+          include GClouder::GSUtil
+          include GClouder::Config::CLIArgs
+
+          def self.setDefaultAccess(bucket_name, default_access)
+            info "# gsutil defacl ch -u #{default_access} gs://#{bucket_name}" if cli_args[:debug]
+
+            return if cli_args[:dry_run]
+
+            # Just use shell, as -p flag is not valid for 'defacl ch'.
+            shell("gsutil defacl ch -u #{default_access} gs://#{bucket_name}")
+          end
+
+          def self.check_exists?(region, bucket_name)
+            gsutil_exec("ls", "gs://#{bucket_name} > /dev/null 2>&1 && echo 0 || echo 1").to_i == 0
+          end
+
+          def self.ensure(region, bucket)
+            if check_exists?(region, bucket["name"])
+              good bucket["name"]
+              return
+            end
+
+            add "#{bucket["name"]} [#{bucket["default_access"]}]"
+            gsutil "mb", "-l #{region} gs://#{bucket["name"]}"
+
+
+            setDefaultAccess bucket["name"], bucket["default_access"] if bucket.key?("default_access")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gclouder/resources/storage/notifications.rb

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+
+module GClouder
+  module Resources
+    module Storage
+      module Notifications
+        include GClouder::Logging
+        include GClouder::Shell
+
+        def self.header(stage = :ensure)
+          info "[#{stage}] storage / notifications", title: true, indent: 1
+        end
+
+        def self.validate
+          return if Local.list.empty?
+          header :validate
+          Local.validate
+        end
+
+        def self.ensure
+          return if Local.list.empty?
+          header
+
+          Local.list.each do |region, region_config|
+            info region, heading: true, indent: 2
+            region_config.each do |notification|
+              info
+              Notification.ensure(notification)
+            end
+          end
+        end
+
+        module Local
+          def self.list
+            instances
+          end
+
+          def self.validate
+            # Validation knowledge included here because we don't have arguments parser for gsutil.
+            # We also don't support every key that gsutil does. See Notification.ensure() below.
+            permitted_and_required_keys = {
+              "bucket"=>{"type"=>"String", "required"=>true},
+              "topic"=>{"type"=>"String", "required"=>true},
+              "events"=>{"type"=>"Array", "required"=>false}
+            }
+
+            Resources::Validate::Region.instances(
+              instances,
+              permitted_keys: permitted_and_required_keys
+            )
+          end
+
+          def self.instances
+            Resources::Region.instances(path: ["storage", "notifications"])
+          end
+        end
+
+        module Notification
+          include GClouder::GSUtil
+          include GClouder::Config::CLIArgs
+
+          def self.notification_exists?(notification)
+            notifications_exist = gsutil_exec("notification list", " gs://#{notification["bucket"]} > /dev/null 2>&1 && echo 0 || echo 1").to_i == 0
+            if not notifications_exist
+              return false
+            end
+
+            return gsutil("notification list", "gs://#{notification["bucket"]}", force: true)
+              .include?("projects/#{project["project_id"]}/topics/#{notification["topic"]}")
+
+          end
+
+          def self.ensure(notification)
+            if notification_exists?(notification)
+              good "notification topic: #{notification["name"]}; bucket: #{notification["bucket"]}", indent: 4
+              return
+            end
+
+            event_type_args = ""
+            if notification.has_key?("events")
+              event_type_args = "-e #{notification["events"].join(",")}"
+            end
+
+            args = "-t #{notification["name"]} #{event_type_args} -f json gs://#{notification["bucket"]}"
+
+            add "notification topic: #{notification["name"]}; bucket: #{notification["bucket"]}", indent: 4
+            gsutil "notification create", args
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gclouder/version.rb

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

data/lib/gclouder.rb

@@ -53,7 +53,8 @@ require "gclouder/resources/project_id"
 require "gclouder/resources/project"
 require "gclouder/resources/project/iam_policy_binding.rb"
 
-require "gclouder/resources/storagebuckets"
+require "gclouder/resources/storage/buckets"
+require "gclouder/resources/storage/notifications"
 
 require "gclouder/resources/compute/networks"
 require "gclouder/resources/compute/networks/subnets"
@@ -161,10 +162,16 @@ module GClouder
 
       {
         name: "storage-buckets",
-        module: Resources::StorageBuckets,
+        module: Resources::Storage::Buckets,
         skip: [ :check ],
       },
 
+      {
+        name: "storage-notifications",
+        module: Resources::Storage::Notifications,
+        skip: [ :check, :clean ],
+      },
+
       {
         name: "networks",
         module: Resources::Compute::Networks,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gclouder
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Rob Wilson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -251,7 +251,8 @@ files:
 - lib/gclouder/resources/project_id.rb
 - lib/gclouder/resources/pubsub/subscriptions.rb
 - lib/gclouder/resources/pubsub/topics.rb
-- lib/gclouder/resources/storagebuckets.rb
+- lib/gclouder/resources/storage/buckets.rb
+- lib/gclouder/resources/storage/notifications.rb
 - lib/gclouder/resources/validate/global.rb
 - lib/gclouder/resources/validate/local.rb
 - lib/gclouder/resources/validate/region.rb

data/lib/gclouder/resources/storagebuckets.rb

@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-
-module GClouder
-  module Resources
-    module StorageBuckets
-      include GClouder::Logging
-      include GClouder::Shell
-      include GClouder::Resource::Cleaner
-
-      def self.header(stage = :ensure)
-        info "[#{stage}] storage / buckets", title: true, indent: 1
-      end
-
-      def self.validate
-        return if Local.list.empty?
-        header :validate
-        Local.validate
-      end
-
-      def self.ensure
-        return if Local.list.empty?
-        header
-
-        Local.list.each do |region, region_config|
-          info region, heading: true, indent: 2
-          region_config.each do |bucket|
-            info
-            StorageBucket.ensure(region, bucket)
-          end
-        end
-      end
-
-      module Local
-        def self.list
-          instances
-        end
-
-        def self.validate
-          # Validation knowledge included here because we don't have arguments parser for gsutil.
-          # We also don't support every key that gsutil does. See StorageBucket.ensure() below.
-          permitted_and_required_keys = {
-            "default_access"=>{"type"=>"String", "required"=>true}
-          }
-
-          Resources::Validate::Region.instances(
-            instances,
-            permitted_keys: permitted_and_required_keys
-          )
-        end
-
-        def self.instances
-          Resources::Region.instances(path: ["storage", "buckets"])
-        end
-      end
-
-      module Remote
-        include GClouder::GSUtil
-
-        # FIXME: make more robust(!)
-        def self.list
-          gsutil("ls", "-L").to_s.split("gs://").delete_if(&:empty?).each_with_object({}) do |data, collection|
-            normalized = data.split("\n").map! { |b| b.delete("\t") }
-            bucket_name = normalized[0].delete("/ :")
-            region = normalized.select { |e| e.match("^Location constraint:") }.last.split(":").last.downcase
-            collection[region] ||= []
-            collection[region] << { "name" => bucket_name }
-          end
-        end
-      end
-
-      module StorageBucket
-        include GClouder::GSUtil
-        include GClouder::Config::CLIArgs
-
-        def self.setDefaultAccess(bucket_name, default_access)
-          info "# gsutil defacl ch -u #{default_access} gs://#{bucket_name}" if cli_args[:debug]
-
-          return if cli_args[:dry_run]
-
-          # Just use shell, as -p flag is not valid for 'defacl ch'.
-          shell("gsutil defacl ch -u #{default_access} gs://#{bucket_name}")
-        end
-
-        def self.check_exists?(region, bucket_name)
-          gsutil_exec("ls", "gs://#{bucket_name} > /dev/null 2>&1 && echo 0 || echo 1").to_i == 0
-        end
-
-        def self.ensure(region, bucket)
-          if check_exists?(region, bucket["name"])
-            good bucket["name"]
-            return
-          end
-
-          add "#{bucket["name"]} [#{bucket["default_access"]}]"
-          gsutil "mb", "-l #{region} gs://#{bucket["name"]}"
-
-
-          setDefaultAccess bucket["name"], bucket["default_access"] if bucket.key?("default_access")
-        end
-      end
-    end
-  end
-end