Renamed package arduino/releases to arduino/resources

Author: cmaglie

arduino/cores/cores.go

@@ -33,7 +33,7 @@ import (
 	"fmt"
 
 	properties "github.com/arduino/go-properties-map"
-	"github.com/bcmi-labs/arduino-cli/arduino/releases"
+	"github.com/bcmi-labs/arduino-cli/arduino/resources"
 
 	"github.com/blang/semver"
 )
@@ -49,7 +49,7 @@ type Platform struct {
 
 // PlatformRelease represents a release of a plaform package.
 type PlatformRelease struct {
-	Resource     *releases.DownloadResource
+	Resource     *resources.DownloadResource
 	Version      string
 	BoardNames   []string
 	Dependencies ToolDependencies // The Dependency entries to load tools.

arduino/cores/packageindex/index.go

@@ -33,7 +33,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	"github.com/bcmi-labs/arduino-cli/arduino/releases"
+	"github.com/bcmi-labs/arduino-cli/arduino/resources"
 
 	"github.com/bcmi-labs/arduino-cli/arduino/cores"
 )
@@ -132,7 +132,7 @@ func (inPlatformRelease indexPlatformRelease) extractPlatformIn(outPackage *core
 
 	size, _ := inPlatformRelease.Size.Int64()
 	outPlatformRelease := outPlatform.GetOrCreateRelease(inPlatformRelease.Version)
-	outPlatformRelease.Resource = &releases.DownloadResource{
+	outPlatformRelease.Resource = &resources.DownloadResource{
 		ArchiveFileName: inPlatformRelease.ArchiveFileName,
 		Checksum:        inPlatformRelease.Checksum,
 		Size:            size,
@@ -177,7 +177,7 @@ func (inToolRelease indexToolRelease) extractFlavours() []*cores.Flavour {
 		size, _ := flavour.Size.Int64()
 		ret[i] = &cores.Flavour{
 			OS: flavour.OS,
-			Resource: &releases.DownloadResource{
+			Resource: &resources.DownloadResource{
 				ArchiveFileName: flavour.ArchiveFileName,
 				Checksum:        flavour.Checksum,
 				Size:            size,

arduino/cores/tools.go

@@ -36,7 +36,7 @@ import (
 	"strings"
 
 	properties "github.com/arduino/go-properties-map"
-	"github.com/bcmi-labs/arduino-cli/arduino/releases"
+	"github.com/bcmi-labs/arduino-cli/arduino/resources"
 
 	"github.com/blang/semver"
 )
@@ -59,7 +59,7 @@ type ToolRelease struct {
 // Flavour represents a flavour of a Tool version.
 type Flavour struct {
 	OS       string `json:"os,required"` // The OS Supported by this flavour.
-	Resource *releases.DownloadResource
+	Resource *resources.DownloadResource
 }
 
 // GetOrCreateRelease returns the ToolRelease object with the specified version
@@ -206,7 +206,7 @@ func (f *Flavour) isCompatibleWithCurrentMachine() bool {
 }
 
 // GetCompatibleFlavour returns the downloadable resource compatible with the running O.S.
-func (tr *ToolRelease) GetCompatibleFlavour() *releases.DownloadResource {
+func (tr *ToolRelease) GetCompatibleFlavour() *resources.DownloadResource {
 	for _, flavour := range tr.Flavours {
 		if flavour.isCompatibleWithCurrentMachine() {
 			return flavour.Resource

arduino/libraries/index.go

@@ -33,8 +33,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	"github.com/bcmi-labs/arduino-cli/arduino/releases"
-
+	"github.com/bcmi-labs/arduino-cli/arduino/resources"
 	"github.com/bcmi-labs/arduino-cli/configs"
 )
 
@@ -90,7 +89,7 @@ func LoadIndex(index *Index) error {
 func (indexLib *indexRelease) extractRelease() *Release {
 	return &Release{
 		Version: indexLib.Version,
-		Resource: &releases.DownloadResource{
+		Resource: &resources.DownloadResource{
 			URL:             indexLib.URL,
 			ArchiveFileName: indexLib.ArchiveFileName,
 			Size:            indexLib.Size,

arduino/libraries/libraries.go

@@ -38,7 +38,7 @@ import (
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
-	"github.com/bcmi-labs/arduino-cli/arduino/releases"
+	"github.com/bcmi-labs/arduino-cli/arduino/resources"
 	"github.com/bcmi-labs/arduino-cli/configs"
 	"github.com/blang/semver"
 )
@@ -195,9 +195,9 @@ func (l *Library) InstalledRelease() (*Release, error) {
 
 // Release represents a release of a library
 type Release struct {
-	Version  string                     `json:"version"`
-	Resource *releases.DownloadResource `json:"resource"`
-	Library  *Library                   `json:"-"`
+	Version  string                      `json:"version"`
+	Resource *resources.DownloadResource `json:"resource"`
+	Library  *Library                    `json:"-"`
 }
 
 func (r *Release) String() string {

arduino/releases/checksums.go renamed to arduino/resources/checksums.go

@@ -27,7 +27,7 @@
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
 
-package releases
+package resources
 
 import (
 	"bytes"

arduino/releases/helpers.go renamed to arduino/resources/helpers.go

@@ -27,7 +27,7 @@
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
 
-package releases
+package resources
 
 import (
 	"fmt"

arduino/releases/install.go renamed to arduino/resources/install.go

@@ -1,4 +1,4 @@
-package releases
+package resources
 
 import (
 	"fmt"

arduino/releases/structs.go renamed to arduino/resources/structs.go

@@ -27,7 +27,7 @@
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
 
-package releases
+package resources
 
 import (
 	"path/filepath"

commands/compile/ctags.go

@@ -32,7 +32,7 @@ package compile
 import (
 	"github.com/bcmi-labs/arduino-cli/arduino/cores"
 	"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
-	"github.com/bcmi-labs/arduino-cli/arduino/releases"
+	"github.com/bcmi-labs/arduino-cli/arduino/resources"
 )
 
 func loadBuiltinCtagsMetadata(pm *packagemanager.PackageManager) {
@@ -42,7 +42,7 @@ func loadBuiltinCtagsMetadata(pm *packagemanager.PackageManager) {
 	ctagsRel.Flavours = []*cores.Flavour{
 		&cores.Flavour{
 			OS: "i686-pc-linux-gnu",
-			Resource: &releases.DownloadResource{
+			Resource: &resources.DownloadResource{
 				ArchiveFileName: "ctags-5.8-arduino11-pm-i686-pc-linux-gnu.tar.bz2",
 				URL:             "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-pm-i686-pc-linux-gnu.tar.bz2",
 				Size:            106930,
@@ -52,7 +52,7 @@ func loadBuiltinCtagsMetadata(pm *packagemanager.PackageManager) {
 		},
 		&cores.Flavour{
 			OS: "x86_64-pc-linux-gnu",
-			Resource: &releases.DownloadResource{
+			Resource: &resources.DownloadResource{
 				ArchiveFileName: "ctags-5.8-arduino11-pm-x86_64-pc-linux-gnu.tar.bz2",
 				URL:             "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-pm-x86_64-pc-linux-gnu.tar.bz2",
 				Size:            111604,
@@ -62,7 +62,7 @@ func loadBuiltinCtagsMetadata(pm *packagemanager.PackageManager) {
 		},
 		&cores.Flavour{
 			OS: "i686-mingw32",
-			Resource: &releases.DownloadResource{
+			Resource: &resources.DownloadResource{
 				ArchiveFileName: "ctags-5.8-arduino11-pm-i686-mingw32.zip",
 				URL:             "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-pm-i686-mingw32.zip",
 				Size:            116455,
@@ -72,7 +72,7 @@ func loadBuiltinCtagsMetadata(pm *packagemanager.PackageManager) {
 		},
 		&cores.Flavour{
 			OS: "x86_64-apple-darwin",
-			Resource: &releases.DownloadResource{
+			Resource: &resources.DownloadResource{
 				ArchiveFileName: "ctags-5.8-arduino11-pm-x86_64-apple-darwin.zip",
 				URL:             "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-pm-x86_64-apple-darwin.zip",
 				Size:            107801,
@@ -82,7 +82,7 @@ func loadBuiltinCtagsMetadata(pm *packagemanager.PackageManager) {
 		},
 		&cores.Flavour{
 			OS: "arm-linux-gnueabihf",
-			Resource: &releases.DownloadResource{
+			Resource: &resources.DownloadResource{
 				ArchiveFileName: "ctags-5.8-arduino11-pm-armv6-linux-gnueabihf.tar.bz2",
 				URL:             "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-pm-armv6-linux-gnueabihf.tar.bz2",
 				Size:            95271,

commands/validate/validate.go

@@ -35,7 +35,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/bcmi-labs/arduino-cli/arduino/releases"
+	"github.com/bcmi-labs/arduino-cli/arduino/resources"
 	"github.com/bcmi-labs/arduino-cli/commands"
 	"github.com/bcmi-labs/arduino-cli/common/formatter"
 	"github.com/bcmi-labs/arduino-cli/configs"
@@ -76,7 +76,7 @@ func run(cmd *cobra.Command, args []string) {
 		}
 		pathParts := strings.Split(relativePath, string(filepath.Separator))
 		if len(pathParts) == 4 {
-			isValid, err := releases.CheckDirChecksum(path)
+			isValid, err := resources.CheckDirChecksum(path)
 			if err != nil {
 				return err
 			}