norad_cli 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7868dd41b4c03f1def4992618bf4fac8ad25154
-  data.tar.gz: 52fa8e4e727bdbf8e18672e634bafe30c2d25a0b
+  metadata.gz: f1089ae2c3cec35a4c705bd1815a64d104947bf7
+  data.tar.gz: 8aa75600ab12c1f623ebadf2f6a322bd41c16cb7
 SHA512:
-  metadata.gz: 36309ee5996ac99a248652d9929e257d5b1d193c4d4db636c4fb4577a83ae977ef3d20737d769093be24b01586a3474acaf10ae98ca5f59d4cf780b2f96d309c
-  data.tar.gz: 91eee08fd2fdfe14465b61020685b4bad623d3f46d3a01b244272f4ac095df91bd4302d66d415070fd63d8f15fdd0143b38bab16232626193ebdc7551b85f04c
+  metadata.gz: 9f6e7dfbde96b1edf5c3ed35d3a536c5a8a8011380d066714e46f03f3e8c6c8a10e3723e119a300a0a021a761ba1c4638957366341184f540896291219f2e9ba
+  data.tar.gz: adef476de5591355f2bad229edb2cdf1cbef15fcfe18df170b8129d7c35f91f9701e005c26d703adb6343b20acd7c6fd3e5a41f8a9c955ed5e6b634b9e757844

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in norad.gemspec

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/lib/norad_cli/cli/main.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'thor'
 require 'norad_cli/cli/secrepo'
 require 'norad_cli/cli/sectest'

data/lib/norad_cli/cli/secrepo.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'thor'
 require 'git'
 require 'docker'
@@ -20,7 +21,7 @@ class Repo < Thor
     Git.init(repo_name)
 
     # Create the necessary directories
-    %w(base spec sectests).each do |dirrepo_name|
+    %w[base spec sectests].each do |dirrepo_name|
       empty_directory "#{repo_name}/#{dirrepo_name}"
     end
 

data/lib/norad_cli/cli/sectest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'thor'
 require 'git'
 require 'docker'
@@ -38,7 +39,7 @@ class Sectest < Thor
     @@sectest_manifest['version'] = 'latest'
 
     # Dynamically add options and description based on the needs of the sectest container
-    if %w(build build:all build:image build:specs execute).include?(ARGV[1]) && sectest_name && !sectest_name.start_with?('-', '--')
+    if %w[build build:all build:image build:specs execute].include?(ARGV[1]) && sectest_name && !sectest_name.start_with?('-', '--')
       # Read in the program arguments
       if File.exist?("sectests/#{sectest_name}/manifest.yml")
         @@sectest_manifest = YAML.safe_load(File.read("sectests/#{sectest_name}/manifest.yml"))
@@ -77,7 +78,7 @@ class Sectest < Thor
     repo_dir = Dir.pwd
 
     # Check for valid test types
-    if !%w(authenticated web_application brute_force ssl_crypto ssh_crypto whole_host).include?(options[:test_type])
+    if !%w[authenticated web_application brute_force ssl_crypto ssh_crypto whole_host].include?(options[:test_type])
       say("#{options[:test_type]} is not a supported test type", :red)
       say('Exiting...', :red)
       exit(1)
@@ -277,25 +278,18 @@ class Sectest < Thor
 
   desc 'validate:image SECTESTNAME', 'Validate SECTESTNAME manifest.yml and readme.md'
   define_method 'validate:image' do |name|
-    # Validate the readme file
-    ENV['sectest_name'] = name
-    RSpec.clear_examples
-    RSpec::Core::Runner.run(["#{File.dirname(File.expand_path(__FILE__))}/../support/readme_spec.rb"], $stderr, $stdout)
-
-    # Validate the manifest file
-    RSpec.clear_examples
-    RSpec::Core::Runner.run(["#{File.dirname(File.expand_path(__FILE__))}/../support/manifest_spec.rb"], $stderr, $stdout)
+    run_validations(name)
   end
 
   desc 'validate', 'Validate all manifest.yml and readme.md'
   def validate
     # Error check to ensure this is a plugin directory
-    Dir.glob('sectests/*').select do |f|
+    files = Dir.glob('sectests/*').map do |f|
       if File.directory? f
-        # Validate manifest and readme for the sectest
-        send('validate:image', f.split('/')[-1])
+        f.split('/')[-1]
       end
-    end
+    end.compact
+    run_validations(*files)
   end
 
   no_tasks do
@@ -320,7 +314,7 @@ class Sectest < Thor
 
     # Ensure commands are run from the root dir
     def root_dir?
-      %w(base spec sectests).each do |dirrepo_name|
+      %w[base spec sectests].each do |dirrepo_name|
         if !File.exist?(dirrepo_name)
           say("Commands must be run from the root of the test repository\nExiting....", :red)
           exit(1)
@@ -359,5 +353,21 @@ class Sectest < Thor
       end
       exit(codes.detect(-> { 0 }, &:nonzero?))
     end
+
+    def run_validations(*files)
+      codes = files.map do |file|
+        ENV['sectest_name'] = file
+        # Validate the readme file
+        say("Validating README for #{file}")
+        RSpec.clear_examples
+        RSpec::Core::Runner.run(["#{File.dirname(File.expand_path(__FILE__))}/../support/readme_spec.rb"], $stderr, $stdout)
+
+        # Validate the manifest file
+        say("Validating manifest.yml for #{file}")
+        RSpec.clear_examples
+        RSpec::Core::Runner.run(["#{File.dirname(File.expand_path(__FILE__))}/../support/manifest_spec.rb"], $stderr, $stdout)
+      end
+      exit(codes.detect(-> { 0 }, &:nonzero?))
+    end
   end
 end

data/lib/norad_cli/support/api_security_container_seed_script.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'yaml'
 
 module SeedGenerator

data/lib/norad_cli/support/manifest_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'safe_yaml'
 SafeYAML::OPTIONS[:default_mode] = :safe
 
@@ -66,7 +67,6 @@ describe Manifest do
   CONFIG_SHIM = { ssh_user: '', ssh_key: '', target: '' }.freeze
   it 'validates the manifest file of all containers' do
     next if File.exist?("sectests/#{ENV['sectest_name']}/.parent_only")
-    puts "Looking for valid manifest in: #{p}..."
     manifest = Manifest.new "sectests/#{ENV['sectest_name']}/manifest.yml"
     ok
     manifest_name_check(manifest)

data/lib/norad_cli/support/readme_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Readme
 end
 

data/lib/norad_cli/support/results_server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module NoradCli
   class ResultsServer
     attr_accessor :container

data/lib/norad_cli/support/sectest_container.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'norad_cli/support/results_server.rb'
 require 'net/http'
 require 'securerandom'

data/lib/norad_cli/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module NoradCli
-  VERSION = '0.1.23'
+  VERSION = '0.1.24'
 end

data/lib/norad_cli.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'norad_cli/version'
 require 'norad_cli/cli/main'
 

data/norad_cli.gemspec

@@ -1,5 +1,6 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'norad_cli/version'

metadata

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