Merge pull request #15 from wirecli/dev

Dev
wirecli · Sep 7, 2024 · 74d6963 · 74d6963
2 parents 70145b7 + 013397d
commit 74d6963
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 10 deletions.
diff --git a/src/Commands/Common/NewCommand.php b/src/Commands/Common/NewCommand.php
@@ -41,9 +41,13 @@ class NewCommand extends PWConnector {
  private $projectName;
  private $projectDir;
  private $version;
+ private $helper;
  private $compressedFilePath;
  private $requirementsErrors = array();
+ private $src;
  private $installer;
+ private $verbose;
+ protected $downloader;
  protected $tools;
 
  /**
@@ -66,7 +70,7 @@ class NewCommand extends PWConnector {
  'userpass' => '',
  'userpass_confirm' => '',
  'useremail' => '',
- 'color' => 'classic',
+ 'color' => 'classic'
  );
 
  /**
@@ -82,6 +86,7 @@ protected function configure() {
  ->setName('new')
  ->setDescription('Creates a new ProcessWire project')
  ->addArgument('directory', InputArgument::OPTIONAL, 'Directory where the new project will be created')
+ ->addOption('force', null, InputOption::VALUE_NONE, 'Force installation in an non empty directory')
  ->addOption('dbUser', null, InputOption::VALUE_REQUIRED, 'Database user')
  ->addOption('dbPass', null, InputOption::VALUE_OPTIONAL, 'Database password')
  ->addOption('dbName', null, InputOption::VALUE_REQUIRED, 'Database name')
@@ -410,9 +415,10 @@ private function download($branch) {
  * @throws \RuntimeException if the downloaded archive could not be extracted
  */
  private function extract() {
+ $forceInstall = $this->input->getOption('force');
  $this->tools->writeBlockBasic('Preparing project...');
  $cfp = $this->src ? $this->src : $this->compressedFilePath;
- $this->downloader->extract($cfp, $this->projectDir, $this->getName());
+ $this->downloader->extract($cfp, $this->projectDir, $this->getName(), $forceInstall);
 
  return $this;
  }

diff --git a/src/Commands/Common/ServeCommand.php b/src/Commands/Common/ServeCommand.php
@@ -19,6 +19,9 @@
  */
 class ServeCommand extends PwConnector {
 
+ private $helper = null;
+
+
  /**
  * Configures the current command.
  */

diff --git a/src/Helpers/Downloader.php b/src/Helpers/Downloader.php
@@ -25,6 +25,7 @@ class Downloader {
  private $version;
  private $output;
  private $tools;
+ private $compressedFilePath;
 
  /**
  * Construct Downloader
@@ -154,7 +155,7 @@ public function download($uri, $prefix = 'pw') {
  * @param string $to
  * @param string $name
  */
- public function extract($from, $to, $name = '') {
+ public function extract($from, $to, $name = '', $force = false) {
  //var_dump($from, $to, $name);exit;
  $source = $name ? 'ProcessWire' : 'the module';
 
@@ -164,12 +165,18 @@ public function extract($from, $to, $name = '') {
  }
 
  // check for empty directory
- $filesInsideDir = new \FilesystemIterator($to, \FilesystemIterator::SKIP_DOTS);
- if (iterator_count($filesInsideDir) > 1) {
- throw new \RuntimeException(sprintf(
- "ProcessWire can't be installed because the target folder `%s` is not empty.\n" .
- "Use an empty directory or provide an argument where the new project will be created like `wire-cli new <dirname>`",
- $to));
+ if (!$force) {
+ $filesInsideDir = new \FilesystemIterator($to, \FilesystemIterator::SKIP_DOTS);
+ if (iterator_count($filesInsideDir) > 1) {
+ throw new \RuntimeException(sprintf(
+ "ProcessWire can't be installed because the target folder `%s` is not empty.\n" .
+ "Use an empty directory or provide an argument where the new project will be created like `wire-cli new <dirname>`.\n" .
+ "Use option --force to proceed the installation in a non empty directory.",
+ $to));
+ }
+ }
+ else {
+ $this->tools->writeWarning("ProcessWire will be installed in a non-empty dir (--force found on command-line).\n"); 
  }
 
  try {

diff --git a/src/Helpers/Installer.php b/src/Helpers/Installer.php
@@ -31,6 +31,7 @@
 class Installer {
 
  protected $fs = null;
+ protected $v = true;
 
  /**
  * Whether or not we force installed files to be copied.

diff --git a/src/Helpers/WsTools.php b/src/Helpers/WsTools.php
@@ -23,7 +23,7 @@
  protected $helper;
  protected $input;
 
- protected static $types = array('error', 'success', 'info', 'comment', 'link', 'header', 'mark');
+ protected static $types = array('error', 'warning', 'success', 'info', 'comment', 'link', 'header', 'mark');
 
  /**
  * Construct WsTools
@@ -51,6 +51,9 @@ public function __construct(OutputInterface $output) {
 
  $style = new OutputFormatterStyle('blue', 'white', array('reverse'));
  $output->getFormatter()->setStyle('mark', $style);
+
+ $style = new OutputFormatterStyle('yellow', null, array('bold'));
+ $output->getFormatter()->setStyle('warning', $style);
  }
 
  /**
@@ -167,6 +170,17 @@ public function writeErrorAndExit($string) {
  public function writeComment($string, $write = true) {
  return $this->write($string, 'comment', $write);
  }
+
+ /**
+ * Simple method for coloring warning output
+ *
+ * @param string $string
+ * @param boolean $write
+ * @return tinted string
+ */
+ public function writeWarning($string, $write = true) {
+ return $this->write($string, 'warning', $write);
+ }
 
  /**
  * Simple method for coloring info output