arduino_ci 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 28e1e4179be7a5d17d57b16b02f3eb75a41f6bb9506c8d034c14d2f077d09c48
-  data.tar.gz: b60ab526bb91b353379aa7f3d4a3ab8ec3f8fa18442369e0197c098487ed53a0
+SHA1:
+  metadata.gz: 15e345b597108192a550ec12ee76a0e885ca6cf0
+  data.tar.gz: 11175d4813c5a96512a69908ced560b04e0a3508
 SHA512:
-  metadata.gz: 7b9b69ee987e14970104cbf6c6e41f846b714d40536af43d5cc1b21e5811bb75f12172de94a21340277cc830654f97a5a8cb4c5e954f5c2358e515a39ac9c871
-  data.tar.gz: 360e1c2b48e9f706a90275356363802c6534968e0d96c29d5f7a825a1f0c73df2d2526d680bf103909544508506c1e0a7effec59a722f1788b171184d0bbd332
+  metadata.gz: 3227370d70a4d319e79c3900e744732c6ed66fcd2cfe2e45347512ba1a13f14e77a2496e34b6711bd2d99fa4d926d24506b2eddded019222359e3e0c78115988
+  data.tar.gz: e5c8b30ad8819d5b01c3efcacb35b90758ead156dd71f2bff6feddfd2f37a61c9de7033906d5501476e35dc505b0f9dc7d92ec1e405512418ed9d159bb1cb07e

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.14)
+# 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.15)
 
 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

@@ -263,8 +263,10 @@ else
   end
 end
 
-if library_examples.empty?
-  inform_multiline("Skipping libraries; no examples found in #{installed_library_path}") do
+if config.platforms_to_build.empty?
+  inform("Skipping builds") { "no platforms were requested" }
+elsif library_examples.empty?
+  inform_multiline("Skipping builds; no examples found in #{installed_library_path}") do
     display_files(installed_library_path)
   end
 else

data/lib/arduino_ci/ci_config.rb

@@ -93,7 +93,7 @@ module ArduinoCI
         if !schema.include?(ksym)
           puts "Warning: unknown field '#{ksym}' under definition for #{rootname}"
         elsif value.nil?
-          # unspecificed, that's fine
+          good_data[ksym] = nil
         elsif value.class != expected_type
           puts "Warning: expected field '#{ksym}' of #{rootname} to be '#{expected_type}', got '#{value.class}'"
         else

data/lib/arduino_ci/cpp_library.rb

@@ -1,6 +1,7 @@
 require 'find'
 require "arduino_ci/host"
 require 'pathname'
+require 'shellwords'
 
 HPP_EXTENSIONS = [".hpp", ".hh", ".h", ".hxx", ".h++"].freeze
 CPP_EXTENSIONS = [".cpp", ".cc", ".c", ".cxx", ".c++"].freeze
@@ -287,7 +288,7 @@ module ArduinoCI
       @last_cmd = executable
       @last_out = ""
       @last_err = ""
-      Host.run_and_output(executable.to_s)
+      Host.run_and_output(executable.to_s.shellescape)
     end
 
   end

data/lib/arduino_ci/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arduino_ci
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Ian Katz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -99,7 +99,6 @@ email:
 - ianfixes@gmail.com
 executables:
 - arduino_ci_remote.rb
-- arduino_ci_remote.rb.orig
 - ensure_arduino_installation.rb
 - libasan.rb
 extensions: []
@@ -407,7 +406,6 @@ files:
 - cpp/unittest/Assertion.h
 - cpp/unittest/Compare.h
 - exe/arduino_ci_remote.rb
-- exe/arduino_ci_remote.rb.orig
 - exe/ensure_arduino_installation.rb
 - exe/libasan.rb
 - lib/arduino_ci.rb
@@ -446,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Tools for building and unit testing Arduino libraries

data/exe/arduino_ci_remote.rb.orig

@@ -1,268 +0,0 @@
-#!/usr/bin/env ruby
-require 'arduino_ci'
-require 'set'
-require 'pathname'
-
-WIDTH = 80
-FIND_FILES_INDENT = 4
-
-@failure_count = 0
-@passfail = proc { |result| result ? "✓" : "✗" }
-
-# terminate after printing any debug info.  TODO: capture debug info
-def terminate(final = nil)
-  puts "Failures: #{@failure_count}"
-  unless @failure_count.zero? || final
-    puts "Last message: #{@arduino_cmd.last_msg}"
-    puts "========== Stdout:"
-    puts @arduino_cmd.last_out
-    puts "========== Stderr:"
-    puts @arduino_cmd.last_err
-  end
-  retcode = @failure_count.zero? ? 0 : 1
-  exit(retcode)
-end
-
-# make a nice status line for an action and react to the action
-def perform_action(message, multiline, mark_fn, on_fail_msg, tally_on_fail, abort_on_fail)
-  line = "#{message}... "
-  endline = "...#{message} "
-  if multiline
-    puts line
-  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.to_s.rjust(WIDTH - line.length, " ")
-  unless result
-    puts on_fail_msg unless on_fail_msg.nil?
-    @failure_count += 1 if tally_on_fail
-    # print out error messaging here if we've captured it
-    terminate if abort_on_fail
-  end
-  result
-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, 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, 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, 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, false, &block)
-end
-
-def inform_multiline(message, &block)
-  perform_action(message, true, nil, nil, false, false, &block)
-end
-
-# Assure that a platform exists and return its definition
-def assured_platform(purpose, name, config)
-  platform_definition = config.platform_definition(name)
-  assure("Requested #{purpose} platform '#{name}' is defined in 'platforms' YML") do
-    !platform_definition.nil?
-  end
-  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 = 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)
-
-# check GCC
-compilers = config.compilers_to_use
-assure("The set of compilers (#{compilers.length}) isn't empty") { !compilers.empty? }
-compilers.each do |gcc_binary|
-  attempt_multiline("Checking #{gcc_binary} version") do
-    version = cpp_library.gcc_version(gcc_binary)
-    next nil unless version
-
-    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.
-# start with the "platforms to unittest" and add the examples
-# while we're doing that, get the aux libraries as well
-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 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
-
-# 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?)
-unless all_urls.empty?
-  assure("Setting board manager URLs") do
-    @arduino_cmd.set_pref("boardsmanager.additional.urls", all_urls.join(","))
-  end
-end
-
-all_packages.each do |p|
-  assure("Installing board package #{p}") do
-    @arduino_cmd.install_boards(p)
-  end
-end
-
-aux_libraries.each do |l|
-  if @arduino_cmd.library_present?(l)
-    inform("Using pre-existing library") { l.to_s }
-  else
-    assure("Installing aux library '#{l}'") { @arduino_cmd.install_library(l) }
-  end
-end
-
-# iterate boards / tests
-last_board = nil
-if !cpp_library.tests_dir.exist?
-  inform_multiline("Skipping unit tests; no tests dir at #{cpp_library.tests_dir}") do
-    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
-    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]
-    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|
-      unittest_name = unittest_path.basename.to_s
-      compilers.each do |gcc_binary|
-        attempt_multiline("Unit testing #{unittest_name} with #{gcc_binary}") do
-          exe = cpp_library.build_for_test_with_configuration(
-            unittest_path,
-            config.aux_libraries_for_unittest,
-            gcc_binary,
-            config.gcc_config(p)
-          )
-          puts
-          unless exe
-            puts "Last command: #{cpp_library.last_cmd}"
-            puts cpp_library.last_out
-            puts cpp_library.last_err
-            next false
-          end
-          cpp_library.run_test_file(exe)
-        end
-      end
-    end
-  end
-end
-
-if library_examples.empty?
-  inform_multiline("Skipping libraries; no examples found in #{installed_library_path}") do
-    display_files(installed_library_path)
-  end
-else
-  attempt("Setting compiler warning level")  { @arduino_cmd.set_pref("compiler.warning_level", "all") }
-
-  # 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|
-      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)
-        unless ret
-          puts
-          puts "Last command: #{@arduino_cmd.last_msg}"
-          puts @arduino_cmd.last_err
-        end
-        ret
-      end
-    end
-  end
-end
-
-terminate(true)