norad_spec_runner 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 699bf53dab967b2672f83af168026b4666797755
-  data.tar.gz: 89f712129ebcd1674576825e4329a46507c57384
+  metadata.gz: 5b73ddcb59e0e2fce7fa32f4f00473aab8ba2bbc
+  data.tar.gz: 321f8f8c755bca498d18200fb311f034b36c26d6
 SHA512:
-  metadata.gz: d9d53ecab4146ecf3d2cd059b3fdbf21aa18c0f70f0f4311fe288557c917a667cbb59af153ec362373e04d1b4c3ffdf61970d47247252bd891bd31a0b8c89ea4
-  data.tar.gz: 79a75e89560e54dbf2182bc46ca2aec2d8bee3803150d1b742637f41fde15f067272d18f428eb35babeaa2eacdaeddbe87db6457f6dd42d15d67791ab585b779
+  metadata.gz: 9900761058380e65ad9de155ffee4bfac7c5e93690eb93cb313069d9d3c7eac1cbff25f4ba0a0a376101b8a0bb95a51d14a31d92c981ea9ea6b2f862677b0168
+  data.tar.gz: d5aea3728b0147c55cd014c1487644ba9fc51d0b87c6738b7f7bc2589bad1bce9b97f13f439ce019405f75f2742df0fed28af997d8d53be78316370400b5b367

data/lib/norad_spec_runner/cli.rb

@@ -21,6 +21,8 @@ module NoradSpecRunner
     method_option :port, :aliases => '-p', :desc => 'Port to connect on', :default => '22'
     method_option :cisco_enable_pw, :desc => 'Password to enter Enable mode in Cisco IOS', :default => ''
     method_option :detect_os, :desc => 'Whether or not to perform OS detection', :type => :boolean, :default => false
+    method_option :disable_sudo, :desc => 'Whether or not to use sudo', :type => :boolean, :default => true
+    method_option :tags, :desc => 'rspec --tag options', :default => '\'\''
 
     def remote(encoded_key)
       spectask = NoradSpecRunner::RemoteTask.new(encoded_key, options)

data/lib/norad_spec_runner/remote_task.rb

@@ -10,12 +10,13 @@ module NoradSpecRunner
   class RemoteTask < Task
     SSH_TIMEOUT = 10
 
-    attr_reader :host, :username, :sshkey, :ssh_port, :obj, :platform, :results_file, :cisco_enable_pw, :tests_parent_dir
+    attr_reader :host, :username, :sshkey, :ssh_port, :obj, :platform, :results_file, :cisco_enable_pw, :tests_parent_dir, :disable_sudo
 
     def initialize(encoded_key, options)
       @host = options.fetch(:host)
       @sshkey = options.fetch(:sshkey)
       @cisco_enable_pw = options.fetch(:cisco_enable_pw, '')
+      @disable_sudo = options.fetch(:disable_sudo, 'true')
       # Decode the key and store
       File.open(@sshkey, "w") do |f|
         f.write Base64.decode64(encoded_key)
@@ -32,7 +33,7 @@ module NoradSpecRunner
 
       @results_file = options.fetch(:results_file)
       @obj.pattern = detect_os ? autodetect_test_pattern(tests) : tests
-      @obj.rspec_opts = "-e #{sub_tests} --format json -o #{@results_file}"
+      @obj.rspec_opts = build_rspec_opts(options)
     end
 
     def run
@@ -46,6 +47,7 @@ module NoradSpecRunner
       ENV['AUDIT_SSHKEY'] = sshkey
       ENV['AUDIT_SSH_PORT'] = ssh_port
       ENV['AUDIT_CISCO_ENABLE_PASSWORD'] = cisco_enable_pw
+      ENV['AUDIT_DISABLE_SUDO'] = disable_sudo.to_s
 
       # Capture STDERR for SSH related errors
       STDERR.reopen(ftmp)
@@ -134,5 +136,18 @@ module NoradSpecRunner
       write_error_to_results_file e.message
       true
     end
+
+    def build_rspec_opts(options)
+      rspec_opts = [ '--format json', "-o #{@results_file}"]
+      options.fetch(:tags).split(',').each do |tag|
+        rspec_opts << "--tag=#{tag}"
+      end
+      # --tag and --example do not work together so
+      # if there is a tag disable example option 
+      if options.fetch(:tags) == ''
+        rspec_opts << "-e #{sub_tests}"
+      end
+      rspec_opts.join(' ')
+    end
   end
 end

data/lib/norad_spec_runner/version.rb

@@ -1,3 +1,3 @@
 module NoradSpecRunner
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_spec_runner
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Brian Manifold
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec