skylight 3.1.5 → 4.0.0.alpha

data/lib/skylight/util/deploy.rb

@@ -1,11 +1,9 @@
-require 'json'
-require 'skylight/core/util/logging'
+require "json"
+require "skylight/core/util/logging"
 
 module Skylight
   module Util
-
     module Deploy
-
       def self.build(config)
         DEPLOY_TYPES.each do |type|
           deploy = type.new(config)
@@ -15,7 +13,6 @@ module Skylight
       end
 
       class EmptyDeploy
-
         attr_reader :config
         attr_reader :timestamp
 
@@ -41,11 +38,10 @@ module Skylight
             timestamp:   timestamp,
             deploy_id:   id.to_s[0..100] # Keep this sane
           }
-          hash[:git_sha] = git_sha.to_s[0..40] if git_sha # A valid SHA will never exceed 40
+          hash[:git_sha] = git_sha[0..40] if git_sha # A valid SHA will never exceed 40
           hash[:description] = description[0..255] if description # Avoid massive descriptions
           hash
         end
-
       end
 
       class DefaultDeploy < EmptyDeploy
@@ -69,26 +65,24 @@ module Skylight
         def description
           config.get(:'deploy.description')
         end
-
       end
 
       class HerokuDeploy < EmptyDeploy
-
         def initialize(*)
           super
           @info = get_info
         end
 
         def id
-          @info ? @info['id'] : nil
+          @info ? @info["id"] : nil
         end
 
         def git_sha
-          @info ? @info['commit'] : nil
+          @info ? @info["commit"] : nil
         end
 
         def description
-          @info ? @info['description'] : nil
+          @info ? @info["description"] : nil
         end
 
         private
@@ -97,16 +91,14 @@ module Skylight
             info_path = config[:'heroku.dyno_info_path']
 
             if File.exist?(info_path)
-              if info = JSON.parse(File.read(info_path))
-                info['release']
+              if (info = JSON.parse(File.read(info_path)))
+                info["release"]
               end
             end
           end
-
       end
 
       class GitDeploy < EmptyDeploy
-
         attr_reader :git_sha, :description
 
         def initialize(*)
@@ -119,15 +111,12 @@ module Skylight
           def get_info
             Dir.chdir(config.root) do
               info = `git log -1 --pretty="%H %s" 2>&1`
-              info.split(" ", 2).map(&:strip) if $?.success?
+              info.split(" ", 2).map(&:strip) if $CHILD_STATUS.success?
             end
           end
-
       end
 
-      DEPLOY_TYPES = [DefaultDeploy, HerokuDeploy, GitDeploy]
-
+      DEPLOY_TYPES = [DefaultDeploy, HerokuDeploy, GitDeploy].freeze
     end
-
   end
 end

data/lib/skylight/util/hostname.rb

@@ -1,13 +1,13 @@
-require 'socket'
-require 'securerandom'
+require "socket"
+require "securerandom"
 
 module Skylight
   module Util
     module Hostname
       def self.default_hostname
-        if hostname = Socket.gethostname
+        if (hostname = Socket.gethostname)
           hostname.strip!
-          hostname = nil if hostname == ''
+          hostname = nil if hostname == ""
         end
 
         hostname || "gen-#{SecureRandom.uuid}"

data/lib/skylight/util/http.rb

@@ -1,42 +1,38 @@
-require 'uri'
-require 'json'
-require 'openssl'
-require 'net/http'
-require 'net/https'
-require 'skylight/core/util/gzip'
-require 'skylight/util/ssl'
+require "uri"
+require "json"
+require "openssl"
+require "net/http"
+require "net/https"
+require "skylight/core/util/gzip"
+require "skylight/util/ssl"
 
 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
-      APPLICATION_JSON = 'application/json'.freeze
-      AUTHORIZATION    = 'authorization'.freeze
-      DEFLATE          = 'deflate'.freeze
-      GZIP             = 'gzip'.freeze
+      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
+      APPLICATION_JSON = "application/json".freeze
+      AUTHORIZATION    = "authorization".freeze
+      DEFLATE          = "deflate".freeze
+      GZIP             = "gzip".freeze
 
       include Core::Util::Logging
 
       attr_accessor :authentication
       attr_reader :host, :port, :config
 
