-
-
Notifications
You must be signed in to change notification settings - Fork 398
Add outdate, update and upgrade commands #865
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1d3db71
Add outdated command to list cores and libs that needs upgrade
silvanocerza d0a4042
Add update command to update the index of cores and libs
silvanocerza 6a16d42
Add upgrade command to upgrade all installed cores and libs
silvanocerza 92e85b6
[skip changelog] Update docs with new commands
silvanocerza b9b430b
[skip changelog] Fix outdated and upgrade command
silvanocerza 4b0152f
[skip changelog] Changed update and outdated commands behaviour
silvanocerza File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
// This file is part of arduino-cli. | ||
// | ||
// Copyright 2020 ARDUINO SA (http://www.arduino.cc/) | ||
// | ||
// This software is released under the GNU General Public License version 3, | ||
// which covers the main part of arduino-cli. | ||
// The terms of this license can be found at: | ||
// https://www.gnu.org/licenses/gpl-3.0.en.html | ||
// | ||
// You can be released from the requirements of the above licenses by purchasing | ||
// a commercial license. Buying such a license is mandatory if you want to | ||
// modify or otherwise use the software for commercial activities involving the | ||
// Arduino software without disclosing the source code of your own applications. | ||
// To purchase a commercial license, send an email to [email protected]. | ||
|
||
package outdated | ||
|
||
import ( | ||
"context" | ||
"os" | ||
|
||
"github.com/arduino/arduino-cli/cli/errorcodes" | ||
"github.com/arduino/arduino-cli/cli/feedback" | ||
"github.com/arduino/arduino-cli/cli/instance" | ||
"github.com/arduino/arduino-cli/commands/core" | ||
"github.com/arduino/arduino-cli/commands/lib" | ||
rpc "github.com/arduino/arduino-cli/rpc/commands" | ||
"github.com/arduino/arduino-cli/table" | ||
"github.com/sirupsen/logrus" | ||
"github.com/spf13/cobra" | ||
) | ||
|
||
// NewCommand creates a new `outdated` command | ||
func NewCommand() *cobra.Command { | ||
outdatedCommand := &cobra.Command{ | ||
Use: "outdated", | ||
Short: "Lists cores and libraries that can be upgraded", | ||
Long: "This commands shows a list of installed cores and/or libraries\n" + | ||
"that can be upgraded. If nothing needs to be updated the output is empty.", | ||
Example: " " + os.Args[0] + " outdated\n", | ||
Args: cobra.NoArgs, | ||
Run: runOutdatedCommand, | ||
} | ||
|
||
return outdatedCommand | ||
} | ||
|
||
func runOutdatedCommand(cmd *cobra.Command, args []string) { | ||
inst, err := instance.CreateInstance() | ||
if err != nil { | ||
feedback.Errorf("Error upgrading: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
logrus.Info("Executing `arduino outdated`") | ||
|
||
// Gets outdated cores | ||
targets, err := core.GetPlatforms(inst.Id, true) | ||
if err != nil { | ||
feedback.Errorf("Error retrieving core list: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
// Gets outdated libraries | ||
res, err := lib.LibraryList(context.Background(), &rpc.LibraryListReq{ | ||
Instance: inst, | ||
All: false, | ||
Updatable: true, | ||
}) | ||
if err != nil { | ||
feedback.Errorf("Error retrieving library list: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
// Prints outdated cores | ||
tab := table.New() | ||
tab.SetHeader("Core name", "Installed version", "New version") | ||
if len(targets) > 0 { | ||
for _, t := range targets { | ||
plat := t.Platform | ||
tab.AddRow(plat.Name, t.Version, plat.GetLatestRelease().Version) | ||
} | ||
feedback.Print(tab.Render()) | ||
} | ||
|
||
// Prints outdated libraries | ||
tab = table.New() | ||
tab.SetHeader("Library name", "Installed version", "New version") | ||
libs := res.GetInstalledLibrary() | ||
if len(libs) > 0 { | ||
for _, l := range libs { | ||
tab.AddRow(l.Library.Name, l.Library.Version, l.Release.Version) | ||
} | ||
feedback.Print(tab.Render()) | ||
} | ||
|
||
logrus.Info("Done") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,118 @@ | ||
// This file is part of arduino-cli. | ||
// | ||
// Copyright 2020 ARDUINO SA (http://www.arduino.cc/) | ||
// | ||
// This software is released under the GNU General Public License version 3, | ||
// which covers the main part of arduino-cli. | ||
// The terms of this license can be found at: | ||
// https://www.gnu.org/licenses/gpl-3.0.en.html | ||
// | ||
// You can be released from the requirements of the above licenses by purchasing | ||
// a commercial license. Buying such a license is mandatory if you want to | ||
// modify or otherwise use the software for commercial activities involving the | ||
// Arduino software without disclosing the source code of your own applications. | ||
// To purchase a commercial license, send an email to [email protected]. | ||
|
||
package update | ||
|
||
import ( | ||
"context" | ||
"os" | ||
|
||
"github.com/arduino/arduino-cli/cli/errorcodes" | ||
"github.com/arduino/arduino-cli/cli/feedback" | ||
"github.com/arduino/arduino-cli/cli/instance" | ||
"github.com/arduino/arduino-cli/cli/output" | ||
"github.com/arduino/arduino-cli/commands" | ||
"github.com/arduino/arduino-cli/commands/core" | ||
"github.com/arduino/arduino-cli/commands/lib" | ||
rpc "github.com/arduino/arduino-cli/rpc/commands" | ||
"github.com/arduino/arduino-cli/table" | ||
"github.com/sirupsen/logrus" | ||
"github.com/spf13/cobra" | ||
) | ||
|
||
// NewCommand creates a new `update` command | ||
func NewCommand() *cobra.Command { | ||
updateCommand := &cobra.Command{ | ||
Use: "update", | ||
Short: "Updates the index of cores and libraries", | ||
Long: "Updates the index of cores and libraries to the latest versions.", | ||
Example: " " + os.Args[0] + " update", | ||
Args: cobra.NoArgs, | ||
Run: runUpdateCommand, | ||
} | ||
updateCommand.Flags().BoolVar(&updateFlags.showOutdated, "outdated", false, "Show outdated cores and libraries after index update") | ||
return updateCommand | ||
} | ||
|
||
var updateFlags struct { | ||
showOutdated bool | ||
} | ||
|
||
func runUpdateCommand(cmd *cobra.Command, args []string) { | ||
instance := instance.CreateInstanceIgnorePlatformIndexErrors() | ||
|
||
logrus.Info("Executing `arduino update`") | ||
|
||
_, err := commands.UpdateIndex(context.Background(), &rpc.UpdateIndexReq{ | ||
Instance: instance, | ||
}, output.ProgressBar()) | ||
if err != nil { | ||
feedback.Errorf("Error updating core index: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
err = commands.UpdateLibrariesIndex(context.Background(), &rpc.UpdateLibrariesIndexReq{ | ||
Instance: instance, | ||
}, output.ProgressBar()) | ||
if err != nil { | ||
feedback.Errorf("Error updating library index: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
if updateFlags.showOutdated { | ||
// Gets outdated cores | ||
targets, err := core.GetPlatforms(instance.Id, true) | ||
if err != nil { | ||
feedback.Errorf("Error retrieving core list: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
// Gets outdated libraries | ||
res, err := lib.LibraryList(context.Background(), &rpc.LibraryListReq{ | ||
Instance: instance, | ||
All: false, | ||
Updatable: true, | ||
}) | ||
if err != nil { | ||
feedback.Errorf("Error retrieving library list: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
// Prints outdated cores | ||
tab := table.New() | ||
tab.SetHeader("Core name", "Installed version", "New version") | ||
if len(targets) > 0 { | ||
for _, t := range targets { | ||
plat := t.Platform | ||
tab.AddRow(plat.Name, t.Version, plat.GetLatestRelease().Version) | ||
} | ||
feedback.Print(tab.Render()) | ||
} | ||
|
||
// Prints outdated libraries | ||
tab = table.New() | ||
tab.SetHeader("Library name", "Installed version", "New version") | ||
libs := res.GetInstalledLibrary() | ||
if len(libs) > 0 { | ||
for _, l := range libs { | ||
tab.AddRow(l.Library.Name, l.Library.Version, l.Release.Version) | ||
} | ||
feedback.Print(tab.Render()) | ||
} | ||
|
||
} | ||
|
||
logrus.Info("Done") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
// This file is part of arduino-cli. | ||
// | ||
// Copyright 2020 ARDUINO SA (http://www.arduino.cc/) | ||
// | ||
// This software is released under the GNU General Public License version 3, | ||
// which covers the main part of arduino-cli. | ||
// The terms of this license can be found at: | ||
// https://www.gnu.org/licenses/gpl-3.0.en.html | ||
// | ||
// You can be released from the requirements of the above licenses by purchasing | ||
// a commercial license. Buying such a license is mandatory if you want to | ||
// modify or otherwise use the software for commercial activities involving the | ||
// Arduino software without disclosing the source code of your own applications. | ||
// To purchase a commercial license, send an email to [email protected]. | ||
|
||
package upgrade | ||
|
||
import ( | ||
"context" | ||
"os" | ||
|
||
"github.com/arduino/arduino-cli/cli/errorcodes" | ||
"github.com/arduino/arduino-cli/cli/feedback" | ||
"github.com/arduino/arduino-cli/cli/instance" | ||
"github.com/arduino/arduino-cli/cli/output" | ||
"github.com/arduino/arduino-cli/commands/core" | ||
"github.com/arduino/arduino-cli/commands/lib" | ||
rpc "github.com/arduino/arduino-cli/rpc/commands" | ||
"github.com/sirupsen/logrus" | ||
"github.com/spf13/cobra" | ||
) | ||
|
||
// NewCommand creates a new `upgrade` command | ||
func NewCommand() *cobra.Command { | ||
upgradeCommand := &cobra.Command{ | ||
Use: "upgrade", | ||
Short: "Upgrades installed cores and libraries.", | ||
Long: "Upgrades installed cores and libraries to latest version.", | ||
Example: " " + os.Args[0] + " upgrade", | ||
Args: cobra.NoArgs, | ||
Run: runUpgradeCommand, | ||
} | ||
|
||
return upgradeCommand | ||
} | ||
|
||
func runUpgradeCommand(cmd *cobra.Command, args []string) { | ||
inst, err := instance.CreateInstance() | ||
if err != nil { | ||
feedback.Errorf("Error upgrading: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
logrus.Info("Executing `arduino upgrade`") | ||
|
||
// Gets list of libraries to upgrade, cores' libraries are ignored since they're upgraded | ||
// when the core is | ||
res, err := lib.LibraryList(context.Background(), &rpc.LibraryListReq{ | ||
Instance: inst, | ||
All: false, | ||
Updatable: true, | ||
}) | ||
if err != nil { | ||
feedback.Errorf("Error retrieving library list: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
libraries := []string{} | ||
for _, l := range res.InstalledLibrary { | ||
libraries = append(libraries, l.Library.Name) | ||
} | ||
|
||
// Upgrades libraries | ||
err = lib.LibraryUpgrade(inst.Id, libraries, output.ProgressBar(), output.TaskProgress()) | ||
if err != nil { | ||
feedback.Errorf("Error upgrading libraries: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
targets, err := core.GetPlatforms(inst.Id, true) | ||
if err != nil { | ||
feedback.Errorf("Error retrieving core list: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
for _, t := range targets { | ||
r := &rpc.PlatformUpgradeReq{ | ||
Instance: inst, | ||
PlatformPackage: t.Platform.Package.Name, | ||
Architecture: t.Platform.Architecture, | ||
} | ||
_, err := core.PlatformUpgrade(context.Background(), r, output.ProgressBar(), output.TaskProgress()) | ||
if err != nil { | ||
feedback.Errorf("Error during upgrade: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
} | ||
|
||
logrus.Info("Done") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# This file is part of arduino-cli. | ||
# | ||
# Copyright 2020 ARDUINO SA (http://www.arduino.cc/) | ||
# | ||
# This software is released under the GNU General Public License version 3, | ||
# which covers the main part of arduino-cli. | ||
# The terms of this license can be found at: | ||
# https://www.gnu.org/licenses/gpl-3.0.en.html | ||
# | ||
# You can be released from the requirements of the above licenses by purchasing | ||
# a commercial license. Buying such a license is mandatory if you want to modify or | ||
# otherwise use the software for commercial activities involving the Arduino | ||
# software without disclosing the source code of your own applications. To purchase | ||
# a commercial license, send an email to [email protected]. | ||
|
||
|
||
def test_outdated(run_command): | ||
# Updates index for cores and libraries | ||
assert run_command("core update-index") | ||
assert run_command("lib update-index") | ||
|
||
# Installs an outdated core and library | ||
assert run_command("core install arduino:[email protected]") | ||
assert run_command("lib install [email protected]") | ||
|
||
# Installs latest version of a core and a library | ||
assert run_command("core install arduino:samd") | ||
assert run_command("lib install ArduinoJson") | ||
|
||
# Verifies only outdated cores and libraries are returned | ||
result = run_command("outdated") | ||
assert result.ok | ||
lines = [l.strip() for l in result.stdout.splitlines()] | ||
assert lines[1].startswith("Arduino AVR Boards") | ||
assert lines[4].startswith("USBHost") |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To really see all the outdated cores and libraries, should we launch a
commands.UpdateIndex()
and aUpdateLibrariesIndex()
before checking through the local libs and cores? (this is also a functional question for @ubidefeo 🙂 )There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in Homebrew style this command only returns something after an
update
, bit I like the idea that it implicitly runsarduino-cli update
before runningThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll change that. 👍