Merge branch 'master' of https://github.com/rvock/mysql-workbench-sch…

…ema-exporter
mysql-workbench-schema-exporter · Mar 28, 2016 · 8dfe341 · 8dfe341
2 parents f3084bf + 9e0b239
commit 8dfe341
Show file tree

Hide file tree

Showing 67 changed files with 120 additions and 7,054 deletions.
diff --git a/README.md b/README.md
diff --git a/bin/mysql-workbench-schema-export b/bin/mysql-workbench-schema-export
@@ -49,10 +49,11 @@ const CMD_OPT_HELP           = 'help';
 function showTitle()
 {
     $version = FormatterInterface::VERSION;
+    $year = date('Y');
     echo <<<EOF
 MySQL Workbench Schema Exporter version $version.
-Copyright (c) 2010-2014 Johannes Mueller <circus2@web.de>
-Copyright (c) 2012-2014 Toha <tohenk@yahoo.com>
+Copyright (c) 2010-{$year} Johannes Mueller <circus2@web.de>
+Copyright (c) 2012-{$year} Toha <tohenk@yahoo.com>
 
 
 EOF;
@@ -69,7 +70,7 @@ Usage:
 $self [options] FILENAME [DEST]
 
 Options:
---export=type       Select the exporter, for a list of available exportor
+--export=type       Select the exporter, for a list of available exporter
                     use --list-exporter option.
 --config=file       Read file for export parameters, in JSON format.
 --saveconfig        Save export parameters to file.
@@ -200,6 +201,13 @@ function listFormatter($bootstrap, $ordered = false)
 {
     $i = 0;
     $formatters = $bootstrap->getFormatters();
+    if (!$formatters) {
+        echo "ERROR: No formatters found. Formatters are separate projects which need to be installed via composer.\n";
+        echo "       You can find all formatters at https://github.com/mysql-workbench-schema-exporter.\n";
+        echo "  Example: \n";
+        echo "  php composer.phar require --dev mysql-workbench-schema-exporter/doctrine2-exporter\n";
+        return [];
+    }
     // find the longest formatter name
     $len = max(array_map('strlen', array_keys($formatters))) + 1;
     $nlen = strlen((string) count($formatters));
@@ -369,4 +377,4 @@ try {
     die(1);
 }
 
-// ----------------------------------------- EOF ----------------------------------------------------- //
+// ----------------------------------------- EOF ----------------------------------------------------- //
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
 		"zend",
 		"sequelizejs"
 	],
-	"homepage" : "https://github.com/johmue/mysql-workbench-schema-exporter",
+	"homepage" : "https://github.com/mysql-workbench-schema-exporter/mysql-workbench-schema-exporter",
 	"license" : "MIT",
 	"authors" : [{
 			"name" : "Johannes Mueller",
@@ -23,12 +23,15 @@
 			"name" : "Toha",
 			"email" : "tohenk@yahoo.com",
 			"role" : "Developer"
+		}, {
+			"name" : "Robert Vock",
+			"email" : "robertvock82@gmail.com",
+			"role" : "Developer"
 		}
 	],
 	"require" : {
-		"php" : ">=5.3.0",
-		"doctrine/inflector" : "1.0.*@dev",
-		"symfony/yaml" : "2.5.*@dev"
+		"php" : ">=5.4.0",
+		"doctrine/inflector" : "^1.0.0"
 	},
 	"bin" : [
 		"bin/mysql-workbench-schema-export",
@@ -39,4 +42,4 @@
 			"MwbExporter\\" : "lib/"
 		}
 	}
-}
+}
diff --git a/lib/MwbExporter/Bootstrap.php b/lib/MwbExporter/Bootstrap.php
@@ -46,23 +46,45 @@ class Bootstrap
      *
      * @return array
      */
