norad_cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3063cd4907e612894a79f1355b7fd550ecc25c
-  data.tar.gz: 960742bba7ea52a70b425d9c46af4aa35ed5cad7
+  metadata.gz: 4ba8aa6c8eb43a079e47bef73c6749214ceb90c1
+  data.tar.gz: f990b54a475f7b626890b1054abd1f1de6a5db56
 SHA512:
-  metadata.gz: 176111f240083608fcfa4e9906bf054d0d6de427c73d215752388aebc56eecc9284ec5025def2d7389abdb3d5180dcfad7b8eb0a7e04695d55f8592695ceeacc
-  data.tar.gz: d8f0a0bc199330a03a43c39c0503a3939e90dede9b30747f8163b9d2128ba2d937f28c60964acd767b2a9740b52ba1eb7b22b2e21545ba7f6c4de4bcbb3eba77
+  metadata.gz: 985deb0174b0775c9d580ce4e6f7a81ba09750c6c8b8193478c51393b5798dfadc38b90aa0604f3d587d34ea2e8462b89f913b1f852c56e246cc670e593d38cd
+  data.tar.gz: b8419a2966677e96763fe08863e59e3cebe361562a91b7bbc825441c1d8eeb0a8e3b882bd914916c673c3d7b0048d7d2d60345ad051f39892c67177948c4979e

data/lib/norad_cli/cli/sectest.rb

@@ -166,8 +166,8 @@ class Sectest < Thor
   option :debug, aliases: '-d', type: :boolean, default: true, desc: 'Turn on debugging messages (e.g. Docker build logs to stdout)'
   define_method 'build:specs' do |name|
     imgs_to_build = {}
-    imgs_to_build["#{File.expand_path(File.dirname(__FILE__))}/../templates/spec/support/Dockerfile.testserver"] = 'docker-images-test-results-server:latest'
-    imgs_to_build["#{File.expand_path(File.dirname(__FILE__))}/../templates/spec/support/Dockerfile.ubuntu_ssh"] = 'docker-images-test-ubuntu-ssh-server:latest'
+    imgs_to_build["#{__dir__}/../templates/spec/support/Dockerfile.testserver"] = 'docker-images-test-results-server:latest'
+    imgs_to_build["#{__dir__}/../templates/spec/support/Dockerfile.ubuntu_ssh"] = 'docker-images-test-ubuntu-ssh-server:latest'
 
     # Determine the Dockerfiles in the assessment spec dir
     Dir.glob("spec/#{name}/targets/Dockerfile.*[^~]").each do |entry|
@@ -177,7 +177,7 @@ class Sectest < Thor
 
     # Build the images
     Docker.options[:read_timeout] = 36_000
-    imgs_to_build.keys.each do |img_dir|
+    imgs_to_build.each_key do |img_dir|
       say("Building image #{img_dir}...", :green)
       docker_file = img_dir.split('/')[-1]
       nocache = docker_file['no-cache'] ? true : false

data/lib/norad_cli/support/manifest_spec.rb

@@ -35,7 +35,8 @@ describe Manifest do
   def manifest_name_check(manifest)
     testing_for 'valid name'
     expect(manifest.values['name']).to_not eq(nil)
-    expect(manifest.values['name'] =~ %r{\A[A-Za-z][A-Za-z0-9_-]+\z}).to_not eq(nil)
+    expect(manifest.values['name']).to match(%r{\A[A-Za-z][A-Za-z0-9_-]+\z})
+    expect(manifest.values['name']).to match(/#{ENV['sectest_name']}/)
   end
 
   def manifest_version_check(manifest)

data/lib/norad_cli/support/readme_spec.rb

@@ -16,6 +16,7 @@ describe Readme do
     next if File.exist?("sectests/#{ENV['sectest_name']}/.parent_only")
     puts "Looking for README.md in: sectests/#{ENV['sectest_name']}..."
     readme = File.read "sectests/#{ENV['sectest_name']}/README.md"
+    expect(readme.lines[0].tr(' ', '-')).to match(/#{ENV['sectest_name']}/i)
     ok
 
     testing_for 'variant READMEs'

data/lib/norad_cli/version.rb

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

data/lib/norad_cli.rb

@@ -5,6 +5,6 @@ require 'norad_cli/cli/main'
 
 module NoradCli
   def self.ssh_key_path
-    "#{File.expand_path(File.dirname(__FILE__))}/norad_cli/templates/spec/support/ssh_key"
+    "#{__dir__}/norad_cli/templates/spec/support/ssh_key"
   end
 end

data/norad_cli.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 lib = File.expand_path('../lib', __FILE__)

metadata

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