connection spinner

Author: francescobianco

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "javanile/mysql-import",
   "description": "Import SQL file from command-line",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "MIT",
   "type": "project",
   "authors": [

develop.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+[[ -f mysql-import.log ]] && rm mysql-import.log
+
+docker-compose down -v
+docker-compose up -d mysql
+docker-compose run --rm -e MYSQL_HOST=ciao -e MYSQL_USER=root -e MYSQL_PASSWORD=secret php ./mysql-import ./tests/fixtures/database.sql
+
+if [[ -f mysql-import.log ]]; then
+    echo "---[ mysql-import.log ]---"
+    cat mysql-import.log
+fi

docker-compose.yml

@@ -17,4 +17,8 @@ services:
 
   mysql:
     image: mysql:5.5
-    environment: ['MYSQL_ROOT_PASSWORD=root']
+    environment: ['MYSQL_ROOT_PASSWORD=secret']
+    volumes: ['mysql:/var/lib/mysql']
+
+volumes:
+  mysql:

mysql-import

@@ -11,7 +11,14 @@
  * @license    https://goo.gl/KPZ2qI  MIT License
  * @copyright  2015-2018 Javanile
  */
-require_once __DIR__.'/../../autoload.php';
+
+if (file_exists(__DIR__ . '/vendor/autoload.php')) {
+    require_once __DIR__ . '/vendor/autoload.php';
+} elseif (file_exists(__DIR__ . '/../autoload.php')) {
+    require_once __DIR__ . '/../autoload.php';
+} else {
+    require_once __DIR__ . '/../../autoload.php';
+}
 
 use Javanile\MysqlImport\MysqlImport;
 

src/MysqlImport.php

@@ -168,7 +168,10 @@ protected function tryUserAndPassword()
 
         // first attempt avoid database delay
         if (!$this->connect($this->user, $this->password)) {
-            sleep(10);
+            for ($i = 0; $i < 10; $i++) {
+                sleep(1);
+                $this->progressBar($i, 10, "connecting...");
+            }
         }
 
         // second attempt real check
@@ -203,7 +206,11 @@ protected function tryRootPassword()
 
         // first attempt avoid database delay
         if (!$this->connect('root', $this->rootPassword)) {
-            sleep(10);
+            for ($i = 0; $i < 10; $i++) {
+                sleep(1);
+                $this->progressBar($i, 10, "connecting...");
+            }
+
         }
 
         // second attempt real check
@@ -236,7 +243,7 @@ protected function tryRootPassword()
     protected function connect($user, $password)
     {
         try {
-            $this->link = mysqli_connect($this->host, $user, $password, '', $this->port);
+            $this->link = @mysqli_connect($this->host, $user, $password, '', $this->port);
         } catch (\Throwable $e) {
             $log = 'ERROR: '.$e->getMessage()."\n".$e->getTraceAsString()."\n";
             file_put_contents('mysql-import.log', $log, FILE_APPEND);
@@ -392,4 +399,18 @@ public function getInfo()
             'database' => $this->database
         ];
     }
+
+    /**
+     * @param $done
+     * @param $total
+     * @param string $info
+     * @param int $width
+     * @return string
+     */
+    public function progressBar($done, $total, $info="", $width=10)
+    {
+        $perc = round(($done * 100) / $total);
+        $bar = round(($width * $perc) / 100);
+        echo sprintf("%s%%[%s>%s] %s\r", $perc, str_repeat("=", $bar), str_repeat(" ", $width-$bar), $info);
+    }
 }

tests/MysqlImportTest.php

@@ -12,7 +12,7 @@ public function testImportByDefault()
         $sqlFile = __DIR__.'/fixtures/database.sql';
         $message = "[mysql-import] database named 'database' successfully imported.";
 
-        $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'root'], [$sqlFile]);
+        $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'secret'], [$sqlFile]);
         $this->assertEquals($message, $app->run());
         $app->drop('yes');
 
@@ -26,7 +26,7 @@ public function testImportWithUserAndPassword()
         $sqlFile = __DIR__.'/fixtures/database.sql';
         $message = "[mysql-import] database named 'database' successfully imported.";
 
-        $app = new MysqlImport(['MYSQL_USER' => 'root', 'MYSQL_PASSWORD' => 'root'], [$sqlFile]);
+        $app = new MysqlImport(['MYSQL_USER' => 'root', 'MYSQL_PASSWORD' => 'secret'], [$sqlFile]);
         $this->assertEquals($message, $app->run());
         $app->drop('yes');
 
@@ -40,7 +40,7 @@ public function testDropAndCreateDatabase()
         $sqlFile = __DIR__.'/fixtures/database.sql';
         $message = "[mysql-import] database named 'database' successfully imported.";
 
-        $app = new MysqlImport(['MYSQL_USER' => 'root', 'MYSQL_PASSWORD' => 'root'], [$sqlFile]);
+        $app = new MysqlImport(['MYSQL_USER' => 'root', 'MYSQL_PASSWORD' => 'secret'], [$sqlFile]);
 
         $app->run();
         $app->drop();
@@ -55,13 +55,13 @@ public function testNotBlankDatabase()
         $sqlFile = __DIR__.'/fixtures/database.sql';
         $message = "[mysql-import] required blank database for import.";
 
-        $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'root'], [$sqlFile]);
+        $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'secret'], [$sqlFile]);
         $app->run();
 
         $app = new MysqlImport([], ['-proot', $sqlFile]);
         $this->assertEquals($message, $app->run());
 
-        $app = new MysqlImport(['DB_USER' => 'root', 'DB_PASSWORD' => 'root'], [$sqlFile]);
+        $app = new MysqlImport(['DB_USER' => 'root', 'DB_PASSWORD' => 'secret'], [$sqlFile]);
         $this->assertEquals($message, $app->run());
 
         $app->drop('yes');
@@ -96,7 +96,7 @@ public function testConnectionProblemWrongHost()
 
     public function testMissingSqlFile()
     {
-        $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'root'], []);
+        $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'secret'], []);
         $this->assertEquals('[mysql-import] required sql file to import.', $app->run());
 
         $sqlFile = __DIR__.'/fixtures/not_exists.sql';
@@ -129,7 +129,7 @@ public function testDefaultDatabaseName()
     {
         $sqlFile = __DIR__.'/fixtures/database.sql';
 
-        $app = new MysqlImport(['WORDPRESS_DB_PASSWORD' => 'root'], [$sqlFile]);
+        $app = new MysqlImport(['WORDPRESS_DB_PASSWORD' => 'secret'], [$sqlFile]);
         $this->assertEquals([
             'state' => 'ready',
             'host' => 'mysql',
@@ -143,7 +143,7 @@ public function testSyntaxError()
         $sqlFile = __DIR__.'/fixtures/syntax_error.sql';
         $message = "[mysql-import] You have an error in your SQL syntax; check the manual that corresponds to";
 
-        $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'root'], [$sqlFile]);
+        $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'secret'], [$sqlFile]);
         $this->assertStringStartsWith($message, $app->run());
     }
 }