skylight 5.0.0.beta4 → 5.1.0.beta2

data/lib/skylight/user_config.rb

@@ -14,16 +14,18 @@ module Skylight
     def file_path
       return @file_path if @file_path
 
-      config_path = @config[:user_config_path] || begin
-        require "etc"
-        home_dir = ENV["HOME"] || Etc.getpwuid.dir || (ENV["USER"] && File.expand_path("~#{ENV['USER']}"))
-        if home_dir
-          File.join(home_dir, ".skylight")
-        else
-          raise ConfigError,
-                "The Skylight `user_config_path` must be defined since the home directory cannot be inferred"
-        end
-      end
+      config_path =
+        @config[:user_config_path] ||
+          begin
+            require "etc"
+            home_dir = ENV["HOME"] || Etc.getpwuid.dir || (ENV["USER"] && File.expand_path("~#{ENV["USER"]}"))
+            if home_dir
+              File.join(home_dir, ".skylight")
+            else
+              raise ConfigError,
+                    "The Skylight `user_config_path` must be defined since the home directory cannot be inferred"
+            end
+          end
 
       @file_path = File.expand_path(config_path)
     end
@@ -46,16 +48,11 @@ module Skylight
 
     def save
       FileUtils.mkdir_p(File.dirname(file_path))
-      File.open(file_path, "w") do |f|
-        f.puts YAML.dump(to_hash)
-      end
+      File.open(file_path, "w") { |f| f.puts YAML.dump(to_hash) }
     end
 
     def to_hash
-      {
-        "disable_dev_warning" => disable_dev_warning,
-        "disable_env_warning" => disable_env_warning
-      }
+      { "disable_dev_warning" => disable_dev_warning, "disable_env_warning" => disable_env_warning }
     end
   end
 end

data/lib/skylight/util/clock.rb

@@ -15,6 +15,7 @@ module Skylight
         now = Time.now
         now.to_i * 1_000_000_000 + now.usec * 1_000
       end
+
       # rubocop:enable Lint/DuplicateMethods
 
       # TODO: rename to secs

data/lib/skylight/util/component.rb

@@ -14,7 +14,7 @@ module Skylight
 
       def initialize(environment, name, force_worker: false)
         @environment = environment || DEFAULT_ENVIRONMENT
-        @name        = resolve_name(name, force_worker)
+        @name = resolve_name(name, force_worker)
 
         raise ArgumentError, "environment can't be blank" if @environment.empty?
 
@@ -40,35 +40,32 @@ module Skylight
 
       # keys here should match those from the main config
       def as_json(*)
-        {
-          component: name,
-          env:       environment
-        }
+        { component: name, env: environment }
       end
 
       private
 
-        def program_name
-          $PROGRAM_NAME
-        end
+      def program_name
+        $PROGRAM_NAME
+      end
 
-        def argv
-          ARGV
-        end
+      def argv
+        ARGV
+      end
 
-        def resolve_name(given_name, force_worker)
-          # don't allow workers to be called 'web'
-          return WORKER_NAME if force_worker && (given_name.nil? || given_name == DEFAULT_NAME)
-          return DEFAULT_NAME if given_name.nil?
+      def resolve_name(given_name, force_worker)
+        # don't allow workers to be called 'web'
+        return WORKER_NAME if force_worker && (given_name.nil? || given_name == DEFAULT_NAME)
+        return DEFAULT_NAME if given_name.nil?
 
-          given_name
-        end
+        given_name
+      end
 
-        def validate_string!(string, kind)
-          return true if string =~ NAME_FORMAT
+      def validate_string!(string, kind)
+        return true if string =~ NAME_FORMAT
 
-          raise ArgumentError, "#{kind} can only contain lowercase letters, numbers, and dashes"
-        end
+        raise ArgumentError, "#{kind} can only contain lowercase letters, numbers, and dashes"
+      end
     end
   end
 end

data/lib/skylight/util/deploy.rb

@@ -48,9 +48,7 @@ module Skylight
 
         def initialize(*)
           super
-          if description && !id
-            warn "The configured deploy will be ignored as an id or git_sha must be provided."
-          end
+          warn "The configured deploy will be ignored as an id or git_sha must be provided." if description && !id
         end
 
         def id
@@ -86,13 +84,13 @@ module Skylight
 
         private
 
-          def get_info
-            info_path = config[:'heroku.dyno_info_path']
+        def get_info
+          info_path = config[:'heroku.dyno_info_path']
 
-            if File.exist?(info_path) && (info = JSON.parse(File.read(info_path)))
-              info["release"]
-            end
+          if File.exist?(info_path) && (info = JSON.parse(File.read(info_path)))
+            info["release"]
           end
+        end
       end
 
       class GitDeploy < EmptyDeploy
@@ -105,12 +103,12 @@ module Skylight
 
         private
 
