norad_cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4016c7a4f61f8e8d54b9daf79ef1748e3c115d6f
-  data.tar.gz: b3c5f09f37994be524483685590551a7aebef891
+  metadata.gz: 3e3063cd4907e612894a79f1355b7fd550ecc25c
+  data.tar.gz: 960742bba7ea52a70b425d9c46af4aa35ed5cad7
 SHA512:
-  metadata.gz: 13375c60fb7f24b76e66ed00566beff0374b637bc3ab2f72eea211a3d1849f8356d39af51896f1e847960771baf780504af678e4630817f9d01b22f59acccd6f
-  data.tar.gz: 93ab9c1e2f66f400bb6e61e7bb69bdaa47ddeb379b4dd6cca407d7e05c4f7d57f994e085322802f25b03301008fdd955eaadc62d4498526b0924a3db37b1a106
+  metadata.gz: 176111f240083608fcfa4e9906bf054d0d6de427c73d215752388aebc56eecc9284ec5025def2d7389abdb3d5180dcfad7b8eb0a7e04695d55f8592695ceeacc
+  data.tar.gz: d8f0a0bc199330a03a43c39c0503a3939e90dede9b30747f8163b9d2128ba2d937f28c60964acd767b2a9740b52ba1eb7b22b2e21545ba7f6c4de4bcbb3eba77

data/lib/norad_cli/cli/sectest.rb

@@ -67,6 +67,9 @@ class Sectest < Thor
   # Correct set default registry and version
   load_manifest(ARGV[2])
 
+  # Used to prevent JSON::ParserError when parsing the output stream
+  Docker.options[:chunk_size] = 1
+
   desc 'scaffold TESTNAME', 'Create a new security test with standard files + testing'
   option :test_type, aliases: '-t', default: 'whole_host', desc: 'The security test type, Options: [authenticated|web_application|brute_force|ssl_crypto|ssh_crypto|whole_host]'
   option :registry, aliases: '-r', default: @@sectest_manifest['registry'], desc: 'The Docker registry to store docker images'
@@ -153,7 +156,7 @@ class Sectest < Thor
     imgs_to_build.keys.reverse_each do |img_dir|
       say("Building image #{img_dir}...", :green)
       Docker::Image.build_from_dir(img_dir, t: imgs_to_build[img_dir]) do |v|
-        $stdout.puts v if options[:debug]
+        parse_json v if options[:debug]
       end
     end
   end
@@ -179,7 +182,7 @@ class Sectest < Thor
       docker_file = img_dir.split('/')[-1]
       nocache = docker_file['no-cache'] ? true : false
       Docker::Image.build_from_dir(img_dir.gsub(docker_file, ''), dockerfile: docker_file, t: imgs_to_build[img_dir], nocache: nocache) do |v|
-        $stdout.puts v if options[:debug]
+        parse_json v if options[:debug]
       end
     end
 
@@ -371,4 +374,15 @@ class Sectest < Thor
       exit(codes.detect(-> { 0 }, &:nonzero?))
     end
   end
+
+  private
+
+  def parse_json(stream)
+    stream.split(/\r\n/).each do |string|
+      parsed = JSON.parse(string)
+      $stdout.print(parsed['stream']) if parsed.is_a?(Hash)
+    end
+  rescue JSON::ParserError
+    $stdout.print stream
+  end
 end

data/lib/norad_cli/support/manifest_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Style/FormatStringToken
 require 'safe_yaml'
 SafeYAML::OPTIONS[:default_mode] = :safe
 
@@ -79,7 +80,7 @@ describe Manifest do
     expect(manifest.values['prog_args']).to_not eq(nil)
     expect(manifest.values['prog_args'].scan('%{target}').length).to eq(1)
     category = manifest.values['category']
-    assert false unless category == 'blackbox' || category == 'whitebox'
+    assert false unless %w[whitebox blackbox].include? category
     if category == 'blackbox'
       expect(manifest.values['prog_args'].scan('%{ssh_user}').length).to eq(0)
       expect(manifest.values['prog_args'].scan('%{ssh_key}').length).to eq(0)
@@ -116,3 +117,4 @@ describe Manifest do
     puts
   end
 end
+# rubocop:enable Style/FormatStringToken

data/lib/norad_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NoradCli
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Blake Hitchcock
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git