arduino_ci 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81bed39a97b584fc45ff028f60c9eeb50e24e929123e3af0ca9e6db48ffc5d1a
-  data.tar.gz: 4ee99e35584eaa5db713d80149b1ce7bead47f8e3ac74d1016e82fdb11f1b1c0
+  metadata.gz: 82a935a3542b8ab937b7176122e9db548ce380680c2d79705106bfe452c8e527
+  data.tar.gz: 5924a473a766721cf3ce2c7a3b47536c0ab57afae539e506349a3d4691d6d401
 SHA512:
-  metadata.gz: 64286125ad20ef12fda79a938d29f44d20751db0716144149a660afb350da73f08ef0b1d0494b1d472cac6d50d2cbdc48ce1e4697736f509fbc036adbb724ac1
-  data.tar.gz: 40620b0806a64191b00c84bdf86f546dd131a5cafdda8cc6da23e9cbd64235f88fa2b7aa9d580d5c05cb47da3f93dd0961f86a18dff344d68de7b7f428a673be
+  metadata.gz: 9f09f7ff8912769fe5660e519fddf7b07da5b4774e7719a04154f76ff8fb7fdb8e1ccb6732e17b49ad5b286f33fab6538e8c57f5b94e8487a1bff246d3017c89
+  data.tar.gz: 47ee9f776d6fcf2bf5a77de5762b949b131c0fc21fa68663743d79bf4c97bd6e4794da6251e5dbb335611879fb929afe14a69e19b8518c45e58a7496aada4397

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/arduino_ci.svg)](https://rubygems.org/gems/arduino_ci)
 [![Build Status](https://travis-ci.org/ifreecarve/arduino_ci.svg)](https://travis-ci.org/ifreecarve/arduino_ci)
-[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/arduino_ci/0.1.6)
+[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/arduino_ci/0.1.7)
 
 # ArduinoCI Ruby gem (`arduino_ci`)
 

data/cpp/arduino/PinHistory.h

@@ -7,8 +7,8 @@
 template <typename T>
 class PinHistory : public ObservableDataStream {
   private:
-    Queue<T> qIn;
-    Queue<T> qOut;
+    ArduinoCIQueue<T> qIn;
+    ArduinoCIQueue<T> qOut;
 
     void clear() {
       qOut.clear();
@@ -16,7 +16,7 @@ class PinHistory : public ObservableDataStream {
     }
 
     // enqueue ascii bits
-    void a2q(Queue<T> &q, String input, bool bigEndian, bool advertise) {
+    void a2q(ArduinoCIQueue<T> &q, String input, bool bigEndian, bool advertise) {
       // 8 chars at a time, form up
       for (int j = 0; j < input.length(); ++j) {
         for (int i = 0; i < 8; ++i) {
@@ -31,10 +31,10 @@ class PinHistory : public ObservableDataStream {
 
     // convert a queue to a string as if it was serial bits
     // start from offset, consider endianness
-    String q2a(const Queue<T> &q, unsigned int offset, bool bigEndian) const {
+    String q2a(const ArduinoCIQueue<T> &q, unsigned int offset, bool bigEndian) const {
       String ret = "";
 
-      Queue<T> q2(q);
+      ArduinoCIQueue<T> q2(q);
 
       while (offset) {
         q2.pop();
@@ -135,7 +135,7 @@ class PinHistory : public ObservableDataStream {
     // copy elements to an array, up to a given length
     // return the number of elements moved
     int toArray (T* arr, unsigned int length) const {
-      Queue<T> q2(qOut);
+      ArduinoCIQueue<T> q2(qOut);
 
       int ret = 0;
       for (int i = 0; i < length && q2.size(); ++i) {
@@ -149,7 +149,7 @@ class PinHistory : public ObservableDataStream {
     // see if the array matches the elements in the queue
     bool hasElements (T const * const arr, unsigned int length) const {
       int i;
-      Queue<T> q2(qOut);
+      ArduinoCIQueue<T> q2(qOut);
       for (i = 0; i < length && q2.size(); ++i) {
         if (q2.front() != arr[i]) return false;
         q2.pop();

data/cpp/arduino/ci/DeviceUsingBytes.h

@@ -25,7 +25,7 @@
 class DeviceUsingBytes : public DataStreamObserver {
   public:
     String mMessage;
-    Table<String, String> mResponses;
+    ArduinoCITable<String, String> mResponses;
     GodmodeState* state;
 
 

data/cpp/arduino/ci/ObservableDataStream.h

@@ -72,7 +72,7 @@ class DataStreamObserver {
 class ObservableDataStream
 {
   private:
-    Table<String, DataStreamObserver*> mObservers;
+    ArduinoCITable<String, DataStreamObserver*> mObservers;
     bool          mAdvertisingBit;
     unsigned char mAdvertisingByte;
 

data/cpp/arduino/ci/Queue.h

@@ -1,7 +1,7 @@
 #pragma once
 
 template <typename T>
-class Queue {
+class ArduinoCIQueue {
   private:
     struct Node {
       T data;
@@ -19,9 +19,9 @@ class Queue {
     }
 
   public:
-    Queue(): mNil() { init(); }
+    ArduinoCIQueue(): mNil() { init(); }
 
-    Queue(const Queue<T>& q) {
+    ArduinoCIQueue(const ArduinoCIQueue<T>& q) {
       init();
       for (Node* n = q.mFront; n; n = n->next) push(n->data);
     }
@@ -69,5 +69,5 @@ class Queue {
 
     void clear() { while (!empty()) pop(); }
 
-    ~Queue() { clear(); }
+    ~ArduinoCIQueue() { clear(); }
 };

data/cpp/arduino/ci/Table.h

@@ -5,7 +5,7 @@
 // this is this stupidest table implementation ever but it's
 // an MVP for unit testing. O(n).
 template <typename K, typename V>
-class Table {
+class ArduinoCITable {
   private:
     struct Node {
       K key;
@@ -25,7 +25,7 @@ class Table {
     }
 
   public:
-    Table() : mNilK(), mNilV() { init(); }
+    ArduinoCITable() : mNilK(), mNilV() { init(); }
 
     // number of things in the table
     inline unsigned long size() const { return mSize; }
@@ -121,5 +121,5 @@ class Table {
       }
     }
 
-    ~Table() { clear(); }
+    ~ArduinoCITable() { clear(); }
 };

data/lib/arduino_ci/version.rb

@@ -1,3 +1,3 @@
 module ArduinoCI
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.7".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arduino_ci
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ian Katz
@@ -103,7 +103,6 @@ files:
 - cpp/arduino/Stream.h
 - cpp/arduino/WCharacter.h
 - cpp/arduino/WString.h
-- cpp/arduino/WString.h.orig
 - cpp/arduino/avr/README.md
 - cpp/arduino/avr/common.h
 - cpp/arduino/avr/fuse.h
@@ -376,7 +375,6 @@ files:
 - cpp/arduino/avr/iox8e5.h
 - cpp/arduino/avr/lock.h
 - cpp/arduino/avr/pgmspace.h
-- cpp/arduino/avr/pgmspace.h.orig
 - cpp/arduino/avr/portpins.h
 - cpp/arduino/avr/version.h
 - cpp/arduino/avr/xmega.h
@@ -399,7 +397,6 @@ files:
 - lib/arduino_ci/arduino_installation.rb
 - lib/arduino_ci/ci_config.rb
 - lib/arduino_ci/cpp_library.rb
-- lib/arduino_ci/cpp_library.rb.orig
 - lib/arduino_ci/display_manager.rb
 - lib/arduino_ci/host.rb
 - lib/arduino_ci/version.rb

data/cpp/arduino/WString.h.orig

@@ -1,172 +0,0 @@
-#pragma once
-
-#include <stdlib.h>
-#include <string>
-#include <algorithm>
-#include <iostream>
-#include "AvrMath.h"
-#include "WCharacter.h"
-
-typedef std::string string;
-
-typedef char __FlashStringHelper;
-<<<<<<< Updated upstream
-
-#define F(string_literal) (string_literal)
-=======
-//class __FlashStringHelper;
-#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
->>>>>>> Stashed changes
-
-// Compatibility with string class
-class String: public string
-{
-  public:
-
-    // allow "string s; if (s) {}"
-    // http://www.artima.com/cppsource/safebool.html
-    typedef void (String::*TTDNSCstring)() const;
-    void ttdnsc() const {}
-    operator TTDNSCstring() const  { return &String::ttdnsc; }
-
-  private:
-    static const char* digit(int val) {
-      static const char* bank = "0123456789ABCDEF";
-      return bank + val;
-    }
-
-    static string mytoa(unsigned long val, int base) {
-      int n = val % base;
-      string place = string(digit(n), 1);
-      if (val < base) return place;
-      return mytoa(val / base, base) + place;
-    }
-
-    static string mytoas(long val, int base) {
-      string ret = mytoa(abs(val), base);
-      return 0 <= val ? ret : string("-") + ret;
-    }
-
-    static string dtoas(double val, int decimalPlaces) {
-      double r = 0.5 * pow(0.1, decimalPlaces); // make sure that integer truncation will properly round
-      if (::isnan(val)) return "nan";
-      if (::isinf(val)) return "inf";
-      val += val > 0 ? r : -r;
-      if (val > 4294967040.0) return "ovf";
-      if (val <-4294967040.0) return "ovf";
-      return mytoas(val, 10) + "." + mytoa(abs(val - (long)val) * pow(10, decimalPlaces), 10);
-    }
-
-public:
-  ~String(void) {}
-  String(const char *cstr = ""): string(cstr) {}
-  String(const string &str): string(str) {}
-  String(const String &str): string(str) {}
-  explicit String(char c): string(1, c) {}
-
-  explicit String(unsigned char val, unsigned char base=10): string(mytoa(val, base)) {}
-  explicit String(int val,           unsigned char base=10): string(mytoas(val, base)) {}
-  explicit String(unsigned int val , unsigned char base=10): string(mytoa(val, base)) {}
-  explicit String(long val,          unsigned char base=10): string(mytoas(val, base)) {}
-  explicit String(unsigned long val, unsigned char base=10): string(mytoa(val, base)) {}
-
-  explicit String(float val,  unsigned char decimalPlaces=2): string(dtoas(val, decimalPlaces)) {}
-  explicit String(double val, unsigned char decimalPlaces=2): string(dtoas(val, decimalPlaces)) {}
-
-  String & operator = (const String &rhs) { assign(rhs); return *this; }
-  String & operator = (const string &rhs) { assign(rhs); return *this; }
-  String & operator = (const char *cstr)  { assign(cstr); return *this; }
-  String & operator = (const char c)      { assign(1, c); return *this; }
-
-  unsigned char concat(const String &str) { append(str); return 1; }
-  unsigned char concat(const char *cstr)  { append(cstr); return 1; }
-  unsigned char concat(char c)            { append(1, c); return 1; }
-  unsigned char concat(unsigned char c)   { append(1, c); return 1; }
-  unsigned char concat(int num)           { append(String(num)); return 1; }
-  unsigned char concat(unsigned int num)  { append(String(num)); return 1; }
-  unsigned char concat(long num)          { append(String(num)); return 1; }
-  unsigned char concat(unsigned long num) { append(String(num)); return 1; }
-  unsigned char concat(float num)         { append(String(num)); return 1; }
-  unsigned char concat(double num)        { append(String(num)); return 1; }
-
-  String & operator += (const String &rhs) { concat(rhs);  return *this; }
-  String & operator += (const char *cstr)  { concat(cstr); return *this; }
-  String & operator += (char c)            { concat(c);    return *this; }
-  String & operator += (unsigned char num) { concat(num);  return *this; }
-  String & operator += (int num)           { concat(num);  return *this; }
-  String & operator += (unsigned int num)  { concat(num);  return *this; }
-  String & operator += (long num)          { concat(num);  return *this; }
-  String & operator += (unsigned long num) { concat(num);  return *this; }
-  String & operator += (float num)         { concat(num);  return *this; }
-  String & operator += (double num)        { concat(num);  return *this; }
-
-
-  int compareTo(const String &s) const { return compare(s); }
-  unsigned char equals(const String &s) const { return compareTo(s) == 0; }
-	unsigned char equals(const char *cstr) const { return compareTo(String(cstr)) == 0; }
-  unsigned char equal(const String &s) const { return equals(s); }
-	unsigned char equal(const char *cstr) const { return equals(cstr); }
-  unsigned char equalsIgnoreCase(const String &s) const {
-    String a = String(*this);
-    String b = String(s);
-    a.toUpperCase();
-    b.toUpperCase();
-    return a.compare(b) == 0;
-  }
-
-  unsigned char startsWith(const String &prefix) const { return find(prefix) == 0; }
-  unsigned char startsWith(const String &prefix, unsigned int offset) const { return find(prefix, offset) == offset; }
-  unsigned char endsWith(const String &suffix) const { return rfind(suffix) == length() - suffix.length(); }
-
-  char charAt(unsigned int index) const {	return operator[](index); }
-  void setCharAt(unsigned int index, char c) { (*this)[index] = c; }
-
-  void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const { copy((char*)buf, bufsize, index); }
-  void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
-    { getBytes((unsigned char *)buf, bufsize, index); }
-
-  int indexOf( char ch ) const                                   { return find(ch); }
-  int indexOf( char ch, unsigned int fromIndex ) const           { return find(ch, fromIndex); }
-  int indexOf( const String &str ) const                         { return find(str); }
-  int indexOf( const String &str, unsigned int fromIndex ) const { return find(str, fromIndex); }
-  int lastIndexOf( char ch ) const                                   { return rfind(ch); }
-  int lastIndexOf( char ch, unsigned int fromIndex ) const           { return rfind(ch, fromIndex); }
-  int lastIndexOf( const String &str ) const                         { return rfind(str); }
-  int lastIndexOf( const String &str, unsigned int fromIndex ) const { return rfind(str, fromIndex); }
-  String substring( unsigned int beginIndex ) const { return String(substr(beginIndex)); }
-  String substring( unsigned int beginIndex, unsigned int endIndex ) const { return String(substr(beginIndex, endIndex)); }
-
-  void replace(const String& target, const String& repl) {
-    int i = 0;
-    while ((i = find(target, i)) != npos) {
-      assign(substr(0, i) + repl + substr(i + target.length()));
-      i += repl.length();
-    }
-  }
-  void replace(char target, char repl) {
-    replace(String(target), String(repl));
-  }
-  void remove(unsigned int index) { assign(substr(0, index)); }
-  void remove(unsigned int index, unsigned int count) { assign(substr(0, index) + substr(min(length(), index + count), count)); }
-  void toLowerCase(void) { std::transform(begin(), end(), begin(), ::tolower); }
-  void toUpperCase(void) { std::transform(begin(), end(), begin(), ::toupper); }
-
-  void trim(void) {
-    int b;
-    int e;
-    for (b = 0; b < length() && isSpace(charAt(b)); ++b);
-    for (e = length() - 1; e > b && isSpace(charAt(e)); --e);
-    assign(substr(b, e - b + 1));
-  }
-
-  long toInt(void) const      { return std::stol(*this); }
-  float toFloat(void) const   { return std::stof(*this); }
-  double toDouble(void) const { return std::stod(*this); }
-
-};
-
-inline std::ostream& operator << ( std::ostream& out, const String& bs ) {
-  out << bs.c_str();
-  return out;
-}
-

data/cpp/arduino/avr/pgmspace.h.orig

@@ -1,95 +0,0 @@
-#pragma once
-
-
-/*
-def d(var_raw)
-   var = var_raw.split("_")[0]
-   out = "#define #{var}_P(...) ::#{var}(__VA_ARGS__)\n"
-   IO.popen('pbcopy', 'w') { |f| f << out }
-   out
- end
-
-text = File.open("arduino-1.8.5/hardware/tools/avr/avr/include/avr/pgmspace.h").read
-externs = text.split("\n").select {|l| l.start_with? "extern"}
-out = externs.map {|l| l.split("(")[0].split(" ")[-1].gsub("*", "") }.uniq
-out.each { |l| puts d(l) }
-*/
-
-#include <avr/io.h>
-#include <string>
-
-#define PROGMEM
-
-#ifndef PGM_P
-#define PGM_P const char *
-#endif
-
-#ifndef PGM_VOID_P
-#define PGM_VOID_P const void *
-#endif
-
-// everything's a no-op
-#define PSTR(s) ((const char *)(s))
-#define pgm_read_byte_near(x)  (x)
-#define pgm_read_word_near(x)  (x)
-#define pgm_read_dword_near(x) (x)
-#define pgm_read_float_near(x) (x)
-#define pgm_read_ptr_near(x)   (x)
-
-#define pgm_read_byte_far(x)  (x)
-#define pgm_read_word_far(x)  (x)
-#define pgm_read_dword_far(x) (x)
-#define pgm_read_float_far(x) (x)
-#define pgm_read_ptr_far(x)   (x)
-
-
-#define pgm_read_byte(x) (x)
-#define pgm_read_word(x) (x)
-#define pgm_read_dword(x) (x)
-#define pgm_read_float(x) (x)
-#define pgm_read_ptr(x) (x)
-#define pgm_get_far_address(x) (x)
-
-#define memchr_P(...) ::memchr(__VA_ARGS__)
-#define memcmp_P(...) ::memcmp(__VA_ARGS__)
-#define memccpy_P(...) ::memccpy(__VA_ARGS__)
-#define memcpy_P(...) ::memcpy(__VA_ARGS__)
-#define memmem_P(...) ::memmem(__VA_ARGS__)
-#define memrchr_P(...) ::memrchr(__VA_ARGS__)
-#define strcat_P(...) ::strcat(__VA_ARGS__)
-#define strchr_P(...) ::strchr(__VA_ARGS__)
-#define strchrnul_P(...) ::strchrnul(__VA_ARGS__)
-#define strcmp_P(...) ::strcmp(__VA_ARGS__)
-#define strcpy_P(...) ::strcpy(__VA_ARGS__)
-#define strcasecmp_P(...) ::strcasecmp(__VA_ARGS__)
-#define strcasestr_P(...) ::strcasestr(__VA_ARGS__)
-#define strcspn_P(...) ::strcspn(__VA_ARGS__)
-#define strlcat_P(...) ::strlcat(__VA_ARGS__)
-#define strlcpy_P(...) ::strlcpy(__VA_ARGS__)
-#define strnlen_P(...) ::strnlen(__VA_ARGS__)
-#define strncmp_P(...) ::strncmp(__VA_ARGS__)
-#define strncasecmp_P(...) ::strncasecmp(__VA_ARGS__)
-#define strncat_P(...) ::strncat(__VA_ARGS__)
-#define strncpy_P(...) ::strncpy(__VA_ARGS__)
-#define strpbrk_P(...) ::strpbrk(__VA_ARGS__)
-#define strrchr_P(...) ::strrchr(__VA_ARGS__)
-#define strsep_P(...) ::strsep(__VA_ARGS__)
-#define strspn_P(...) ::strspn(__VA_ARGS__)
-#define strstr_P(...) ::strstr(__VA_ARGS__)
-#define strtok_P(...) ::strtok(__VA_ARGS__)
-#define strtok_P(...) ::strtok(__VA_ARGS__)
-#define strlen_P(...) ::strlen(__VA_ARGS__)
-#define strnlen_P(...) ::strnlen(__VA_ARGS__)
-#define memcpy_P(...) ::memcpy(__VA_ARGS__)
-#define strcpy_P(...) ::strcpy(__VA_ARGS__)
-#define strncpy_P(...) ::strncpy(__VA_ARGS__)
-#define strcat_P(...) ::strcat(__VA_ARGS__)
-#define strlcat_P(...) ::strlcat(__VA_ARGS__)
-#define strncat_P(...) ::strncat(__VA_ARGS__)
-#define strcmp_P(...) ::strcmp(__VA_ARGS__)
-#define strncmp_P(...) ::strncmp(__VA_ARGS__)
-#define strcasecmp_P(...) ::strcasecmp(__VA_ARGS__)
-#define strncasecmp_P(...) ::strncasecmp(__VA_ARGS__)
-#define strstr_P(...) ::strstr(__VA_ARGS__)
-#define strlcpy_P(...) ::strlcpy(__VA_ARGS__)
-#define memcmp_P(...) ::memcmp(__VA_ARGS__)

data/lib/arduino_ci/cpp_library.rb.orig

@@ -1,215 +0,0 @@
-require 'find'
-require "arduino_ci/host"
-
-HPP_EXTENSIONS = [".hpp", ".hh", ".h", ".hxx", ".h++"].freeze
-CPP_EXTENSIONS = [".cpp", ".cc", ".c", ".cxx", ".c++"].freeze
-ARDUINO_HEADER_DIR = File.expand_path("../../../cpp/arduino", __FILE__)
-UNITTEST_HEADER_DIR = File.expand_path("../../../cpp/unittest", __FILE__)
-
-module ArduinoCI
-
-  # Information about an Arduino CPP library, specifically for compilation purposes
-  class CppLibrary
-
-    # @return [String] The path to the library being tested
-    attr_reader :base_dir
-
-    # @return [Array<String>] The set of artifacts created by this class (note: incomplete!)
-    attr_reader :artifacts
-
-    # @return [String] STDERR from the last command
-    attr_reader :last_err
-
-    # @return [String] STDOUT from the last command
-    attr_reader :last_out
-
-    # @return [String] the last command
-    attr_reader :last_cmd
-
-    # @param base_dir [String] The path to the library being tested
-    def initialize(base_dir)
-      @base_dir = File.expand_path(base_dir)
-      @artifacts = []
-      @last_err = ""
-      @last_out = ""
-      @last_msg = ""
-    end
-
-    # Guess whether a file is part of the vendor bundle (indicating we should ignore it).
-    #
-    # This assumes the vendor bundle will be at `vendor/bundle` and not some other location
-    # @param path [String] The path to check
-    # @return [Array<String>] The paths of the found files
-    def vendor_bundle?(path)
-      # TODO: look for Gemfile, look for .bundle/config and get BUNDLE_PATH from there?
-      base = File.join(@base_dir, "vendor")
-      real = File.join(File.realpath(@base_dir), "vendor")
-      return true if path.start_with?(base)
-      return true if path.start_with?(real)
-      false
-    end
-
-    # Get a list of all CPP source files in a directory and its subdirectories
-    # @param some_dir [String] The directory in which to begin the search
-    # @return [Array<String>] The paths of the found files
-    def cpp_files_in(some_dir)
-      return [] unless File.exist?(some_dir)
-      real = File.realpath(some_dir)
-      files = Find.find(real).reject { |path| File.directory?(path) }
-      ret = files.select { |path| CPP_EXTENSIONS.include?(File.extname(path)) }
-      ret
-    end
-
-    # CPP files that are part of the project library under test
-    # @return [Array<String>]
-    def cpp_files
-      real_tests_dir = File.realpath(tests_dir)
-      cpp_files_in(@base_dir).reject do |p|
-        next true if File.dirname(p).include?(tests_dir)
-        next true if File.dirname(p).include?(real_tests_dir)
-        next true if vendor_bundle?(p)
-      end
-    end
-
-    # CPP files that are part of the arduino mock library we're providing
-    # @return [Array<String>]
-    def cpp_files_arduino
-      cpp_files_in(ARDUINO_HEADER_DIR)
-    end
-
-    # CPP files that are part of the unit test library we're providing
-    # @return [Array<String>]
-    def cpp_files_unittest
-      cpp_files_in(UNITTEST_HEADER_DIR)
-    end
-
-    # The directory where we expect to find unit test defintions provided by the user
-    # @return [String]
-    def tests_dir
-      File.join(@base_dir, "test")
-    end
-
-    # The files provided by the user that contain unit tests
-    # @return [Array<String>]
-    def test_files
-      cpp_files_in(tests_dir)
-    end
-
-    # Find all directories in the project library that include C++ header files
-    # @return [Array<String>]
-    def header_dirs
-      real = File.realpath(@base_dir)
-      all_files = Find.find(real).reject { |path| File.directory?(path) }
-      unbundled = all_files.reject { |path| vendor_bundle?(path) }
-      files = unbundled.select { |path| HPP_EXTENSIONS.include?(File.extname(path)) }
-      ret = files.map { |path| File.dirname(path) }.uniq
-      ret
-    end
-
-    # wrapper for the GCC command
-    def run_gcc(*args, **kwargs)
-      full_args = ["g++-4.9"] + args
-      @last_cmd = " $ #{full_args.join(' ')}"
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
-      ret = Host.run_and_capture(*full_args, **kwargs)
-      @last_err = ret[:err]
-      @last_out = ret[:out]
-      ret[:success]
-    end
-
-    # Return the GCC version
-    # @return [String] the version reported by `gcc -v`
-    def gcc_version
-      return nil unless run_gcc("-v")
-      @last_err
-    end
-
-    # GCC command line arguments for including aux libraries
-    # @param aux_libraries [String] The external Arduino libraries required by this project
-    # @return [Array<String>] The GCC command-line flags necessary to include those libraries
-    def include_args(aux_libraries)
-      places = [ARDUINO_HEADER_DIR, UNITTEST_HEADER_DIR] + header_dirs + aux_libraries
-      places.map { |d| "-I#{d}" }
-    end
-
-    # GCC command line arguments for features (e.g. -fno-weak)
-    # @param ci_gcc_config [Hash] The GCC config object
-    # @return [Array<String>] GCC command-line flags
-    def feature_args(ci_gcc_config)
-      return [] if ci_gcc_config[:features].nil?
-      ci_gcc_config[:features].map { |f| "-f#{f}" }
-    end
-
-    # GCC command line arguments for warning (e.g. -Wall)
-    # @param ci_gcc_config [Hash] The GCC config object
-    # @return [Array<String>] GCC command-line flags
-    def warning_args(ci_gcc_config)
-      return [] if ci_gcc_config[:warnings].nil?
-      ci_gcc_config[:features].map { |w| "-W#{w}" }
-    end
-
-    # GCC command line arguments for defines (e.g. -Dhave_something)
-    # @param ci_gcc_config [Hash] The GCC config object
-    # @return [Array<String>] GCC command-line flags
-    def define_args(ci_gcc_config)
-      return [] if ci_gcc_config[:defines].nil?
-      ci_gcc_config[:defines].map { |d| "-D#{d}" }
-    end
-
-    # GCC command line arguments as-is
-    # @param ci_gcc_config [Hash] The GCC config object
-    # @return [Array<String>] GCC command-line flags
-    def flag_args(ci_gcc_config)
-      return [] if ci_gcc_config[:flags].nil?
-      ci_gcc_config[:flags]
-    end
-
-    # All GCC command line args for building any unit test
-    # @param aux_libraries [String] The external Arduino libraries required by this project
-    # @param ci_gcc_config [Hash] The GCC config object
-    # @return [Array<String>] GCC command-line flags
-    def test_args(aux_libraries, ci_gcc_config)
-      # TODO: something with libraries?
-      ret = include_args(aux_libraries) + cpp_files_arduino + cpp_files_unittest + cpp_files
-      unless ci_gcc_config.nil?
-        cgc = ci_gcc_config
-        ret = feature_args(cgc) + warning_args(cgc) + define_args(cgc) + flag_args(cgc) + ret
-      end
-      ret
-    end
-
-    # build a file for running a test of the given unit test file
-    # @param test_file [String] The path to the file containing the unit tests
-    # @param aux_libraries [String] The external Arduino libraries required by this project
-    # @param ci_gcc_config [Hash] The GCC config object
-    # @return [String] path to the compiled test executable
-    def build_for_test_with_configuration(test_file, aux_libraries, ci_gcc_config)
-      base = File.basename(test_file)
-      executable = File.expand_path("unittest_#{base}.bin")
-      File.delete(executable) if File.exist?(executable)
-      args = [
-        ["-std=c++0x", "-o", executable, "-DARDUINO=100"],
-        test_args(aux_libraries, ci_gcc_config),
-        [test_file],
-      ].flatten(1)
-      return nil unless run_gcc(*args)
-      artifacts << executable
-      executable
-    end
-
-    # run a test file
-    # @param [String] the path to the test file
-    # @return [bool] whether all tests were successful
-    def run_test_file(executable)
-      @last_cmd = executable
-      @last_out = ""
-      @last_err = ""
-      Host.run_and_output(executable)
-    end
-
-  end
-
-end