add location of gcc binary to installation

Author: ianfixes

lib/arduino_ci/arduino_cmd.rb

@@ -18,6 +18,7 @@ def self.flag(name, text = nil)
 
     attr_accessor :installation
     attr_accessor :base_cmd
+    attr_accessor :gcc_cmd
 
     attr_reader   :library_is_indexed
 
@@ -98,6 +99,12 @@ def run(*args, **kwargs)
       _run(*full_args, **kwargs)
     end
 
+    def run_gcc(*args, **kwargs)
+      # TODO: detect env!!
+      full_args = @gcc_cmd + args
+      _run(*full_args, **kwargs)
+    end
+
     # run a command and capture its output
     # @return [Hash] {:out => String, :err => String, :success => bool}
     def run_and_capture(*args, **kwargs)

lib/arduino_ci/arduino_installation.rb

@@ -25,21 +25,21 @@ def autolocate
       end
 
       def autolocate_osx
-        osx_root = "/Applications/Arduino.app"
+        osx_root = "/Applications/Arduino.app/Contents"
         old_way = false
         return nil unless File.exist? osx_root
 
         ret = ArduinoCmdOSX.new
-        osx_place = "#{osx_root}/Contents/MacOS"
+        osx_place = "#{osx_root}/MacOS"
 
         if old_way
           ret.base_cmd = [File.join(osx_place, "Arduino")]
         else
           jvm_runtime = `/usr/libexec/java_home`
           ret.base_cmd = [
             "java",
-            "-cp", "#{osx_root}/Contents/Java/*",
-            "-DAPP_DIR=#{osx_root}/Contents/Java",
+            "-cp", "#{osx_root}/Java/*",
+            "-DAPP_DIR=#{osx_root}/Java",
             "-Djava.ext.dirs=$JVM_RUNTIME/Contents/Home/lib/ext/:#{jvm_runtime}/Contents/Home/jre/lib/ext/",
             "-Dfile.encoding=UTF-8",
             "-Dapple.awt.UIElement=true",
@@ -48,6 +48,8 @@ def autolocate_osx
             "processing.app.Base",
           ]
         end
+
+        ret.gcc_cmd = [File.join(osx_root, "Java", "hardware", "tools", "avr", "bin", "avr-gcc")]
         ret
       end
 
@@ -58,13 +60,15 @@ def autolocate_linux
           unless cli_place.nil?
             ret = ArduinoCmdLinuxBuilder.new
             ret.base_cmd = [cli_place]
+            ret.gcc_cmd = Host.which("avr-gcc")
             return ret
           end
 
           forced_builder = File.join(force_install_location, builder_name)
           if File.exist?(forced_builder)
             ret = ArduinoCmdLinuxBuilder.new
             ret.base_cmd = [forced_builder]
+            ret.gcc_cmd = [File.join(force_install_location, "hardware", "tools", "avr", "bin", "avr-gcc")]
             return ret
           end
         end
@@ -74,13 +78,15 @@ def autolocate_linux
         unless gui_place.nil?
           ret = ArduinoCmdLinux.new
           ret.base_cmd = [gui_place]
+          ret.gcc_cmd = Host.which("avr-gcc")
           return ret
         end
 
         forced_arduino = File.join(force_install_location, gui_name)
         if File.exist?(forced_arduino)
           ret = ArduinoCmdLinux.new
           ret.base_cmd = [forced_arduino]
+          ret.gcc_cmd = [File.join(force_install_location, "hardware", "tools", "avr", "bin", "avr-gcc")]
           return ret
         end
         nil

spec/arduino_installation_spec.rb

@@ -14,11 +14,17 @@
   end
 
   context "autolocate!" do
+    arduino_cmd = ArduinoCI::ArduinoInstallation.autolocate!
     it "doesn't fail" do
-      arduino_cmd = ArduinoCI::ArduinoInstallation.autolocate!
       expect(arduino_cmd.base_cmd).not_to be nil
+      expect(arduino_cmd.gcc_cmd).not_to be nil
       expect(arduino_cmd._lib_dir).not_to be nil
     end
+
+    it "produces a working AVR-GCC" do
+      expect(arduino_cmd.gcc_cmd).not_to be nil
+      expect(arduino_cmd.run_gcc("--version")).to be true
+    end
   end
 
 end