Merge branch 'develop'

Author: tobias-kuendig

october

@@ -8,7 +8,7 @@ if (file_exists(__DIR__.'/../../autoload.php')) {
     require __DIR__.'/vendor/autoload.php';
 }
 
-$app = new Symfony\Component\Console\Application('October CMS Bootstrapper', '0.4.0');
+$app = new Symfony\Component\Console\Application('October CMS Bootstrapper', '0.4.1');
 $app->add(new \OFFLINE\Bootstrapper\October\Console\InitCommand);
 $app->add(new \OFFLINE\Bootstrapper\October\Console\InstallCommand);
 $app->run();

src/Installer/BaseInstaller.php

@@ -7,6 +7,7 @@
 use OFFLINE\Bootstrapper\October\Util\Gitignore;
 use RuntimeException;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Process\Process;
 
 abstract class BaseInstaller
 {
@@ -89,7 +90,7 @@ protected function cleanup($path)
     }
 
     /**
-     * Removes a directory recursive.
+     * Removes a directory recursively.
      *
      * @param $dir
      *
@@ -100,12 +101,36 @@ public function rmdir($dir)
         $entries = array_diff(scandir($dir), ['.', '..']);
         foreach ($entries as $entry) {
             $path = $dir . DS . $entry;
-            is_dir($path) ? $this->rmdir($path) : unlink($path);
+            is_dir($path) ? $this->rmdir($path) : $this->unlink($path);
         }
 
         return rmdir($dir);
     }
 
+    /**
+     * Delete a file. Fallback to OS native rm command if the file to be deleted is write protected.
+     *
+     * @param string $file
+     */
+    public function unlink($file)
+    {
+        if (is_writable($file)) {
+            unlink($file);
+        } else {
+            // Just to be sure that we don't delete "too much" by accident...
+            if (\in_array($file, ['*', '**', '.', '..', '/', '/*'])) {
+                return;
+            }
+
+            // If there are write-protected files present (primarily on Windows) we can use
+            // the force mode of rm to remove it. PHP itself won't delete write-protected files.
+            $command = stripos(PHP_OS, 'WIN') === 0 ? 'rm /f' : 'rm -f';
+            $file    = escapeshellarg($file);
+
+            (new Process($command . ' ' . $file))->setTimeout(60)->run();
+        }
+    }
+
     protected function write($line)
     {
         $this->output->writeln($line);

src/Installer/PluginInstaller.php

@@ -3,8 +3,8 @@
 namespace OFFLINE\Bootstrapper\October\Installer;
 
 
-use GitElephant\Repository;
 use OFFLINE\Bootstrapper\October\Util\Composer;
+use OFFLINE\Bootstrapper\October\Util\Git;
 use Symfony\Component\Process\Exception\LogicException;
 use Symfony\Component\Process\Exception\RuntimeException;
 use Symfony\Component\Process\Process;
@@ -70,7 +70,7 @@ public function install()
                 continue;
             }
 
-            $repo = Repository::open($pluginDir);
+            $repo = Git::repo($pluginDir);
             try {
                 $repo->cloneFrom($remote, $pluginDir);
                 if ($branch !== false) {

src/Installer/ThemeInstaller.php

@@ -3,7 +3,7 @@
 namespace OFFLINE\Bootstrapper\October\Installer;
 
 
-use GitElephant\Repository;
+use OFFLINE\Bootstrapper\October\Util\Git;
 use Symfony\Component\Process\Exception\InvalidArgumentException;
 use Symfony\Component\Process\Exception\LogicException;
 use Symfony\Component\Process\Exception\RuntimeException;
@@ -43,10 +43,11 @@ public function install()
 
         if ( ! $this->isEmpty($themeDir)) {
             $this->write(sprintf('<comment>-> Theme "%s" is already installed. Skipping.</comment>', $theme));
+
             return;
         }
 
-        $repo = Repository::open($themeDir);
+        $repo = Git::repo($themeDir);
         try {
             $repo->cloneFrom($remote, $themeDir);
         } catch (RuntimeException $e) {

src/Util/Git.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace OFFLINE\Bootstrapper\October\Util;
+
+use GitElephant\GitBinary;
+use GitElephant\Repository;
+
+/**
+ * This is a simple wrapper class around GitElephant to provide
+ * the correct Binary if we run on Windows.
+ */
+class Git
+{
+    public static function repo($path)
+    {
+        $binary = null;
+        if (stripos(PHP_OS, 'WIN') === 0) {
+            // Use the default `git` command under Windows. This requires the git binary
+            // to be added to the PATH environment variable.
+            $binary = new GitBinary('git');
+        }
+
+        return Repository::open($path, $binary);
+    }
+}

src/Util/UsesTemplate.php

@@ -2,7 +2,6 @@
 
 namespace OFFLINE\Bootstrapper\October\Util;
 
-use GitElephant\Repository;
 use RuntimeException;
 
 trait UsesTemplate
@@ -33,7 +32,7 @@ public function updateTemplateFiles()
             return;
         }
 
-        $repo = Repository::open($overridePath);
+        $repo = Git::repo($overridePath);
         try {
             $repo->pull();
         } catch (\Throwable $e) {