inspec_tools 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1dee9a9941b2324ad4e6c58f3033e8d642f64bc0a9acf92686aac51484bac6
-  data.tar.gz: 11954720bf60d4234d9833a04c7533e51cda15b32b83b499a230394868332f77
+  metadata.gz: e1624fa6a12ead98dfd354a493256ecbaeeb33627bc94aff46053fa673238e95
+  data.tar.gz: 753a011624c348b0c427366a69cb607a1c2f3155dab551d1dd01dc3f9ebfa2d8
 SHA512:
-  metadata.gz: 81e3d4f1e59c9b2ebdc39063055d66950c1702dd03223dc6116aa089d21bea2fbb636b102032f88206bd2c6a1940c4d4878eba5fdcf6332188b66caaa08782b0
-  data.tar.gz: b7fd78e8af38c8dbaefaef49c518b5dd58983d209c8a8a112c515771fe39c00091a9971649d70d895b0f3f1cec2770d899e5e00afb7e248bd923c871c95bd90f
+  metadata.gz: 8b34323e3e0519cf722d82ea232f3d609b784bc25c6db883e69ccc4bc8b12fd4871d8a4d917f63fbd4140f105e57427482b9f18d9d2bc012329ac6d5f6d6ad10
+  data.tar.gz: 6d7baf7e9716daa2f5f9fc3707192d953294da87d882b523e5bc741f093cd82b850c66d8cbe2300460b2f73a7cd8590dc879f452952276c0cfb8d6c0a5ac87c2

data/CHANGELOG.md

@@ -1,15 +1,19 @@
 # Change Log
 
+## [v1.4.0](https://github.com/mitre/inspec_tools/tree/v1.4.0) (2019-05-17)
+[Full Changelog](https://github.com/mitre/inspec_tools/compare/v1.3.6...v1.4.0)
+
+**Merged pull requests:**
+
+- Apply fixes from CodeFactor [\#61](https://github.com/mitre/inspec_tools/pull/61) ([aaronlippold](https://github.com/aaronlippold))
+
 ## [v1.3.6](https://github.com/mitre/inspec_tools/tree/v1.3.6) (2019-05-02)
 [Full Changelog](https://github.com/mitre/inspec_tools/compare/v1.3.5...v1.3.6)
 
 **Implemented enhancements:**
 
-- remove 'severity' from conversion [\#57](https://github.com/mitre/inspec_tools/pull/57) ([aaronlippold](https://github.com/aaronlippold))
-
-**Fixed bugs:**
-
 - document new metadata.json file and creation of file in README.md [\#53](https://github.com/mitre/inspec_tools/issues/53)
+- remove 'severity' from conversion [\#57](https://github.com/mitre/inspec_tools/pull/57) ([aaronlippold](https://github.com/aaronlippold))
 
 **Closed issues:**
 

data/README.md

@@ -101,8 +101,9 @@ Examples:
   inspec_tools compliance -j examples/sample_json/rhel-simp.json -f examples/sample_yaml/threshold.yaml
 ```
 
-##### Possible In-line and yaml file threshold definition styles:
+### YAML file or In-line threshold definition styles:
 
+#### File Examples
 ```
 failed:
   critical:
@@ -114,17 +115,18 @@ compliance:
 ```
 
 ```
-{compliance: {min: 80}, failed: {critical: {max: 0}, high: {max: 0}}}
+compliance.min: 81
+failed.critical.max: 1
+failed.high.max: 1
 ```
 
+#### In-Line Exmamples
 ```
-{compliance.min: 81, failed.critical.max: 10, failed.high.max: 0}
+{compliance: {min: 90}, failed: {critical: {max: 0}, high: {max: 0}}}
 ```
 
 ```
-compliance.min: 81
-failed.critical.max: 10
-failed.high.max: 1
+{compliance.min: 81, failed.critical.max: 0, failed.high.max: 0}
 ```
 
 ## summary
@@ -137,10 +139,11 @@ USAGE: inspec_tools summary [OPTIONS] -j <inspec-json> -o <summary-csv>
 FLAGS:
 	-j --inspec-json <inspec-json>  : path to InSpec results Json
 	-o --output <output-json> 		: path to summary json
+    -c --cli <output-cli>           : print summary to stdout
 
 Examples:
 
-  inspec_tools summary -j examples/sample_json/rhel-simp.json -o summary.json
+  inspec_tools summary -j examples/sample_json/rhel-simp.json -o summary.json -c
 ```
 
 ## xccdf2inspec
@@ -300,7 +303,7 @@ Then, run `bundle exec rake release` which will create a git tag for the specifi
 
 Approved for Public Release; Distribution Unlimited. Case Number 18-3678.
 
-## NOTICE
+### NOTICE
 
 MITRE hereby grants express written permission to use, reproduce, distribute, modify, and otherwise leverage this software to the extent permitted by the licensed terms provided in the LICENSE.md file included with this project.
 

data/lib/inspec_tools/cli.rb

@@ -163,12 +163,21 @@ module InspecTools
     desc 'summary', 'summary parses an inspec results json to create a summary json'
     long_desc Help.text(:summary)
     option :inspec_json, required: true, aliases: '-j'
-    option :output, required: true, aliases: '-o'
+    option :output, required: false, aliases: '-o'
+    option :cli, required: false, aliases: '-c'
     option :verbose, type: :boolean, aliases: '-V'
 
     def summary
       summary = InspecTools::Summary.new(File.read(options[:inspec_json])).to_summary
-      File.write(options[:output], summary.to_json)
+
+      summary[:status].keys.each do |status|
+        puts status
+        summary[:status][status.to_sym].keys.each do |impact|
+          print "\t#{impact} : #{summary[:status][status.to_sym][impact.to_sym]}\n"
+        end
+      end if options[:cli]
+
+      File.write(options[:output], summary.to_json) if options[:output]
     end
 
     desc 'compliance', 'compliance parses an inspec results json to check if the compliance level meets a specified threshold'

data/lib/inspec_tools/version.rb

@@ -1,3 +1,3 @@
 module InspecTools
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec_tools
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Robert Thew
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -31,16 +31,22 @@ dependencies:
   name: inspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement