google-cloud-pubsub 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7f83c2402c87e054a0d08e734c8a7bbfd103d11a86a1d1feb0df5634ac09d7d
-  data.tar.gz: 7ea51a0d33514c2feebb6eb15423ccbb5f4a65e446f4b070380eb5298dbbeaca
+  metadata.gz: 7b647f7265e16e47a38c39b2171f2f21823604e384830cd209b2e85b0284a5db
+  data.tar.gz: 62cbd134e8699a48759114fe1437286230b485b7b8598c1ee32823cb66215b80
 SHA512:
-  metadata.gz: 379e48558ef31382d9b648cfeaf09de5ff388d3759cab4133c92cc68ceb0494cc2d742ba91495b78726581b4558b7e96842c5fa98426059a2d94865d39e84726
-  data.tar.gz: 9b9eb864b182ff0e4435e824f3e7f75495e56e54af64880394d2b07307d898f80cfc8adc36588d132e2c55d5bd823775f895ef1c10b70e13efbf9db30a1acd72
+  metadata.gz: e39a2f11dbdace3f1088e3bbc0f4b883a939d0c9d7d0ff8e8978397bfe4fff20f5d162b736df7ed435f03396eb773c817970c55fdf5f414eb0bf4d698749b97f
+  data.tar.gz: 488f6fc246f5cc7f7d108cb7096e94cae4ea8b7680fc7e9e6f062bad987a5705825eaa4456a113f37d5f60823adaefb1c5b3a74fb48e085135a3eb3a98d9ba40

data/lib/google-cloud-pubsub.rb

@@ -20,6 +20,8 @@
 
 gem "google-cloud-core"
 require "google/cloud"
+require "google/cloud/config"
+require "googleauth"
 
 module Google
   module Cloud
@@ -110,3 +112,31 @@ module Google
     end
   end
 end
+
+# Set the default pubsub configuration
+Google::Cloud.configure.add_config! :pubsub do |config|
+  default_project = Google::Cloud::Config.deferred do
+    ENV["PUBSUB_PROJECT"]
+  end
+  default_creds = Google::Cloud::Config.deferred do
+    Google::Cloud::Config.credentials_from_env(
+      "PUBSUB_CREDENTIALS", "PUBSUB_CREDENTIALS_JSON",
+      "PUBSUB_KEYFILE", "PUBSUB_KEYFILE_JSON"
+    )
+  end
+  default_emulator = Google::Cloud::Config.deferred do
+    ENV["PUBSUB_EMULATOR_HOST"]
+  end
+
+  config.add_field! :project_id, default_project, match: String, allow_nil: true
+  config.add_alias! :project, :project_id
+  config.add_field! :credentials, default_creds,
+                    match: [String, Hash, Google::Auth::Credentials],
+                    allow_nil: true
+  config.add_alias! :keyfile, :credentials
+  config.add_field! :scope, nil, match: [String, Array]
+  config.add_field! :timeout, nil, match: Integer
+  config.add_field! :client_config, nil, match: Hash
+  config.add_field! :emulator_host, default_emulator,
+                    match: String, allow_nil: true
+end

data/lib/google/cloud/pubsub.rb

@@ -15,6 +15,8 @@
 
 require "google-cloud-pubsub"
 require "google/cloud/pubsub/project"
+require "google/cloud/config"
+require "google/cloud/env"
 
 module Google
   module Cloud
@@ -28,11 +30,14 @@ module Google
     # Cloud Pub/Sub allows developers to communicate between independently
     # written applications.
     #
-    # The goal of google-cloud is to provide a API that is comfortable to
-    # Rubyists. Authentication is handled by {Google::Cloud#pubsub}. You can
-    # provide the project and credential information to connect to the Pub/Sub
-    # service, or if you are running on Google Compute Engine this configuration
-    # is taken care of for you.
+    # The goal of google-cloud is to provide an API that is comfortable to
+    # Rubyists. Your authentication credentials are detected automatically in
+    # Google Cloud Platform environments such as Google Compute Engine, Google
+    # App Engine and Google Kubernetes Engine. In other environments you can
+    # configure authentication easily, either directly in your code or via
+    # environment variables. Read more about the options for connecting in the
+    # [Authentication
+    # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
     #
     # ```ruby
     # require "google/cloud/pubsub"
@@ -507,7 +512,7 @@ module Google
       # @param [Hash] client_config A hash of values to override the default
       #   behavior of the API client. Optional.
       # @param [String] emulator_host Pub/Sub emulator host. Optional.
-      #   If the param is nil, ENV["PUBSUB_EMULATOR_HOST"] will be used.
+      #   If the param is nil, uses the value of the `emulator_host` config.
       # @param [String] project Alias for the `project_id` argument. Deprecated.
       # @param [String] keyfile Alias for the `credentials` argument.
       #   Deprecated.
@@ -525,19 +530,24 @@ module Google
       def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil,
                    client_config: nil, emulator_host: nil, project: nil,
                    keyfile: nil
-        project_id ||= (project || Pubsub::Project.default_project_id)
+        project_id ||= (project || default_project_id)
         project_id = project_id.to_s # Always cast to a string
-        fail ArgumentError, "project_id is missing" if project_id.empty?
+        raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        emulator_host ||= ENV["PUBSUB_EMULATOR_HOST"]
+        scope ||= configure.scope
+        timeout ||= configure.timeout
+        client_config ||= configure.client_config
+        emulator_host ||= configure.emulator_host
         if emulator_host
           return Pubsub::Project.new(
             Pubsub::Service.new(
               project_id, :this_channel_is_insecure,
-              host: emulator_host))
+              host: emulator_host
+            )
+          )
         end
 
-        credentials ||= (keyfile || Pubsub::Credentials.default(scope: scope))
+        credentials ||= (keyfile || default_credentials(scope: scope))
         unless credentials.is_a? Google::Auth::Credentials
           credentials = Pubsub::Credentials.new credentials, scope: scope
         end
@@ -545,7 +555,55 @@ module Google
         Pubsub::Project.new(
           Pubsub::Service.new(
             project_id, credentials, timeout: timeout,
-                                     client_config: client_config))
+                                     client_config: client_config
+          )
+        )
+      end
+
+      ##
+      # Configure the Google Cloud Pubsub library.
+      #
+      # The following Pubsub configuration parameters are supported:
+      #
+      # * `project_id` - (String) Identifier for a Pubsub project. (The
+      #   parameter `project` is considered deprecated, but may also be used.)
+      # * `credentials` - (String, Hash, Google::Auth::Credentials) The path to
+      #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+      #   Google::Auth::Credentials object. (See {Pubsub::Credentials}) (The
+      #   parameter `keyfile` is considered deprecated, but may also be used.)
+      # * `scope` - (String, Array<String>) The OAuth 2.0 scopes controlling
+      #   the set of resources and operations that the connection can access.
+      # * `retries` - (Integer) Number of times to retry requests on server
+      #   error.
+      # * `timeout` - (Integer) Default timeout to use in requests.
+      # * `client_config` - (Hash) A hash of values to override the default
+      #   behavior of the API client.
+      # * `emulator_host` - (String) Host name of the emulator. Defaults to
+      #   `ENV["PUBSUB_EMULATOR_HOST"]`
+      #
+      # @return [Google::Cloud::Config] The configuration object the
+      #   Google::Cloud::Pubsub library uses.
+      #
+      def self.configure
+        yield Google::Cloud.configure.pubsub if block_given?
+
+        Google::Cloud.configure.pubsub
+      end
+
+      ##
+      # @private Default project.
+      def self.default_project_id
+        Google::Cloud.configure.pubsub.project_id ||
+          Google::Cloud.configure.project_id ||
+          Google::Cloud.env.project_id
+      end
+
+      ##
+      # @private Default credentials.
+      def self.default_credentials scope: nil
+        Google::Cloud.configure.pubsub.credentials ||
+          Google::Cloud.configure.credentials ||
+          Pubsub::Credentials.default(scope: scope)
       end
     end
   end

data/lib/google/cloud/pubsub/async_publisher.rb

@@ -93,7 +93,7 @@ module Google
           msg = create_pubsub_message data, attributes
 
           synchronize do
-            fail "Can't publish when stopped." if @stopped
+            raise "Can't publish when stopped." if @stopped
 
             if @batch.nil?
               @batch ||= Batch.new self
@@ -238,7 +238,7 @@ module Google
                 publish_result = PublishResult.from_grpc(item.msg)
                 execute_callback_async item.callback, publish_result
               end
-            rescue => e
+            rescue StandardError => e
               batch.items.each do |item|
                 next unless item.callback
 

data/lib/google/cloud/pubsub/convert.rb

@@ -50,7 +50,7 @@ module Google
           def duration_to_number duration
             return nil if duration.nil?
 
-            return duration.seconds if duration.nanos == 0
+            return duration.seconds if duration.nanos.zero?
 
             duration.seconds + (duration.nanos / 1000000000.0)
           end

data/lib/google/cloud/pubsub/credentials.rb

@@ -38,19 +38,19 @@ module Google
       #   pubsub.project_id #=> "my-project"
       #
       class Credentials < Google::Auth::Credentials
-        SCOPE = ["https://www.googleapis.com/auth/pubsub"]
-        PATH_ENV_VARS = %w(PUBSUB_CREDENTIALS
+        SCOPE = ["https://www.googleapis.com/auth/pubsub"].freeze
+        PATH_ENV_VARS = %w[PUBSUB_CREDENTIALS
                            PUBSUB_KEYFILE
                            GOOGLE_CLOUD_CREDENTIALS
                            GOOGLE_CLOUD_KEYFILE
-                           GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(PUBSUB_CREDENTIALS_JSON
+                           GCLOUD_KEYFILE].freeze
+        JSON_ENV_VARS = %w[PUBSUB_CREDENTIALS_JSON
                            PUBSUB_KEYFILE_JSON
                            GOOGLE_CLOUD_CREDENTIALS_JSON
                            GOOGLE_CLOUD_KEYFILE_JSON
-                           GCLOUD_KEYFILE_JSON)
+                           GCLOUD_KEYFILE_JSON].freeze
         DEFAULT_PATHS = \
-          ["~/.config/gcloud/application_default_credentials.json"]
+          ["~/.config/gcloud/application_default_credentials.json"].freeze
       end
     end
   end

data/lib/google/cloud/pubsub/message.rb

@@ -66,7 +66,8 @@ module Google
 
           @grpc = Google::Pubsub::V1::PubsubMessage.new(
             data: String(data).encode("ASCII-8BIT"),
-            attributes: attributes)
+            attributes: attributes
+          )
         end
 
         ##
@@ -90,14 +91,14 @@ module Google
         def message_id
           @grpc.message_id
         end
-        alias_method :msg_id, :message_id
+        alias msg_id message_id
 
         ##
         # The time at which the message was published.
         def published_at
           Convert.timestamp_to_time @grpc.publish_time
         end
-        alias_method :publish_time, :published_at
+        alias publish_time published_at
 
         ##
         # @private New Message from a Google::Pubsub::V1::PubsubMessage object.

data/lib/google/cloud/pubsub/project.rb

@@ -14,7 +14,6 @@
 
 
 require "google/cloud/errors"
-require "google/cloud/env"
 require "google/cloud/pubsub/service"
 require "google/cloud/pubsub/credentials"
 require "google/cloud/pubsub/topic"
@@ -71,16 +70,7 @@ module Google
         def project_id
           service.project
         end
-        alias_method :project, :project_id
-
-        ##
-        # @private Default project.
-        def self.default_project_id
-          ENV["PUBSUB_PROJECT"] ||
-            ENV["GOOGLE_CLOUD_PROJECT"] ||
-            ENV["GCLOUD_PROJECT"] ||
-            Google::Cloud.env.project_id
-        end
+        alias project project_id
 
         ##
         # Retrieves topic by name.
@@ -166,8 +156,8 @@ module Google
         rescue Google::Cloud::NotFoundError
           nil
         end
-        alias_method :get_topic, :topic
-        alias_method :find_topic, :topic
+        alias get_topic topic
+        alias find_topic topic
 
         ##
         # Creates a new topic.
@@ -206,7 +196,7 @@ module Google
           grpc = service.create_topic topic_name
           Topic.from_grpc grpc, service, async: async
         end
-        alias_method :new_topic, :create_topic
+        alias new_topic create_topic
 
         ##
         # Retrieves a list of topics for the given project.
@@ -245,8 +235,8 @@ module Google
           grpc = service.list_topics options
           Topic::List.from_grpc grpc, service, max
         end
-        alias_method :find_topics, :topics
-        alias_method :list_topics, :topics
+        alias find_topics topics
+        alias list_topics topics
 
         ##
         # Retrieves subscription by name.
@@ -291,8 +281,8 @@ module Google
         rescue Google::Cloud::NotFoundError
           nil
         end
-        alias_method :get_subscription, :subscription
-        alias_method :find_subscription, :subscription
+        alias get_subscription subscription
+        alias find_subscription subscription
 
         ##
         # Retrieves a list of subscriptions for the given project.
@@ -330,8 +320,8 @@ module Google
           grpc = service.list_subscriptions options
           Subscription::List.from_grpc grpc, service, max
         end
-        alias_method :find_subscriptions, :subscriptions
-        alias_method :list_subscriptions, :subscriptions
+        alias find_subscriptions subscriptions
+        alias list_subscriptions subscriptions
 
 
         ##
@@ -370,8 +360,8 @@ module Google
           grpc = service.list_snapshots options
           Snapshot::List.from_grpc grpc, service, max
         end
-        alias_method :find_snapshots, :snapshots
-        alias_method :list_snapshots, :snapshots
+        alias find_snapshots snapshots
+        alias list_snapshots snapshots
 
         protected
 
@@ -379,7 +369,7 @@ module Google
         # @private Raise an error unless an active connection to the service is
         # available.
         def ensure_service!
-          fail "Must have active connection to service" unless service
+          raise "Must have active connection to service" unless service
         end
 
         ##

data/lib/google/cloud/pubsub/publish_result.rb

@@ -32,7 +32,7 @@ module Google
         def message
           @message
         end
-        alias_method :msg, :message
+        alias msg message
 
         ##
         # The message's data.
@@ -52,14 +52,14 @@ module Google
         def message_id
           message.message_id
         end
-        alias_method :msg_id, :message_id
+        alias msg_id message_id
 
         ##
         # The time at which the message was published.
         def published_at
           message.published_at
         end
-        alias_method :publish_time, :published_at
+        alias publish_time published_at
 
         ##
         # The error that was raised when published, if any.

data/lib/google/cloud/pubsub/received_message.rb

@@ -68,7 +68,7 @@ module Google
         def message
           Message.from_grpc @grpc.message
         end
-        alias_method :msg, :message
+        alias msg message
 
         ##
         # The received message payload. This data is a list of bytes encoded as
@@ -89,14 +89,14 @@ module Google
         def message_id
           message.message_id
         end
-        alias_method :msg_id, :message_id
+        alias msg_id message_id
 
         ##
         # The time at which the message was published.
         def published_at
           message.published_at
         end
-        alias_method :publish_time, :published_at
+        alias publish_time published_at
 
         ##
         # Acknowledges receipt of the message.
