Code style cleanup

Author: icanhazstring

assets/unit-template.tpl

@@ -1,7 +1,7 @@
 <?php foreach ($sections as $section => $properties): ?>
 [<?= $this->e($section); ?>]
 <?php foreach ($properties as $property => $value): ?>
-<?= $this->e($property); ?>=<?= $this->e($value); ?>
+<?= $this->e($property); ?>=<?= $this->e($value); ?><?= $this->e("\n"); ?>
 <?php endforeach; ?>
 
 <?php endforeach; ?>

src/Command/SymfonyCommand.php

@@ -44,7 +44,7 @@ public function getOutput(): string
      */
     public function isSuccessful(): bool
     {
-        return $this->process->isSuccessful();
+        return \in_array($this->process->getExitCode(), self::VALID_EXITCODES, true);
     }
 
     /**
@@ -54,9 +54,7 @@ public function run(): CommandInterface
     {
         $this->process->run();
 
-        $exitCode = $this->process->getExitCode();
-
-        if (!\in_array((int)$exitCode, self::VALID_EXITCODES, true)) {
+        if (!$this->isSuccessful()) {
             throw new CommandFailedException($this->process->getErrorOutput());
         }
 

src/Scope/ScopeInterface.php

@@ -16,5 +16,10 @@ interface ScopeInterface
      *
      * @return string
      */
-    public function __toString(): string;
+    public function getArgument(): string;
+
+    /**
+     * @return string
+     */
+    public function getName(): string;
 }

src/Scope/SystemScope.php

@@ -14,8 +14,16 @@ class SystemScope implements ScopeInterface
     /**
      * @inheritdoc
      */
-    public function __toString(): string
+    public function getArgument(): string
     {
-        return '--system';
+        return '--' . $this->getName();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName(): string
+    {
+        return 'system';
     }
 }

src/Scope/UserScope.php

@@ -14,8 +14,16 @@ class UserScope implements ScopeInterface
     /**
      * @inheritdoc
      */
-    public function __toString(): string
+    public function getArgument(): string
     {
-        return '--user';
+        return '--' . $this->getName();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName(): string
+    {
+        return 'user';
     }
 }

src/SystemCtl.php

@@ -13,7 +13,9 @@
 use SystemCtl\Template\AbstractUnitTemplate;
 use SystemCtl\Template\Installer\UnitInstaller;
 use SystemCtl\Template\Installer\UnitInstallerInterface;
+use SystemCtl\Template\PathResolverInterface;
 use SystemCtl\Template\Renderer\PlatesRenderer;
+use SystemCtl\Unit\AbstractUnit;
 use SystemCtl\Unit\Service;
 use SystemCtl\Unit\Timer;
 use SystemCtl\Unit\UnitInterface;
@@ -32,12 +34,17 @@ class SystemCtl
     /** @var int timeout for commands */
     private static $timeout = 3;
 
-    /** @var string install path for new units */
-    private static $installPath = '/etc/systemd/system';
-
     /** @var string */
     private static $assetPath = __DIR__ . '/../assets';
 
+    private const INSTALL_PATHS = [
+        'system' => '/etc/systemd/system/',
+        'user' => '~/.config/systemd/user/'
+    ];
+
+    /** @var PathResolverInterface */
+    private $pathResolver;
+
     /** @var CommandDispatcherInterface */
     private $commandDispatcher;
 
@@ -63,7 +70,7 @@ class SystemCtl
 
     public const SUPPORTED_UNITS = [
         Service::UNIT,
-        Timer::UNIT,
+        Timer::UNIT
     ];
 
     /**
@@ -86,16 +93,6 @@ public static function setTimeout(int $timeout): void
         self::$timeout = $timeout;
     }
 
-    /**
-     * Change install path for units
-     *
-     * @param string $installPath
-     */
-    public static function setInstallPath(string $installPath): void
-    {
-        self::$installPath = $installPath;
-    }
-
     /**
      * Change asset path
      *
@@ -255,17 +252,35 @@ public function getCommandDispatcher(): CommandDispatcherInterface
                 ->setBinary(self::$binary);
         }
 
-        $this->commandDispatcher->setArguments([(string)$this->getScope()]);
+        $this->commandDispatcher->setArguments([$this->getScope()->getArgument()]);
 
         return $this->commandDispatcher;
     }
 
+    /**
+     * @return PathResolverInterface
+     */
+    public function getPathResolver(): PathResolverInterface
+    {
+        return $this->pathResolver;
+    }
+
+    /**
+     * @param PathResolverInterface $pathResolver
+     * @return SystemCtl
+     */
+    public function setPathResolver(PathResolverInterface $pathResolver): SystemCtl
+    {
+        $this->pathResolver = $pathResolver;
+        return $this;
+    }
+
     /**
      * @param CommandDispatcherInterface $dispatcher
      *
      * @return SystemCtl
      */
-    public function setCommandDispatcher(CommandDispatcherInterface $dispatcher)
+    public function setCommandDispatcher(CommandDispatcherInterface $dispatcher): SystemCtl
     {
         $this->commandDispatcher = $dispatcher
             ->setTimeout(self::$timeout)
@@ -281,7 +296,7 @@ public function getUnitInstaller(): UnitInstallerInterface
     {
         if ($this->unitInstaller === null) {
             $this->unitInstaller = (new UnitInstaller)
-                ->setPath(self::$installPath)
+                ->setPath(self::INSTALL_PATHS[$this->getScope()->getName()])
                 ->setRenderer(new PlatesRenderer(self::$assetPath));
         }
 
@@ -306,22 +321,26 @@ public function setUnitInstaller(UnitInstallerInterface $unitInstaller): self
      * Install a given template, reload the daemon and return the freshly installed unit.
      *
      * @param AbstractUnitTemplate $unitTemplate
+     * @param bool                 $overwrite
      *
      * @return UnitInterface
-     * @throws UnitTypeNotSupportedException
      */
-    public function install(AbstractUnitTemplate $unitTemplate): UnitInterface
+    public function install(AbstractUnitTemplate $unitTemplate, bool $overwrite = false): UnitInterface
     {
         $unitSuffix = $unitTemplate->getUnitSuffix();
         $unitName = $unitTemplate->getUnitName();
 
-        if (!in_array($unitSuffix, self::SUPPORTED_UNITS)) {
+        if (!\in_array($unitSuffix, self::SUPPORTED_UNITS, true)) {
             throw UnitTypeNotSupportedException::create($unitSuffix);
         }
 
-        $this->getUnitInstaller()->install($unitTemplate);
+        $this->getUnitInstaller()->install($unitTemplate, $overwrite);
+
+        $unit = AbstractUnit::byType($unitSuffix, $unitName, $this->getCommandDispatcher());
+        $unit->enable();
+
         $this->daemonReload();
 
-        return $this->{'get' . ucfirst($unitSuffix)}($unitName);
+        return $unit;
     }
 }

src/Template/AbstractUnitTemplate.php

@@ -46,7 +46,7 @@ public function __construct(string $unitName, string $unitSuffix)
     /**
      * @return AbstractSection
      */
-    abstract public function getTypeSpecificSection();
+    abstract public function getTypeSpecificSection(): AbstractSection;
 
     /**
      * Get all definitions for this template as array

src/Template/Installer/UnitInstaller.php

@@ -52,14 +52,14 @@ public function getRenderer(): RendererInterface
     /**
      * @inheritDoc
      */
-    public function install(AbstractUnitTemplate $unitTemplate): bool
+    public function install(AbstractUnitTemplate $unitTemplate, bool $overwrite = false): bool
     {
         $unitSuffix = $unitTemplate->getUnitSuffix();
         $unitName = $unitTemplate->getUnitName();
 
         $targetFile = $this->path . DIRECTORY_SEPARATOR . $unitName . '.' . $unitSuffix;
 
-        if (\file_exists($targetFile)) {
+        if (!$overwrite && \file_exists($targetFile)) {
             throw UnitFileExistsException::create($unitName, $unitSuffix);
         }
 

src/Template/Installer/UnitInstallerInterface.php

@@ -39,9 +39,9 @@ public function getRenderer(): RendererInterface;
      * Install a unit by template
      *
      * @param AbstractUnitTemplate $unitTemplate
-     *
+     * @param bool                 $overwrite
      * @return bool
      * @throw UnitNotInstalledException
      */
-    public function install(AbstractUnitTemplate $unitTemplate): bool;
+    public function install(AbstractUnitTemplate $unitTemplate, bool $overwrite = false): bool;
 }

src/Template/PathResolver.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace SystemCtl\Template;
+
+use SystemCtl\Scope\ScopeInterface;
+
+class PathResolver implements PathResolverInterface
+{
+    public function __invoke(ScopeInterface $scope): string
+    {
+
+    }
+}