inspec_tools 2.3.8 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f754f4816775d8bb360ed2ce768b1f4a443f647a440a1fe04a371388af6fe0
-  data.tar.gz: d31e79fb1477ab0b9fed85df8847f59f487d1ca5dc0bfc369e201dd2e0b87ba8
+  metadata.gz: 5b88a75ec28d6491c6f8070b70402898b70d0971eb1d467aaab58e8f1671c50f
+  data.tar.gz: acad2a4ee5d9c23e972e98b175575915213ea55bb8546b942191ba037392d0a8
 SHA512:
-  metadata.gz: 5f4fe6b5f733d4654d179e0bbe651276afa3ccfff6527e6088f50c13da23324b1be9c6b695cad464895f13e53b442dd674d546c826b31632def647b73d50d26e
-  data.tar.gz: bee2b9f2a53efa941413308ea6eaeb340493c8d581b07a4d348094ba1278c4177fd3de7ee6575226896d41d0156bf6eaf0934a5f0eb597956c1b4c5ff2c07c67
+  metadata.gz: aab806365dba6a0878a2351cd6e433655ddcd8dcfbf5136228a5e2b79b1110709a9f714d13e801b7cbf836564a82f72b462f1cd4e4ba319d78f8c9d35f0b6950
+  data.tar.gz: 245322d7e8d84eb755aa644dbc4fe8cba3098e467c2f055a56dd66a4ee05fc4ff30beabecf13fea9eed060e26199f9b9b6da87dbcb1cc2ff0658ee959beefef6

data/lib/inspec_tools/inspec.rb

@@ -15,7 +15,7 @@ require_relative '../utilities/xccdf/to_xccdf'
 module InspecTools
   class Inspec
     def initialize(inspec_json, metadata = {})
-      @json = JSON.parse(inspec_json.gsub(/\\+u0000/, ''))
+      @json = JSON.parse(inspec_json)
       @metadata = metadata
     end
 

data/lib/inspec_tools/plugin_cli.rb

@@ -62,9 +62,10 @@ module InspecPlugins
       option :metadata, required: false, type: :string, aliases: '-m',
                         desc: 'path to JSON file with additional host metadata for the XCCDF file'
       def inspec2xccdf
-        json = File.read(options[:inspec_json])
+        io = File.open(options[:inspec_json], 'rb')
+        io.set_encoding_by_bom
         metadata = options[:metadata] ? JSON.parse(File.read(options[:metadata])) : {}
-        inspec_tool = InspecTools::Inspec.new(json, metadata)
+        inspec_tool = InspecTools::Inspec.new(io.read, metadata)
         attr_hsh = YAML.load_file(options[:attributes])
         xccdf = inspec_tool.to_xccdf(attr_hsh)
         File.write(options[:output], xccdf)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec_tools
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 3.0.0
 platform: ruby
 authors:
 - Robert Thew
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -288,7 +288,7 @@ dependencies:
 description: Converter utils for Inspec that can be included as a gem or used from
   the command line
 email:
-- rthew@mitre.org
+- saf@mitre.org
 executables:
 - inspec_tools
 extensions: []
@@ -365,14 +365,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Converter utils for Inspec