google-cloud-debugger 0.30.0 → 0.31.0

data/lib/google/cloud/debugger/breakpoint/source_location.rb

@@ -37,8 +37,7 @@ module Google
 
           ##
           # @private Create an empty SourceLocation object.
-          def initialize
-          end
+          def initialize; end
 
           ##
           # @private New Google::Cloud::Debugger::Breakpoint::SourceLocation

data/lib/google/cloud/debugger/breakpoint/validator.rb

@@ -22,9 +22,9 @@ module Google
         #
         # A collection of static methods to help validate a given breakpoint.
         module Validator
-          FILE_NOT_FOUND_MSG = "File not found."
-          WRONG_FILE_TYPE_MSG = "File must be a `.rb` file."
-          INVALID_LINE_MSG = "Invalid line."
+          FILE_NOT_FOUND_MSG = "File not found.".freeze
+          WRONG_FILE_TYPE_MSG = "File must be a `.rb` file.".freeze
+          INVALID_LINE_MSG = "Invalid line.".freeze
 
           ##
           # Validate a given breakpoint. Set breakpoint to error state if
@@ -52,7 +52,7 @@ module Google
           # @private Verifies the given file path exists
           def self.verify_file_path file_path
             File.exist? file_path
-          rescue
+          rescue StandardError
             false
           end
 
@@ -61,7 +61,7 @@ module Google
           def self.verify_file_type file_path
             File.extname(file_path) == ".rb" ||
               File.basename(file_path) == "config.ru"
-          rescue
+          rescue StandardError
             false
           end
 
@@ -82,7 +82,7 @@ module Google
             comment_line = line =~ /^\s*#.*$/
 
             blank_line || comment_line ? false : true
-          rescue
+          rescue StandardError
             false
           end
         end

data/lib/google/cloud/debugger/breakpoint/variable.rb

@@ -99,11 +99,12 @@ module Google
           ##
           # @private Message to display on variables when snapshot buffer is
           # full.
-          BUFFER_FULL_MSG = "Buffer full. Use an expression to see more data."
+          BUFFER_FULL_MSG =
+            "Buffer full. Use an expression to see more data.".freeze
 
           ##
           # @private Error message when variable can't be converted.
-          FAIL_CONVERSION_MSG = "Error: Unable to inspect value"
+          FAIL_CONVERSION_MSG = "Error: Unable to inspect value".freeze
 
           ##
           # @private Name of the variable, if any.
@@ -249,7 +250,7 @@ module Google
             else
               from_primitive_var source, name: name, limit: limit
             end
-          rescue
+          rescue StandardError
             new.tap do |var|
               var.name = name.to_s if name
               var.set_error_state FAIL_CONVERSION_MSG
@@ -576,11 +577,9 @@ module Google
           # @private Exports the Variable var_table_index attribute to
           # an Int32Value gRPC struct
           def var_table_index_to_grpc
-            if var_table_index
-              Google::Protobuf::Int32Value.new value: var_table_index
-            else
-              nil
-            end
+            return unless var_table_index
+
+            Google::Protobuf::Int32Value.new value: var_table_index
           end
 
           ##

data/lib/google/cloud/debugger/breakpoint_manager.rb

@@ -85,7 +85,7 @@ module Google
         def sync_active_breakpoints debuggee_id
           begin
             response = service.list_active_breakpoints debuggee_id, @wait_token
-          rescue
+          rescue StandardError
             return false
           end
 

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

@@ -39,20 +39,20 @@ module Google
       #   debugger.project_id #=> "my-project"
       #
       class Credentials < Google::Auth::Credentials
