report path of Arduino binary

ianfixes · ianfixes · commit 1640dbbd4ea2 · 2018-09-21T10:24:07.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Arduino command wrapper now natively supports board manager URLs
 - CI checks for proper board manager URLs for requested platforms
+- CI reports on Arduino executable location
 
 ### Changed
 - Centralized file listing code in `arduino_ci_remote.rb`
diff --git a/exe/arduino_ci_remote.rb b/exe/arduino_ci_remote.rb
@@ -103,6 +103,7 @@ def display_files(pathname)
 # initialize command and config
 config = ArduinoCI::CIConfig.default.from_project_library
 @arduino_cmd = ArduinoCI::ArduinoInstallation.autolocate!
+inform("Located Arduino binary") { @arduino_cmd.binary_path.to_s }
 
 # initialize library under test
 installed_library_path = attempt("Installing library under test") do
diff --git a/lib/arduino_ci/arduino_cmd.rb b/lib/arduino_ci/arduino_cmd.rb
@@ -18,10 +18,14 @@ def self.flag(name, text = nil)
       self.class_eval("def flag_#{name};\"#{text}\";end", __FILE__, __LINE__)
     end
 
-    # the path to the Arduino executable
-    # @return [String]
+    # the array of command components to launch the Arduino executable
+    # @return [Array<String>]
     attr_accessor :base_cmd
 
+    # the actual path to the executable on this platform
+    # @return [Pathname]
+    attr_accessor :binary_path
+
     # part of a workaround for https://github.com/arduino/Arduino/issues/3535
     attr_reader   :library_is_indexed
 
diff --git a/lib/arduino_ci/arduino_installation.rb b/lib/arduino_ci/arduino_installation.rb
@@ -1,3 +1,4 @@
+require 'pathname'
 require "arduino_ci/host"
 require "arduino_ci/arduino_cmd_osx"
 require "arduino_ci/arduino_cmd_linux"
@@ -32,12 +33,14 @@ def autolocate
 
           ret = ArduinoCmdLinux.new
           ret.base_cmd = [loc]
+          ret.binary_path = Pathname.new(loc)
         when :windows then
           loc = ArduinoDownloaderWindows.autolocated_executable
           return nil if loc.nil?
 
           ret = ArduinoCmdWindows.new
           ret.base_cmd = [loc]
+          ret.binary_path = Pathname.new(loc)
         end
         ret
       end
@@ -77,6 +80,7 @@ def autolocate_osx
           result = Host.run_and_capture(*args)
           if result[:err].include? "Error: unknown option: --bogus-option"
             ret.base_cmd = launcher
+            ret.binary_path = Pathname.new(osx_root)
             return ret
           end
         end
