arduino_ci 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc68a43b822ba3c0456a181772f22d0aabd5a3d068e4012da71a25c073b85d1
-  data.tar.gz: ca27e600b1c0768a5a2e69b0bde17cd6d985d3a99b9c963fc50b8d3675780e3e
+  metadata.gz: 28e1e4179be7a5d17d57b16b02f3eb75a41f6bb9506c8d034c14d2f077d09c48
+  data.tar.gz: b60ab526bb91b353379aa7f3d4a3ab8ec3f8fa18442369e0197c098487ed53a0
 SHA512:
-  metadata.gz: 990cab7ac8de31536d3287d4bad8853f3a0710d89f49511cc54176be2a6ac4e725814bde7dcd9aaa3b6ce5dff47522a6294d802f3b53dacb921c6eb8a4702c7c
-  data.tar.gz: d6eb5c03d83ea50cf1ee361360ede6869481f65123667604f0ef5309611c493717e706d04893a2a55786249acf509b08eeef31ff149d1c411cb4a787e59ddb52
+  metadata.gz: 7b9b69ee987e14970104cbf6c6e41f846b714d40536af43d5cc1b21e5811bb75f12172de94a21340277cc830654f97a5a8cb4c5e954f5c2358e515a39ac9c871
+  data.tar.gz: 360e1c2b48e9f706a90275356363802c6534968e0d96c29d5f7a825a1f0c73df2d2526d680bf103909544508506c1e0a7effec59a722f1788b171184d0bbd332

data/README.md

@@ -1,5 +1,5 @@
 