-        SCOPE = ["https://www.googleapis.com/auth/cloud_debugger"] +
-                Google::Cloud::Logging::Credentials::SCOPE
-        PATH_ENV_VARS = %w(DEBUGGER_CREDENTIALS
+        SCOPE = (["https://www.googleapis.com/auth/cloud_debugger"] +
+                 Google::Cloud::Logging::Credentials::SCOPE).freeze
+        PATH_ENV_VARS = %w[DEBUGGER_CREDENTIALS
                            GOOGLE_CLOUD_CREDENTIALS
                            DEBUGGER_KEYFILE
                            GOOGLE_CLOUD_KEYFILE
-                           GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(DEBUGGER_CREDENTIALS_JSON
+                           GCLOUD_KEYFILE].freeze
+        JSON_ENV_VARS = %w[DEBUGGER_CREDENTIALS_JSON
                            GOOGLE_CLOUD_CREDENTIALS_JSON
                            DEBUGGER_KEYFILE_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/debugger/debuggee.rb

@@ -86,7 +86,7 @@ module Google
           begin
             response = service.register_debuggee to_grpc
             @id = response.debuggee.id
-          rescue
+          rescue StandardError
             revoke_registration
           end
 
@@ -134,12 +134,8 @@ module Google
           debuggee_args[:id] = id if id
 
           source_context = read_app_json_file "source-context.json"
-          debuggee_args[:source_contexts] = [source_context] if source_context
-
-          source_contexts = read_app_json_file "source-contexts.json"
-          if source_contexts
-            debuggee_args[:ext_source_contexts] = source_contexts
-          elsif source_context
+          if source_context
+            debuggee_args[:source_contexts] = [source_context]
             debuggee_args[:ext_source_contexts] = [{ context: source_context }]
           end
 
@@ -219,7 +215,7 @@ module Google
         # @private Helper method to parse json file
         def read_app_json_file file_path
           JSON.parse File.read(file_path), symbolize_names: true
-        rescue
+        rescue StandardError
           nil
         end
       end

data/lib/google/cloud/debugger/debuggee/app_uniquifier_generator.rb

@@ -53,8 +53,6 @@ module Google
             nil
           end
 
-          private
-
           ##
           # @private Recursively parse files and directories.
           def self.process_directory sha, path, depth = 1

data/lib/google/cloud/debugger/logpoint.rb

@@ -45,7 +45,7 @@ module Google
 
             begin
               evaluate_log_message binding
-            rescue
+            rescue StandardError
               return false
             end
           end

data/lib/google/cloud/debugger/middleware.rb

@@ -49,8 +49,8 @@ module Google
             @debugger = debugger
           else
             @debugger =
-              Debugger.new(project: configuration.project_id,
-                           keyfile: configuration.keyfile,
+              Debugger.new(project_id: configuration.project_id,
+                           credentials: configuration.credentials,
                            service_name: configuration.service_name,
                            service_version: configuration.service_version)
 
@@ -98,16 +98,17 @@ module Google
         # already.
         #
         def load_config **kwargs
-          configuration.project_id = kwargs[:project] ||
-                                     kwargs[:project_id] ||
-                                     configuration.project_id
-          configuration.keyfile = kwargs[:keyfile] ||
-                                  configuration.keyfile
+          project_id = kwargs[:project] || kwargs[:project_id]
+          configuration.project_id = project_id unless project_id.nil?
 
-          configuration.service_name = kwargs[:service_name] ||
-                                       configuration.service_name
-          configuration.service_version = kwargs[:service_version] ||
-                                          configuration.service_version
+          creds = kwargs[:credentials] || kwargs[:keyfile]
+          configuration.credentials = creds unless creds.nil?
+
+          service_name = kwargs[:service_name]
+          configuration.service_name = service_name unless service_name.nil?
+
+          service_vers = kwargs[:service_version]
+          configuration.service_version = service_vers unless service_vers.nil?
 
           init_default_config
         end
@@ -115,13 +116,10 @@ module Google
         ##
         # Fallback to default configuration values if not defined already
         def init_default_config
-          configuration.project_id ||= Cloud.configure.project_id ||
-                                       Debugger::Project.default_project_id
-          configuration.keyfile ||= Cloud.configure.keyfile
-
-          configuration.service_name ||= Debugger::Project.default_service_name
-          configuration.service_version ||=
-            Debugger::Project.default_service_version
+          configuration.project_id ||= Debugger.default_project_id
+          configuration.credentials ||= Debugger.default_credentials
+          configuration.service_name ||= Debugger.default_service_name
+          configuration.service_version ||= Debugger.default_service_version
         end
 
         ##

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

@@ -14,7 +14,6 @@
 
 
 require "google/cloud/errors"
-require "google/cloud/env"
 require "google/cloud/debugger/agent"
 require "google/cloud/debugger/credentials"
 require "google/cloud/debugger/middleware"
@@ -74,32 +73,7 @@ module Google
         def project_id
           service.project
         end
-        alias_method :project, :project_id
-
-        ##
-        # @private Default project.
-        def self.default_project_id
-          ENV["DEBUGGER_PROJECT"] ||
-            ENV["GOOGLE_CLOUD_PROJECT"] ||
-            ENV["GCLOUD_PROJECT"] ||
-            Google::Cloud.env.project_id
-        end
-
-        ##
-        # @private Default service name identifier.
-        def self.default_service_name
-          ENV["DEBUGGER_SERVICE_NAME"] ||
-            Google::Cloud.env.app_engine_service_id ||
-            "ruby-app"
-        end
-
-        ##
-        # @private Default service version identifier.
-        def self.default_service_version
-          ENV["DEBUGGER_SERVICE_VERSION"] ||
-            Google::Cloud.env.app_engine_service_version ||
-            ""
-        end
+        alias project project_id
 
         ##
         # Start the Stackdriver Debugger Agent.
@@ -114,7 +88,7 @@ module Google
         def start
           agent.start
         end
-        alias_method :attach, :start
+        alias attach start
 
         ##
         # Stop the Stackdriver Debugger Agent.

data/lib/google/cloud/debugger/rails.rb

@@ -80,7 +80,7 @@ module Google
           # Verify credentials and set use_debugger to false if
           # credentials are invalid
           unless valid_credentials? Debugger.configure.project_id,
-                                    Debugger.configure.keyfile
+                                    Debugger.configure.credentials
             Cloud.configure.use_debugger = false
             return
           end
@@ -90,6 +90,8 @@ module Google
           Google::Cloud.configure.use_debugger ||= Rails.env.production?
         end
 
+        # rubocop:disable all
+
         ##
         # @private Merge Rails configuration into Debugger instrumentation
         # configuration.
@@ -99,20 +101,30 @@ module Google
 
           Cloud.configure.use_debugger ||= gcp_config.use_debugger
           Debugger.configure do |config|
-            config.project_id ||= dbg_config.project_id || gcp_config.project_id
-            config.keyfile ||= dbg_config.keyfile || gcp_config.keyfile
-            config.service_name ||= dbg_config.service_name
-            config.service_version ||= dbg_config.service_version
+            config.project_id ||= begin
+              config.project || dbg_config.project_id || dbg_config.project
+                gcp_config.project_id || gcp_config.project
+            end
+            config.credentials ||= begin
+              config.keyfile || dbg_config.credentials || dbg_config.keyfile
+                gcp_config.credentials || gcp_config.keyfile
+            end
+            config.service_name ||= \
+              (dbg_config.service_name || gcp_config.service_name)
+            config.service_version ||= \
+              (dbg_config.service_version || gcp_config.service_version)
           end
         end
 
+        # rubocop:enable all
+
         ##
         # Fallback to default config values if config parameters not provided.
         def self.init_default_config
           config = Debugger.configure
-          config.project_id ||= Debugger::Project.default_project_id
-          config.service_name ||= Debugger::Project.default_service_name
-          config.service_version ||= Debugger::Project.default_service_version
+          config.project_id ||= Debugger.default_project_id
+          config.service_name ||= Debugger.default_service_name
+          config.service_version ||= Debugger.default_service_version
         end
 
         ##
@@ -126,7 +138,7 @@ module Google
               # if credentials is not a Credentials object, create one
               Debugger::Credentials.new credentials
             end
-          rescue => e
+          rescue StandardError => e
             STDOUT.puts "Note: Google::Cloud::Debugger is disabled because " \
               "it failed to authorize with the service. (#{e.message})"
             return false

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

@@ -44,7 +44,8 @@ module Google
               timeout: timeout,
               client_config: client_config,
               lib_name: "gccl",
-              lib_version: Google::Cloud::Debugger::VERSION)
+              lib_version: Google::Cloud::Debugger::VERSION
+            )
         end
         attr_accessor :mocked_debugger
 
@@ -56,7 +57,8 @@ module Google
               timeout: timeout,
               client_config: client_config,
               lib_name: "gccl",
-              lib_version: Google::Cloud::Debugger::VERSION)
+              lib_version: Google::Cloud::Debugger::VERSION
+            )
         end
         attr_accessor :mocked_transmitter
 

data/lib/google/cloud/debugger/snappoint.rb

@@ -86,7 +86,7 @@ module Google
               eval_call_stack call_stack_bindings
 
               complete
-            rescue
+            rescue StandardError
               return false
             end
           end

data/lib/google/cloud/debugger/tracer.rb

@@ -81,7 +81,8 @@ module Google
             breakpoints_hash[breakpoint_path] ||= {}
             breakpoints_hash[breakpoint_path][breakpoint_line] ||= []
             breakpoints_hash[breakpoint_path][breakpoint_line].push(
-              active_breakpoint)
+              active_breakpoint
+            )
           end
 
           # Tracer is explicitly designed to not have a lock. This should be the

data/lib/google/cloud/debugger/transmitter.rb

@@ -97,7 +97,7 @@ module Google
           return if breakpoint.nil?
           begin
             service.update_active_breakpoint agent.debuggee.id, breakpoint
-          rescue => e
+          rescue StandardError => e
             warn ["#{e.class}: #{e.message}", e.backtrace].join("\n\t")
             @last_exception = e
           end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-debugger
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Heng Xiong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -30,14 +30,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-cloud-logging
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,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
@@ -328,7 +328,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 and instrumentation library for Stackdriver Debugger