smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deploy archive in a dated sub-directory, not directory in the main dir.

This commit is contained in:
Matthieu Gautier 2017-02-13 12:11:54 +01:00
parent d78bc45be1
commit 877ecdd2a8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kiwix-deploy.py
View File

@ -21,6 +21,8 @@ FILES_TO_UPLOAD = [
class Archiver: class Archiver:
def __init__(self, options): def __init__(self, options):
self.options = options self.options = options
self.working_directory = "nightly_{:%Y-%m-%d}".format(datetime.date.today())
os.makedirs(self.working_directory, exist_ok=True)
self.archive_basename = "kiwix-tools.{:%Y-%m-%d}".format(datetime.date.today()) self.archive_basename = "kiwix-tools.{:%Y-%m-%d}".format(datetime.date.today())
self.files_to_upload = list(self._gen_file_list()) self.files_to_upload = list(self._gen_file_list())
@ -33,6 +35,7 @@ class Archiver:
def build_tar(self): def build_tar(self):
archive_name = "{}.tar.gz".format(self.archive_basename) archive_name = "{}.tar.gz".format(self.archive_basename)
archive_name = pj(self.working_directory, archive_name)
with tarfile.open(archive_name, "w:gz") as archive: with tarfile.open(archive_name, "w:gz") as archive:
for filename, arcname in self.files_to_upload: for filename, arcname in self.files_to_upload:
archive.add(filename, arcname=arcname) archive.add(filename, arcname=arcname)
@ -40,6 +43,7 @@ class Archiver:
def build_zip(self): def build_zip(self):
archive_name = "{}.zip".format(self.archive_basename) archive_name = "{}.zip".format(self.archive_basename)
archive_name = pj(self.working_directory, archive_name)
with zipfile.ZipFile(archive_name, "w") as archive: with zipfile.ZipFile(archive_name, "w") as archive:
for filename, arcname in self.files_to_upload: for filename, arcname in self.files_to_upload:
archive.write(filename, arcname) archive.write(filename, arcname)
@ -50,12 +54,12 @@ class Deployer:
def __init__(self, options): def __init__(self, options):
self.options = options self.options = options
def deploy(self, *files): def deploy(self, directory):
if not files: if not os.path.isdir(directory):
return return
command = "scp -v -p -i {id_file} {files_list} {host_addr}".format( command = "scp -v -r -p -i {id_file} {directory} {host_addr}".format(
id_file=self.options.ssh_private_key, id_file=self.options.ssh_private_key,
files_list=' '.join("'{}'".format(f) for f in files), directory=directory,
host_addr="{}:{}".format(self.options.server, self.options.base_path) host_addr="{}:{}".format(self.options.server, self.options.base_path)
) )
return subprocess.check_call(command, shell=True) return subprocess.check_call(command, shell=True)
@ -91,4 +95,4 @@ if __name__ == "__main__":
if options.deploy: if options.deploy:
deployer = Deployer(options) deployer = Deployer(options)
deployer.deploy(*archive_list) deployer.deploy(archiver.working_directory)