Skip to content
This repository was archived by the owner on Sep 6, 2024. It is now read-only.

Commit 5125314

Browse files
anomiexanomiex
committed
Enhance for Jetpack Beta 3.0.0
Jetpack Beta plugin v3.0.0 adds the ability to work with multiple plugins. This enhances Jurassic Ninja to take advantage of that, offering to install a branch for each available plugin and then doing so. For this to fully work, you'll have to edit the specialops page with the change included in this PR.
1 parent 1b0f882 commit 5125314

File tree

5 files changed

+235
-91
lines changed

5 files changed

+235
-91
lines changed

‎docker-compose.yml

+12-14
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,33 @@ services:
88
MYSQL_DATABASE: wordpress
99
volumes:
1010
- ./jndb:/var/lib/mysql
11-
ports:
12-
- "${PORT_MYSQL:-3306}:3306"
1311
env_file:
14-
- ../jetpack/docker/default.env
15-
- ../jetpack/docker/.env
12+
- ../jetpack/tools/docker/default.env
13+
- ../jetpack/tools/docker/.env
1614

1715
wordpress:
1816
container_name: jn_wordpress
1917
depends_on:
2018
- db
21-
build: ../jetpack/docker
19+
build: ../jetpack/tools/docker
2220
image: jn_wordpress:localbuild
2321
ports:
2422
- "${PORT_WORDPRESS:-80}:80"
2523
env_file:
26-
- ../jetpack/docker/default.env
27-
- ../jetpack/docker/.env
24+
- ../jetpack/tools/docker/default.env
25+
- ../jetpack/tools/docker/.env
2826
environment:
2927
- HOST_PORT=${PORT_WORDPRESS}
3028
- WORDPRESS_DB_PASSWORD=wordpress
3129
- XDEBUG_CONFIG=_host=10.0.1.19
3230
volumes:
33-
- ../jetpack:/var/www/html/wp-content/plugins/jetpack
34-
- ../jetpack/docker/wordpress:/var/www/html
35-
- ../jetpack/docker/logs/apache2:/var/log/apache2
36-
- ../jetpack/docker/logs/php:/var/log/php
37-
- ../jetpack/docker/bin:/var/scripts
38-
- ../jetpack/docker/wordpress-develop:/tmp/wordpress-develop
31+
- ../jetpack/projects/plugins/jetpack:/var/www/html/wp-content/plugins/jetpack
32+
- ../jetpack/tools/docker/wordpress:/var/www/html
33+
- ../jetpack/tools/docker/logs/apache2:/var/log/apache2
34+
- ../jetpack/tools/docker/logs/php:/var/log/php
35+
- ../jetpack/tools/docker/bin:/var/scripts
36+
- ../jetpack/tools/docker/wordpress-develop:/tmp/wordpress-develop
3937
- ../errors:/var/www/html/wp-content/plugins/errors
4038
- ./:/var/www/html/wp-content/plugins/jurassic.ninja
4139
- ../jurassic.ninja-ext:/var/www/html/wp-content/plugins/jurassic.ninja-ext
42-
40+

‎docs/specialops.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ Recommended `/specialops` page content:
6363
<div class="checkbox"><label><input type="checkbox" data-feature="jetpack-beta">&nbsp;Include Jetpack Beta</label></div>
6464
</li>
6565
<li>
66-
<div class="form-group"><label for="jetpack_branch">Jetpack Branch:</label><br><input id="jetpack_branch" class="form-control" role="search" disabled="disabled" list="jetpack_branches" type="text" value="" placeholder="Requires Jetpack Beta plugin" data-feature="branch" aria-hidden="false"><br>
67-
<datalist id="jetpack_branches"></datalist>
68-
</div>
66+
<div class="form-group" id="jetpack_beta_branches_group"></div>
6967
</li>
7068
<li>
7169
<div class="checkbox"><label><input type="checkbox" data-feature="vaultpress">&nbsp;Include VaultPress</label></div>

‎features/jetpack-beta.php

+86-20
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
add_action(
1111
'jurassic_ninja_added_rest_api_endpoints',
1212
function () {
13+
// Old endpoint, deprecated.
1314
add_get_endpoint(
1415
'available-jetpack-built-branches',
1516
function () {
@@ -19,6 +20,33 @@ function () {
1920
return $output;
2021
}
2122
);
23+
24+
// New endpoints.
25+
add_get_endpoint(
26+
'jetpack-beta/plugins',
27+
function () {
28+
$manifest_url = 'https://betadownload.jetpack.me/plugins.json';
29+
$manifest = json_decode( wp_remote_retrieve_body( wp_remote_get( $manifest_url ) ) );
30+
$output = $manifest;
31+
return $output;
32+
}
33+
);
34+
35+
add_get_endpoint(
36+
'jetpack-beta/plugins/(?P<plugin>[a-zA-Z0-9-]+)/branches',
37+
function ( $data ) {
38+
$plugin = $data['plugin'];
39+
$manifest_url = 'https://betadownload.jetpack.me/plugins.json';
40+
$manifest = json_decode( wp_remote_retrieve_body( wp_remote_get( $manifest_url ) ) );
41+
if ( ! isset( $manifest->{$plugin}->manifest_url ) ) {
42+
return new \WP_Error( 'unknown_plugin', 'Plugin not known.', array( 'status' => 404 ) );
43+
}
44+
$manifest_url = $manifest->{$plugin}->manifest_url;
45+
$manifest = json_decode( wp_remote_retrieve_body( wp_remote_get( $manifest_url ) ) );
46+
$output = $manifest;
47+
return $output;
48+
}
49+
);
2250
}
2351
);
2452

@@ -28,6 +56,7 @@ function () {
2856
$defaults = array(
2957
'jetpack-beta' => false,
3058
'branch' => false,
59+
'branches' => array(),
3160
);
3261

3362
add_action(
@@ -39,9 +68,18 @@ function ( &$app = null, $features, $domain ) use ( $defaults ) {
3968
add_jetpack_beta_plugin();
4069
}
4170

42-
if ( $features['branch'] ) {
43-
debug( '%s: Activating Jetpack %s branch in Beta plugin', $domain, $features['branch'] );
44-
activate_jetpack_branch( $features['branch'] );
71+
// Deprecated parameter.
72+
if ( $features['branch'] && ! $features['branches'] ) {
73+
$features['branches'] = array( 'jetpack' => $features['branch'] );
74+
}
75+
76+
if ( $features['branches'] ) {
77+
foreach ( $features['branches'] as $plugin_name => $branch_name ) {
78+
if ( $branch_name ) {
79+
debug( '%s: Activating %s plugin %s branch in Beta plugin', $domain, $plugin_name, $branch_name );
80+
activate_jetpack_branch( $plugin_name, $branch_name );
81+
}
82+
}
4583
}
4684
},
4785
10,
@@ -63,23 +101,41 @@ function ( $defaults ) {
63101
add_filter(
64102
'jurassic_ninja_rest_create_request_features',
65103
function ( $features, $json_params ) {
66-
$branch = isset( $json_params['branch'] ) && $json_params['branch'] ? $json_params['branch'] : 'master';
67104
if ( isset( $json_params['jetpack-beta'] ) && $json_params['jetpack-beta'] ) {
68-
$url = get_jetpack_beta_url( $branch );
105+
106+
// Deprecated parameter.
107+
if ( isset( $json_params['branch'] ) && empty( $json_params['branches'] ) ) {
108+
$json_params['branches'] = array( 'jetpack' => $json_params['branch'] );
109+
}
110+
111+
// Default.
112+
if ( ! isset( $json_params['branches'] ) ) {
113+
$json_params['branches'] = array( 'jetpack' => 'master' );
114+
}
115+
69116

70117
$error = null;
71-
if ( null === $url ) {
72-
$error = new \WP_Error(
73-
'failed_to_launch_site_with_branch',
74-
/* translators: is a GitHub branch name */
75-
sprintf( esc_html__( 'Invalid branch name or not ready yet: %s', 'jurassic-ninja' ), $branch ),
76-
array(
77-
'status' => 400,
78-
)
79-
);
118+
foreach ( $json_params['branches'] as $plugin_name => $branch_name ) {
119+
if ( ! $branch_name ) {
120+
continue;
121+
}
122+
123+
$url = get_jetpack_beta_url( $plugin_name, $branch_name );
124+
if ( null === $url ) {
125+
$error = new \WP_Error(
126+
'failed_to_launch_site_with_branch',
127+
/* translators: %1$s: Plugin slug. %2$s: GitHub branch name */
128+
sprintf( esc_html__( 'Invalid branch name for %1$s or not ready yet: %2$s', 'jurassic-ninja' ), $plugin_name, $branch_name ),
129+
array(
130+
'status' => 400,
131+
)
132+
);
133+
break;
134+
}
135+
$features['branches'][ $plugin_name ] = $branch_name;
80136
}
81137
$features['jetpack-beta'] = null === $error ? $json_params['jetpack-beta'] : $error;
82-
$features['branch'] = $branch;
138+
$features['branch'] = isset( $features['branches']['jetpack'] ) ? $features['branches']['jetpack'] : null; // Deprecated.
83139
}
84140

85141
return $features;
@@ -129,10 +185,11 @@ function ( $s ) use ( $cmd ) {
129185
/**
130186
* Activates jetpack branch in Beta plugin
131187
*
188+
* @param string $plugin_name Plugin name.
132189
* @param string $branch_name Branch name.
133190
*/
134-
function activate_jetpack_branch( $branch_name ) {
135-
$cmd = "wp jetpack-beta branch activate $branch_name";
191+
function activate_jetpack_branch( $plugin_name, $branch_name ) {
192+
$cmd = "wp jetpack-beta activate $plugin_name $branch_name";
136193
add_filter(
137194
'jurassic_ninja_feature_command',
138195
function ( $s ) use ( $cmd ) {
@@ -144,13 +201,20 @@ function ( $s ) use ( $cmd ) {
144201
/**
145202
* Get URL for beta download.
146203
*
204+
* @param string $plugin_name Plugin name.
147205
* @param string $branch_name Branch name.
148206
*
149-
* @return string Download URL.
207+
* @return string|null Download URL.
150208
*/
151-
function get_jetpack_beta_url( $branch_name ) {
209+
function get_jetpack_beta_url( $plugin_name, $branch_name ) {
210+
$manifest_url = 'https://betadownload.jetpack.me/plugins.json';
211+
$manifest = json_decode( wp_remote_retrieve_body( wp_remote_get( $manifest_url ) ) );
212+
if ( ! isset( $manifest->{$plugin_name}->manifest_url ) ) {
213+
return null;
214+
}
215+
152216
$branch_name = str_replace( '/', '_', $branch_name );
153-
$manifest_url = 'https://betadownload.jetpack.me/jetpack-branches.json';
217+
$manifest_url = $manifest->{$plugin_name}->manifest_url;
154218
$manifest = json_decode( wp_remote_retrieve_body( wp_remote_get( $manifest_url ) ) );
155219

156220
if ( ( 'rc' === $branch_name || 'master' === $branch_name ) && isset( $manifest->{$branch_name}->download_url ) ) {
@@ -160,4 +224,6 @@ function get_jetpack_beta_url( $branch_name ) {
160224
if ( isset( $manifest->pr->{$branch_name}->download_url ) ) {
161225
return $manifest->pr->{$branch_name}->download_url;
162226
}
227+
228+
return null;
163229
}

‎jurassic.ninja.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function init() {
4747
// Create settings page.
4848
add_settings_page();
4949
// Settings problems include credentials and IDs not configured.
50-
if ( ! settings_problems() ) {
50+
if ( true || ! settings_problems() ) {
5151
// Include the JS only under the page which has the /create slug.
5252
add_scripts();
5353
// Serve the API root and nonce only under the page which has the /create slug.

0 commit comments

Comments
 (0)