-          def get_info
-            Dir.chdir(config.root) do
-              info = `git log -1 --pretty="%H %s" 2>&1`
-              info.split(" ", 2).map(&:strip) if $CHILD_STATUS.success?
-            end
+        def get_info
+          Dir.chdir(config.root) do
+            info = `git log -1 --pretty="%H %s" 2>&1`
+            info.split(" ", 2).map(&:strip) if $CHILD_STATUS.success?
           end
+        end
       end
 
       DEPLOY_TYPES = [DefaultDeploy, HerokuDeploy, GitDeploy].freeze

data/lib/skylight/util/http.rb

@@ -10,14 +10,14 @@ module Skylight
   module Util
     class HTTP
       CONTENT_ENCODING = "content-encoding".freeze
-      CONTENT_LENGTH   = "content-length".freeze
-      CONTENT_TYPE     = "content-type".freeze
-      ACCEPT           = "Accept".freeze
-      X_VERSION_HDR    = "x-skylight-agent-version".freeze
+      CONTENT_LENGTH = "content-length".freeze
+      CONTENT_TYPE = "content-type".freeze
+      ACCEPT = "Accept".freeze
+      X_VERSION_HDR = "x-skylight-agent-version".freeze
       APPLICATION_JSON = "application/json".freeze
-      AUTHORIZATION    = "authorization".freeze
-      DEFLATE          = "deflate".freeze
-      GZIP             = "gzip".freeze
+      AUTHORIZATION = "authorization".freeze
+      DEFLATE = "deflate".freeze
+      GZIP = "gzip".freeze
 
       include Logging
 
@@ -35,7 +35,8 @@ module Skylight
         end
       end
 
-      class ReadResponseError < StandardError; end
+      class ReadResponseError < StandardError
+      end
 
       def initialize(config, service = :auth, opts = {})
         @config = config
@@ -46,7 +47,7 @@ module Skylight
 
         url = URI.parse(url)
 
-        @ssl  = url.scheme == "https"
+        @ssl = url.scheme == "https"
         @host = url.host
         @port = url.port
 
@@ -81,131 +82,129 @@ module Skylight
 
       private
 
-        def get_timeout(type, config, service, opts)
-          config.duration_ms("#{service}_http_#{type}_timeout") ||
-            opts[:timeout] || 15
-        end
+      def get_timeout(type, config, service, opts)
+        config.duration_ms("#{service}_http_#{type}_timeout") || opts[:timeout] || 15
+      end
 
-        def build_request(type, endpoint, hdrs, length = nil)
-          headers = {}
+      def build_request(type, endpoint, hdrs, length = nil)
+        headers = {}
 
-          headers[CONTENT_LENGTH]   = length.to_s if length
-          headers[AUTHORIZATION]    = authentication if authentication
-          headers[ACCEPT]           = APPLICATION_JSON
-          headers[X_VERSION_HDR]    = VERSION
-          headers[CONTENT_ENCODING] = GZIP if length && @deflate
+        headers[CONTENT_LENGTH] = length.to_s if length
+        headers[AUTHORIZATION] = authentication if authentication
+        headers[ACCEPT] = APPLICATION_JSON
+        headers[X_VERSION_HDR] = VERSION
+        headers[CONTENT_ENCODING] = GZIP if length && @deflate
 
-          hdrs.each do |k, v|
-            headers[k] = v
-          end
+        hdrs.each { |k, v| headers[k] = v }
 
-          type.new(endpoint, headers)
+        type.new(endpoint, headers)
+      end
+
+      def do_request(http, req)
+        begin
+          client = http.start
+        rescue StandardError => e
+          # TODO: Retry here
+          raise StartError, e
         end
 
-        def do_request(http, req)
-          begin
-            client = http.start
-          rescue => e
-            # TODO: Retry here
-            raise StartError, e
-          end
+        begin
+          res = client.request(req)
+        rescue *READ_EXCEPTIONS => e
+          raise ReadResponseError, e.inspect
+        end
 
-          begin
-            res = client.request(req)
-          rescue *READ_EXCEPTIONS => e
-            raise ReadResponseError, e.inspect
-          end
+        yield res
+      ensure
+        client&.finish
+      end
 
-          yield res
-        ensure
-          client&.finish
+      def execute(req, body = nil)
+        t do
+          fmt "executing HTTP request; host=%s; port=%s; path=%s, body=%s",
+              @host,
+              @port,
+              req.path,
+              body && body.bytesize
         end
 
-        def execute(req, body = nil)
-          t do
-            fmt "executing HTTP request; host=%s; port=%s; path=%s, body=%s",
-                @host, @port, req.path, body && body.bytesize
-          end
+        if body
+          body = Gzip.compress(body) if @deflate
+          req.body = body
+        end
 
-          if body
-            body = Gzip.compress(body) if @deflate
-            req.body = body
-          end
+        http = Net::HTTP.new(@host, @port, @proxy_addr, @proxy_port, @proxy_user, @proxy_pass)
 
