Adapt scaffolding logic

Author: schlessera

bin/install-package-tests.sh

@@ -47,6 +47,12 @@ class ScaffoldPackageCommand {
 	 * default: ^2.5
 	 * ---
 	 *
+	 * [--require_wp_cli_tests=<version>]
+	 * : Required WP-CLI testing framework version for the package.
+	 * ---
+	 * default: ^3.0.11
+	 * ---
+
 	 * [--skip-tests]
 	 * : Don't generate files for integration testing.
 	 *
@@ -103,13 +109,13 @@ public function package( $args, $assoc_args ) {
 EOT;
 
 		$files_written = $this->create_files( array(
-			"{$package_dir}/.gitignore"     => file_get_contents( "{$package_root}/.gitignore" ),
-			"{$package_dir}/.editorconfig"  => file_get_contents( "{$package_root}/.editorconfig" ),
-			"{$package_dir}/.distignore"    => file_get_contents( "{$package_root}/.distignore" ),
-			"{$package_dir}/CONTRIBUTING.md"=> file_get_contents( "{$package_root}/CONTRIBUTING.md" ),
-			"{$package_dir}/wp-cli.yml"     => $wp_cli_yml,
-			"{$package_dir}/command.php"    => Utils\mustache_render( "{$template_path}/command.mustache", $assoc_args ),
-			"{$package_dir}/composer.json"  => Utils\mustache_render( "{$template_path}/composer.mustache", $assoc_args ),
+			"{$package_dir}/.gitignore"              => file_get_contents( "{$package_root}/.gitignore" ),
+			"{$package_dir}/.editorconfig"           => file_get_contents( "{$package_root}/.editorconfig" ),
+			"{$package_dir}/.distignore"             => file_get_contents( "{$package_root}/.distignore" ),
+			"{$package_dir}/CONTRIBUTING.md"         => file_get_contents( "{$package_root}/CONTRIBUTING.md" ),
+			"{$package_dir}/wp-cli.yml"              => $wp_cli_yml,
+			"{$package_dir}/hello-world-command.php" => Utils\mustache_render( "{$template_path}/command.mustache", $assoc_args ),
+			"{$package_dir}/composer.json"           => Utils\mustache_render( "{$template_path}/composer.mustache", $assoc_args ),
 		), $force );
 
 		if ( empty( $files_written ) ) {
@@ -612,13 +618,9 @@ public function package_tests( $args, $assoc_args ) {
 		self::check_if_valid_package_dir( $package_dir );
 
 		$package_dir .= '/';
-		$bin_dir       = $package_dir . 'bin/';
-		$utils_dir     = $package_dir . 'utils/';
 		$features_dir  = $package_dir . 'features/';
-		foreach ( array( $features_dir, $utils_dir, $bin_dir ) as $dir ) {
-			if ( ! is_dir( $dir ) ) {
-				Process::create( Utils\esc_cmd( 'mkdir %s', $dir ) )->run();
-			}
+		if ( ! is_dir( $features_dir ) ) {
+			Process::create( Utils\esc_cmd( 'mkdir %s', $features_dir ) )->run();
 		}
 
 		$package_root = dirname( dirname( __FILE__ ) );

bin/test.sh

@@ -13,3 +13,16 @@ $hello_world_command = function() {
 	WP_CLI::success( "Hello world." );
 };
 WP_CLI::add_command( 'hello-world', $hello_world_command );
+<?php
+
+if ( ! class_exists( 'WP_CLI' ) ) {
+	return;
+}
+
+$wpcli_hello_world_autoloader = __DIR__ . '/vendor/autoload.php';
+
+if ( file_exists( $wpcli_hello_world_autoloader ) ) {
+	require_once $wpcli_hello_world_autoloader;
+}
+
+WP_CLI::add_command( 'hello-world', '\WP_CLI\HelloWorld\HelloWorldCommand' );

src/ScaffoldPackageCommand.php

@@ -17,3 +17,57 @@
         "wp-cli/wp-cli-tests": "^3.0.11"
     }
 }
+{
+    "name": "{{name}}",
+    "type": "wp-cli-package",
+    "description": "{{description}}",
+    "homepage": "{{homepage}}",
+    "license": "{{license}}",
+    "authors": [],
+    "require": {
+        "wp-cli/wp-cli": "{{require_wp_cli}}"
+    },
+    "require-dev": {
+        "wp-cli/wp-cli-tests": "{{require_wp_cli_tests}}"
+    },
+    "config": {
+        "process-timeout": 7200,
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.x-dev"
+        },
+        "bundled": false,
+        "commands": [
+            "hello-world"
+        ]
+    },
+    "autoload": {
+        "psr-4": {
+            "WP_CLI\\HelloWorld\\": "src/"
+        },
+        "files": [
+            "hello-world-command.php"
+        ]
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "scripts": {
+        "behat": "run-behat-tests",
+        "behat-rerun": "rerun-behat-tests",
+        "lint": "run-linter-tests",
+        "phpcs": "run-phpcs-tests",
+        "phpunit": "run-php-unit-tests",
+        "prepare-tests": "install-package-tests",
+        "test": [
+            "@lint",
+            "@phpcs",
+            "@phpunit",
+            "@behat"
+        ]
+    },
+    "support": {
+        "issues": "https://github.com/{{name}}/issues"
+    }
+}