Merge branch 'master' into add-probot-move-support

Author: schlessera

.gitignore

@@ -5,3 +5,4 @@ vendor/
 *.zip
 *.tar.gz
 composer.lock
+*.log

.travis.yml

@@ -41,7 +41,7 @@ install:
 
 script:
   - composer phpunit
-  - composer behat
+  - ccomposer behat || composer behat-rerun
 
 jobs:
   include:

composer.json

@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "wp-cli/extension-command": "^1.2 || ^2",
-        "wp-cli/wp-cli-tests": "^2"
+        "wp-cli/wp-cli-tests": "^2.0.7"
     },
     "config": {
         "process-timeout": 7200,
@@ -51,6 +51,7 @@
     "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",

features/scaffold.feature

@@ -44,7 +44,7 @@ Feature: WordPress code scaffolding
     When I try `wp scaffold child-theme hello-world --parent_theme=just-test --enable-network --quiet`
     Then STDERR should contain:
       """
-      Error: This is not a multisite install.
+      Error: This is not a multisite install
       """
     And the return code should be 1
 
@@ -338,7 +338,8 @@ Feature: WordPress code scaffolding
     Given I run `wp theme path`
     And save STDOUT as {THEME_DIR}
 
-    When I run `wp scaffold _s starter-theme`
+    # Allow for warnings to be generated due to https://github.com/wp-cli/scaffold-command/issues/181
+    When I try `wp scaffold _s starter-theme`
     Then STDOUT should contain:
       """
       Success: Created theme 'Starter-theme'.
@@ -351,7 +352,8 @@ Feature: WordPress code scaffolding
     Given I run `wp theme path`
     And save STDOUT as {THEME_DIR}
 
-    When I run `wp scaffold _s starter-theme --sassify`
+    # Allow for warnings to be generated due to https://github.com/wp-cli/scaffold-command/issues/181
+    When I try `wp scaffold _s starter-theme --sassify`
     Then STDOUT should contain:
       """
       Success: Created theme 'Starter-theme'.
@@ -363,7 +365,8 @@ Feature: WordPress code scaffolding
     Given I run `wp theme path`
     And save STDOUT as {THEME_DIR}
 
-    When I run `wp scaffold _s starter-theme --woocommerce`
+    # Allow for warnings to be generated due to https://github.com/wp-cli/scaffold-command/issues/181
+    When I try `wp scaffold _s starter-theme --woocommerce`
     Then STDOUT should contain:
       """
       Success: Created theme 'Starter-theme'.
@@ -373,7 +376,8 @@ Feature: WordPress code scaffolding
 
   Scenario: Scaffold starter code for a theme and activate it
     Given a WP install
-    When I run `wp scaffold _s starter-theme --activate`
+    # Allow for warnings to be generated due to https://github.com/wp-cli/scaffold-command/issues/181
+    When I try `wp scaffold _s starter-theme --activate`
     Then STDOUT should contain:
       """
       Success: Switched to 'Starter-theme' theme.
@@ -488,7 +492,8 @@ Feature: WordPress code scaffolding
 
   Scenario: Scaffold starter code for a theme and network enable it
     Given a WP multisite install
-    When I run `wp scaffold _s starter-theme --enable-network`
+    # Allow for warnings to be generated due to https://github.com/wp-cli/scaffold-command/issues/181
+    When I try `wp scaffold _s starter-theme --enable-network`
     Then STDOUT should contain:
       """
       Success: Network enabled the 'Starter-theme' theme.

src/Scaffold_Command.php

@@ -400,13 +400,25 @@ public function _s( $args, $assoc_args ) {
 			$body['underscoresme_woocommerce'] = 1;
 		}
 
-		$tmpfname = wp_tempnam( $url );
-		$response = wp_remote_post( $url, array(
+		$tmpfname  = wp_tempnam( $url );
+		$post_args = array(
 			'timeout'  => $timeout,
 			'body'     => $body,
 			'stream'   => true,
 			'filename' => $tmpfname,
-		) );
+		);
+
+		$response = wp_remote_post( $url, $post_args );
+
+		// Workaround to get scaffolding to work within Travis CI.
+		// See https://github.com/wp-cli/scaffold-command/issues/181
+		if ( is_wp_error( $response )
+		     && false !== strpos( $response->get_error_message(), 'gnutls_handshake() failed' ) ) {
+			// Certificate problem, falling back to unsecured request instead.
+			$alt_url = str_replace( 'https://', 'http://', $url );
+			WP_CLI::warning( "Secured request to {$url} failed, using {$alt_url} as a fallback." );
+			$response = wp_remote_post( $alt_url, $post_args );
+		}
 
 		if ( is_wp_error( $response ) ) {
 			WP_CLI::error( $response );