norad_spec_runner 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce841d83e425d3af5434769e162b8ae280ed627d
-  data.tar.gz: 7c6548fdf09a8269e60110eb8028e07a55263f78
+  metadata.gz: 699bf53dab967b2672f83af168026b4666797755
+  data.tar.gz: 89f712129ebcd1674576825e4329a46507c57384
 SHA512:
-  metadata.gz: 8cec437dbb4a1de0267bd5b6845bb0d2d634f42424a2b7cb3f7ad86f0037db8f8effe2b9cf51b38912b0e0d841801c538ea259e6ffde61f3c752e0c171e85189
-  data.tar.gz: dc635602ce19918b069396abc11202e677980978d0341a9b2abfbfd3d82cc4f415b8c0db7405e3cd7a82d952029b011be499096c506e9bafb99624d6fa9fc6d5
+  metadata.gz: d9d53ecab4146ecf3d2cd059b3fdbf21aa18c0f70f0f4311fe288557c917a667cbb59af153ec362373e04d1b4c3ffdf61970d47247252bd891bd31a0b8c89ea4
+  data.tar.gz: 79a75e89560e54dbf2182bc46ca2aec2d8bee3803150d1b742637f41fde15f067272d18f428eb35babeaa2eacdaeddbe87db6457f6dd42d15d67791ab585b779

data/.gitlab-ci.yml

@@ -1,4 +1,5 @@
 stages:
+  - behavior_test
   - release
 
 image: ruby:2.4.0
@@ -6,6 +7,11 @@ image: ruby:2.4.0
 before_script:
   - bundle install --jobs=4 --with development
 
+rspec:
+  stage: behavior_test
+  script:
+    - bundle exec rspec --order rand spec
+
 publish:
   stage: release
   script:

data/lib/norad_spec_runner/cli.rb

@@ -18,7 +18,7 @@ module NoradSpecRunner
     method_option :tests, :aliases => '-t', :desc => 'Rspec tests to execute'
     method_option :sub_tests, :aliases => '-s', :desc => 'Specific test from given RSpec file', :default => '\'\''
     method_option :results_file, :aliases => '-r', :desc => 'File to store the results'
-    method_option :port, :aliases => '-p', :desc => 'Port to connect on', :default => 22
+    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
 

data/lib/norad_spec_runner/linux_sec_test.rb

@@ -0,0 +1,9 @@
+require 'norad_spec_runner/sec_test'
+
+module NoradSpecRunner
+  class LinuxSecTest < SecTest
+    def default_test_file
+      "#{test_name}/default_linux_spec.rb"
+    end
+  end
+end

data/lib/norad_spec_runner/remote_task.rb

@@ -2,12 +2,13 @@ require 'rspec'
 require 'rspec/core/rake_task'
 require 'net/ssh'
 require 'specinfra'
+require 'norad_spec_runner/sec_test'
+require 'norad_spec_runner/linux_sec_test'
 
 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, :tests_parent_dir
 
@@ -81,19 +82,20 @@ module NoradSpecRunner
 
     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)
-        puts "Platform #{platform} detected!"
-        "#{tests}/#{platform}_spec.rb"
+    def select_spec_for_os(test_name)
+      # Explicitly need this test case first
+      if target_is_ios_device?(start_ssh_session)
+        test_klass = SecTest
+      elsif target_is_linux?(start_ssh_session)
+        test_klass = LinuxSecTest
       else
-        puts 'COULD NOT DETECT OS!'
-        "#{File.expand_path(File.dirname(__FILE__))}/support/os_not_supported_spec.rb"
+        test_klass = SecTest
       end
+      test_klass.new(tests_parent_dir, test_name, platform).test_to_run
     end
 
     def target_is_ios_device?(ssh_session)

data/lib/norad_spec_runner/sec_test.rb

@@ -0,0 +1,35 @@
+module NoradSpecRunner
+  class SecTest
+    UNSUPPORTED_SPEC_FILE = "#{File.expand_path(File.dirname(__FILE__))}/support/os_not_supported_spec.rb"
+    attr_reader :tests_parent_dir, :test_name, :platform
+
+    def initialize(tests_parent_dir, test_name, platform)
+      @tests_parent_dir = tests_parent_dir
+      @test_name = test_name
+      @platform = platform
+      print_detection_message
+    end
+
+    def test_to_run
+      suggested_test_file_exists? ? suggested_test_file : default_test_file
+    end
+
+    def suggested_test_file_exists?
+      File.exist?("#{tests_parent_dir}/#{suggested_test_file}")
+    end
+
+    def suggested_test_file
+      "#{test_name}/#{platform}_spec.rb"
+    end
+
+    def default_test_file
+      UNSUPPORTED_SPEC_FILE
+    end
+
+    private
+
+    def print_detection_message
+      platform ? puts("Platform #{platform} detected!") : puts("Unable to detect OS!")
+    end
+  end
+end

data/lib/norad_spec_runner/version.rb

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

metadata

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