Add admin-tools Command #2

mrrobot47 · 2018-08-08T12:49:02Z

Closes: #1
Closes: EasyEngine/easyengine#1118

Functions implemented so far:

ee admin-tools install
ee admin-tools up
ee admin-tools down

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Update move config function

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Switch from composer install to update Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

rahulsprajapati · 2018-08-21T08:58:47Z

.gitignore

@@ -0,0 +1,11 @@
+.DS_Store
+wp-cli.local.yml


We can remove this now from all repo. We don't have wp-cli.local.yml. Maybe check if we can have ee-cli.local.yml.

rahulsprajapati · 2018-08-21T08:59:59Z

src/Admin_Tools_Command.php

+
+class Admin_Tools_Command extends EE_Command {
+
+


extra line?

rahulsprajapati · 2018-08-21T09:07:10Z

src/Admin_Tools_Command.php

+			$this->fs->mkdir( ADMIN_TOOL_DIR );
+		}
+
+		$tools = json_decode( file_get_contents( ADMIN_TOOLS_FILE ), true );


a couple of things here we can take care of.

if we are expecting the ADMIN_TOOLS_FILE file to be .json file we can check the file extension.

check if file_get_contents( ADMIN_TOOLS_FILE ) is not empty if it is do not proceed further just add an error message.

Check if json_decode is done correctly ( it will fail if there is invalid JSON formate data ) After this line you can check if ( json_last_error() != JSON_ERROR_NONE ) and send a error message/exception.

And one last thing if json data is valid but empty {} then you can add a check for $tools if it's empty add a message/exception.

Will update according to this 👍

rahulsprajapati · 2018-08-21T09:11:55Z

src/Admin_Tools_Command.php

+			if ( ! $this->is_installed( $tool ) ) {
+				EE::log( "Installing $tool" );
+				$tool_path = ADMIN_TOOL_DIR . '/' . $tool;
+				call_user_func_array( [ $this, "install_$tool" ], [ $data, $tool_path ] );


I think here we need to check method_exists since the $tool can come from json file which can be updated from ADMIN_TOOLS_FILE constant.

rahulsprajapati · 2018-08-21T09:19:49Z

src/Admin_Tools_Command.php

+		$this->fs->dumpFile( $config_file, file_get_contents( ADMIN_TEMPLATE_ROOT . '/' . $template_file ) );
+	}
+
+	private function composer_install( $tool_path ) {


function doc?

rahulsprajapati · 2018-08-21T09:23:51Z

templates/index.mustache

@@ -0,0 +1,70 @@
+<?php
+
+function populate_site_info() {


Please add comments in this file where needed. I believe this will be copied paste from mustache template as .php file and it won't have any comment.

rahulsprajapati · 2018-08-21T09:24:45Z

templates/index.mustache

+
+function select( $columns = array(), $where = array(), $table_name = 'services', $limit = null ) {
+
+	$db_path = '/opt/easyengine/ee.sqlite';


can't we read this path from env variables?

No. EE_CONF_ROOT is a constant defined in EE core. It is not present as an env variable which can be used from index.php of admin-tools.

I mean we can keep it in Env variable and then use it when needed.

rahulsprajapati · 2018-08-21T09:25:13Z

templates/index.mustache

+unset( $services['site_url'] );
+
+
+$scan  = scandir( '/var/www/htdocs/ee-admin' );


can't we read this path from env variables?

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

mrrobot47 added 10 commits August 8, 2018 18:08

Add docker-compose-admin template

294908b

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add template for index.php

b11611a

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add template for phpinfo.php

40988d0

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add template for pma configuration

54fbd45

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add template for pra configuration

12e3d00

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add initial installation, up and down of admin tools

6f922d7

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add initial admin-tools

e3e5c46

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Merge branch 'master' into develop

6929338

Add zend opcache gui

0a842d8

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Remove listing of index.php from admin-tools

8666ee2

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

mbtamuli assigned mrrobot47 Aug 9, 2018

mrrobot47 added 6 commits August 10, 2018 19:16

Add composer installation

fb6490b

Update move config function

Update according to db refactoring

8f3fbad

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add inclusion of site mode

6e39233

Switch from composer install to update Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Update config file move function call

fb2ba53

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Fix file moving

aa5c9cf

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Update index according to db refactoring

2a30991

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

mrrobot47 changed the title ~~[WIP] Add admin-tools Command~~ Add admin-tools Command Aug 21, 2018

mrrobot47 requested review from kirtangajjar, mbtamuli and rahulsprajapati August 21, 2018 06:57

mrrobot47 added 2 commits August 21, 2018 14:34

Remove wp-cli specific ignore file

7cc3538

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Update editorconfig

d7bd488

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

rahulsprajapati suggested changes Aug 21, 2018

View reviewed changes

mrrobot47 added 6 commits August 21, 2018 16:28

Remove extra lines

35cde10

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Update json handling validations

98b8262

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add check before user_call_func

ff6964f

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Add doc comment

091d2ec

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Update doc-comments in index mustache

e960a6e

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Remove extra variable

f7f9173

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

mrrobot47 added 3 commits August 21, 2018 17:50

Update important path in index via mustaching

37b0dc9

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Update flow and warning to error

50dd657

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

Update log msg to success

00fc253

Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>

rahulsprajapati approved these changes Aug 21, 2018

View reviewed changes

rahulsprajapati merged commit 7b59881 into EasyEngine:master Aug 21, 2018

mrrobot47 mentioned this pull request Aug 22, 2018

Initial admin-tools command #3

Merged

5 tasks


		function select( $columns = array(), $where = array(), $table_name = 'services', $limit = null ) {

		$db_path = '/opt/easyengine/ee.sqlite';

		unset( $services['site_url'] );


		$scan = scandir( '/var/www/htdocs/ee-admin' );

		@@ -0,0 +1,11 @@
		.DS_Store
		wp-cli.local.yml

Add admin-tools Command #2

Add admin-tools Command #2

Uh oh!

Conversation

mrrobot47 commented Aug 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mrrobot47 commented Aug 8, 2018 •

edited

Loading