arduino_ci 0.1.10 → 0.1.11

data/lib/arduino_ci/host.rb

@@ -1,5 +1,6 @@
 require 'os'
 require 'open3'
+require 'pathname'
 
 module ArduinoCI
 
@@ -38,15 +39,20 @@ module ArduinoCI
     end
 
     # if on windows, call mklink, else self.symlink
-    # https://stackoverflow.com/a/22716582/2063546
+    # @param [Pathname] old_path
+    # @param [Pathname] new_path
     def self.symlink(old_path, new_path)
-      return FileUtils.ln_s(old_path, new_path) unless RUBY_PLATFORM =~ /mswin32|cygwin|mingw|bccwin/
+      return FileUtils.ln_s(old_path.to_s, new_path.to_s) unless RUBY_PLATFORM =~ /mswin32|cygwin|mingw|bccwin/
 
+      # https://stackoverflow.com/a/22716582/2063546
       # windows mklink syntax is reverse of unix ln -s
       # windows mklink is built into cmd.exe
       # vulnerable to command injection, but okay because this is a hack to make a cli tool work.
-      _stdin, _stdout, _stderr, wait_thr = Open3.popen3('cmd.exe', "/c mklink #{new_path} #{old_path}")
-      wait_thr.value.exitstatus
+      orp = old_path.realpath.to_s.tr("/", "\\") # HACK DUE TO REALPATH BUG where it
+      np = new_path.to_s.tr("/", "\\")           # still joins windows paths with '/'
+
+      _stdout, _stderr, exitstatus = Open3.capture3('cmd.exe', "/C mklink /D #{np} #{orp}")
+      exitstatus.success?
     end
   end
 end

data/lib/arduino_ci/version.rb

@@ -1,3 +1,3 @@
 module ArduinoCI
-  VERSION = "0.1.10".freeze
+  VERSION = "0.1.11".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arduino_ci
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Ian Katz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.59.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.59.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,8 @@ email:
 - ianfixes@gmail.com
 executables:
 - arduino_ci_remote.rb
+- arduino_ci_remote.rb.orig
+- ensure_arduino_installation.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -113,6 +115,7 @@ files:
 - cpp/arduino/HardwareSerial.h
 - cpp/arduino/PinHistory.h
 - cpp/arduino/Print.h
+- cpp/arduino/SPI.h
 - cpp/arduino/SoftwareSerial.h
 - cpp/arduino/Stream.h
 - cpp/arduino/WCharacter.h
@@ -403,6 +406,8 @@ 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
 - lib/arduino_ci.rb
 - lib/arduino_ci/arduino_cmd.rb
 - lib/arduino_ci/arduino_cmd_linux.rb
@@ -410,17 +415,12 @@ files:
 - lib/arduino_ci/arduino_cmd_osx.rb
 - lib/arduino_ci/arduino_cmd_windows.rb
 - lib/arduino_ci/arduino_downloader.rb
-- lib/arduino_ci/arduino_downloader.rb.orig
 - lib/arduino_ci/arduino_downloader_linux.rb
-- lib/arduino_ci/arduino_downloader_linux.rb.orig
 - lib/arduino_ci/arduino_downloader_osx.rb
-- lib/arduino_ci/arduino_downloader_osx.rb.orig
 - lib/arduino_ci/arduino_downloader_windows.rb
 - lib/arduino_ci/arduino_installation.rb
-- lib/arduino_ci/arduino_installation.rb.orig
 - lib/arduino_ci/ci_config.rb
 - lib/arduino_ci/cpp_library.rb
-- lib/arduino_ci/display_manager.rb
 - lib/arduino_ci/host.rb
 - lib/arduino_ci/version.rb
 - misc/default.yml

data/lib/arduino_ci/arduino_downloader.rb.orig

