-
-
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
Changes from 4 commits
1d3db71
d0a4042
6a16d42
92e85b6
b9b430b
4b0152f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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\n", | ||
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`") | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. in Homebrew style this command only returns something after an There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll change that. 👍 |
||
// 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: true, | ||
Updatable: true, | ||
}) | ||
if err != nil { | ||
feedback.Errorf("Error retrieving library list: %v", err) | ||
os.Exit(errorcodes.ErrGeneric) | ||
} | ||
|
||
tab := table.New() | ||
tab.SetHeader("Name", "Installed version", "New version") | ||
|
||
// Prints outdated cores | ||
if len(targets) > 0 { | ||
for _, t := range targets { | ||
plat := t.Platform | ||
tab.AddRow(plat.Name, t.Version, plat.GetLatestRelease().Version) | ||
} | ||
} | ||
|
||
// Prints outdated libraries | ||
libs := res.GetInstalledLibrary() | ||
if len(libs) > 0 { | ||
for _, l := range libs { | ||
tab.AddRow(l.Library.Name, l.Library.Version, l.Release.Version) | ||
} | ||
} | ||
if len(targets) > 0 || len(libs) > 0 { | ||
feedback.Print(tab.Render()) | ||
} | ||
|
||
logrus.Info("Done") | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
// 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" | ||
rpc "github.com/arduino/arduino-cli/rpc/commands" | ||
"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, | ||
} | ||
|
||
return updateCommand | ||
} | ||
|
||
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) | ||
} | ||
|
||
logrus.Info("Done") | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
// 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`") | ||
|
||
err = lib.LibraryUpgradeAll(inst.Id, 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") | ||
} |
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 outdate core and library are returned | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
result = run_command("outdated") | ||||||
assert result.ok | ||||||
lines = result.stdout.splitlines() | ||||||
assert lines[1].startswith("Arduino AVR Boards") | ||||||
assert lines[2].startswith("USBHost") |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# 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_update(run_command): | ||
res = run_command("update") | ||
assert res.ok | ||
lines = [l.strip() for l in res.stdout.splitlines()] | ||
|
||
assert "Updating index: package_index.json downloaded" in lines | ||
assert "Updating index: package_index.json.sig downloaded" in lines | ||
assert "Updating index: library_index.json downloaded" in lines |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# 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_upgrade(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") | ||
|
||
assert run_command("upgrade") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Might be reasonable to add a double check here like you did in the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's kinda problematic for I can check |
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.
This created an empty row in the autocompletion like: