inspec_tools 2.0.1.pre3 → 2.0.1.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9821cf8b386c55599d08754287c0e15cf461c2cf1885e9c4e2006f89c560427b
-  data.tar.gz: b07b4ea7ab7f79da47fa1ef3fc2dc52c09d98a7f6a8b24e140d0ba47aae7d435
+  metadata.gz: d2586a67f71f35174ae21e09e02136705d3e09662e176f6f36e81ca92af9b8cc
+  data.tar.gz: fd59d2d3ba2c8b4dcb98cfbd4c217743ff987e57fca5f244e04536bd47ad1c05
 SHA512:
-  metadata.gz: b0375514656589efc9171cdc47d2106376a3da86b84e5eb6bf753c8778819784074204bfbc8763536cf4aa1c720236c9692527239d5c2250d0f881f3c882104b
-  data.tar.gz: ecaa2419766fa3fe9f1ad9722e029002b19eb2e080309e8aeb797ad501ffbcf86ad5da3cc8968bfb8be83268f381261c69ca911315981ca5e1e8f8e356aabf2a
+  metadata.gz: e124c707c7d52ad506b82f0f0de235b6093701725bd2b9afe6cb00e886772a9295602d7468977e41383dd2079eede8718e27c047d8dfed54f8e3bab9e0a4947b
+  data.tar.gz: 53e215d32e5cc505946c553470455bb61470f1ddb8c8baf839aa7e9c82e883d3bf4ef35f2736de0de67ebc977686650b0825bf641c241897a2ed59ff275d25b7

data/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 ## [Unreleased](https://github.com/mitre/inspec_tools/tree/HEAD)
 
-[Full Changelog](https://github.com/mitre/inspec_tools/compare/v2.0.1.pre2...HEAD)
+[Full Changelog](https://github.com/mitre/inspec_tools/compare/v2.0.1.pre3...HEAD)
+
+**Closed issues:**
+
+- consider how to convert impact 0 to Severity in inspec2ckl [\#60](https://github.com/mitre/inspec_tools/issues/60)
+
+**Merged pull requests:**
+
+- Apply fixes from CodeFactor [\#129](https://github.com/mitre/inspec_tools/pull/129) ([aaronlippold](https://github.com/aaronlippold))
+
+## [v2.0.1.pre3](https://github.com/mitre/inspec_tools/tree/v2.0.1.pre3) (2020-04-03)
+
+[Full Changelog](https://github.com/mitre/inspec_tools/compare/v2.0.1.pre2...v2.0.1.pre3)
 
 **Merged pull requests:**
 

data/lib/inspec_tools/cli.rb

@@ -3,10 +3,6 @@ require 'json'
 
 require 'inspec-objects'
 require 'inspec'
-require_relative 'version'
-
-require_relative '../utilities/inspec_util'
-require_relative '../utilities/csv_util'
 require_relative './plugin_cli.rb'
 
 # This tells the ruby cli app to use the same argument parsing as the plugin

data/lib/inspec_tools/plugin_cli.rb

@@ -1,9 +1,6 @@
 require 'yaml'
 require 'json'
-
 require 'roo'
-require_relative 'version'
-
 require_relative '../utilities/inspec_util'
 require_relative '../utilities/csv_util'
 
@@ -17,7 +14,7 @@ module InspecTools
   autoload :Inspec, 'inspec_tools/inspec'
   autoload :Summary, 'inspec_tools/summary'
   autoload :Threshold, 'inspec_tools/threshold'
-  autoload :XLSXTool, 'inspec_tools/xlsx'
+  autoload :XLSXTool, 'inspec_tools/xlsx_tool'
 end
 
 # rubocop:disable Style/GuardClause

data/lib/inspec_tools/{xlsx.rb → xlsx_tool.rb}

@@ -3,6 +3,7 @@ require 'inspec-objects'
 require 'word_wrap'
 require 'yaml'
 require 'digest'
+require 'roo'
 
 require_relative '../utilities/inspec_util'
 
@@ -51,7 +52,7 @@ module InspecTools
         if row[3].is_a? Numeric
           cis_to_nist[row[3].to_s] = row[0]
         else
-          cis2Nist[row[2].to_s] = row[0] unless (row[2] == '') || row[2].to_i.nil?
+          cis_to_nist[row[2].to_s] = row[0] unless (row[2] == '') || row[2].to_i.nil?
         end
       end
       cis_to_nist
@@ -70,7 +71,7 @@ module InspecTools
       @profile['attributes'] = []
       @profile['generator'] = {
         'name': 'inspec_tools',
-        'version': VERSION
+        'version': ::InspecTools::VERSION
       }
     end
 
@@ -122,10 +123,10 @@ module InspecTools
 
       if cis_tags[:sub_section].nil? || cis_tags[:sub_section].blank?
         control['tags']['cis_controls'] << cis_tags[:section]
-        control['tags']['nist'] << get_nist_control_for_cis([cis_tags[:section]])
+        control['tags']['nist'] << get_nist_control_for_cis(cis_tags[:section])
       else
         control['tags']['cis_controls'] << "#{cis_tags[:section]}.#{cis_tags[:sub_section]}"
-        control['tags']['nist'] << get_nist_control_for_cis([cis_tags[:section], cis_tags[:sub_section]])
+        control['tags']['nist'] << get_nist_control_for_cis(cis_tags[:section], cis_tags[:sub_section])
       end
 
       control['tags']['nist'] << LATEST_NIST_REV unless control['tags']['nist'].nil?
@@ -134,7 +135,7 @@ module InspecTools
       control
     end
 
-    def get_nist_control_for_cis(section, sub_section=nil)
+    def get_nist_control_for_cis(section, sub_section = nil)
       return @cis_to_nist[section] if sub_section.nil?
 
       @cis_to_nist["#{section}.#{sub_section}"]

data/lib/inspec_tools.rb

@@ -13,5 +13,5 @@ module InspecTools
   autoload :Inspec, 'inspec_tools/inspec'
   autoload :Summary, 'inspec_tools/summary'
   autoload :Threshold, 'inspec_tools/threshold'
-  autoload :XLSXTool, 'inspec_tools/xlsx.rb'
+  autoload :XLSXTool, 'inspec_tools/xlsx_tool'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec_tools
 version: !ruby/object:Gem::Version
-  version: 2.0.1.pre3
+  version: 2.0.1.pre4
 platform: ruby
 authors:
 - Robert Thew
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -321,7 +321,7 @@ files:
 - lib/inspec_tools/summary.rb
 - lib/inspec_tools/version.rb
 - lib/inspec_tools/xccdf.rb
-- lib/inspec_tools/xlsx.rb
+- lib/inspec_tools/xlsx_tool.rb
 - lib/inspec_tools_plugin.rb
 - lib/overrides/false_class.rb
 - lib/overrides/nil_class.rb