Merge pull request #5 from igormukhingmailcom/refactoring

Refactored: Code and dependencies; tests added

Author: joostfaassen

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitignore

@@ -1,2 +1,4 @@
 *~
 vendor/
+composer.lock
+phpunit.xml

README.md

@@ -1,9 +1,30 @@
 schema-loader
 =============
 
-Load database schema from an XML file
+Load database schema from an XML file.
 
-Example usage:
+## Usage
+
+You can load schema to database by PDO url:
+
+```bash
+./bin/dbtk-schema-loader schema:load example/schema.xml mysql://username:password@localhost/database_name
 ```
-bin/dbtk-schema-loader schema:load example/example.xml mysql://username:password@localhost/test
+
+or by database name:
+
+```bash
+./bin/dbtk-schema-loader schema:load example/schema.xml database_name
 ```
+
+In this case you must have a `database_name.conf` file at `/share/config/database/` as described at [database-manager's documentation](https://github.com/linkorb/database-manager#database-configuration-files).
+
+## License
+Please refer to the included LICENSE file
+
+## Brought to you by the LinkORB Engineering team
+
+<img src="http://www.linkorb.com/d/meta/tier1/images/linkorbengineering-logo.png" width="200px" /><br />
+Check out our other projects at [engineering.linkorb.com](http://engineering.linkorb.com).
+
+Btw, we're hiring!

bin/dbtk-schema-loader

@@ -1,20 +1,24 @@
 #!/usr/bin/env php
 <?php
 
-$baseDir = __DIR__ . '/..';
-if (!file_exists($baseDir . '/vendor')) {
-    $baseDir = __DIR__ . '/../../../..';
+$filename = __DIR__ . '/../vendor/autoload.php';
+if (!file_exists($filename)) {
+    $filename = __DIR__ . '/../../../autoload.php';
 }
 
-if (!file_exists($baseDir . '/vendor/autoload.php')) {
+if (!file_exists($filename)) {
     die(
-        'File not found: ' . $baseDir . '/vendor/autoload.php' . PHP_EOL .
         'You must set up the project dependencies, run the following commands:' . PHP_EOL .
         'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
         'php composer.phar install' . PHP_EOL
     );
 }
-$loader = require $baseDir . '/vendor/autoload.php';
-$cli = new crodas\cli\Cli;
-$cli->addDirectory(__DIR__ . "/../src/Command");
-$cli->main();
+
+$loader = require $filename;
+
+use Symfony\Component\Console\Application;
+
+$application = new Application('DBTK Schema Loader', '1.1.0');
+$application->setCatchExceptions(true);
+$application->add(new \DbTk\SchemaLoader\Command\LoadCommand());
+$application->run();

composer.json

@@ -1,16 +1,26 @@
 {
     "name": "dbtk/schema-loader",
     "description": "Load Database schema from XML",
-    "authors": [
-        {
-            "name": "Joost Faassen",
-            "email": "j.faassen@linkorb.com"
-        }
-    ],
+    "authors": [{
+        "name": "Joost Faassen",
+        "email": "j.faassen@linkorb.com"
+    }],
     "bin": ["bin/dbtk-schema-loader"],
     "minimum-stability": "stable",
     "require": {
-        "doctrine/dbal": "*",
-        "crodas/cli": "*"
+        "doctrine/dbal": "~2.5"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.6"
+    },
+    "autoload": {
+        "psr-4": {
+            "DbTk\\SchemaLoader\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "DbTk\\SchemaLoader\\Tests\\": "tests/"
+        }
     }
 }