Merge pull request #561 from inspec/zenspider/refactor/os

Refactor OS detection.

.expeditor/buildkite/verify.sh

@@ -20,5 +20,4 @@ echo "--- push bundle cache"
 push_bundle
 
 echo "+++ bundle exec rake"
-bundle exec rake
-
+bundle exec rake ${RAKE_TASK:-}

.expeditor/verify.pipeline.yml

@@ -1,37 +1,45 @@
 ---
 steps:
 
+- label: lint-ruby-2.6
+  command:
+    - RAKE_TASK=lint /workdir/.expeditor/buildkite/verify.sh
+  expeditor:
+    executor:
+      docker:
+        image: ruby:2.6
+
 - label: run-tests-ruby-2.4
   command:
     - /workdir/.expeditor/buildkite/verify.sh
   expeditor:
     executor:
       docker:
-        image: ruby:2.4-stretch
+        image: ruby:2.4
 
 - label: run-tests-ruby-2.5
   command:
     - /workdir/.expeditor/buildkite/verify.sh
   expeditor:
     executor:
       docker:
-        image: ruby:2.5-stretch
+        image: ruby:2.5
 
 - label: run-tests-ruby-2.6
   command:
     - /workdir/.expeditor/buildkite/verify.sh
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: ruby:2.6
 
 - label: run-tests-ruby-2.7
   command:
     - /workdir/.expeditor/buildkite/verify.sh
   expeditor:
     executor:
       docker:
-        image: ruby:2.7-rc
+        image: ruby:2.7
 
 - label: run-tests-ruby-2.6-windows
   command:

Rakefile

@@ -14,7 +14,7 @@ RuboCop::RakeTask.new(:lint) do |task|
 end
 
 # run tests
-task default: %i{test lint}
+task default: %i{test}
 
 Rake::TestTask.new do |t|
   t.libs << "test"

lib/train/platforms/common.rb

@@ -19,16 +19,10 @@ def in_family(family)
     end
 
     def detect(&block)
-      if block_given?
-        @detect = block
-        self
-      elsif @detect.nil?
-        # we are returning a block that just returns false here
-        # to skip the family/platform evaluation if detect is not set
-        ->(_) { false }
-      else
-        @detect
-      end
+      @detect = block if block
+
+      # TODO: detect shouldn't be a setter and getter at the same time
+      @detect ||= ->(_) { false }
     end
   end
 end

lib/train/platforms/detect/helpers/os_common.rb

@@ -70,11 +70,8 @@ def brocade_version
       res = command_output("version")
 
       m = res.match(/^Fabric OS:\s+v(\S+)$/)
-      unless m.nil?
-        return @cache[:brocade] = { version: m[1], type: "fos" }
-      end
 
-      @cache[:brocade] = nil
+      @cache[:brocade] = m && { version: m[1], type: "fos" }
     end
 
     def cisco_show_version
@@ -156,5 +153,24 @@ def uuid_from_string(string)
       # rubocop:disable Style/FormatString
       "%08x-%04x-%04x-%04x-%04x%08x" % ary
     end
+
+    def json_cmd(cmd)
+      cmd = @backend.run_command(cmd)
+      if cmd.exit_status == 0 && !cmd.stdout.empty?
+        require "json"
+        eos_ver = JSON.parse(cmd.stdout)
+        @platform[:release] = eos_ver["version"]
+        @platform[:arch] = eos_ver["architecture"]
+        true
+      end
+    rescue JSON::ParserError
+      nil
+    end
+
+    def set_from_uname
+      @platform[:name]    = unix_uname_s.lines.first.chomp
+      @platform[:release] = unix_uname_r.lines.first.chomp
+      true
+    end
   end
 end

lib/train/platforms/detect/helpers/os_linux.rb

@@ -19,6 +19,13 @@ def redhatish_version(conf)
       end
     end
 
+    def redhatish(path)
+      if (raw = unix_file_contents(path))
+        @platform[:release] = redhatish_version(raw)
+        true
+      end
+    end
+
     def linux_os_release
       data = unix_file_contents("/etc/os-release")
       return if data.nil?

lib/train/platforms/detect/helpers/os_windows.rb

@@ -44,6 +44,11 @@ def check_powershell
       true
     end
 
+    def local_windows?
+      @backend.class.to_s == "Train::Transports::Local::Connection" &&
+        ruby_host_os(/mswin|mingw32|windows/)
+    end
+
     # reads os name and version from wmic
     # @see https://msdn.microsoft.com/en-us/library/bb742610.aspx#EEAA
     # Thanks to Matt Wrock (https://github.com/mwrock) for this hint

lib/train/platforms/detect/scanner.rb

@@ -27,7 +27,7 @@ def scan
       top.each do |_name, plat|
         # we are doing a instance_eval here to make sure we have the proper
         # context with all the detect helper methods
-        next unless instance_eval(&plat.detect) == true
+        next unless instance_eval(&plat.detect)
 
         # if we have a match start looking at the children
         plat_result = scan_children(plat)
@@ -43,7 +43,7 @@ def scan
 
     def scan_children(parent)
       parent.children.each do |plat, condition|
-        next unless instance_eval(&plat.detect) == true
+        next unless instance_eval(&plat.detect)
 
         if plat.class == Train::Platforms::Platform
           return plat if condition.empty? || check_condition(condition)