Bug fixes

Fix handling missing primary config file
Fix handling of services that are not installed

Author: dave-redfern

src/Commands/Behaviours/CanUpdateGitRemoteRepository.php

@@ -25,6 +25,8 @@ protected function changeGitOrigin(Project $project, $cwd, $repo): int
         }
 
         if ($this->tools()->git()->{$com}($cwd, 'origin', $repo)) {
+            $this->tools()->git()->trackRemote($cwd, 'origin/master');
+
             $this->updateProjectConfig($project, 1);
 
             $this->tools()->success('successfully set <info>origin</info> to <info>%s</info>', $repo);

src/Commands/InitCommand.php

@@ -8,6 +8,7 @@
 use function file_exists;
 use function file_get_contents;
 use function file_put_contents;
+use function filesize;
 use function mkdir;
 use const DIRECTORY_SEPARATOR;
 
@@ -47,6 +48,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->tools()->warning('Configuration at <info>%s</info> already exists', $dir);
         }
 
+        if (0 == filesize($dir . DIRECTORY_SEPARATOR . 'project_manager.yaml')) {
+            $this->tools()->warning('Configuration file is empty');
+            file_put_contents($dir . DIRECTORY_SEPARATOR . 'project_manager.yaml', $this->config());
+            $this->tools()->success('Configuration re-created at <info>%s</info>', $dir);
+        }
+
         $this->tools()->newline();
 
         return 0;

src/Services/Config/ConfigParser.php

@@ -42,7 +42,7 @@ class ConfigParser
      */
     public function parse(string $file): Config
     {
-        $config = MutableCollection::create(Yaml::parse($this->readFile($file))['somnambulist']);
+        $config = MutableCollection::create(Yaml::parse($this->readFile($file))['somnambulist'] ?? []);
 
         $spm = new Config($config->except('templates')->toArray(), $this->getEnvParameters());
 

src/Services/DockerManager.php

@@ -70,6 +70,10 @@ public function bindConsoleHelper(ConsoleHelper $helper): void
 
     public function resolve(Service $service): void
     {
+        if (!$service->isInstalled()) {
+            return;
+        }
+
         $env = (new Dotenv())->parse(file_get_contents($service->envFile()));
         $name = implode('_', array_filter([$env['COMPOSE_PROJECT_NAME'] ?? '', $service->appContainer()]));
 

src/Services/GitManager.php

@@ -106,6 +106,13 @@ public function addRemote(string $cwd, string $name, string $remote): bool
         return $proc->isSuccessful();
     }
 
+    public function trackRemote(string $cwd, string $remote): bool
+    {
+        $proc = $this->exec('git branch -u %s', $cwd, $remote);
+
+        return $proc->isSuccessful();
+    }
+
     public function getRemotes(string $cwd): array
     {
         $proc = $this->exec('git remote -v', $cwd);