@@ -1,219 +0,0 @@
-DOWNLOAD_ATTEMPTS = 3
-
-module ArduinoCI
-
-  # Manage the OS-specific download & install of Arduino
-  class ArduinoDownloader
-
-    def initialize(desired_ide_version)
-      @desired_ide_version = desired_ide_version
-    end
-
-    # Provide guidelines to the implementer of this class
-<<<<<<< HEAD
-    def must_implement(method)
-      raise NoMethodError("#{self.class.name} failed to implement ArduinoDownloader.#{method}")
-=======
-    def self.must_implement(method)
-      raise NotImplementedError, "#{self.class.name} failed to implement ArduinoDownloader.#{method}"
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # Make any preparations or run any checks prior to making changes
-    # @return [string] Error message, or nil if success
-    def prepare
-      nil
-    end
-
-    # The autolocated executable of the installation
-    #
-    # @return [string] or nil
-<<<<<<< HEAD
-    def self.autolocation
-=======
-    def self.autolocated_executable
->>>>>>> Refactor force_install code in preparation for windows CI
-      # Arbitrarily, I'm going to pick the force installed location first
-      # if it exists.  I'm not sure why we would have both, but if we did
-      # a force install then let's make sure we actually use it.
-      locations = [self.force_installed_executable, self.existing_executable]
-      locations.each do |loc|
-        next if loc.nil?
-        next unless File.exist? loc
-        return loc
-      end
-      nil
-    end
-
-<<<<<<< HEAD
-    # The executable Arduino file in an existing installation, or nil
-    # @return [string]
-    def self.existing_executable
-      must_implement(__method__)
-=======
-    # The autolocated directory of the installation
-    #
-    # @return [string] or nil
-    def self.autolocated_installation
-      # Arbitrarily, I'm going to pick the force installed location first
-      # if it exists.  I'm not sure why we would have both, but if we did
-      # a force install then let's make sure we actually use it.
-      locations = [self.force_install_location, self.existing_installation]
-      locations.each do |loc|
-        next if loc.nil?
-        next unless File.exist? loc
-        return loc
-      end
-      nil
-    end
-
-    # The path to the directory of an existing installation, or nil
-    # @return [string]
-    def self.existing_installation
-      self.must_implement(__method__)
-    end
-
-    # The executable Arduino file in an existing installation, or nil
-    # @return [string]
-    def self.existing_executable
-      self.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # The executable Arduino file in a forced installation, or nil
-    # @return [string]
-    def self.force_installed_executable
-<<<<<<< HEAD
-      must_implement(__method__)
-=======
-      self.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # The technology that will be used to complete the download
-    # (for logging purposes)
-    # @return [string]
-    def downloader
-<<<<<<< HEAD
-      must_implement(__method__)
-=======
-      self.class.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # The technology that will be used to extract the download
-    # (for logging purposes)
-    # @return [string]
-    def extracter
-<<<<<<< HEAD
-      must_implement(__method__)
-=======
-      self.class.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # The URL of the desired IDE package (zip/tar/etc) for this platform
-    # @return [string]
-    def package_url
-      "https://downloads.arduino.cc/#{package_file}"
-    end
-
-    # The local file (dir) name of the desired IDE package (zip/tar/etc)
-    # @return [string]
-    def package_file
-<<<<<<< HEAD
-      must_implement(__method__)
-=======
-      self.class.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # The local filename of the extracted IDE package (zip/tar/etc)
-    # @return [string]
-    def extracted_file
-<<<<<<< HEAD
-      must_implement(__method__)
-=======
-      self.class.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # @return [String] The location where a forced install will go
-    def self.force_install_location
-      File.join(ENV['HOME'], 'arduino_ci_ide')
-    end
-
-    # Download the package_url to package_file, and maybe print a line of dots......
-    # @return [bool] whether successful
-    def download
-<<<<<<< HEAD
-      must_implement(__method__)
-=======
-      self.class.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # Extract the package_file to extracted_file
-    # @return [bool] whether successful
-    def extract
-<<<<<<< HEAD
-      must_implement(__method__)
-=======
-      self.class.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # Move the extracted package file from extracted_file to the force_install_location
-    # @return [bool] whether successful
-    def install
-<<<<<<< HEAD
-      must_implement(__method__)
-=======
-      self.class.must_implement(__method__)
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # Forcibly install Arduino on linux from the web
-    # @return [bool] Whether the command succeeded
-    def execute
-      error_preparing = prepare
-      unless error_preparing.nil?
-        puts "Arduino force-install failed preparation: #{error_preparing}"
-        return false
-      end
-
-      attempts = 0
-
-      loop do
-        if File.exist? package_file
-          puts "Arduino package seems to have been downloaded already" if attempts.zero?
-          break
-        elsif attempts >= DOWNLOAD_ATTEMPTS
-          break puts "After #{DOWNLOAD_ATTEMPTS} attempts, failed to download #{package_url}"
-        else
-          puts "Attempting to download Arduino package with #{downloader}"
-          download
-        end
-        attempts += 1
-      end
-
-      if File.exist? extracted_file
-        puts "Arduino package seems to have been extracted already"
-      elsif File.exist? package_file
-        puts "Extracting archive with #{extracter}"
-        extract
-      end
-
-      if File.exist? self.class.force_install_location
-        puts "Arduino package seems to have been installed already"
-      elsif File.exist? extracted_file
-        install
-      else
-        puts "Arduino force-install failed"
-      end
-
-      File.exist? self.class.force_install_location
-    end
-
-  end
-end

data/lib/arduino_ci/arduino_downloader_linux.rb.orig

