norad_cli 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e59ae272be4575213e6e4a1ae0006a84e5eb069
-  data.tar.gz: fcd29e17a780f3550a3c62d4b16c505db7268b9e
+  metadata.gz: 8ca0e03325e221db2ca3a367bb023d4d5838c0d9
+  data.tar.gz: b99ad1c5723bdd3de37cb02272ca72a7c0097461
 SHA512:
-  metadata.gz: 292d9d37e8061927977261226c463d5fd02f0020ad92147d99d6e100e5ed60bddd05bfce0e191c42ff0a1d966f06b4332923216cf26266a15e2ef6864eb1a458
-  data.tar.gz: 784a9255cf124973739cb992b776c6b1ef3d2183eb91d71c1707ebc6ed43de371c5759c85370a74a54ccf3728f15d79d4e84f0c9765e71abf35cd48bab9b1b9f
+  metadata.gz: 36264ce742ac208290b2d0073011b2a58e0749b7b3e410eeba86042aab209e033592a8efb00c81934e190e91b9d1ffdd28acebae6003250d839ddd1440df9152
+  data.tar.gz: 4752f3fe64b20ebdadcc3a7eec8decb92f3f911471765653b74e942d8d49f12ac955401f85302d5dcdbf7bd3d082bc7745807b0929cc814abc61c42f2bde07e9

data/lib/norad_cli/cli/sectest.rb

@@ -251,28 +251,7 @@ class Sectest < Thor
   option :verbose, aliases: '-v', type: :boolean, desc: 'Turn on verbose logging'
   option :debug, aliases: '-d', type: :boolean, desc: 'Turn on debugging'
   define_method 'spec:image' do |name|
-    # Set environment variables
-    if options[:verbose]
-      ENV['ENABLE_LOGS'] = 'true'
-    end
-
-    if options[:debug]
-      ENV['ENABLE_NORAD_DEBUG'] = 'true'
-    end
-
-    ENV['SCAN_ASSESSMENT'] = 'true'
-    ENV['TEST_RESULTS_SERVER_IMAGE'] = 'docker-images-test-results-server'
-    ENV['UBUNTU_SSH_SERVER_IMAGE'] = 'docker-images-test-ubuntu-ssh-server'
-
-    # Run the tests
-    if File.exist?("spec/#{name}/#{name}_spec.rb")
-      RSpec.clear_examples
-      say("Testing spec/#{name}/#{name}_spec.rb")
-      RSpec::Core::Runner.run(["spec/#{name}/#{name}_spec.rb"], $stderr, $stdout)
-    else
-      say("Warning: spec/#{name}/#{name}_spec.rb does not exist!\n", :yellow)
-      say("Warning: No tests will be run for #{name}\n", :yellow)
-    end
+    run_specs(name, options)
   end
 
   desc 'spec', 'Run all rspec tests for the entire repo (all sectests)'
@@ -280,12 +259,12 @@ class Sectest < Thor
   option :debug, aliases: '-d', type: :boolean, desc: 'Turn on debugging'
   def spec
     # Error check to ensure this is a plugin directory
-    Dir.glob('sectests/*').select do |f|
+    specs = Dir.glob('sectests/*').map do |f|
       if File.directory? f
-        # Build all for the sectest
-        send('spec:image', f.split('/')[-1])
+        f.split('/')[-1]
       end
-    end
+    end.compact
+    run_specs(specs, options)
   end
 
   desc 'seed', 'Create the containers.rb seed to import into the api'
@@ -349,4 +328,35 @@ class Sectest < Thor
       end
     end
   end
+
+  no_commands do
+    def run_specs(*specs, **opts)
+      # Set environment variables
+      if opts[:verbose]
+        ENV['ENABLE_LOGS'] = 'true'
+      end
+
+      if opts[:debug]
+        ENV['ENABLE_NORAD_DEBUG'] = 'true'
+      end
+
+      ENV['SCAN_ASSESSMENT'] = 'true'
+      ENV['TEST_RESULTS_SERVER_IMAGE'] = 'docker-images-test-results-server'
+      ENV['UBUNTU_SSH_SERVER_IMAGE'] = 'docker-images-test-ubuntu-ssh-server'
+
+      codes = specs.map do |spec|
+        # Run the tests
+        if File.exist?("spec/#{spec}/#{spec}_spec.rb")
+          RSpec.clear_examples
+          say("Testing spec/#{spec}/#{spec}_spec.rb")
+          RSpec::Core::Runner.run(["spec/#{spec}/#{spec}_spec.rb"], $stderr, $stdout)
+        else
+          say("Warning: spec/#{spec}/#{spec}_spec.rb does not exist!\n", :yellow)
+          say("Warning: No tests will be run for #{spec}\n", :yellow)
+          0 # always return 0 if the spec doesn't exist
+        end
+      end
+      exit(codes.detect(-> { 0 }, &:nonzero?))
+    end
+  end
 end

data/lib/norad_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Blake Hitchcock
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git