-    public function getFormatters()
-    {
-        if (null === self::$formatters) {
-            self::$formatters = array();
-            $pattern = implode(DIRECTORY_SEPARATOR, array(__DIR__, 'Formatter', '*', '*', 'Formatter.php'));
-            foreach (glob($pattern) as $filename) {
-                $dirs = explode(DIRECTORY_SEPARATOR, dirname(realpath($filename)));
-                $subVendor = array_pop($dirs);
-                $vendor = array_pop($dirs);
-                $formatter = strtolower(implode('-', array($vendor, $subVendor)));
-                $formatterClass = sprintf('\\MwbExporter\\Formatter\\%s\\%s\\Formatter', $vendor, $subVendor);
-                self::$formatters[$formatter] = $formatterClass;
-            }
-        }
-
-        return self::$formatters;
-    }
+     public function getFormatters()
+     {
+         if (null === self::$formatters) {
+             self::$formatters = array();
+             $DS = DIRECTORY_SEPARATOR;
+             $pattern = implode($DS, array(__DIR__, 'Formatter', '*', '*', 'Formatter.php'));
+
+             // check if mwbse is installed via composer
+             if (strpos($pattern, 'vendor' . $DS . 'mysql-workbench-schema-exporter' . $DS) !== false) {
+                 $pattern = str_replace('mysql-workbench-schema-exporter' . $DS . 'mysql-workbench-schema-exporter' . $DS, 'mysql-workbench-schema-exporter' . $DS . '*' . $DS, $pattern);
+             }
+             foreach (glob($pattern) as $filename) {
+                 $dirs = explode(DIRECTORY_SEPARATOR, dirname(realpath($filename)));
+                 $subVendor = array_pop($dirs);
+                 $vendor = array_pop($dirs);
+                 $formatter = strtolower(implode('-', array($vendor, $subVendor)));
+                 $formatterClass = sprintf('\\MwbExporter\\Formatter\\%s\\%s\\Formatter', $vendor, $subVendor);
+                 self::$formatters[$formatter] = $formatterClass;
+             }
+
+             if ($position = strpos(__DIR__, 'vendor' . $DS . 'mysql-workbench-schema-exporter' . $DS)) {
+                 // possibly executed via composer. There might be more exporters in the current project
+                 $currentProject = substr(__DIR__, 0, $position);
+
+                 $pattern = implode($DS, array($currentProject, 'lib', 'MwbExporter', 'Formatter', '*', '*', 'Formatter.php'));
+
+                 foreach (glob($pattern) as $filename) {
+                     $dirs = explode(DIRECTORY_SEPARATOR, dirname(realpath($filename)));
+                     $subVendor = array_pop($dirs);
+                     $vendor = array_pop($dirs);
+                     $formatter = strtolower(implode('-', array($vendor, $subVendor)));
+                     $formatterClass = sprintf('\\MwbExporter\\Formatter\\%s\\%s\\Formatter', $vendor, $subVendor);
+                     self::$formatters[$formatter] = $formatterClass;
+                 }
+             }
+         }
+
+         return self::$formatters;
+     }
 
     /**
      * Get formatter.
@@ -74,16 +96,21 @@ public function getFormatter($name)
     {
         $formatters = $this->getFormatters();
         if (!array_key_exists($name, $formatters)) {
-            throw new \InvalidArgumentException(sprintf('Unknown formatter "%s".', $name));
+            list($vendor, $subVendor) = explode('-', $name, 2);
+            $class = 'MwbExporter\\Formatter\\' . ucfirst(strtolower($vendor)) . '\\' . ucfirst(strtolower($subVendor)) . '\\Formatter';
+            if (!class_exists($class)) {
+                throw new \InvalidArgumentException(sprintf('Unknown formatter "%s".', $name));
+            }
+        } else {
+            $class = $formatters[$name];
         }
-        $class = $formatters[$name];
 
         return new $class($name);
     }
 
     /**
      * Get writer.
-     * 
+     *
      * @param string $name  The writer name
      * @return \MwbExporter\Writer\WriterInterface
      */
@@ -101,7 +128,7 @@ public function getWriter($name)
 
     /**
      * Get storage.
-     * 
+     *
      * @param string $name  The storage name
      * @return \MwbExporter\Storage\StorageInterface
      */
@@ -133,7 +160,7 @@ public function export(FormatterInterface $formatter, $filename, $outDir, $stora
         }
         if ($formatter && $storage = $this->getStorage($storage)) {
             if ($formatter->getRegistry()->config->get(FormatterInterface::CFG_USE_LOGGED_STORAGE)) {
-                $storage = new LoggedStorage($storage); 
+                $storage = new LoggedStorage($storage);
             }
             $storage->setName(basename($filename, '.mwb'));
             $storage->setOutdir(realpath($outDir) ? realpath($outDir) : $outDir);
@@ -169,4 +196,4 @@ public function export(FormatterInterface $formatter, $filename, $outDir, $stora
             return $document;
         }
     }
-}
+}
diff --git a/lib/MwbExporter/Formatter/Doctrine1/DatatypeConverter.php b/lib/MwbExporter/Formatter/Doctrine1/DatatypeConverter.php
diff --git a/lib/MwbExporter/Formatter/Doctrine1/Formatter.php b/lib/MwbExporter/Formatter/Doctrine1/Formatter.php
diff --git a/lib/MwbExporter/Formatter/Doctrine1/Yaml/DatatypeConverter.php b/lib/MwbExporter/Formatter/Doctrine1/Yaml/DatatypeConverter.php