sqreen 1.4.3-java → 1.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3be83ec63339da677df7f8d12efd3f57c5ae135b
-  data.tar.gz: 873ab18040fdb66fd7a6f4ebe75d6c465b2035e0
+  metadata.gz: 7dabc8645b6eaca59937e5742c95229b6a4016b4
+  data.tar.gz: 0a9b782a69bd8b807d4bfc6077bad91b9e9b537f
 SHA512:
-  metadata.gz: 208b06ca1100546c07a8512d5ab22ee9630f749408aa7f450ba7ea41c7449c952f16f58ef76c3d2631183f64f353bb53fc94d52a6c871f18cfd7cbcea7b64530
-  data.tar.gz: 503bfca4f48c619745153cbfa9049cdc0fbb234a320dfdab74a7a0672604b50b0c36d8dd0540af1c53dc3433c6b611204b8da39c6487709c3c45825ea131ae72
+  metadata.gz: 7d2f9dd053786379e7b8a2834bb4e73499c7a4d74ab1835710ea4341196b428b71759d905543e108eede149b1ea7ba2fb47ce8741a63424f019a43113f7708dd
+  data.tar.gz: df8b05e55f77b2a34bdbcc89c5dbe0586fa476597c4784a20818418880bba75d43c3ee6176125f7594fccf9a26a9e3e8c1ff53b4947d63438757360267c3696f

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: java
 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