@@ -123,7 +123,7 @@ module Google
           ensure_subscription!
           subscription.acknowledge ack_id
         end
-        alias_method :ack!, :acknowledge!
+        alias ack! acknowledge!
 
         ##
         # Modifies the acknowledge deadline for the message.
@@ -160,7 +160,7 @@ module Google
           ensure_subscription!
           subscription.delay new_deadline, ack_id
         end
-        alias_method :modify_ack_deadline!, :delay!
+        alias modify_ack_deadline! delay!
 
         ##
         # Resets the acknowledge deadline for the message without acknowledging
@@ -190,8 +190,8 @@ module Google
         def reject!
           delay! 0
         end
-        alias_method :nack!, :reject!
-        alias_method :ignore!, :reject!
+        alias nack! reject!
+        alias ignore! reject!
 
         ##
         # @private New ReceivedMessage from a
@@ -208,7 +208,7 @@ module Google
         ##
         # Raise an error unless an active subscription is available.
         def ensure_subscription!
-          fail "Must have active subscription" unless subscription
+          raise "Must have active subscription" unless subscription
         end
       end
     end

data/lib/google/cloud/pubsub/service.rb

@@ -66,7 +66,8 @@ module Google
               timeout: timeout,
               client_config: client_config,
               lib_name: "gccl",
-              lib_version: Google::Cloud::Pubsub::VERSION)
+              lib_version: Google::Cloud::Pubsub::VERSION
+            )
           end
         end
         attr_accessor :mocked_subscriber
@@ -78,7 +79,8 @@ module Google
               credentials: channel,
               timeout: timeout,
               lib_name: "gccl",
-              lib_version: Google::Cloud::Pubsub::VERSION)
+              lib_version: Google::Cloud::Pubsub::VERSION
+            )
           end
         end
         attr_accessor :mocked_publisher

data/lib/google/cloud/pubsub/snapshot.rb

@@ -157,7 +157,7 @@ module Google
         # @private Raise an error unless an active connection to the service is
         # available.
         def ensure_service!
-          fail "Must have active connection to service" unless service
+          raise "Must have active connection to service" unless service
         end
       end
     end

data/lib/google/cloud/pubsub/snapshot/list.rb

@@ -163,7 +163,7 @@ module Google
           # @private Raise an error unless an active connection to the service
           # is available.
           def ensure_service!
-            fail "Must have active connection to service" unless @service
+            raise "Must have active connection to service" unless @service
           end
 
           def next_snapshots

data/lib/google/cloud/pubsub/subscriber.rb

@@ -87,7 +87,7 @@ module Google
           @started = nil
           @stopped = nil
 
-          stream_pool = @streams.times.map do
+          stream_pool = Array.new(@streams) do
             Thread.new { Stream.new self }
           end
           @stream_pool = stream_pool.map(&:value)
@@ -172,7 +172,8 @@ module Google
         ##
         # @private
         def to_s
-          format "(subscription: %s, streams: %i)", subscription_name, streams
+          format "(subscription: %<sub>s, streams: %<count>i)",
+                 sub: subscription_name, count: streams
         end
 
         ##

data/lib/google/cloud/pubsub/subscriber/stream.rb

@@ -70,10 +70,12 @@ module Google
             synchronize do
               break if @stopped
 
-              @inventory.stop
               @stopped = true
-              # Kill the thread since it may be sleeping
-              @background_thread.kill if @background_thread
+
+              @inventory.stop
+
+              # signal to the background thread that we are unpaused
+              @pause_cond.broadcast
             end
 
             self
@@ -175,7 +177,8 @@ module Google
 
           # @private
           def to_s
-            format "(inventory: %i, status: %s)", inventory.count, status
+            format "(inventory: %<inv>i, status: %<sts>s)",
+                   inv: inventory.count, sts: status
           end
 
           # @private
@@ -188,14 +191,17 @@ module Google
           # rubocop:disable all
 
           def background_run enum
