skylight 0.5.0.beta1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7eb484b9fcd3852564008f81d9cdbc1da4ddf11
-  data.tar.gz: 37c8da551cbe8d0b460bfcf8346defe265e5a665
+  metadata.gz: e78118dc565426a957d8f55afe082e19b6b342c6
+  data.tar.gz: 6486c1af0cc556a30bcc9763df080dcdcc465f94
 SHA512:
-  metadata.gz: 8aa90d031fe9903413d71cd4dbb1097fa9566595eadfa288326dd629d98313bd8096547fed9681e49aed8fdbe03b38b1d59621aa8b1f61411e819affebbecafb
-  data.tar.gz: 89722c481983864f6e1fbfec52885fa3d10a63587ed324f77356f7276c0b6c63f5da63f5862e79c7a496cf42899588bfefbddfb8cc4fe0b87da94a84fd337c3b
+  metadata.gz: 70fd431199b0b0b55afa2fad0d0009ac94b0b77458022ac4fd8904b0281ece7353f87c4f2bbbb315a5c7c5330cf240950c6f20491953419b78cfccc3307c9a9c
+  data.tar.gz: b518630c1a7adc80873a0b4d415a4312006a51f947ee767e5bd81d1e9232a2cda4e3b7081e0133e830ffd9bbda3ac33cda83515850f4a3250518d8e3b3501832

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-## 0.5.0 (unreleased)
+## 0.5.0 (December 4, 2014)
+* [IMPROVEMENT] Automatically load configuration from ENV
+* [BUGFIX] Fix Moped integration
 * [FEATURE] Track object allocations per span
 * [BUGFIX] Fix exit status in 1.9.2
 * [IMPROVEMENT] Fix C warnings

data/lib/skylight/config.rb

@@ -171,10 +171,13 @@ module Skylight
       end
     end
 
-    def self.load(path = nil, environment = nil, env = ENV)
+    def self.load(opts = {}, env = ENV)
       attrs   = {}
       version = nil
 
+      path = opts.delete(:file)
+      environment = opts.delete(:environment)
+
       if path
         error = nil
         begin
@@ -194,11 +197,13 @@ module Skylight
         attrs[:priority] = remap_env(env)
       end
 
-      new(environment, attrs)
-    end
+      config = new(environment, attrs)
+
+      opts.each do |k, v|
+        config[k] = v
+      end
 
-    def self.load_from_env(env = ENV)
-      self.load(nil, nil, env)
+      config
     end
 
     def self.remap_key(key)

data/lib/skylight/instrumenter.rb

@@ -32,16 +32,13 @@ module Skylight
     def self.start!(config = nil)
       return @instance if @instance
 
-      # Initialize here so we can catch errors
-      config ||= Config.new
-
       LOCK.synchronize do
         return @instance if @instance
         @instance = new(config).start!
       end
     rescue => e
       message = sprintf("[SKYLIGHT] [#{Skylight::VERSION}] Unable to start Instrumenter; msg=%s; class=%s", e.message, e.class)
-      if config
+      if config && config.respond_to?(:logger)
         config.logger.warn message
       else
         warn message
@@ -72,16 +69,11 @@ module Skylight
       end
     end
 
-
     attr_reader :config, :gc, :trace_info
 
     def self.new(config)
-      if config.nil?
-        raise ArgumentError, "config is required"
-      elsif Hash === config
-        config = Config.new(config)
-      end
-
+      config ||= {}
+      config = Config.load(config) unless config.is_a?(Config)
       config.validate!
 
       inst = native_new(config.to_env)

data/lib/skylight/normalizers/moped/query.rb

@@ -117,18 +117,18 @@ module Skylight
         end
 
         def extract_binds(hash, binds=[])
-          hash = hash.dup
+          ret = {}
 
           hash.each do |k,v|
             if v.is_a?(Hash)
-              hash[k] = extract_binds(v, binds)[0]
+              ret[k] = extract_binds(v, binds)[0]
             else
               binds << stringify(hash[k])
-              hash[k] = '?'
+              ret[k] = '?'
             end
           end
 
-          [hash, binds]
+          [ret, binds]
         end
 
         def stringify(value)

data/lib/skylight/railtie.rb

@@ -65,7 +65,7 @@ module Skylight
         return nil
       end
 
-      config = Config.load(path, Rails.env.to_s, ENV)
+      config = Config.load(file: path, environment: Rails.env.to_s)
       config['root'] = Rails.root
 
       configure_logging(config, app)

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.5.0-beta1'
+  VERSION = '0.5.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -162,9 +162,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2