Detection is not responsible for extraction

app/config/container.php

@@ -33,6 +33,7 @@
 use Owncloud\Updater\Utils\FilesystemHelper;
 use Owncloud\Updater\Utils\Locator;
 use Owncloud\Updater\Utils\OccRunner;
+use Owncloud\Updater\Utils\Registry;
 use Owncloud\Updater\Command\BackupDataCommand;
 use Owncloud\Updater\Command\BackupDbCommand;
 use Owncloud\Updater\Command\CheckpointCommand;
@@ -73,6 +74,10 @@
 	return new OccRunner($c['utils.locator']);
 };
 
+$c['utils.registry'] = function($c){
+	return new Registry();
+};
+
 $c['utils.appmanager'] = function($c){
 	return new AppManager($c['utils.occrunner']);
 };
@@ -187,7 +192,7 @@
 };
 
 $c['application'] = function($c){
-	$application = new Application('ownCloud updater', '0.1');
+	$application = new Application('ownCloud updater', '1.0');
 	$application->setContainer($c);
 	$application->addCommands($c['commands']);
 	return $application;

src/Command/DetectCommand.php

@@ -30,7 +30,6 @@
 use Owncloud\Updater\Utils\Fetcher;
 use Owncloud\Updater\Utils\Feed;
 use Owncloud\Updater\Utils\ConfigReader;
-use Owncloud\Updater\Utils\ZipExtractor;
 
 class DetectCommand extends Command {
 
@@ -71,6 +70,9 @@ protected function configure(){
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output){
+		$registry = $this->container['utils.registry'];
+		$registry->set('feed', false);
+
 		$locator = $this->container['utils.locator'];
 		$fsHelper = $this->container['utils.filesystemhelper'];
 		try{
@@ -96,7 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output){
 
 				if ($action === 'abort'){
 					$output->writeln('Abort has been choosed. Exiting.');
-					return 0;
+					return 128;
 				}
 
 				$path = $this->fetcher->getBaseDownloadPath($feed);
@@ -119,36 +121,20 @@ protected function execute(InputInterface $input, OutputInterface $output){
 				}
 				if ($action === 'download'){
 					$output->writeln('Downloading has been completed. Exiting.');
-					return 0;
+					return 64;
 				}
 				if ($fileExists){
-					$fullExtractionPath = $locator->getExtractionBaseDir() . '/' . $feed->getVersion();
-					if (!file_exists($fullExtractionPath)){
-						try {
-							$fsHelper->mkdir($fullExtractionPath, true);
-						} catch (\Exception $ex) {
-							$output->writeln('Unable create directory ' . $fullExtractionPath);
-						}
-					}
-					$output->writeln('Extracting source into ' . $fullExtractionPath);
-
-					$zipExtractor = new ZipExtractor($path, $fullExtractionPath);
-					try {
-						$zipExtractor->extract();
-					} catch (\Exception $ex) {
-						$output->writeln('Extraction has been failed');
-						$fsHelper->removeIfExists($locator->getExtractionBaseDir());
-					}
+					$registry->set('feed', $feed);
 				}
 			} else {
 				$output->writeln('No updates found online.');
 				if ($input->getOption('exit-if-none')){
-					exit(4);
+					return 4;
 				}
 			}
 		} catch (\Exception $e){
 			$this->getApplication()->getLogger()->error($e->getMessage());
-			exit(2);
+			return 2;
 		}
 	}
 

src/Command/ExecuteCoreUpgradeScriptsCommand.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
@@ -26,6 +27,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Owncloud\Updater\Utils\OccRunner;
+use Owncloud\Updater\Utils\ZipExtractor;
 
 class ExecuteCoreUpgradeScriptsCommand extends Command {
 
@@ -42,17 +44,45 @@ public function __construct($occRunner){
 	protected function configure(){
 		$this
 				->setName('upgrade:executeCoreUpgradeScripts')
-				->setDescription('execute core upgrade scripts
-[danger, might take long]')
-		;
+				->setDescription('execute core upgrade scripts [danger, might take long]');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output){
 		$locator = $this->container['utils.locator'];
 		$fsHelper = $this->container['utils.filesystemhelper'];
-
-		$plain = $this->occRunner->run('upgrade');
-		$output->writeln($plain);
+		$registry = $this->container['utils.registry'];
+		$fetcher = $this->container['utils.fetcher'];
+
+		$feed = $registry->get('feed');
+
+		if ($feed){
+			$path = $fetcher->getBaseDownloadPath($feed);
+			$fullExtractionPath = $locator->getExtractionBaseDir() . '/' . $feed->getVersion();
+
+			if (!file_exists($fullExtractionPath)){
+				try{
+					$fsHelper->mkdir($fullExtractionPath, true);
+				} catch (\Exception $ex){
+
+					$output->writeln('Unable create directory ' . $fullExtractionPath);
+				}
+			}
+			$output->writeln('Extracting source into ' . $fullExtractionPath);
+
+			$zipExtractor = new ZipExtractor($path, $fullExtractionPath);
+			try{
+				$zipExtractor->extract();
+			} catch (\Exception $e){
+				$output->writeln('Extraction has been failed');
+				$fsHelper->removeIfExists($locator->getExtractionBaseDir());
+				throw $e;
+			}
+
+			$plain = $this->occRunner->run('upgrade');
+			$output->writeln($plain);
+
+		}
+
 	}
 
 }

src/Utils/Registry.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Owncloud\Updater\Utils;
+
+class Registry {
+
+	protected $objects = array();
+
+	function set($name, $object){
+		$this->objects[$name] = $object;
+	}
+
+	function get($name){
+		if (isset($this->objects[$name])){
+			return $this->objects[$name];
+		}
+		return null;
+	}
+
+}