-# ArduinoCI Ruby gem (`arduino_ci`) [![Gem Version](https://badge.fury.io/rb/arduino_ci.svg)](https://rubygems.org/gems/arduino_ci) [![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/arduino_ci/0.1.13)
+# ArduinoCI Ruby gem (`arduino_ci`) [![Gem Version](https://badge.fury.io/rb/arduino_ci.svg)](https://rubygems.org/gems/arduino_ci) [![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/arduino_ci/0.1.14)
 
 You want your Arduino library to be automatically built and tested every time someone contributes code to your project on GitHub, but the Arduino IDE lacks the ability to run unit tests. [Arduino CI](https://github.com/ianfixes/arduino_ci) provides that ability.
 

data/exe/arduino_ci_remote.rb

@@ -4,6 +4,7 @@ require 'set'
 require 'pathname'
 
 WIDTH = 80
+FIND_FILES_INDENT = 4
 
 @failure_count = 0
 @passfail = proc { |result| result ? "✓" : "✗" }
@@ -23,6 +24,10 @@ def terminate(final = nil)
 end
 
 # make a nice status line for an action and react to the action
+# TODO / note to self: inform_multline is tougher to write
+#   without altering the signature because it only leaves space
+#   for the checkmark _after_ the multiline, it doesn't know how
+#   to make that conditionally the body
 def perform_action(message, multiline, mark_fn, on_fail_msg, tally_on_fail, abort_on_fail)
   line = "#{message}... "
   endline = "...#{message} "
@@ -83,9 +88,36 @@ def assured_platform(purpose, name, config)
   platform_definition
 end
 
+# Return true if the file (or one of the dirs containing it) is hidden
+def file_is_hidden_somewhere?(path)
+  # this is clunkly but pre-2.2-ish ruby doesn't return ascend as an enumerator
+  path.ascend do |part|
+    return true if part.basename.to_s.start_with? "."
+  end
+  false
+end
+
+# print out some files
+def display_files(pathname)
+  # `find` doesn't follow symlinks, so we should instead
+  realpath = pathname.symlink? ? pathname.readlink : pathname
+
+  # suppress directories and dotfile-based things
+  all_files = realpath.find.select(&:file?)
+  non_hidden = all_files.reject { |path| file_is_hidden_somewhere?(path) }
+
+  # print files with an indent
+  margin = " " * FIND_FILES_INDENT
+  non_hidden.each { |p| puts "#{margin}#{p}" }
+end
+
 # 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 }
+
+# index the existing libraries
+attempt("Indexing libraries") { @arduino_cmd.index_libraries } unless @arduino_cmd.libraries_indexed
 
 # initialize library under test
 installed_library_path = attempt("Installing library under test") do
@@ -95,10 +127,11 @@ if installed_library_path.exist?
   inform("Library installed at") { installed_library_path.to_s }
 else
   assure_multiline("Library installed successfully") do
+    # print out the contents of the deepest directory we actually find
     @arduino_cmd.lib_dir.ascend do |path_part|
       next unless path_part.exist?
 
-      break puts path_part.find.to_a.to_s
+      break display_files(path_part)
     end
     false
   end
@@ -120,26 +153,54 @@ compilers.each do |gcc_binary|
   inform("libasan availability for #{gcc_binary}") { cpp_library.libasan?(gcc_binary) }
 end
 
-# gather up all required boards so we can install them up front.
+# Ensure platforms exist for unit test, and save their info in all_platform_info keyed by name
+all_platform_info = {}
+config.platforms_to_unittest.each { |p| all_platform_info[p] = assured_platform("unittest", p, config) }
+
+# gather up all required boards for compilation so we can install them up front.
 # start with the "platforms to unittest" and add the examples
 # while we're doing that, get the aux libraries as well
-all_platforms = {}
+example_platform_info = {}
+board_package_url = {}
 aux_libraries = Set.new(config.aux_libraries_for_unittest + config.aux_libraries_for_build)
 # while collecting the platforms, ensure they're defined
-config.platforms_to_unittest.each { |p| all_platforms[p] = assured_platform("unittest", p, config) }
 library_examples.each do |path|
   ovr_config = config.from_example(path)
-  ovr_config.platforms_to_build.each { |p| all_platforms[p] = assured_platform("library example", p, config) }
+  ovr_config.platforms_to_build.each do |platform|
+    # assure the platform if we haven't already
+    next if example_platform_info.key?(platform)
+
+    platform_info = assured_platform("library example", platform, config)
+    next if platform_info.nil?
+
+    example_platform_info[platform] = all_platform_info[platform] = platform_info
+    package = platform_info[:package]
+    board_package_url[package] = ovr_config.package_url(package)
+  end
   aux_libraries.merge(ovr_config.aux_libraries_for_build)
 end
 
 # with all platform info, we can extract unique packages and their urls
 # do that, set the URLs, and download the packages
-all_packages = all_platforms.values.map { |v| v[:package] }.uniq.reject(&:nil?)
-all_urls = all_packages.map { |p| config.package_url(p) }.uniq.reject(&:nil?)
+all_packages = all_platform_info.values.map { |v| v[:package] }.uniq.reject(&:nil?)
+
+# inform about builtin packages
+all_packages.select { |p| config.package_builtin?(p) }.each do |p|
+  inform("Using built-in board package") { p }
+end
+
+# make sure any non-builtin package has a URL defined
+all_packages.reject { |p| config.package_builtin?(p) }.each do |p|
+  assure("Board package #{p} has a defined URL") { board_package_url[p] }
+end
+
+# set up all the board manager URLs.
+# we can safely reject nils now, they would be for the builtins
+all_urls = all_packages.map { |p| board_package_url[p] }.uniq.reject(&:nil?)
+
 unless all_urls.empty?
   assure("Setting board manager URLs") do
-    @arduino_cmd.set_pref("boardsmanager.additional.urls", all_urls.join(","))
+    @arduino_cmd.board_manager_urls = all_urls
   end
 end
 
@@ -161,19 +222,21 @@ end
 last_board = nil
 if !cpp_library.tests_dir.exist?
   inform_multiline("Skipping unit tests; no tests dir at #{cpp_library.tests_dir}") do
-    puts cpp_library.tests_dir.parent.find.to_a.to_s
+    puts "  In case that's an error, this is what was found in the library:"
+    display_files(cpp_library.tests_dir.parent)
     true
   end
 elsif cpp_library.test_files.empty?
   inform_multiline("Skipping unit tests; no test files were found in #{cpp_library.tests_dir}") do
-    puts cpp_library.tests_dir.find.to_a.to_s
+    puts "  In case that's an error, this is what was found in the tests directory:"
+    display_files(cpp_library.tests_dir)
     true
   end
 elsif config.platforms_to_unittest.empty?
   inform("Skipping unit tests") { "no platforms were requested" }
 else
   config.platforms_to_unittest.each do |p|
-    board = all_platforms[p][:board]
+    board = all_platform_info[p][:board]
     assure("Switching to board for #{p} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
     last_board = board
     cpp_library.test_files.each do |unittest_path|
@@ -202,7 +265,7 @@ end
 
 if library_examples.empty?
   inform_multiline("Skipping libraries; no examples found in #{installed_library_path}") do
-    puts installed_library_path.find.to_a.to_s
+    display_files(installed_library_path)
   end
 else
   attempt("Setting compiler warning level")  { @arduino_cmd.set_pref("compiler.warning_level", "all") }
@@ -218,7 +281,7 @@ else
   end
 
   examples_by_platform.each do |platform, example_paths|
-    board = all_platforms[platform][:board]
+    board = all_platform_info[platform][:board]
     assure("Switching to board for #{platform} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
     last_board = board
 

data/exe/arduino_ci_remote.rb.orig

@@ -4,6 +4,7 @@ require 'set'
 require 'pathname'
 
 WIDTH = 80
+FIND_FILES_INDENT = 4
 
 @failure_count = 0
 @passfail = proc { |result| result ? "✓" : "✗" }
@@ -23,7 +24,7 @@ def terminate(final = nil)
 end
 
 # make a nice status line for an action and react to the action
-def perform_action(message, multiline, mark_fn, on_fail_msg, abort_on_fail)
+def perform_action(message, multiline, mark_fn, on_fail_msg, tally_on_fail, abort_on_fail)
   line = "#{message}... "
   endline = "...#{message} "
   if multiline
@@ -31,14 +32,15 @@ def perform_action(message, multiline, mark_fn, on_fail_msg, abort_on_fail)
   else
     print line
   end
+  STDOUT.flush
   result = yield
   mark = mark_fn.nil? ? "" : mark_fn.call(result)
   # if multline, put checkmark at full width
   print endline if multiline
-  puts mark.rjust(WIDTH - line.length, " ")
+  puts mark.to_s.rjust(WIDTH - line.length, " ")
   unless result
     puts on_fail_msg unless on_fail_msg.nil?
-    @failure_count += 1
+    @failure_count += 1 if tally_on_fail
     # print out error messaging here if we've captured it
     terminate if abort_on_fail
   end
@@ -47,29 +49,30 @@ end
 
 # Make a nice status for something that defers any failure code until script exit
 def attempt(message, &block)
-  perform_action(message, false, @passfail, nil, false, &block)
+  perform_action(message, false, @passfail, nil, true, false, &block)
 end
 
 # Make a nice status for something that defers any failure code until script exit
 def attempt_multiline(message, &block)
-  perform_action(message, true, @passfail, nil, false, &block)
+  perform_action(message, true, @passfail, nil, true, false, &block)
 end
 
 # Make a nice status for something that kills the script immediately on failure
+FAILED_ASSURANCE_MESSAGE = "This may indicate a problem with ArduinoCI, or your configuration".freeze
 def assure(message, &block)
-  perform_action(message, false, @passfail, "This may indicate a problem with ArduinoCI, or your configuration", true, &block)
+  perform_action(message, false, @passfail, FAILED_ASSURANCE_MESSAGE, true, true, &block)
+end
+
+def assure_multiline(message, &block)
+  perform_action(message, true, @passfail, FAILED_ASSURANCE_MESSAGE, true, true, &block)
 end
 
 def inform(message, &block)
-  perform_action(message, false, proc { |x| x }, nil, false, &block)
+  perform_action(message, false, proc { |x| x }, nil, false, false, &block)
 end
 
 def inform_multiline(message, &block)
-<<<<<<< HEAD
-  perform_action(message, true, nil, nil, false, &block)
-=======
-  perform_action(message, true, proc { }, nil, false, &block)
->>>>>>> 30d4a9f... Show file tree when unittests or examples aren't found
+  perform_action(message, true, nil, nil, false, false, &block)
 end
 
 # Assure that a platform exists and return its definition
@@ -81,15 +84,51 @@ def assured_platform(purpose, name, config)
   platform_definition
 end
 
+# print out some files
+def display_files(pathname)
+  # `find` doesn't follow symlinks, so we should instead
+  realpath = pathname.symlink? ? pathname.readlink : pathname
+
+  # suppress directories and dotfile-based things
+  all_files = realpath.find.select(&:file?)
+  non_hidden = all_files.reject do |path|
+<<<<<<< HEAD
+    path.ascend.any? { |part| part.basename.to_s.start_with? "." }
+=======
+    path.ascend do |path_part|
+      next true if path_part.basename.to_s.start_with? "."
+    end
+    false
+>>>>>>> 0f4e679... don't redundantly report assured platforms
+  end
+
+  # print files with an indent
+  margin = " " * FIND_FILES_INDENT
+  non_hidden.each { |p| puts "#{margin}#{p}" }
+end
+
 # initialize command and config
 config = ArduinoCI::CIConfig.default.from_project_library
 @arduino_cmd = ArduinoCI::ArduinoInstallation.autolocate!
 
 # initialize library under test
-installed_library_path = assure("Installing library under test") { @arduino_cmd.install_local_library(".") }
+installed_library_path = attempt("Installing library under test") do
+  @arduino_cmd.install_local_library(Pathname.new("."))
+end
+if installed_library_path.exist?
+  inform("Library installed at") { installed_library_path.to_s }
+else
+  assure_multiline("Library installed successfully") do
+    @arduino_cmd.lib_dir.ascend do |path_part|
+      next unless path_part.exist?
+
+      break display_files(path_part)
+    end
+    false
+  end
+end
 library_examples = @arduino_cmd.library_examples(installed_library_path)
 cpp_library = ArduinoCI::CppLibrary.new(installed_library_path, @arduino_cmd.lib_dir)
-inform("Library installed at") { installed_library_path.to_s }
 
 # check GCC
 compilers = config.compilers_to_use
@@ -102,6 +141,7 @@ compilers.each do |gcc_binary|
     puts version.split("\n").map { |l| "    #{l}" }.join("\n")
     version
   end
+  inform("libasan availability for #{gcc_binary}") { cpp_library.libasan?(gcc_binary) }
 end
 
 # gather up all required boards so we can install them up front.
@@ -111,9 +151,13 @@ all_platforms = {}
 aux_libraries = Set.new(config.aux_libraries_for_unittest + config.aux_libraries_for_build)
 # while collecting the platforms, ensure they're defined
 config.platforms_to_unittest.each { |p| all_platforms[p] = assured_platform("unittest", p, config) }
+example_platforms = {}
 library_examples.each do |path|
   ovr_config = config.from_example(path)
-  ovr_config.platforms_to_build.each { |p| all_platforms[p] = assured_platform("library example", p, config) }
+  ovr_config.platforms_to_build.each do |p|
+    # assure the platform if we haven't already
+    example_platforms[p] = all_platforms[p] = assured_platform("library example", p, config) unless example_platforms.key?(p)
+  end
   aux_libraries.merge(ovr_config.aux_libraries_for_build)
 end
 
@@ -145,12 +189,12 @@ end
 last_board = nil
 if !cpp_library.tests_dir.exist?
   inform_multiline("Skipping unit tests; no tests dir at #{cpp_library.tests_dir}") do
-    puts cpp_library.tests_dir.find.to_a.to_s
+    display_files(cpp_library.tests_dir.parent)
     true
   end
 elsif cpp_library.test_files.empty?
   inform_multiline("Skipping unit tests; no test files were found in #{cpp_library.tests_dir}") do
-    puts cpp_library.tests_dir.find.to_a.to_s
+    display_files(cpp_library.tests_dir)
     true
   end
 elsif config.platforms_to_unittest.empty?
@@ -158,7 +202,6 @@ elsif config.platforms_to_unittest.empty?
 else
   config.platforms_to_unittest.each do |p|
     board = all_platforms[p][:board]
-    last_board = "arduino:avr:pro:cpu=16MHzatmega328"
     assure("Switching to board for #{p} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
     last_board = board
     cpp_library.test_files.each do |unittest_path|
@@ -187,18 +230,27 @@ end
 
 if library_examples.empty?
   inform_multiline("Skipping libraries; no examples found in #{installed_library_path}") do
-    puts installed_library_path.find.to_a.to_s
+    display_files(installed_library_path)
   end
 else
   attempt("Setting compiler warning level")  { @arduino_cmd.set_pref("compiler.warning_level", "all") }
 
-  # unlike previous, iterate examples / boards
-  library_examples.each do |example_path|
+  # switching boards takes time, so iterate board first
+  # _then_ whichever examples match it
+  examples_by_platform = library_examples.each_with_object({}) do |example_path, acc|
     ovr_config = config.from_example(example_path)
     ovr_config.platforms_to_build.each do |p|
-      board = all_platforms[p][:board]
-      assure("Switching to board for #{p} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
-      last_board = board
+      acc[p] = [] unless acc.key?(p)
+      acc[p] << example_path
+    end
+  end
+
+  examples_by_platform.each do |platform, example_paths|
+    board = all_platforms[platform][:board]
+    assure("Switching to board for #{platform} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
+    last_board = board
+
+    example_paths.each do |example_path|
       example_name = File.basename(example_path)
       attempt("Verifying #{example_name}") do
         ret = @arduino_cmd.verify_sketch(example_path)

data/lib/arduino_ci/arduino_cmd.rb

@@ -1,6 +1,9 @@
 require 'fileutils'
 require 'pathname'
 
+# workaround for https://github.com/arduino/Arduino/issues/3535
+WORKAROUND_LIB = "USBHost".freeze
+
 module ArduinoCI
 
   # Wrap the Arduino executable.  This requires, in some cases, a faked display.
@@ -18,12 +21,16 @@ module ArduinoCI
       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
+    attr_reader   :libraries_indexed
 
     # @return [String] STDOUT of the most recently-run command
     attr_reader   :last_out
@@ -47,7 +54,7 @@ module ArduinoCI
     def initialize
       @prefs_cache        = {}
       @prefs_fetched      = false
-      @library_is_indexed = false
+      @libraries_indexed  = false
       @last_out           = ""
       @last_err           = ""
       @last_msg           = ""
@@ -145,11 +152,19 @@ module ArduinoCI
       ret
     end
 
-    # run a command and don't capture its output, but use the same signature
-    # @return [Hash] {:out => String, :err => String, :success => bool}
-    def run_wrap(*args, **kwargs)
-      success = run(*args, **kwargs)
-      { out: "NOPE, use run_and_capture", err: "NOPE, use run_and_capture", success: success }
+    # Board manager URLs
+    # @return [Array<String>] The additional URLs used by the board manager
+    def board_manager_urls
+      url_list = get_pref("boardsmanager.additional.urls")
+      return [] if url_list.nil?
+
+      url_list.split(",")
+    end
+
+    # Set board manager URLs
+    # @return [Array<String>] The additional URLs used by the board manager
+    def board_manager_urls=(all_urls)
+      set_pref("boardsmanager.additional.urls", all_urls.join(","))
     end
 
     # check whether a board is installed
@@ -174,21 +189,29 @@ module ArduinoCI
     # install a library by name
     # @param name [String] the library name
     # @return [bool] whether the command succeeded
-    def install_library(library_name)
-      # workaround for https://github.com/arduino/Arduino/issues/3535
-      # use a dummy library name but keep open the possiblity that said library
-      # might be selected by choice for installation
-      workaround_lib = "USBHost"
-      unless @library_is_indexed || workaround_lib == library_name
-        @library_is_indexed = run_and_capture(flag_install_library, workaround_lib)
-      end
+    def _install_library(library_name)
+      success = run_and_capture(flag_install_library, library_name)[:success]
 
-      # actual installation
-      result = run_and_capture(flag_install_library, library_name)
+      @libraries_indexed = (@libraries_indexed || success) if library_name == WORKAROUND_LIB
+      success
+    end
+
+    # index the set of libraries by installing a dummy library
+    # related to WORKAROUND_LIB and https://github.com/arduino/Arduino/issues/3535
+    # TODO: unclear if this is still necessary
+    def index_libraries
+      return true if @libraries_indexed
+
+      _install_library(WORKAROUND_LIB)
+      @libraries_indexed
+    end
 
-      # update flag if necessary
-      @library_is_indexed = (@library_is_indexed || result[:success]) if library_name == workaround_lib
-      result[:success]
+    # install a library by name
+    # @param name [String] the library name
+    # @return [bool] whether the command succeeded
+    def install_library(library_name)
+      index_libraries
+      _install_library(library_name)
     end
 
     # generate the (very likely) path of a library given its name

data/lib/arduino_ci/arduino_cmd_linux.rb

@@ -5,9 +5,6 @@ module ArduinoCI
 
   # Implementation of Arduino linux IDE commands
   class ArduinoCmdLinux < ArduinoCmd
-
-    attr_reader :prefs_response_time
-
     flag :get_pref,        "--get-pref"
     flag :set_pref,        "--pref"
     flag :save_prefs,      "--save-prefs"
@@ -15,61 +12,6 @@ module ArduinoCI
     flag :install_boards,  "--install-boards"
     flag :install_library, "--install-library"
     flag :verify,          "--verify"
-
-    def initialize
-      super
-      @prefs_response_time = nil
-    end
-
-    # fetch preferences in their raw form
-    # @return [String] Preferences as a set of lines
-    def _prefs_raw
-      start = Time.now
-      resp = run_and_capture(flag_get_pref)
-      @prefs_response_time = Time.now - start
-      return nil unless resp[:success]
-
-      resp[:out]
-    end
-
-    def run_with_gui_guess(message, *args, **kwargs)
-      # On Travis CI, we get an error message in the GUI instead of on STDERR
-      # so, assume that if we don't get a rapid reply that things are not installed
-
-      prefs if @prefs_response_time.nil?
-      x3 = @prefs_response_time * 3
-      Timeout.timeout(x3) do
-        result = run_and_capture(*args, **kwargs)
-        result[:success]
-      end
-    rescue Timeout::Error
-      puts "No response in #{x3} seconds. Assuming graphical modal error message#{message}."
-      false
-    end
-
-    # underlying preference-setter.
-    # @param key [String] the preference key
-    # @param value [String] the preference value
-    # @return [bool] whether the command succeeded
-    def _set_pref(key, value)
-      run_with_gui_guess(" about preferences", flag_set_pref, "#{key}=#{value}", flag_save_prefs)
-    end
-
-    # check whether a board is installed
-    # we do this by just selecting a board.
-    #   the arduino binary will error if unrecognized and do a successful no-op if it's installed
-    # @param boardname [String] The name of the board
-    # @return [bool]
-    def board_installed?(boardname)
-      run_with_gui_guess(" about board not installed", flag_use_board, boardname)
-    end
-
-    # use a particular board for compilation
-    # @param boardname [String] The name of the board
-    def use_board(boardname)
-      run_with_gui_guess(" about board not installed", flag_use_board, boardname, flag_save_prefs)
-    end
-
   end
 
 end

data/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 @@ module ArduinoCI
 
           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
@@ -75,10 +78,11 @@ module ArduinoCI
           # don't want to see is a java error.
           args = launcher + ["--bogus-option"]
           result = Host.run_and_capture(*args)
-          if result[:err].include? "Error: unknown option: --bogus-option"
-            ret.base_cmd = launcher
-            return ret
-          end
+          next unless result[:err].include? "Error: unknown option: --bogus-option"
+
+          ret.base_cmd = launcher
+          ret.binary_path = Pathname.new(osx_root)
+          return ret
         end
         nil
       end

data/lib/arduino_ci/ci_config.rb

@@ -191,6 +191,13 @@ module ArduinoCI
       deep_clone(defn)
     end
 
+    # Whether a package is built-in to arduino
+    # @param package [String] the package name (e.g. "arduino:avr")
+    # @return [bool]
+    def package_builtin?(package)
+      package.start_with?("arduino:")
+    end
+
     # the URL that gives the download info for a given package (a JSON file).
     # this is NOT where the package comes from.
     # @param package [String] the package name (e.g. "arduino:avr")

data/lib/arduino_ci/cpp_library.rb

@@ -50,16 +50,32 @@ module ArduinoCI
     #
     # This assumes the vendor bundle will be at `vendor/bundle` and not some other location
     # @param path [Pathname] The path to check
-    # @return [Array<Pathname>] The paths of the found files
+    # @return [bool]
     def vendor_bundle?(path)
       # TODO: look for Gemfile, look for .bundle/config and get BUNDLE_PATH from there?
       base = @base_dir + "vendor"
       return false unless base.exist?
 
-      real = base.realpath
-      path.ascend do |path_part|
-        return true if path_part == base
-        return true if path_part == real
+      vendor_bundle_aliases = [base, base.realpath]
+
+      # we could do this but some rubies don't return an enumerator for ascend
+      # path.ascend.any? { |part| vendor_bundle_aliases.include?(part) }
+      path.ascend do |part|
+        return true if vendor_bundle_aliases.include?(part)
+      end
+      false
+    end
+
+    # Guess whether a file is part of the tests/ dir (indicating library compilation should ignore it).
+    #
+    # @param path [Pathname] The path to check
+    # @return [bool]
+    def in_tests_dir?(path)
+      tests_dir_aliases = [tests_dir, tests_dir.realpath]
+      # we could do this but some rubies don't return an enumerator for ascend
+      # path.ascend.any? { |part| tests_dir_aliases.include?(part) }
+      path.ascend do |part|
+        return true if tests_dir_aliases.include?(part)
       end
       false
     end
@@ -98,16 +114,7 @@ module ArduinoCI
     # CPP files that are part of the project library under test
     # @return [Array<Pathname>]
     def cpp_files
-      real_tests_dir = tests_dir.realpath
-      cpp_files_in(@base_dir).reject do |p|
-        next true if p.ascend do |path_part|
-          break true if path_part == tests_dir
-          break true if path_part == real_tests_dir
-          break true if vendor_bundle?(p)
-        end
-
-        false
-      end
+      cpp_files_in(@base_dir).reject { |p| vendor_bundle?(p) || in_tests_dir?(p) }
     end
 
     # CPP files that are part of the arduino mock library we're providing

data/lib/arduino_ci/version.rb

@@ -1,3 +1,3 @@
 module ArduinoCI
-  VERSION = "0.1.13".freeze
+  VERSION = "0.1.14".freeze
 end

data/misc/default.yml

@@ -3,15 +3,21 @@
 #   https://en.wikipedia.org/wiki/List_of_Arduino_boards_and_compatible_systems
 
 packages:
+  # arduino:xxx are builtin, we don't need to include them here
   esp8266:esp8266:
     url: http://arduino.esp8266.com/stable/package_esp8266com_index.json
   adafruit:avr:
     url: https://adafruit.github.io/arduino-board-index/package_adafruit_index.json
+  adafruit:samd:
+    url: https://adafruit.github.io/arduino-board-index/package_adafruit_index.json
+  esp32:esp32:
+    url: https://dl.espressif.com/dl/package_esp32_index.json
 
 platforms:
+
   uno:
     board: arduino:avr:uno
-    package: ~
+    package: arduino:avr
     gcc:
       features:
       defines:
@@ -37,6 +43,14 @@ platforms:
        - ARDUINO_SAMD_ZERO
       warnings:
       flags:
+  esp32:
+    board: esp32:esp32:featheresp32:FlashFreq=80
+    package: esp32:esp32
+    gcc:
+      features:
+      defines:
+      warnings:
+      flags:
   esp8266:
     board: esp8266:esp8266:huzzah:FlashSize=4M3M,CpuFrequency=80
     package: esp8266:esp8266
@@ -47,7 +61,7 @@ platforms:
       flags:
   leonardo:
     board: arduino:avr:leonardo
-    package: ~
+    package: arduino:avr
     gcc:
       features:
       defines:
@@ -70,6 +84,39 @@ platforms:
       defines:
       warnings:
       flags:
+  m4:
+    board: adafruit:samd:adafruit_metro_m4
+    package: adafruit:samd
+    gcc:
+      features:
+      defines:
+      warnings:
+      flags:
+  mega2560:
+    board: arduino:avr:mega:cpu=atmega2560
+    package: arduino:avr
+    gcc:
+      features:
+      defines:
+      warnings:
+      flags:
+  cplayClassic:
+    board: arduino:avr:circuitplay32u4cat
+    package: arduino:avr
+    gcc:
+      features:
+      defines:
+      warnings:
+      flags:
+  cplayExpress:
+    board: arduino:samd:adafruit_circuitplayground_m0
+    package: arduino:samd
+    gcc:
+      features:
+      defines:
+      warnings:
+      flags:
+
 
 compile:
   libraries: ~
@@ -78,6 +125,10 @@ compile:
     - due
     - zero
     - leonardo
+    - m4
+    - esp32
+    - esp8266
+    - mega2560
 
 unittest:
   compilers:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arduino_ci
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Ian Katz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os