@@ -1,79 +0,0 @@
-require "arduino_ci/arduino_downloader_posix"
-
-USE_BUILDER = false
-
-module ArduinoCI
-
-  # Manage the linux download & install of Arduino
-  class ArduinoDownloaderLinux < ArduinoDownloaderPosix
-
-    # The local filename of the desired IDE package (zip/tar/etc)
-    # @return [string]
-    def package_file
-      "#{extracted_file}-linux64.tar.xz"
-    end
-
-    # The technology that will be used to extract the download
-    # (for logging purposes)
-    # @return [string]
-    def extracter
-      "tar"
-    end
-
-    # Extract the package_file to extracted_file
-    # @return [bool] whether successful
-    def extract
-      system(extracter, "xf", package_file)
-    end
-
-    # The local file (dir) name of the extracted IDE package (zip/tar/etc)
-    # @return [string]
-    def extracted_file
-      "arduino-#{@desired_ide_version}"
-    end
-
-<<<<<<< HEAD
-=======
-    # The path to the directory of an existing installation, or nil
-    # @return [string]
-    def self.existing_installation
-      exe = self.existing_executable
-      return nil if exe.nil?
-      File.dirname(exe) # it's not really this
-      # but for this platform it doesn't really matter
-    end
-
->>>>>>> Refactor force_install code in preparation for windows CI
-    # The executable Arduino file in an existing installation, or nil
-    # @return [string]
-    def self.existing_executable
-      if USE_BUILDER
-        # builder_name = "arduino-builder"
-        # cli_place = Host.which(builder_name)
-        # unless cli_place.nil?
-        #   ret = ArduinoCmdLinuxBuilder.new
-        #   ret.base_cmd = [cli_place]
-        #   return ret
-        # end
-      end
-      Host.which("arduino")
-    end
-
-    # The executable Arduino file in a forced installation, or nil
-    # @return [string]
-    def self.force_installed_executable
-      if USE_BUILDER
-        # forced_builder = File.join(ArduinoCmdLinuxBuilder.force_install_location, builder_name)
-        # if File.exist?(forced_builder)
-        #   ret = ArduinoCmdLinuxBuilder.new
-        #   ret.base_cmd = [forced_builder]
-        #   return ret
-        # end
-      end
-      forced_arduino = File.join(self.force_install_location, "arduino")
-      return forced_arduino if File.exist? forced_arduino
-      nil
-    end
-
-  end
-end

data/lib/arduino_ci/arduino_downloader_osx.rb.orig

@@ -1,88 +0,0 @@
-require "arduino_ci/arduino_downloader_posix"
-
-module ArduinoCI
-
-  # Manage the OSX download & install of Arduino
-  class ArduinoDownloaderOSX < ArduinoDownloaderPosix
-
-    # The local filename of the desired IDE package (zip/tar/etc)
-    # @return [string]
-    def package_file
-<<<<<<< HEAD
-      "#arduino-#{@desired_ide_version}-macosx.zip"
-=======
-      "arduino-#{@desired_ide_version}-macosx.zip"
->>>>>>> Refactor force_install code in preparation for windows CI
-    end
-
-    # The technology that will be used to extract the download
-    # (for logging purposes)
-    # @return [string]
-    def extracter
-      "unzip"
-    end
-
-    # Extract the package_file to extracted_file
-    # @return [bool] whether successful
-    def extract
-      system(extracter, package_file)
-    end
-
-    # The local file (dir) name of the extracted IDE package (zip/tar/etc)
-    # @return [string]
-    def extracted_file
-      "Arduino.app"
-    end
-
-<<<<<<< HEAD
-    # The an existing Arduino file in one of the given directories, or nil
-=======
-    # An existing Arduino directory in one of the given directories, or nil
-    # @param Array<string> a list of places to look
-    # @return [string]
-    def self.find_existing_arduino_dir(paths)
-      paths.each do |path|
-        return path if File.exist? path
-      end
-      nil
-    end
-
-    # An existing Arduino file in one of the given directories, or nil
->>>>>>> Refactor force_install code in preparation for windows CI
-    # @param Array<string> a list of places to look for the executable
-    # @return [string]
-    def self.find_existing_arduino_exe(paths)
-      paths.each do |path|
-<<<<<<< HEAD
-        exe = File.join(path, "Arduino")
-=======
-        exe = File.join(path, "MacOS", "Arduino")
->>>>>>> Refactor force_install code in preparation for windows CI
-        return exe if File.exist? exe
-      end
-      nil
-    end
-
-<<<<<<< HEAD
-=======
-    # The path to the directory of an existing installation, or nil
-    # @return [string]
-    def self.existing_installation
-      self.find_existing_arduino_dir(["/Applications/Arduino.app/Contents"])
-    end
-
->>>>>>> Refactor force_install code in preparation for windows CI
-    # The executable Arduino file in an existing installation, or nil
-    # @return [string]
-    def self.existing_executable
-      self.find_existing_arduino_exe(["/Applications/Arduino.app/Contents"])
-    end
-
-    # The executable Arduino file in a forced installation, or nil
-    # @return [string]
-    def self.force_installed_executable
-      self.find_existing_arduino_exe([File.join(self.force_install_location, "Contents")])
-    end
-
-  end
-end