ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added ability to install github bundles using zips.

Browse Source
This commit is contained in:
Taylor Otwell
2012-02-02 15:18:36 -06:00
parent 87424c73f5
commit ec5c08a7cc
4 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
laravel/cli/artisan.php
View File

@@ -15,7 +15,9 @@ Bundle::start(DEFAULT_BUNDLE);
* retrieve them from the various parts of the CLI code. We can use
* the Request class to access them conveniently.
*/
list($arguments, $_SERVER['cli']) = Console::options($_SERVER['argv']);
list($arguments, $_SERVER['CLI']) = Console::options($_SERVER['argv']);
$_SERVER['CLI'] = array_change_key_case($_SERVER['CLI'], CASE_UPPER);
/**
* The Laravel environment may be specified on the CLI using the "env"
@@ -23,9 +25,9 @@ list($arguments, $_SERVER['cli']) = Console::options($_SERVER['argv']);
* files from the CLI since the environment is usually controlled
* by server environmenet variables.
*/
if (isset($_SERVER['cli']['env']))
if (isset($_SERVER['CLI']['ENV']))
{
$_SERVER['LARAVEL_ENV'] = $_SERVER['cli']['env'];
$_SERVER['LARAVEL_ENV'] = $_SERVER['CLI']['ENV'];
}
/**
@@ -33,9 +35,9 @@ if (isset($_SERVER['cli']['env']))
* for the "database" CLI option. This allows migrations to be run
* conveniently for a test or staging database.
*/
if (isset($_SERVER['cli']['db']))
if (isset($_SERVER['CLI']['DB']))
{
Config::set('database.default', $_SERVER['cli']['db']);
Config::set('database.default', $_SERVER['CLI']['DB']);
}
/**

5
laravel/cli/tasks/bundle/providers/github.php
View File

@@ -25,9 +25,9 @@ class Github extends Provider {
*/
protected function zipball($bundle)
{
$zip = "https://github.com/{$bundle['location']}/zipball/master";
$url = "http://nodeload.github.com/{$bundle['location']}/zipball/master";
parent::zipball($zip, true);
parent::zipball($bundle, $url, true);
}
/**
@@ -38,6 +38,7 @@ class Github extends Provider {
*/
protected function submodule($bundle)
{
die('here');
$repository = "git@github.com:{$bundle['location']}.git";
$this->directory($bundle);

38
laravel/cli/tasks/bundle/providers/provider.php
View File

@@ -1,5 +1,7 @@
<?php namespace Laravel\CLI\Tasks\Bundle\Providers;
use Laravel\File;
abstract class Provider {
/**
@@ -10,6 +12,42 @@ abstract class Provider {
*/
abstract public function install($bundle);
/**
* Install a bundle from by downloading a Zip.
*
* @param array $bundle
* @param string $url
* @return void
*/
protected function zipball($bundle, $url)
{
// When installing a bundle from a Zip archive, we'll first clone
// down the bundle zip into the bundles "working" directory.
// This gives us a spot to all of our bundle extrations.
$target = path('storage').'work/bundles/bundle.zip';
File::put($target, file_get_contents($url));
$zip = new \ZipArchive;
$zip->open($target);
// Once we have the Zip archive, we can open it and extract it
// into the working directory. By convention, we expect the
// archive to contain one root directory, and all of the
// bundle contents should be stored in that directory.
$zip->extractTo(path('storage').'work/bundles');
$latest = File::latest(dirname($target));
// Once we have the latest modified directory, we should be
// able to move its contents over into the bundles folder
// so the bundle will be usable by the develoepr.
$path = $this->path($bundle);
File::cpdir($latest->getRealPath(), path('bundle').$path);
}
/**
* Create the path to the bundle's dirname.
*