sqreen 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36d9acaf03b582ce9120a6425278ccd50d113a9d
-  data.tar.gz: 18ac50baadde2c653751bcff36952738ddadf602
+  metadata.gz: 6d96899ae72184cb34509aab39eba75cb2ba0cf8
+  data.tar.gz: 4201f6dbc906404d35dfb4352a32f4b1b2cc9775
 SHA512:
-  metadata.gz: bad005dac888fccba0429e29c22f0bf2f471f53dd1745b5fe210af74a13742fedb3d78f4b091f17356d7f3fc7c8717a848ecaea325044ecb80ab443b23ed89ae
-  data.tar.gz: 7b8708e9c8d5f4c5a6d6428a12416a7904b3fa2e862f0384ccd4ff18865588d3e476a060ea448df15e86e5bd7e9aa75c8dae20cecb6aeed1686fc79f7dfaa60e
+  metadata.gz: 63b4dc8db5a2709f720614ecf0e8b57fd91648ce02124a6fafd083435aa3c8d7e6c1de5b877c4b65be1aa9e7adb5214b93861b93e3e50d842d21f74967b76570
+  data.tar.gz: f589404093b80c59cf48680f4de58b2b3e8ebd164f5912ed4daa4b6a8c3b0de0348581fab382ae912ae4e5cc134d3883818f13e6c86998e833e65fc043c83b4b

data/lib/sqreen/configuration.rb

@@ -2,6 +2,7 @@
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
 require 'yaml'
+require 'erb'
 require 'sqreen/performance_notifications/newrelic'
 
 module Sqreen
@@ -24,6 +25,8 @@ module Sqreen
   CONFIG_FILE_BY_ENV = 'SQREEN_CONFIG_FILE'.freeze
 
   CONFIG_DESCRIPTION = [
+    { :env => :SQREEN_DISABLE, :name => :disable,
+      :default => false },
     { :env => :SQREEN_URL,       :name => :url,
       :default => 'https://back.sqreen.io' },
     { :env => :SQREEN_TOKEN,     :name => :token,
@@ -104,7 +107,7 @@ module Sqreen
     end
 
     def parse_configuration_file(path)
-      res = YAML.load_file path
+      res = YAML.load(ERB.new(File.read(path)).result)
       return {} unless res.is_a?(Hash)
       if @framework
         env = @framework.framework_infos[:environment]

data/lib/sqreen/frameworks/generic.rb

@@ -143,7 +143,9 @@ module Sqreen
 
       # Should the agent not be starting up?
       def prevent_startup
-        :irb if $0 == 'irb'
+        return :irb if $0 == 'irb'
+        return if sqreen_configuration.nil?
+        return :config_disable if sqreen_configuration.get(:disable)
       end
 
       # Instrument with our rules when the framework as finished loading

data/lib/sqreen/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 module Sqreen
-  VERSION = '1.4.3'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs