Merge pull request #49 from initbiz/leave-git-repo

README.md

@@ -111,6 +111,7 @@ database:
 
 git:
     deployment: gitlab
+    keepRepo: false       # Keep .git in plugins
 
 # deployment:            # Automatically configure the Envoy file for GitLab deployments      
 #     user: hostinguser  

src/Console/InstallCommand.php

@@ -110,6 +110,12 @@ public function setOutput(OutputInterface $output)
         $this->composer->setOutput($output);
     }
 
+    public function setWithGitDirectory(bool $withGitDirectory)
+    {
+        $this->pluginManager->setWithGitDirectory($withGitDirectory);
+        $this->themeManager->setWithGitDirectory($withGitDirectory);
+    }
+
     /**
      * Configure the command options.
      *
@@ -206,6 +212,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->write('Migrating database...');
         $this->artisan->call('october:up');
 
+        if (isset($this->config->git['keepRepo'])) {
+            $this->setWithGitDirectory($this->config->git['keepRepo']);
+        }
+
         $themeDeclaration = false;
         try {
             $themeDeclaration = $this->config->cms['theme'];

src/Manager/BaseManager.php

@@ -29,6 +29,11 @@ class BaseManager
      */
     protected $php;
 
+    /**
+     * @var bool
+     */
+    protected $withGitDirectory = false;
+
     public function __construct()
     {
         $this->artisan = new Artisan();
@@ -46,4 +51,17 @@ public function setPhp(string $php = 'php')
         $this->php = $php;
         $this->artisan->setPhp($php);
     }
+
+    /**
+     * Set if remove .git directories or not
+     */
+    public function setWithGitDirectory(bool $withGitDirectory = false)
+    {
+        $this->withGitDirectory = $withGitDirectory;
+    }
+
+    public function isWithGitDirectory(): bool
+    {
+        return $this->withGitDirectory;
+    }
 }

src/Manager/PluginManager.php

@@ -140,7 +140,9 @@ public function install(string $pluginDeclaration)
             throw new RuntimeException('Error while cloning plugin repo: ' . $e->getMessage());
         }
 
-        $this->removeGitRepo($this->getDirPath($pluginDeclaration));
+        if(!$this->isWithGitDirectory()) {
+            $this->removeGitRepo($this->getDirPath($pluginDeclaration));
+        }
     }
 
     /**

src/Manager/ThemeManager.php

@@ -92,7 +92,9 @@ public function install(string $themeDeclaration)
             throw new RuntimeException('Error while cloning theme repo: ' . $e->getMessage());
         }
 
-        $this->removeGitRepo($themeDir);
+        if(!$this->isWithGitDirectory()) {
+            $this->removeGitRepo($themeDir);
+        }
 
         return true;
     }

templates/october.yaml

@@ -24,6 +24,7 @@ git:
     excludePlugins: false   # Even exclude plugins from your repo. Private plugins will be
                             # checkout out again during each "install" run. Be careful!
                             # Manual changes to these plugins will be overwritten.
+    keepRepo: false         # Keep .git in plugins
 
 # deployment:
 #     user: hostinguser