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

Improve platform manager when VCS is used

Browse Source
This commit is contained in:
Ivan Kravets
2016-08-05 17:02:39 +03:00
parent bf727d6905
commit 39542c4ef2
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
platformio/managers/package.py
View File

@ -109,12 +109,7 @@ class PkgInstallerMixin(object):
VCS_MANIFEST_NAME = ".piopkgmanager.json" VCS_MANIFEST_NAME = ".piopkgmanager.json"
def get_manifest_path(self, pkg_dir): def get_vcs_manifest_path(self, pkg_dir):
if not isdir(pkg_dir):
return None
manifest_path = join(pkg_dir, self.manifest_name)
if isfile(manifest_path):
return manifest_path
for item in os.listdir(pkg_dir): for item in os.listdir(pkg_dir):
if not isdir(join(pkg_dir, item)): if not isdir(join(pkg_dir, item)):
continue continue
@ -122,13 +117,27 @@ class PkgInstallerMixin(object):
return join(pkg_dir, item, self.VCS_MANIFEST_NAME) return join(pkg_dir, item, self.VCS_MANIFEST_NAME)
return None return None
def get_manifest_path(self, pkg_dir):
if not isdir(pkg_dir):
return None
manifest_path = join(pkg_dir, self.manifest_name)
if isfile(manifest_path):
return manifest_path
return self.get_vcs_manifest_path(pkg_dir)
def manifest_exists(self, pkg_dir): def manifest_exists(self, pkg_dir):
return self.get_manifest_path(pkg_dir) is not None return self.get_manifest_path(pkg_dir) is not None
def load_manifest(self, pkg_dir): def load_manifest(self, path):
manifest_path = self.get_manifest_path(pkg_dir) pkg_dir = path
if manifest_path: if isdir(path):
manifest = util.load_json(manifest_path) path = self.get_manifest_path(path)
else:
pkg_dir = dirname(pkg_dir)
if isfile(path) and path.endswith(self.VCS_MANIFEST_NAME):
pkg_dir = dirname(pkg_dir)
if path:
manifest = util.load_json(path)
manifest['__pkg_dir'] = pkg_dir manifest['__pkg_dir'] = pkg_dir
return manifest return manifest
return None return None
@ -401,8 +410,7 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
"%s @ %s is not installed" % (name, requirements or "*"), "%s @ %s is not installed" % (name, requirements or "*"),
fg="yellow") fg="yellow")
return return
manifest_path = self.get_manifest_path(installed_dir) if self.get_vcs_manifest_path(installed_dir):
if manifest_path.endswith(self.VCS_MANIFEST_NAME):
return False return False
manifest = self.load_manifest(installed_dir) manifest = self.load_manifest(installed_dir)
return manifest['version'] != self.get_latest_repo_version( return manifest['version'] != self.get_latest_repo_version(
@ -490,19 +498,24 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
fg="yellow") fg="yellow")
return return
manifest = self.load_manifest(installed_dir) is_vcs_pkg = False
if self.get_vcs_manifest_path(installed_dir):
is_vcs_pkg = True
manifest_path = self.get_vcs_manifest_path(installed_dir)
else:
manifest_path = self.get_manifest_path(installed_dir)
manifest = self.load_manifest(manifest_path)
click.echo( click.echo(
"%s %s @ %s: \t" % ("Checking" "%s %s @ %s: \t" % ("Checking"
if only_check else "Updating", click.style( if only_check else "Updating", click.style(
manifest['name'], fg="cyan"), name, fg="cyan"), manifest['version']),
manifest['version']),
nl=False) nl=False)
manifest_path = self.get_manifest_path(installed_dir) if is_vcs_pkg:
if manifest_path.endswith(self.VCS_MANIFEST_NAME):
if only_check: if only_check:
click.echo("[%s]" % (click.style("Skip", fg="yellow"))) click.echo("[%s]" % (click.style("Skip", fg="yellow")))
return return
click.echo("[%s]" % (click.style("Checking", fg="yellow"))) click.echo("[%s]" % (click.style("VCS", fg="yellow")))
vcs = VCSClientFactory.newClient(installed_dir, manifest['url']) vcs = VCSClientFactory.newClient(installed_dir, manifest['url'])
if not vcs.can_be_updated: if not vcs.can_be_updated:
click.secho( click.secho(