-            until synchronize { @stopped }
+            loop do
               synchronize do
-                if @paused
+                if @paused && !@stopped
                   @pause_cond.wait
                   next
                 end
               end
 
+              # Break loop, close thread if stopped
+              break if synchronize { @stopped }
+
               begin
                 # Cannot syncronize the enumerator, causes deadlock
                 response = enum.next
@@ -232,8 +238,8 @@ module Google
             # Also stealthly restart the stream on Unavailable, Cancelled,
             # ResourceExhausted, and Internal.
             synchronize { start_streaming! }
-          rescue => e
-            fail Google::Cloud::Error.from_error(e)
+          rescue StandardError => e
+            raise Google::Cloud::Error.from_error(e)
           end
 
           # rubocop:enable all
@@ -245,6 +251,9 @@ module Google
           end
 
           def start_streaming!
+            # Don't allow a stream to restart if already stopped
+            return if @stopped
+
             # signal to the previous queue to shut down
             old_queue = []
             old_queue = @request_queue.dump_queue if @request_queue
@@ -270,6 +279,7 @@ module Google
           end
 
           def pause_streaming?
+            return if @stopped
             return if @paused
 
             @inventory.full?
@@ -284,9 +294,10 @@ module Google
           end
 
           def unpause_streaming?
+            return if @stopped
             return if @paused.nil?
 
-            @inventory.count < @inventory.limit*0.8
+            @inventory.count < @inventory.limit * 0.8
           end
 
           def initial_input_request
@@ -341,7 +352,9 @@ module Google
               ack_ids = Array(ack_ids).flatten
               synchronize do
                 @_ack_ids += ack_ids
-                @background_thread ||= Thread.new { background_run }
+                unless @stopped
+                  @background_thread ||= Thread.new { background_run }
+                end
               end
             end
 

data/lib/google/cloud/pubsub/subscription.rb

@@ -103,7 +103,6 @@ module Google
           @grpc = service.update_subscription update_grpc,
                                               :ack_deadline_seconds
           @lazy = nil
-          self
         end
 
         ##
@@ -126,7 +125,6 @@ module Google
           @grpc = service.update_subscription update_grpc,
                                               :retain_acked_messages
           @lazy = nil
-          self
         end
 
         ##
@@ -152,7 +150,6 @@ module Google
           @grpc = service.update_subscription update_grpc,
                                               :message_retention_duration
           @lazy = nil
-          self
         end
 
         ##
@@ -168,10 +165,13 @@ module Google
         def endpoint= new_endpoint
           ensure_service!
           service.modify_push_config name, new_endpoint, {}
+
+          return unless @grpc
+
           @grpc.push_config = Google::Pubsub::V1::PushConfig.new(
             push_endpoint: new_endpoint,
             attributes: {}
-          ) if @grpc
+          )
         end
 
         ##
@@ -429,7 +429,7 @@ module Google
           service.acknowledge name, *ack_ids
           true
         end
-        alias_method :ack, :acknowledge
+        alias ack acknowledge
 
         ##
         # Modifies the acknowledge deadline for messages.
@@ -463,7 +463,7 @@ module Google
           service.modify_ack_deadline name, ack_ids, new_deadline
           true
         end
-        alias_method :modify_ack_deadline, :delay
+        alias modify_ack_deadline delay
 
         ##
         # Creates a new {Snapshot} from the subscription. The created snapshot
@@ -510,7 +510,7 @@ module Google
           grpc = service.create_snapshot name, snapshot_name
           Snapshot.from_grpc grpc, service
         end
-        alias_method :new_snapshot, :create_snapshot
+        alias new_snapshot create_snapshot
 
         ##
         # Resets the subscription's backlog to a given {Snapshot} or to a point
@@ -604,7 +604,7 @@ module Google
           policy = Policy.from_grpc grpc
           return policy unless block_given?
           yield policy
-          self.policy = policy
+          update_policy policy
         end
 
         ##
@@ -634,13 +634,14 @@ module Google
         #
         #   policy.add "roles/owner", "user:owner@example.com"
         #
-        #   sub.policy = policy # API call
+        #   sub.update_policy policy # API call
         #
-        def policy= new_policy
+        def update_policy new_policy
           ensure_service!
           grpc = service.set_subscription_policy name, new_policy.to_grpc
           Policy.from_grpc grpc
         end
+        alias policy= update_policy
 
         ##
         # Tests the specified permissions against the [Cloud
@@ -707,7 +708,7 @@ module Google
         # @private Raise an error unless an active connection to the service is
         # available.
         def ensure_service!
-          fail "Must have active connection to service" unless service
+          raise "Must have active connection to service" unless service
         end
 
         ##

data/lib/google/cloud/pubsub/subscription/list.rb

@@ -184,7 +184,7 @@ module Google
           # @private Raise an error unless an active connection to the service
           # is available.
           def ensure_service!
-            fail "Must have active connection to service" unless @service
+            raise "Must have active connection to service" unless @service
           end
 
           def next_subscriptions

data/lib/google/cloud/pubsub/topic.rb

@@ -161,8 +161,8 @@ module Google
           grpc = service.create_subscription name, subscription_name, options
           Subscription.from_grpc grpc, service
         end
-        alias_method :create_subscription, :subscribe
-        alias_method :new_subscription, :subscribe
+        alias create_subscription subscribe
+        alias new_subscription subscribe
 
         ##
         # Retrieves subscription by name.
@@ -205,8 +205,8 @@ module Google
         rescue Google::Cloud::NotFoundError
           nil
         end
-        alias_method :get_subscription, :subscription
-        alias_method :find_subscription, :subscription
+        alias get_subscription subscription
+        alias find_subscription subscription
 
         ##
         # Retrieves a list of subscription names for the given project.
@@ -246,8 +246,8 @@ module Google
           grpc = service.list_topics_subscriptions name, options
           Subscription::List.from_topic_grpc grpc, service, name, max
         end
-        alias_method :find_subscriptions, :subscriptions
-        alias_method :list_subscriptions, :subscriptions
+        alias find_subscriptions subscriptions
+        alias list_subscriptions subscriptions
 
         ##
         # Publishes one or more messages to the topic.
@@ -412,7 +412,7 @@ module Google
           policy = Policy.from_grpc grpc
           return policy unless block_given?
           yield policy
-          self.policy = policy
+          update_policy policy
         end
 
         ##
@@ -442,13 +442,14 @@ module Google
         #
         #   policy.add "roles/owner", "user:owner@example.com"
         #
-        #   topic.policy = policy # API call
+        #   topic.update_policy policy # API call
         #
-        def policy= new_policy
+        def update_policy new_policy
           ensure_service!
           grpc = service.set_topic_policy name, new_policy.to_grpc
           @policy = Policy.from_grpc grpc
         end
+        alias policy= update_policy
 
         ##
         # Tests the specified permissions against the [Cloud
@@ -555,7 +556,7 @@ module Google
         # @private Raise an error unless an active connection to the service is
         # available.
         def ensure_service!
-          fail "Must have active connection to service" unless service
+          raise "Must have active connection to service" unless service
         end
 
         ##

data/lib/google/cloud/pubsub/topic/list.rb

@@ -162,7 +162,7 @@ module Google
           # @private Raise an error unless an active connection to the service
           # is available.
           def ensure_service!
-            fail "Must have active connection to service" unless @service
+            raise "Must have active connection to service" unless @service
           end
         end
       end

data/lib/google/cloud/pubsub/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Pubsub
-      VERSION = "0.29.0"
+      VERSION = "0.30.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: google-gax
   requirement: !ruby/object:Gem::Requirement
@@ -141,16 +141,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Pub/Sub