From 083d8a074b3e83994607b97b9e628a5e6939089c Mon Sep 17 00:00:00 2001 From: Lee Hicks Date: Fri, 29 Jan 2016 12:42:05 -0500 Subject: [PATCH] cleanup --- .gitignore | 2 +- composer.json-all-dist | 48 +++++++++++++++++++----------------- composer.json-min-dist | 27 ++++++++++++--------- pull_migrations | 55 ------------------------------------------ 4 files changed, 42 insertions(+), 90 deletions(-) delete mode 100644 pull_migrations diff --git a/.gitignore b/.gitignore index e017e166..b19956a5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ vendor .idea /public/dreamfactory -/public/swagger-ui +/public/df-swagger-ui /workbench composer.phar _ide_helper.php diff --git a/composer.json-all-dist b/composer.json-all-dist index 054724db..739ef2ee 100644 --- a/composer.json-all-dist +++ b/composer.json-all-dist @@ -14,6 +14,10 @@ "name": "Arif Islam", "email": "arifislam@dreamfactory.com" }, + { + "name": "David Weiner", + "email": "davidweiner@dreamfactory.com" + }, { "name": "Jerry Ablan", "email": "jerryablan@dreamfactory.com" @@ -21,10 +25,6 @@ { "name": "Lee Hicks", "email": "leehicks@dreamfactory.com" - }, - { - "name": "David Weiner", - "email": "davidweiner@dreamfactory.com" } ], "support": { @@ -44,28 +44,30 @@ "require": { "laravel/framework": "5.1.*", "tymon/jwt-auth": "0.5.*", - "dreamfactory/df-managed": "2.0.*", - "dreamfactory/df-admin-app": "2.0.*", - "dreamfactory/df-core": "0.1.*", - "dreamfactory/df-aws": "0.1.*", - "dreamfactory/df-azure": "0.1.*", - "dreamfactory/df-rackspace": "0.1.*", - "dreamfactory/df-sqldb": "0.1.*", - "dreamfactory/df-mongodb": "0.1.*", - "dreamfactory/df-couchdb": "0.1.*", - "dreamfactory/df-rws": "0.1.*", - "dreamfactory/df-salesforce": "0.1.*", - "dreamfactory/df-soap": "0.1.*", - "dreamfactory/df-user": "0.1.*", - "dreamfactory/df-oauth": "0.1.*", - "dreamfactory/df-adldap": "0.1.*" + "dreamfactory/df-managed": "dev-develop as dev-master", + "dreamfactory/df-admin-app": "dev-develop as dev-master", + "dreamfactory/df-swagger-ui": "dev-develop as dev-master", + "dreamfactory/df-core": "dev-develop as dev-master", + "dreamfactory/df-aws": "dev-develop as dev-master", + "dreamfactory/df-azure": "dev-develop as dev-master", + "dreamfactory/df-rackspace": "dev-develop as dev-master", + "dreamfactory/df-sqldb": "dev-develop as dev-master", + "dreamfactory/df-mongodb": "dev-develop as dev-master", + "dreamfactory/df-couchdb": "dev-develop as dev-master", + "dreamfactory/df-rws": "dev-develop as dev-master", + "dreamfactory/df-salesforce": "dev-develop as dev-master", + "dreamfactory/df-soap": "dev-develop as dev-master", + "dreamfactory/df-user": "dev-develop as dev-master", + "dreamfactory/df-oauth": "dev-develop as dev-master", + "dreamfactory/df-adldap": "dev-develop as dev-master" }, "require-dev": { "barryvdh/laravel-ide-helper": "~2.0", "laracasts/generators": "~1.0", "laracasts/testdummy": "~2.0", "phpunit/phpunit": "~4.0", - "phpspec/phpspec": "~2.1" + "phpspec/phpspec": "~2.1", + "laravel/homestead": "dev-master" }, "autoload": { "classmap": [ @@ -84,12 +86,14 @@ "post-install-cmd": [ "php artisan clear-compiled", "php artisan optimize", - "php artisan dreamfactory:pull-migrations" + "php artisan dreamfactory:pull-migrations", + "php artisan dreamfactory:homestead-config" ], "post-update-cmd": [ "php artisan clear-compiled", "php artisan optimize", - "php artisan dreamfactory:pull-migrations" + "php artisan dreamfactory:pull-migrations", + "php artisan dreamfactory:homestead-config" ] }, "config": { diff --git a/composer.json-min-dist b/composer.json-min-dist index 9e4862ad..d7fad2e7 100644 --- a/composer.json-min-dist +++ b/composer.json-min-dist @@ -14,6 +14,10 @@ "name": "Arif Islam", "email": "arifislam@dreamfactory.com" }, + { + "name": "David Weiner", + "email": "davidweiner@dreamfactory.com" + }, { "name": "Jerry Ablan", "email": "jerryablan@dreamfactory.com" @@ -21,10 +25,6 @@ { "name": "Lee Hicks", "email": "leehicks@dreamfactory.com" - }, - { - "name": "David Weiner", - "email": "davidweiner@dreamfactory.com" } ], "support": { @@ -35,21 +35,22 @@ }, "minimum-stability": "dev", "prefer-stable": true, - "repositories": [], "require": { "laravel/framework": "5.1.*", "tymon/jwt-auth": "0.5.*", - "dreamfactory/df-managed": "2.0.*", - "dreamfactory/df-admin-app": "2.0.*", - "dreamfactory/df-core": "0.1.*", - "dreamfactory/df-sqldb": "0.1.*" + "dreamfactory/df-managed": "dev-develop as dev-master", + "dreamfactory/df-admin-app": "dev-develop as dev-master", + "dreamfactory/df-swagger-ui": "dev-develop as dev-master", + "dreamfactory/df-core": "dev-develop as dev-master", + "dreamfactory/df-sqldb": "dev-develop as dev-master" }, "require-dev": { "barryvdh/laravel-ide-helper": "~2.0", "laracasts/generators": "~1.0", "laracasts/testdummy": "~2.0", "phpunit/phpunit": "~4.0", - "phpspec/phpspec": "~2.1" + "phpspec/phpspec": "~2.1", + "laravel/homestead": "dev-master" }, "autoload": { "classmap": [ @@ -68,12 +69,14 @@ "post-install-cmd": [ "php artisan clear-compiled", "php artisan optimize", - "php artisan dreamfactory:pull-migrations" + "php artisan dreamfactory:pull-migrations", + "php artisan dreamfactory:homestead-config" ], "post-update-cmd": [ "php artisan clear-compiled", "php artisan optimize", - "php artisan dreamfactory:pull-migrations" + "php artisan dreamfactory:pull-migrations", + "php artisan dreamfactory:homestead-config" ] }, "config": { diff --git a/pull_migrations b/pull_migrations deleted file mode 100644 index e06098e8..00000000 --- a/pull_migrations +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env php -isFile()) { - copy($f->getRealPath(), "$dst/" . $f->getFilename()); - } else if (!$f->isDot() && $f->isDir()) { - rcopy($f->getRealPath(), "$dst/$f"); - } - } - - return true; -} - -$source = 'vendor/'; -$destination = 'database/migrations/'; - -$vendors = new DirectoryIterator($source); -foreach ($vendors as $vendor) { - if (!$vendor->isDot() && $vendor->isDir()) { - $products = new DirectoryIterator($source . $vendor); - foreach ($products as $product) { - if (!$product->isDot() && $product->isDir()) { - $potential = $product->getRealPath() . '/database/migrations/'; - if (is_dir($potential)) { - rcopy($potential, $destination); - } - } - } - } -}