norad_spec_runner 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6e227a6333689055aa8d270fb0f923161cd3d0a
-  data.tar.gz: ffbf59f5ad6873432f2b31053561bc5cdcdb52d9
+  metadata.gz: ce841d83e425d3af5434769e162b8ae280ed627d
+  data.tar.gz: 7c6548fdf09a8269e60110eb8028e07a55263f78
 SHA512:
-  metadata.gz: c6596f7443c41ead0a3b84bc3d220982dad40219f9dd604835346863211aa05a1a5509ef02257e7c77d66d24ba2bd47cdc0f9615e5815c5dbb495ef0ed03f2fd
-  data.tar.gz: 41f606e39bf13ee04144990b059a7c453269f04941d09094d888dea02c57e737970bdfd724d9cc43a7a513008473c04a85899a7ec39c46c448c49bc17709c24d
+  metadata.gz: 8cec437dbb4a1de0267bd5b6845bb0d2d634f42424a2b7cb3f7ad86f0037db8f8effe2b9cf51b38912b0e0d841801c538ea259e6ffde61f3c752e0c171e85189
+  data.tar.gz: dc635602ce19918b069396abc11202e677980978d0341a9b2abfbfd3d82cc4f415b8c0db7405e3cd7a82d952029b011be499096c506e9bafb99624d6fa9fc6d5

data/lib/norad_spec_runner/remote_task.rb

@@ -7,8 +7,9 @@ module NoradSpecRunner
   # Class to run Rspec tests over SSH
   class RemoteTask < Task
     SSH_TIMEOUT = 10
+    DEFAULT_LINUX_SPEC = 'default_linux_spec.rb'
 
-    attr_reader :host, :username, :sshkey, :ssh_port, :obj, :platform, :results_file, :cisco_enable_pw
+    attr_reader :host, :username, :sshkey, :ssh_port, :obj, :platform, :results_file, :cisco_enable_pw, :tests_parent_dir
 
     def initialize(encoded_key, options)
       @host = options.fetch(:host)
@@ -20,6 +21,7 @@ module NoradSpecRunner
       end
       @ssh_port = options.fetch(:port, nil)
       @username = options.fetch(:username, nil)
+      @tests_parent_dir = ENV.fetch('TESTS_PARENT_DIR', '/')
       tests = options.fetch(:tests)
       sub_tests = options.fetch(:sub_tests)
       detect_os = options.fetch(:detect_os, false)
@@ -78,15 +80,19 @@ module NoradSpecRunner
     end
 
     def autodetect_test_pattern(tests)
+      pattern = select_spec_for_os(tests)
+      pattern = "#{tests}/#{DEFAULT_LINUX_SPEC}" unless File.exist?("#{tests_parent_dir}/#{pattern}")
+      puts "Trying to run #{pattern}"
+      pattern
+    end
+
+    def select_spec_for_os(tests)
       if target_is_ios_device?(start_ssh_session) || target_is_linux?(start_ssh_session)
-        x = "#{tests}/#{platform}_spec.rb"
-        puts "Platform detected!"
-        puts "Trying to run #{x}"
-        x
+        puts "Platform #{platform} detected!"
+        "#{tests}/#{platform}_spec.rb"
       else
-        puts "COULD NOT DETECT OS!"
-        ""
-        # we need to do something to signify OS could not be detected
+        puts 'COULD NOT DETECT OS!'
+        "#{File.expand_path(File.dirname(__FILE__))}/support/os_not_supported_spec.rb"
       end
     end
 

data/lib/norad_spec_runner/support/os_not_supported_spec.rb

@@ -0,0 +1,7 @@
+require 'rspec'
+
+RSpec.describe 'Operating System Detection:' do
+  it "OS Not Supported" do
+    expect(0).to eq(1), "Your operating system could not be detected. Please contact Norad Support."
+  end
+end

data/lib/norad_spec_runner/version.rb

@@ -1,3 +1,3 @@
 module NoradSpecRunner
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_spec_runner
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Brian Manifold
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec
@@ -131,6 +131,7 @@ files:
 - lib/norad_spec_runner.rb
 - lib/norad_spec_runner/cli.rb
 - lib/norad_spec_runner/remote_task.rb
+- lib/norad_spec_runner/support/os_not_supported_spec.rb
 - lib/norad_spec_runner/task.rb
 - lib/norad_spec_runner/version.rb
 - norad_spec_runner.gemspec