spark_api 1.5.6 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c3d4c9f45558cce85bffb176aec80b078549b79c6254aebf327ee6044e821eb
-  data.tar.gz: b64d5dbb122e21f47a8860b0c80f9d601ce2fbf212281a14dcaa0e6e69b85119
+  metadata.gz: bbd257984db9c6b0321b546eaf34794a8ddd42a0cedb46c284d48305ee1cf5aa
+  data.tar.gz: 3f2c191759d9ac5df0290d1ed2486cd55be3e11dc94b01ab4d779314aa42219e
 SHA512:
-  metadata.gz: 6162c7da6c81aa3bf9e2e947ed32ce2632e8f8d15961ec63f1c1812a8e65b9730bbd081d3aff8c68306ae35590b4094ab99fcd77b5dca6e85b7b71e20e67e21b
-  data.tar.gz: 99fca35f709e59f97589eebc86206ec0f80c855103122e3101665cf6d6042b6c1d1de10e560d65d6e8d10e3b2a6925086857ae01c124c6531781d047754e3c6b
+  metadata.gz: e3aaba4e37303375cd7ffc8149b39d2ed9f3cefb36c987f0c7ed2632a9f4881e1040a41fcc1fd7b3ea8e26bc2d05631ccd92d52f163326f1ac398470749e7719
+  data.tar.gz: a0488169eb021611cb52fc6c75a56d256fcf32963a3923d6bd4ef1b9b7ab4ce25faa7f75e008b3f974bc8c8a6f18868d7f7819a1e6a236bdb4997c8d30c2b97d

data/VERSION

@@ -1 +1 @@
-1.5.6
+1.6.0

data/lib/spark_api/authentication/oauth2_impl/cli_provider.rb

@@ -82,8 +82,8 @@ module SparkApi
         
         def load_file
           yaml = {}
-          begin 
-            yaml = YAML.load(File.open(filename))
+          begin
+            yaml = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(File.open(filename)) : YAML.load(File.open(filename))
             yaml = {} if yaml == false
           rescue => e
             puts "no file: #{e.message}"

data/lib/spark_api/configuration/yaml.rb

@@ -16,7 +16,9 @@ module SparkApi
       def load_file(file)
         @file = file
         @name = File.basename(file, ".yml")
-        config = YAML.load(ERB.new(File.read(file)).result)[api_env]
+
+        erb_file = ERB.new(File.read(file)).result
+        config = (YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(erb_file) : YAML.load(erb_file))[api_env]
         config["oauth2"] == true  ? load_oauth2(config) : load_api_auth(config)
       rescue => e
         SparkApi.logger().error("Unable to load config file #{file}[#{api_env}]")

data/spec/spec_helper.rb

@@ -2,10 +2,12 @@ if ENV['COVERAGE'] == "on"
   require 'simplecov'
   require 'simplecov-rcov'
   SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start do
-    add_filter '/vendor'
-    add_filter '/spec'
-    add_filter '/test'
+  unless SimpleCov.running   # Hack to prevent starting SimpleCov multiple times  see: https://github.com/simplecov-ruby/simplecov/issues/1003
+    SimpleCov.start do
+      add_filter '/vendor'
+      add_filter '/spec'
+      add_filter '/test'
+    end
   end
 end
 
@@ -21,13 +23,6 @@ require path + '/spark_api'
 
 require 'spark_api'
 
-if ENV['COVERAGE'] == "on"
-  require 'simplecov'
-  require 'simplecov-rcov'
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start { add_filter %w(/vendor /spec /test) }
-end
-
 FileUtils.mkdir 'log' unless File.exists? 'log'
 
 module SparkApi
@@ -51,7 +46,7 @@ end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # # in spec/support/ and its subdirectories.
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))].each { |f| require f }
 
 RSpec.configure do |config|
 
@@ -66,6 +61,6 @@ RSpec.configure do |config|
   config.color = true
 end
 
-def jruby? 
+def jruby?
   RUBY_PLATFORM == "java"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spark_api
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.0
 platform: ruby
 authors:
 - Brandon Hornseth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement