skylight 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a76099fda886af0e74d06bed09f512715705be0a
-  data.tar.gz: 7f926a22b2da10ecc498995ada0ddc5b48d2b510
+  metadata.gz: b493d2bd2640af0664051fabec05cb868ff84b95
+  data.tar.gz: f5d1f59e9653f75e13d6235c9b0edd2e41316f62
 SHA512:
-  metadata.gz: c054668e4feec17241dbbcfbc6ddb1bf8808d7d718f10a1449940c056ecfdb3d26a2ddfe805e0d0c81d880eb949b699f517687e3cf13eda242bba4e287a5a1c0
-  data.tar.gz: 35516e9b5e0cec82a57d1e04e759787a301123b223c9a00d0ae829d2e116f1a1d85154bd79ed962e2229e92757ed36919d25efe55bea5ac608fc640ea51e6771
+  metadata.gz: c9b9b7ab7b673ce41b1e48caa14fd75e4ed89e4761272eed68b3541d1ca70d76e451033f515f748d2ffc5c2e08e68ab41e5bc6166c19b8cd9ac9b75539929a62
+  data.tar.gz: 8aba7b9f73bae5cefaf1b7c772c7687bb3a8b0103378c93350aefb111d51600db0af90055c7c5b29908ba8bb213433f243a1775bbfca31ad44cff402d5de8219

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.10.5 (June 22, 2016)
+
+* [BUGFIX] Fix issue with Grape multi-method naming
+* [BUGFIX] Add http to proxy_url for native fetching
+* [BUGFIX] Fix setting `proxy_url` in config YML
+* [IMPROVEMENT] Log errors during authentication validation
+
 ## 0.10.4 (June 3, 2016)
 
 * [BUGFIX] Sinatra instrumenation now works for latest master
@@ -9,7 +16,7 @@
 * [IMPROVEMENT] Allow Skylight to raise on logged errors, useful for testing and debugging
 * [IMPROVEMENT] Finish Rack::Responses in Middleware
 * [IMRPOVEMENT] Better message when config/skylight.yml already exists
-* [IMPROVEMENT] Update Rust Agent with SQL improvements
+* [IMPROVEMENT] Update Rust Agent with SQL improvements, including handling for arrays and WITH
 
 ## 0.10.3 (February 2, 2016)
 

data/lib/skylight/api.rb

@@ -3,6 +3,8 @@ require 'uri'
 module Skylight
   # @api private
   class Api
+    include Util::Logging
+
     attr_reader :config, :http
 
     class CreateFailed < StandardError
@@ -53,9 +55,11 @@ module Skylight
       when 400...500
         :invalid
       else
+        warn res.exception.message if res.exception
         :unknown
       end
-    rescue
+    rescue => e
+      warn e.message
       :unknown
     end
 

data/lib/skylight/config.rb

@@ -9,6 +9,7 @@ require 'skylight/util/hostname'
 require 'skylight/util/logging'
 require 'skylight/util/platform'
 require 'skylight/util/ssl'
+require 'skylight/util/proxy'
 
 module Skylight
   class Config
@@ -241,7 +242,10 @@ module Skylight
 
       return ret unless env
 
-      ret[:proxy_url] = detect_proxy_url(env)
+      # Only set if it exists, we don't want to set to a nil value
+      if proxy_url = Util::Proxy.detect_url(env)
+        ret[:proxy_url] = proxy_url
+      end
 
       env.each do |k, val|
         # Support deprecated SK_ key prefix
@@ -263,13 +267,6 @@ module Skylight
       ret
     end
 
-    def self.detect_proxy_url(env)
-      if u = env['HTTP_PROXY'] || env['http_proxy']
-        u = "http://#{u}" unless u =~ %r[://]
-        u
-      end
-    end
-
     # @api private
     def skip_validation?
       !!get(:skip_validation)

data/lib/skylight/normalizers/grape/endpoint.rb

@@ -12,7 +12,7 @@ module Skylight
 
           def get_method(endpoint)
             method = endpoint.options[:method].first
-            method << "..." if endpoint.options[:method].length > 1
+            method = "#{method}..." if endpoint.options[:method].length > 1
             method
           end
 

data/lib/skylight/util/native_ext_fetcher.rb

@@ -4,6 +4,7 @@ require 'net/http'
 require 'fileutils'
 require 'digest/sha2'
 require 'skylight/util/ssl'
+require 'skylight/util/proxy'
 
 # Used from extconf.rb
 module Skylight
@@ -92,9 +93,9 @@ module Skylight
               when :success
                 log "successfully downloaded native ext; out=#{out}"
                 return extra
-              else
+              when :redirect
                 log "fetching native ext; uri=#{uri}; redirected=#{res}"
-                uri = res
+                uri = extra
 
                 next
               end
@@ -118,7 +119,7 @@ module Skylight
       end
 
       def http_get(host, port, use_ssl, path, out)
-        if http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
+        if http_proxy = Proxy.detect_url(ENV)
           log "connecting with proxy: #{http_proxy}"
           uri = URI.parse(http_proxy)
           p_host, p_port = uri.host, uri.port

data/lib/skylight/util/proxy.rb

@@ -0,0 +1,12 @@
+module Skylight
+  module Util
+    module Proxy
+      def self.detect_url(env)
+        if u = env['HTTP_PROXY'] || env['http_proxy']
+          u = "http://#{u}" unless u =~ %r[://]
+          u
+        end
+      end
+    end
+  end
+end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,6 +113,7 @@ files:
 - lib/skylight/util/multi_io.rb
 - lib/skylight/util/native_ext_fetcher.rb
 - lib/skylight/util/platform.rb
+- lib/skylight/util/proxy.rb
 - lib/skylight/util/ssl.rb
 - lib/skylight/vendor/active_support/notifications.rb
 - lib/skylight/vendor/active_support/notifications/fanout.rb