norad_cli 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8860651242fcd0bf3b1705504a70f600823d6aac
-  data.tar.gz: 21aa5ac57a4b9a8c76ead029a59d4e6d57b9762d
+  metadata.gz: d75304010117d3484f9e1d7828b0d09335131d48
+  data.tar.gz: 7e79b1b5f11ffbf988248644102a1d1b6f13b52a
 SHA512:
-  metadata.gz: cd71776227fa2fe192b53349624b8f09d4f2843554b0146d48c172c1a8339692e6fc338d00ac022032e71539a26f552dbc2935be61eb135cbbc413329c5989c9
-  data.tar.gz: b05c1f5a97cb2bca7a72239e04f99fb4d74e0a35f6a20a8a095baabb0217d99dd7b3e3694df6af78c48beabdf606f327bc3d12e42c29fa505c56ca4a6cdd0fe7
+  metadata.gz: e0c87d8f23fa01e5fcae0355bc5886d4c3e4e3e4a5822542ccd2adb895a78711857cf81df6e259696161b656db14b65dfffec84928ce1007c26356c7bc8dbc73
+  data.tar.gz: b60aa8a94481885057e0b8e9913c971197c3b2b6fb819f15655ee3b99b5a969b2e156ae7ef63693fe270743fa69f02dba693b2e4019fd9383b54e24e76595990

data/lib/norad_cli/cli/sectest.rb

@@ -211,9 +211,12 @@ class Sectest < Thor
   else
     desc 'execute SECTESTNAME', 'Execute SECTESTNAME against an arbitrary target'
   end
-  option :debug, aliases: '-d', type: :boolean, default: false, desc: 'Turn on debugging messages (e.g. Docker build logs to stdout)'
+  option :debug, aliases: '-d', type: :boolean, default: false, desc: 'Turn on debugging messages (e.g. Docker build logs to stdout, containers not removed!)'
   option :format, aliases: '-f', type: :boolean, default: false, desc: 'Print the JSON results formatted'
   def execute(sectest_name)
+    # Warn users if debugging is enabled
+    say('Warning: Debug enabled: containers must be removed manually', :yellow) && sleep(2) if options['debug']
+
     # Ensure the results server is built by building the images specs (code reuse)
     send('build:specs', sectest_name)
 
@@ -239,6 +242,9 @@ class Sectest < Thor
 
     # Cleanup the sectest container
     sectest_instance.shutdown
+
+    # Warn users if debugging is enabled
+    say('Warning: Debug enabled: containers must be removed manually', :yellow) if options['debug']
   end
 
   desc 'spec:image SECTESTNAME', 'Run the rspec tests for SECTESTNAME'

data/lib/norad_cli/support/sectest_container.rb

@@ -10,6 +10,7 @@ module NoradCli
     attr_accessor :assessment_id
     attr_accessor :sectest_image
     attr_accessor :results_server
+    attr_accessor :debug
 
     def initialize(sectest_name, registry, version, options)
       # Generate a random assessment id
@@ -17,6 +18,9 @@ module NoradCli
 
       @sectest_image = "#{registry}/#{sectest_name}:#{version}"
 
+      # Set whether debugging is configured
+      @debug = options[:debug]
+
       # Create a results server
       @results_server = NoradCli::ResultsServer.new('docker-images-test-results-server')
 
@@ -107,7 +111,9 @@ module NoradCli
     def shutdown
       # Stop the sectest image container and delete
       @container.stop
-      @container.delete(force: true)
+
+      # Delete the container only if not in debug mode
+      @container.delete(force: true) unless @debug
 
       # Cleanup/Garbage collect the results server
       @results_server.shutdown

data/lib/norad_cli/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module NoradCli
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Blake Hitchcock