Laravel 5 support

Author: Stolz

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Stolz https://github.com/Stolz
+Copyright (c) 2015 Stolz https://github.com/Stolz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # Laravel SchemaSpy
 
-[Laravel SchemaSpy](https://github.com/Stolz/laravel-schema-spy) is a [Laravel artisan command](http://laravel.com/docs/commands) that acts as an interface for the program [SchemaSpy](http://schemaspy.sourceforge.net). With SchemaSpy you can analyze the schema metadata of a database and generate browser readable files with useful information such:
+[Laravel SchemaSpy](https://github.com/Stolz/laravel-schema-spy) is a [Laravel artisan command](http://laravel.com/docs/master/commands) that acts as an interface for the program [SchemaSpy](http://schemaspy.sourceforge.net). With SchemaSpy you can analyze the schema metadata of a database and generate browser readable files with useful information such:
 
 - Visual ER diagram.
 - Proper table insertion/deletion order for database migrations.
@@ -19,9 +19,9 @@ Graphvis is not required to view the output, only the `dot` command that is used
 
 ## Installation
 
-To get the latest version simply require it in your Laravel project `composer.json` file by running:
+Install via [Composer](https://getcomposer.org/)
 
-	composer require "stolz/laravel-schema-spy:dev-master" --dev
+	composer require stolz/laravel-schema-spy --dev
 
 Once the package is installed you need to register the service provider with the application. Open up `config/app.php` and find the `providers` key.
 
@@ -38,11 +38,11 @@ If no connection is provided Laravel's default one will be used. After successfu
 
 ## Configuration
 
-To configure the package use the following command to copy the configuration file to `config/packages/stolz/laravel-schema-spy/config.php`.
+To configure the package use the following command to copy the configuration file to `config/spy.php`.
 
-	php artisan publish:config stolz/laravel-schema-spy
+	php artisan vendor:publish
 
-All available settings are included inside `config.php` and with the provided comments they should be self-explanatory.
+All available settings are included inside `spy.php` and with the provided comments they should be self-explanatory.
 
 ## License
 

composer.json

@@ -17,8 +17,8 @@
 		"squizlabs/php_codesniffer": "2.*"
 	},
 	"autoload": {
-		"psr-0": {
-			"Stolz\\SchemaSpy": "src/"
+		"psr-4": {
+			"Stolz\\SchemaSpy\\": "src/"
 		}
 	},
 	"config": {

phpunit.xml

@@ -1,12 +1,10 @@
 <?php namespace Stolz\SchemaSpy;
 
-// use Symfony\Component\Console\Input\InputOption;
+use Illuminate\Console\Command as ConsoleCommand;
 use Symfony\Component\Console\Input\InputArgument;
-use Config;
 
-class Command extends \Illuminate\Console\Command
+class Command extends ConsoleCommand
 {
-
 	/**
 	 * The console command name.
 	 *
@@ -21,43 +19,26 @@ class Command extends \Illuminate\Console\Command
 	 */
 	protected $description = 'Generate a database report using http://schemaspy.sourceforge.net';
 
-	/**
-	 * Default command to run schemaSpy.jar
-	 *
-	 * @var string
-	 */
-	protected $command = 'java -jar schemaSpy.jar';
-
 	/**
 	 * Parameters passed to schemaSpy.jar
 	 *
 	 * @var array
 	 */
 	protected $parameters = [];
 
-	/**
-	 * Create a new command instance
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
 	/**
 	 * Set parameters from config file
 	 *
-	 * @return SchemaSpyCommand
+	 * @return Command
 	 */
 	protected function setParametersFromConfig()
 	{
 		// Set output dir parameter
-		$this->parameters['-o'] = Config::get('laravel-schema-spy::output', app_path('database/schema'));
+		$this->parameters['-o'] = config('spy.output', app_path('database/schema'));
 
 		// Set database connection parameters
-		$connections = Config::get('database.connections', []);
-		$connection = ($this->argument('connection')) ?: Config::get('database.default');
+		$connections = config('database.connections', []);
+		$connection = ($this->argument('connection')) ?: config('database.default');
 		if(isset($connections[$connection]))
 		{
 			$this->info("Using '$connection' connection");
@@ -81,7 +62,7 @@ protected function setParametersFromConfig()
 	public function fire()
 	{
 		// Merge automatic parameters with user configurable parameters
-		$this->parameters = array_merge($this->setParametersFromConfig()->parameters, Config::get('laravel-schema-spy::arguments', []));
+		$this->parameters = array_merge($this->setParametersFromConfig()->parameters, config('spy.arguments', []));
 
 		// Ask for missing mandatory parameters
 		if( ! isset($this->parameters['-db']))
@@ -91,7 +72,7 @@ public function fire()
 			$this->parameters['-u'] = $this->ask('Enter database username');
 
 		// Build command
-		$command = Config::get('laravel-schema-spy::command', $this->command);
+		$command = config('spy.command', 'java -jar schemaSpy.jar');
 		foreach($this->parameters as $key => $value)
 			$command .= " $key $value";
 
@@ -120,16 +101,4 @@ protected function getArguments()
 			array('connection', InputArgument::OPTIONAL, 'Database connection name'),
 		);
 	}
-
-	/**
-	 * Get the console command options.
-	 *
-	 * @return array
-	 */
-	protected function getOptions()
-	{
-		return array(
-// 			array('example', null, InputOption::VALUE_OPTIONAL, 'An example option.', null),
-		);
-	}
 }

src/Stolz/SchemaSpy/Command.php renamed to src/Command.php

@@ -0,0 +1,47 @@
+<?php namespace Stolz\SchemaSpy;
+
+use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
+
+class ServiceProvider extends LaravelServiceProvider
+{
+	/**
+	 * Path to the default config file.
+	 *
+	 * @var string
+	 */
+	protected $configFile = __DIR__ . '/config.php';
+
+	/**
+	 * Register bindings in the container.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		// Merge user's configuration
+		$this->mergeConfigFrom($this->configFile, 'spy');
+
+		// Bind 'stolz.schemaspy.command.spy' component to the IoC container
+		$this->app->bind('stolz.schemaspy.command.spy', function ($app) {
+			return new Command();
+		});
+	}
+
+	/**
+	 * Perform post-registration booting of services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		// Register paths to be published by 'vendor:publish' artisan command
+		$this->publishes([
+			$this->configFile => config_path('spy.php'),
+		]);
+
+		// Add artisan command
+		$this->commands('stolz.schemaspy.command.spy');
+	}
+
+
+}

src/ServiceProvider.php

@@ -4,30 +4,30 @@
 
 	/*
 	 |--------------------------------------------------------------------------
-	 | Base command to run schemaSpy.jar on your system
+	 | Directory where generated files will be written
 	 |--------------------------------------------------------------------------
 	 |
-	 | No parametes here, instead use 'arguments' array below!
+	 | NOTE: For security reasons, setting this option to any path within your
+	 | public_path() directory will be a really bad idea.
 	 |
-	 | Default: java -jar schemaSpy.jar
+	 | Default: app_path('database/schema')
 	 |
 	 */
 
-	//'command' => 'java -jar schemaSpy.jar',
+	'output' => app_path('database/schema'),
 
 	/*
 	 |--------------------------------------------------------------------------
-	 | Directory where generated files will be written
+	 | Base command to run schemaSpy.jar on your system
 	 |--------------------------------------------------------------------------
 	 |
-	 | NOTE: For security reasons, setting this option to any path within your
-	 | public_path() directory will be a really bad idea.
+	 | No parameters here, instead use 'arguments' array below!
 	 |
-	 | Default: app_path('database/schema')
+	 | Default: java -jar schemaSpy.jar
 	 |
 	 */
 
-	//'output' => app_path('database/schema'),
+	'command' => 'java -jar schemaSpy.jar',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -41,9 +41,9 @@
 	|
 	*/
 
-	/*'arguments' => [
-		'-t'	=> 'mysql',
-		'-dp'	=> '/mysql/mysql-connector-java-5.1.30-bin.jar', // download from http://dev.mysql.com/downloads/connector/j/
-		'-hq'	=> null,
-	],*/
+	'arguments' => [
+		'-t'  => 'mysql',
+		'-dp' => '/path/to/mysql-connector-java-5.1.30-bin.jar', // download from http://dev.mysql.com/downloads/connector/j/
+		'-hq' => null,
+	],
 );