onceover 3.13.4 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6449e2a04348ed1fa97a08d0e452a7bd612eb45bf807aaddd4c32b2a22a6b1c6
-  data.tar.gz: 7d93dcf1e360f4a43aa36ace53db60009a7aa0062a734f9472ca14825c59db49
+  metadata.gz: 0d6c972cf07194a1c1e9241024d8eb5d636d65e653496ad23db5153cf054001e
+  data.tar.gz: 70b6ec4fc67378ab886af67a09e82aaae4ae017d403529d6d93362878fabccf5
 SHA512:
-  metadata.gz: '038b4af7edbfd3cf592c425c3de222a3166be32d301999948cb93e2fc62555b3a349cfd412a918aa4a4457d819bc47b80eebb3e1eb007c14f0424352783ec95f'
-  data.tar.gz: 727fb90aec81e72997768799dabd11860423413b176de03e94fdf1d01e0d4451efd7e68aeb61b13d9c60ca8d1c7372ed013b1e34eeb5ffd70f907ceaaf5971f1
+  metadata.gz: e42b021c7ddf16731d0aee35306bd1a4c3e4c51083d7b1de9c1af2be5b423b79cc2599d3dfa819716e2ad08514948ad9b096796245ddcfb68f27a17465f5c560
+  data.tar.gz: 1fada5b3aa7fc42e714fb34e2f5ccc4cbfb3b5557cd584bb42e76dfd7ff33e583f1d1ddd1c327441ef0354df83864982337eab1c7666e458410fdad94296bbc7

data/lib/onceover/controlrepo.rb

@@ -1,10 +1,10 @@
 require 'r10k/puppetfile'
 require 'erb'
-require 'json'
 require 'yaml'
 require 'find'
 require 'pathname'
 require 'thread'
+require 'multi_json'
 require 'onceover/beaker'
 require 'onceover/logger'
 include Onceover::Logger
@@ -499,8 +499,8 @@ class Onceover
       warn "[DEPRECATION] #{__method__} is deprecated due to the removal of Beaker"
 
       require 'onceover/beaker'
+      require 'multi_json'
       require 'net/http'
-      require 'json'
 
       hosts_hash = {}
 
@@ -522,7 +522,7 @@ class Onceover
           comment_out = true
         else
           comment_out = false
-          box_info = JSON.parse(response.body)
+          box_info = MultiJson.load(response.body)
           box_info['current_version']['providers'].each do |provider|
             if provider['name'] == 'virtualbox'
               url = provider['original_url']
@@ -596,8 +596,8 @@ class Onceover
     def read_facts(facts_file)
       file = File.read(facts_file)
       begin
-        result = JSON.parse(file)
-      rescue JSON::ParserError
+        result = MultiJson.load(file)
+      rescue MultiJson::ParseError
         raise "Could not parse the file #{facts_file}, check that it is valid JSON and that the encoding is correct"
       end
       result

data/lib/onceover/deploy.rb

@@ -5,7 +5,7 @@ class Onceover
       require 'onceover/controlrepo'
       require 'pathname'
       require 'fileutils'
-      require 'json'
+      require 'multi_json'
 
       logger.debug 'Deploying locally (R10K)...'
 
@@ -96,7 +96,7 @@ class Onceover
       old_manifest_path = "#{repo.tempdir}/#{repo.environmentpath}/production/.onceover_manifest.json"
       if File.exist? old_manifest_path
         logger.debug "Found manifest from previous run, parsing..."
-        old_manifest = JSON.parse(File.read(old_manifest_path))
+        old_manifest = MultiJson.load(File.read(old_manifest_path))
         logger.debug "Removing #{old_manifest.count} files"
         old_manifest.reverse.each do |file|
           FileUtils.rm_f(File.join("#{repo.tempdir}/#{repo.environmentpath}/production/",file))

data/lib/onceover/rake_tasks.rb

@@ -50,7 +50,7 @@ task :generate_nodesets do
 
   require 'onceover/beaker'
   require 'net/http'
-  require 'json'
+  require 'multi_json'
 
   repo = Onceover::Controlrepo.new
 
@@ -72,7 +72,7 @@ task :generate_nodesets do
       comment_out = true
     else
       comment_out = false
-      box_info = JSON.parse(response.body)
+      box_info = MultiJson.load(response.body)
       box_info['current_version']['providers'].each do |provider|
         if  provider['name'] == 'virtualbox'
           url = provider['original_url']

data/onceover.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.13.4"
+  s.version     = "3.14.0"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   # Runtime dependencies, but also probably dependencies of requiring projects
   s.add_runtime_dependency 'rake', '>= 10.0.0'
-  s.add_runtime_dependency 'json', '>= 1.8.2'
+  s.add_runtime_dependency 'multi_json', '~> 1.10'
   s.add_runtime_dependency 'backticks', '>= 1.0.2'
   s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0"
   s.add_runtime_dependency 'parallel_tests', ">= 2.0.0"

data/templates/test_spec.rb.erb

@@ -23,8 +23,8 @@ describe "<%= cls.name %>" do
     # Create a from_json function so that we can parse the output of json for mocked functions
     before :each do
       Puppet::Parser::Functions.newfunction(:from_json, :type => :rvalue) { |args|
-          require 'json'
-          JSON.parse(args[0])
+          require 'multi_json'
+          MultiJson.load(args[0])
         }
     end
 <% end -%>
@@ -46,7 +46,7 @@ $onceover_node  = '<%= node.name %>'
 # End user-specified pre_condition
 
 <% if @mock_functions -%>
-<% require 'json' -%>
+<% require 'multi_json' -%>
 # Mocking functions
 <% @mock_functions.each do |function,params| -%>
 <% if params['returns'].is_a? String -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.13.4
+  version: 3.14.0
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: backticks
   requirement: !ruby/object:Gem::Requirement