From 389b259fb586454c3dc447613545c280d512fc51 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 30 Jul 2014 16:57:16 +0000 Subject: Refactor process_args to be clearer Move stuff into new methods to make overall logic clearer and to avoid stuffing too much into each method. --- scripts/release-upload | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/release-upload b/scripts/release-upload index 68de800a..cfbe06b2 100755 --- a/scripts/release-upload +++ b/scripts/release-upload @@ -153,18 +153,23 @@ class ReleaseUploader(cliapp.Application): def process_args(self, args): self.status(msg='Uploading and publishing Baserock release') - BuildArtifactPublisher(self.settings, - self.status).publish_build_artifacts() - self.status(msg='Build artifiacts have been published') - + self.publish_build_artifacts() if self.settings['upload-release-artifacts']: - ReleaseArtifactPublisher(self.settings, - self.status).publish_release_artifacts() - self.status(msg='Release images have been published') + self.publish_release_artifacts() else: self.status( - msg=('Not uploading release artifacts ' - '(--upload-release-artifacts not set)')) + msg='Not uploading release artifacts ' + '(upload-release-artifacts set to false') + + def publish_build_artifacts(self): + publisher = BuildArtifactPublisher(self.settings, self.status) + publisher.publish_build_artifacts() + self.status(msg='Build artifacts have been published') + + def publish_release_artifacts(self): + publisher = ReleaseArtifactPublisher(self.settings, self.status) + publisher.publish_release_artifacts() + self.status(msg='Release artifacts have been published') def status(self, msg, **kwargs): formatted = msg.format(**kwargs) -- cgit v1.2.1