feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Improve PlatformIO upgrading and detecting of new version // Resolve #63

Browse Source
This commit is contained in:
Ivan Kravets
2015-02-13 23:55:08 +02:00
parent f186488fc3
commit 2e90ab8092
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platformio/commands/upgrade.py
View File

@ -12,11 +12,7 @@ from platformio.util import exec_command
@click.command("upgrade", @click.command("upgrade",
short_help="Upgrade PlatformIO to the latest version") short_help="Upgrade PlatformIO to the latest version")
def cli(): def cli():
try: last = get_latest_version()
last = get_latest_version()
except:
raise GetLatestVersionError()
if __version__ == last: if __version__ == last:
return click.secho( return click.secho(
"You're up-to-date!\nPlatformIO %s is currently the " "You're up-to-date!\nPlatformIO %s is currently the "
@ -39,6 +35,9 @@ def cli():
def get_latest_version(): def get_latest_version():
pkgdata = requests.get( try:
"https://pypi.python.org/pypi/platformio/json").json() pkgdata = requests.get(
return pkgdata['info']['version'] "https://pypi.python.org/pypi/platformio/json").json()
return pkgdata['info']['version']
except:
raise GetLatestVersionError()

2
platformio/exception.py
View File

@ -110,7 +110,7 @@ class GetSerialPortsError(PlatformioException):
class GetLatestVersionError(PlatformioException): class GetLatestVersionError(PlatformioException):
MESSAGE = "Can't retrieve latest PlatformIO version" MESSAGE = "Can't retrieve the latest PlatformIO version"
class APIRequestError(PlatformioException): class APIRequestError(PlatformioException):

18
platformio/maintenance.py
View File

@ -14,7 +14,7 @@ from platformio.commands.install import cli as cmd_install
from platformio.commands.lib import lib_update as cmd_libraries_update from platformio.commands.lib import lib_update as cmd_libraries_update
from platformio.commands.update import cli as cli_platforms_update from platformio.commands.update import cli as cli_platforms_update
from platformio.commands.upgrade import get_latest_version from platformio.commands.upgrade import get_latest_version
from platformio.exception import UpgraderFailed from platformio.exception import GetLatestVersionError, UpgraderFailed
from platformio.libmanager import LibraryManager from platformio.libmanager import LibraryManager
from platformio.platforms.base import PlatformFactory from platformio.platforms.base import PlatformFactory
from platformio.util import get_home_dir, get_lib_dir from platformio.util import get_home_dir, get_lib_dir
@ -44,7 +44,10 @@ class Upgrader(object):
@staticmethod @staticmethod
def version_to_int(version): def version_to_int(version):
return int(re.sub(r"[^\d]+", "", version)) intver = int(re.sub(r"[^\d]+", "", version))
if "dev" in version:
intver -= 1
return intver
def run(self, ctx): def run(self, ctx):
if self.from_version > self.to_version: if self.from_version > self.to_version:
@ -106,13 +109,13 @@ def after_upgrade(ctx):
)) ))
click.secho("Thanks a lot!\n", fg="green") click.secho("Thanks a lot!\n", fg="green")
if not isdir(get_home_dir()): last_version = app.get_state_item("last_version", "0.0.0")
if last_version == "0.0.0":
return return
click.secho("Please wait while upgrading PlatformIO ...", click.secho("Please wait while upgrading PlatformIO ...",
fg="yellow") fg="yellow")
last_version = app.get_state_item("last_version", "0.0.0")
u = Upgrader(last_version, __version__) u = Upgrader(last_version, __version__)
if u.run(ctx): if u.run(ctx):
app.set_state_item("last_version", __version__) app.set_state_item("last_version", __version__)
@ -135,7 +138,12 @@ def check_platformio_upgrade():
last_check['platformio_upgrade'] = int(time()) last_check['platformio_upgrade'] = int(time())
app.set_state_item("last_check", last_check) app.set_state_item("last_check", last_check)
latest_version = get_latest_version() try:
latest_version = get_latest_version()
except GetLatestVersionError:
click.secho("Failed to check for PlatformIO upgrades", fg="red")
return
if (latest_version == __version__ or if (latest_version == __version__ or
Upgrader.version_to_int(latest_version) < Upgrader.version_to_int(latest_version) <
Upgrader.version_to_int(__version__)): Upgrader.version_to_int(__version__)):