Merge pull request #74 from danjohnson95/main

NativePHP · Dec 28, 2023 · e94a7ba · e94a7ba
2 parents d0715a3 + a6c4ae4
commit e94a7ba
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/src/Commands/BuildCommand.php b/src/Commands/BuildCommand.php
@@ -31,7 +31,7 @@ public function handle()
         Process::path(__DIR__.'/../../resources/js/')
             ->env($this->getEnvironmentVariables())
             ->forever()
-            ->tty(PHP_OS_FAMILY != 'Windows')
+            ->tty(PHP_OS_FAMILY != 'Windows' && !$this->option('no-interaction'))
             ->run($buildCommand, function (string $type, string $output) {
                 echo $output;
             });

diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
@@ -19,14 +19,19 @@ class InstallCommand extends Command
     public function handle(): void
     {
         intro('Publishing NativePHP Service Provider...');
+
+        $withoutInteraction = $this->option('no-interaction');
+
         $this->callSilent('vendor:publish', ['--tag' => 'nativephp-provider']);
         $this->callSilent('vendor:publish', ['--tag' => 'nativephp-config']);
 
-        $installer = $this->getInstaller($this->option('installer'));
+        $installer = $this->getInstaller($this->option('installer'), $withoutInteraction);
+
+        $this->installNPMDependencies(force: $this->option('force'), installer: $installer, withoutInteraction: $withoutInteraction);
 
-        $this->installNPMDependencies(force: $this->option('force'), installer: $installer);
+        $shouldPromptForServe = ! $withoutInteraction && ! $this->option('force');
 
-        if (! $this->option('force') && confirm('Would you like to start the NativePHP development server', false)) {
+        if ($shouldPromptForServe && confirm('Would you like to start the NativePHP development server', false)) {
             $this->call('native:serve', ['--installer' => $installer]);
         }
 

diff --git a/src/Commands/PublishCommand.php b/src/Commands/PublishCommand.php
@@ -33,7 +33,7 @@ public function handle()
         Process::path(__DIR__.'/../../resources/js/')
             ->env($this->getEnvironmentVariables())
             ->forever()
-            ->tty(PHP_OS_FAMILY != 'Windows')
+            ->tty(PHP_OS_FAMILY != 'Windows' && !$this->option('no-interaction'))
             ->run('npm run publish:mac-arm', function (string $type, string $output) {
                 echo $output;
             });

diff --git a/src/Traits/ExecuteCommand.php b/src/Traits/ExecuteCommand.php
@@ -10,7 +10,7 @@ trait ExecuteCommand
 {
     use LocatesPhpBinary;
 
-    protected function executeCommand(string $command, bool $skip_queue = false, string $type = 'install'): void
+    protected function executeCommand(string $command, bool $skip_queue = false, string $type = 'install', bool $withoutInteraction = false): void
     {
         $envs = [
             'install' => [
@@ -29,7 +29,7 @@ protected function executeCommand(string $command, bool $skip_queue = false, str
         Process::path(__DIR__.'/../../resources/js/')
             ->env($envs[$type])
             ->forever()
-            ->tty(PHP_OS_FAMILY != 'Windows')
+            ->tty(!$withoutInteraction && PHP_OS_FAMILY != 'Windows')
             ->run($command, function (string $type, string $output) {
                 if ($this->getOutput()->isVerbose()) {
                     echo $output;

diff --git a/src/Traits/Installer.php b/src/Traits/Installer.php
@@ -11,26 +11,28 @@ trait Installer
 {
     use ExecuteCommand;
 
-    protected function installNPMDependencies(bool $force, ?string $installer = 'npm'): void
+    protected function installNPMDependencies(bool $force, ?string $installer = 'npm', bool $withoutInteraction = false): void
     {
-        if ($force || confirm('Would you like to install the NativePHP NPM dependencies?', true)) {
+        $shouldPrompt = $force || $withoutInteraction;
+
+        if ($shouldPrompt || confirm('Would you like to install the NativePHP NPM dependencies?', true)) {
             note('Installing NPM dependencies (This may take a while)...');
 
             if (! $installer) {
-                $this->installDependencies();
+                $this->installDependencies(withoutInteraction: $withoutInteraction);
             } else {
-                $this->installDependencies(installer: $installer);
+                $this->installDependencies(installer: $installer, withoutInteraction: $withoutInteraction);
             }
             $this->output->newLine();
         }
     }
 
-    protected function installDependencies(?string $installer): void
+    protected function installDependencies(?string $installer = null, bool $withoutInteraction = false): void
     {
         [$installer, $command] = $this->getInstallerAndCommand(installer: $installer);
 
         note("Installing NPM dependencies using the {$installer} package manager...");
-        $this->executeCommand(command: $command);
+        $this->executeCommand(command: $command, withoutInteraction: $withoutInteraction);
     }
 
     protected function getInstallerAndCommand(?string $installer, $type = 'install'): array