-      READ_EXCEPTIONS = [Timeout::Error, EOFError]
-      # This doesn't exist on Ruby 1.9.3
-      READ_EXCEPTIONS << Net::ReadTimeout if defined?(Net::ReadTimeout)
-      READ_EXCEPTIONS.freeze
+      READ_EXCEPTIONS = [Timeout::Error, EOFError, Net::ReadTimeout].freeze
 
       class StartError < StandardError
         attr_reader :original
 
-        def initialize(e)
-          @original = e
-          super e.inspect
+        def initialize(error)
+          @original = error
+          super error.inspect
         end
-
       end
 
       class ReadResponseError < StandardError; end
@@ -44,27 +40,28 @@ module Skylight
       def initialize(config, service = :auth, opts = {})
         @config = config
 
-        unless url = config["#{service}_url"]
+        unless (url = config["#{service}_url"])
           raise ArgumentError, "no URL specified for #{service}"
         end
 
         url = URI.parse(url)
 
-        @ssl  = url.scheme == 'https'
+        @ssl  = url.scheme == "https"
         @host = url.host
         @port = url.port
 
-        if proxy_url = config[:proxy_url]
+        if (proxy_url = config[:proxy_url])
           proxy_url = URI.parse(proxy_url)
-          @proxy_addr, @proxy_port = proxy_url.host, proxy_url.port
-          @proxy_user, @proxy_pass = (proxy_url.userinfo || '').split(/:/)
+          @proxy_addr = proxy_url.host
+          @proxy_port = proxy_url.port
+          @proxy_user, @proxy_pass = (proxy_url.userinfo || "").split(/:/)
         end
 
         @open_timeout = get_timeout(:connect, config, service, opts)
         @read_timeout = get_timeout(:read, config, service, opts)
 
         @deflate = config["#{service}_http_deflate"]
-        @authentication = config[:'authentication']
+        @authentication = config[:authentication]
       end
 
       def get(endpoint, hdrs = {})
@@ -82,146 +79,147 @@ module Skylight
         execute(request, body)
       end
 
-    private
+      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 do |k, v|
-          headers[k] = v
+          type.new(endpoint, headers)
         end
 
-        type.new(endpoint, headers)
-      end
+        def do_request(http, req)
+          begin
+            client = http.start
+          rescue => 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
+          yield res
+        ensure
+          client.finish if client
         end
 
-        yield res
-      ensure
-        client.finish if client
-      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
 
-      def execute(req, body=nil)
-        t { fmt "executing HTTP request; host=%s; port=%s; path=%s, body=%s",
-              @host, @port, req.path, body && body.bytesize }
+          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
+            unless SSL.ca_cert_file?
+              http.ca_file = SSL.ca_cert_file_or_default
+            end
 
-          unless SSL.ca_cert_file?
-            http.ca_file = SSL.ca_cert_file_or_default
+            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
           end
 
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        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
 
-        do_request(http, req) do |res|
-          unless res.code =~ /2\d\d/
-            debug "server responded with #{res.code}"
-            t { fmt "body=%s", res.body }
+            Response.new(res.code.to_i, res, 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
-
-      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
+        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
             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)
-          return nil unless Hash === body
+          def get(key)
+            return nil unless body.is_a?(Hash)
 
-          res = body
-          key.split('.').each do |part|
-            return unless res = res[part]
+            res = body
+            key.split(".").each do |part|
+              return unless (res = res[part])
+            end
+            res
           end
-          res
-        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
+          def method_missing(name, *args, &blk)
+            if respond_to_missing?(name)
+              body.send(name, *args, &blk)
+            else
+              super
+            end
           end
         end
-      end
 
-      class ErrorResponse < Struct.new(:request, :exception)
-        def status
-          nil
-        end
+        ErrorResponse = Struct.new(:request, :exception) do
+          def status
+            nil
+          end
 
-        def success?
-          false
+          def success?
+            false
+          end
         end
-      end
-
     end
   end
 end