-          http = Net::HTTP.new(@host, @port,
-                               @proxy_addr, @proxy_port, @proxy_user, @proxy_pass)
+        http.open_timeout = @open_timeout
+        http.read_timeout = @read_timeout
 
-          http.open_timeout = @open_timeout
-          http.read_timeout = @read_timeout
+        if @ssl
+          http.use_ssl = true
 
-          if @ssl
-            http.use_ssl = true
+          http.ca_file = SSL.ca_cert_file_or_default unless SSL.ca_cert_file?
 
-            unless SSL.ca_cert_file?
-              http.ca_file = SSL.ca_cert_file_or_default
-            end
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
 
-            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        do_request(http, req) do |res|
+          unless res.code =~ /2\d\d/
+            debug "server responded with #{res.code}"
+            t { fmt "body=%s", res.body }
           end
 
-          do_request(http, req) do |res|
-            unless res.code =~ /2\d\d/
-              debug "server responded with #{res.code}"
-              t { fmt "body=%s", res.body }
-            end
+          Response.new(res.code.to_i, res, res.body)
+        end
+      rescue Exception => e
+        error "http %s %s failed; error=%s; msg=%s", req.method, req.path, e.class, e.message
+        t { e.backtrace.join("\n") }
+        ErrorResponse.new(req, e)
+      end
 
-            Response.new(res.code.to_i, res, res.body)
-          end
-        rescue Exception => e
-          error "http %s %s failed; error=%s; msg=%s", req.method, req.path, e.class, e.message
-          t { e.backtrace.join("\n") }
-          ErrorResponse.new(req, e)
-        end
-
-        class Response
-          attr_reader :status, :headers, :body, :exception
-
-          def initialize(status, headers, body)
-            @status  = status
-            @headers = headers
-
-            if (headers[CONTENT_TYPE] || "").include?(APPLICATION_JSON)
-              begin
-                @body = JSON.parse(body)
-              rescue JSON::ParserError
-                @body = body # not really JSON I guess
-              end
-            else
-              @body = body
+      class Response
+        attr_reader :status, :headers, :body, :exception
+
+        def initialize(status, headers, body)
+          @status = status
+          @headers = headers
+
+          if (headers[CONTENT_TYPE] || "").include?(APPLICATION_JSON)
+            begin
+              @body = JSON.parse(body)
+            rescue JSON::ParserError
+              @body = body # not really JSON I guess
             end
+          else
+            @body = body
           end
+        end
 
-          def success?
-            status >= 200 && status < 300
-          end
+        def success?
+          status >= 200 && status < 300
+        end
 
-          def to_s
-            body.to_s
-          end
+        def to_s
+          body.to_s
+        end
 
-          def get(key)
-            body.dig(*key.split(".")) if body.is_a?(Hash)
-          end
+        def get(key)
+          body.dig(*key.split(".")) if body.is_a?(Hash)
+        end
 
-          def respond_to_missing?(name, include_all = false)
-            super || body.respond_to?(name, include_all)
-          end
+        def respond_to_missing?(name, include_all = false)
+          super || body.respond_to?(name, include_all)
+        end
 
-          def method_missing(name, *args, &blk)
-            if respond_to_missing?(name)
-              body.send(name, *args, &blk)
-            else
-              super
-            end
+        def method_missing(name, *args, &blk)
+          if respond_to_missing?(name)
+            body.send(name, *args, &blk)
+          else
+            super
           end
         end
+      end
 
-        ErrorResponse = Struct.new(:request, :exception) do
+      ErrorResponse =
+        Struct.new(:request, :exception) do
           def status
             nil
           end

data/lib/skylight/util/logging.rb

@@ -14,9 +14,7 @@ module Skylight
         # Try to avoid writing to STDOUT/STDERR twice
         logger_logdev = @logger.instance_variable_get(:@logdev)
         logger_out = logger_logdev.respond_to?(:dev) ? logger_logdev.dev : nil
-        if logger_out != $stdout && logger_out != $stderr
-          @logger.<<(*args)
-        end
+        @logger.<<(*args) if logger_out != $stdout && logger_out != $stderr
       end
 
       def close; end
@@ -85,8 +83,8 @@ module Skylight
 
       alias log_trace trace
       alias log_debug debug
-      alias log_info  info
-      alias log_warn  warn
+      alias log_info info
+      alias log_warn warn
       alias log_error error
 
       # Alias for `Kernel#sprintf`
@@ -123,7 +121,7 @@ module Skylight
           else
             Kernel.warn "Invalid logger"
           end
-        # Fallback to stderr for warn and error levels
+          # Fallback to stderr for warn and error levels
         elsif %i[warn error].include?(level)
           $stderr.puts format("[SKYLIGHT] #{msg}", *args)
         end