Merge pull request #2 from swissspidy/tov2

Fix tests in PR

Author: wojsmol

composer.json

@@ -19,11 +19,11 @@
     "require": {
         "php": ">=5.4",
         "wp-cli/package-command": "^2",
-        "wp-cli/wp-cli": "2"
+        "wp-cli/wp-cli": "^2"
     },
     "require-dev": {
         "wp-cli/extension-command": "^2",
-        "wp-cli/wp-cli-tests": "2"
+        "wp-cli/wp-cli-tests": "^2.0.7"
     },
     "config": {
         "platform": {

features/menge-cache.feature features/manage-cache.featurefeatures/menge-cache.feature renamed to features/manage-cache.feature

@@ -1,27 +1,24 @@
 Feature: Generate cache
 
-  Scenario: Manage wp-super-cache via cli
+  Scenario: Manage wp-super-cache via CLI
     Given a WP install
 
     When I run `wp plugin install wp-super-cache`
     Then STDOUT should contain:
-      """
-      Downloading install
-      """
-    And STDOUT should contain:
       """
       Plugin installed successfully.
       """
     And the wp-content/plugins/wp-super-cache directory should exist
 
-    When I run `wp package install wojsmol/wp-super-cache-cli:tov2`
-    Then STDOUT should contain:
+    When I try `wp super-cache enable`
+    Then STDERR should contain:
       """
-      Success: Package installed.
+      Error: WP Super Cache needs to be enabled to use its WP-CLI commands.
       """
 
-     When I run `wp super-cache enable`
-     Then STDOUT should contain:
+    When I run `wp plugin activate wp-super-cache`
+    And I run `wp super-cache enable`
+    Then STDOUT should contain:
       """
       Success: The WP Super Cache is enabled.
       """

src/WPSuperCache_Command.php src/WP_Super_Cache_Command.phpsrc/WPSuperCache_Command.php renamed to src/WP_Super_Cache_Command.php

@@ -3,7 +3,7 @@
 /**
  * Manages the WP Super Cache plugin
  */
-class WPSuperCache_Command extends WP_CLI_Command {
+class WP_Super_Cache_Command extends WP_CLI_Command {
 
 	/**
 	 * Clear something from the cache.
@@ -167,13 +167,3 @@ protected function preload_status( $preload_counter, $pending_cancel ) {
 		}
 	}
 }
-
-WP_CLI::add_command(
-	'super-cache', 'WPSuperCache_Command', array(
-		'before_invoke' => function() {
-			if ( ! function_exists( 'wp_super_cache_enable' ) ) {
-				WP_CLI::error( 'WP Super Cache needs to be enabled to use its WP-CLI commands.' );
-			}
-		},
-	)
-);

wp-super-cache-cli.php

@@ -1,15 +1,21 @@
 <?php
-/*
-Plugin Name: WP Super Cache CLI
-Version: 1.0
-Description: A CLI interface for the WP Super Cache plugin
-Author: WP-CLI Team
-Author URI: http://github.com/wp-cli
-Plugin URI: http://github.com/wp-cli/wp-super-cache-cli
-License: MIT
-*/
-
-$autoload = __DIR__ . '/vendor/autoload.php';
+
+$autoload = dirname( __FILE__ ) . '/vendor/autoload.php';
+
 if ( file_exists( $autoload ) ) {
 	require_once $autoload;
 }
+
+if ( ! class_exists( 'WP_CLI' ) ) {
+	return;
+}
+
+WP_CLI::add_command(
+	'super-cache', 'WP_Super_Cache_Command', array(
+		'before_invoke' => function() {
+			if ( ! function_exists( 'wp_super_cache_enable' ) ) {
+				WP_CLI::error( 'WP Super Cache needs to be enabled to use its WP-CLI commands.' );
+			}
+		},
+	)
+);