Merge pull request #102 from GeoJunkie/fix/99-overwrite-option

Add --force option to overwrite

Author: BrianHenryIE

features/dist-archive.feature

@@ -494,3 +494,19 @@ Feature: Generate a distribution archive of a project
       """
     And the {RUN_DIR}/subdir/hello-world-dist.zip file should exist
     And the return code should be 0
+
+  Scenario: Do not ask for confirmation if archive file exists when using --force
+    Given a WP install
+
+    When I run `wp scaffold plugin hello-world`
+    Then the wp-content/plugins/hello-world directory should exist
+
+    When I run `wp dist-archive wp-content/plugins/hello-world ./hello-world-dist.zip`
+    Then STDERR should be empty
+
+    When I try `wp dist-archive wp-content/plugins/hello-world ./hello-world-dist.zip --force`
+    Then STDERR should be empty
+    And STDOUT should contain:
+      """
+      Success: Created hello-world-dist.zip
+      """

src/Dist_Archive_Command.php

@@ -46,6 +46,9 @@ class Dist_Archive_Command {
 	 * [--create-target-dir]
 	 * : Automatically create the target directory as needed.
 	 *
+	 * [--force]
+	 * : Forces overwriting of the archive file if it already exists.
+	 *
 	 * [--plugin-dirname=<plugin-slug>]
 	 * : Set the archive extract directory name. Defaults to project directory name.
 	 *
@@ -100,20 +103,23 @@ public function __invoke( $args, $assoc_args ) {
 		$archive_absolute_filepath = "{$destination_dir_path}/{$archive_file_name}";
 
 		if ( file_exists( $archive_absolute_filepath ) ) {
-			WP_CLI::warning( 'Archive file already exists' );
-			WP_CLI::log( $archive_absolute_filepath );
-			$answer      = \cli\prompt(
-				'Do you want to skip or replace it with a new archive?',
-				$default = false,
-				$marker  = ' [s/r]: '
-			);
-			$should_overwrite = 'r' === strtolower( $answer );
+			$should_overwrite = Utils\get_flag_value( $assoc_args, 'force' );
+			if ( ! $should_overwrite ) {
+				WP_CLI::warning( 'Archive file already exists' );
+				WP_CLI::log( $archive_absolute_filepath );
+				$answer      = \cli\prompt(
+					'Do you want to skip or replace it with a new archive?',
+					$default = false,
+					$marker  = ' [s/r]: '
+				);
+				$should_overwrite = 'r' === strtolower( $answer );
+			}
 			if ( ! $should_overwrite ) {
 				WP_CLI::log( 'Skipping' . PHP_EOL );
 				WP_CLI::log( 'Archive generation skipped.' );
 				exit( 0 );
 			}
-			WP_CLI::log( 'Replacing' . PHP_EOL );
+			WP_CLI::log( "Replacing $archive_absolute_filepath" . PHP_EOL );
 		}
 
 		chdir( dirname( $source_path ) );