Converted sketchCopyAdditionalFiles into a Builder method

Author: cmaglie

Diff for: arduino/builder/sketch.go

@@ -52,7 +52,7 @@ func (b *Builder) PrepareSketchBuildPath(sourceOverrides map[string]string, buil
 		return 0, err
 	}
 
-	if err := sketchCopyAdditionalFiles(b.sketch, buildPath, sourceOverrides); err != nil {
+	if err := b.sketchCopyAdditionalFiles(buildPath, sourceOverrides); err != nil {
 		return 0, err
 	}
 
@@ -108,9 +108,9 @@ func (b *Builder) sketchMergeSources(overrides map[string]string) (int, string,
 
 // sketchCopyAdditionalFiles copies the additional files for a sketch to the
 // specified destination directory.
-func sketchCopyAdditionalFiles(sketch *sketch.Sketch, buildPath *paths.Path, overrides map[string]string) error {
-	for _, file := range sketch.AdditionalFiles {
-		relpath, err := sketch.FullPath.RelTo(file)
+func (b *Builder) sketchCopyAdditionalFiles(buildPath *paths.Path, overrides map[string]string) error {
+	for _, file := range b.sketch.AdditionalFiles {
+		relpath, err := b.sketch.FullPath.RelTo(file)
 		if err != nil {
 			return errors.Wrap(err, tr("unable to compute relative path to the sketch for the item"))
 		}

Diff for: arduino/builder/sketch_test.go

@@ -76,10 +76,11 @@ func TestCopyAdditionalFiles(t *testing.T) {
 	sk1, err := sketch.New(paths.New("testdata", t.Name()))
 	require.Nil(t, err)
 	require.Equal(t, sk1.AdditionalFiles.Len(), 1)
+	b1 := NewBuilder(sk1)
 
 	// copy the sketch over, create a fake main file we don't care about it
 	// but we need it for `SketchLoad` to succeed later
-	err = sketchCopyAdditionalFiles(sk1, tmp, nil)
+	err = b1.sketchCopyAdditionalFiles(tmp, nil)
 	require.Nil(t, err)
 	fakeIno := tmp.Join(fmt.Sprintf("%s.ino", tmp.Base()))
 	require.Nil(t, fakeIno.WriteFile([]byte{}))
@@ -94,7 +95,7 @@ func TestCopyAdditionalFiles(t *testing.T) {
 	require.Nil(t, err)
 
 	// copy again
-	err = sketchCopyAdditionalFiles(sk1, tmp, nil)
+	err = b1.sketchCopyAdditionalFiles(tmp, nil)
 	require.Nil(t, err)
 
 	// verify file hasn't changed