Added a new version of bin/vendors that supports git submodules

Signed-off-by: Gergely POLONKAI (W00d5t0ck) <polesz@w00d5t0ck.info>

bin/vendors

@@ -8,94 +8,89 @@
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Florian Preusner <florian@preusner.com>
  */
 
-set_time_limit(0);
-
 $rootDir      = dirname(__DIR__);
-$vendorDir = $rootDir.'/vendor';
+$vendorName   = 'vendor';
+$vendorDir    = $rootDir . '/' . $vendorName;
+$submodule    = false;
+$cloneOptions = '';
+$delete       = false;
+$install      = true;
+
+$commands = array(
+    'install'             => 'install vendors as specified in deps or deps.lock (recommended)', 
+    'update'              => 'update vendors to their latest versions (as specified in deps)', 
+    'delete'              => 'remove vendors', 
+    'reinstall'           => 'delete and install', 
+    'submodule:install'   => 'install vendors as submodules', 
+    'submodule:update'    => 'update vendors to their latest versions (as specified in deps)', 
+    'submodule:delete'    => 'remove vendors', 
+    'submodule:reinstall' => 'delete and install'
+);
+
+
 
 array_shift($argv);
-if (!isset($argv[0])) {
+if (!isset($argv[0]) || in_array('help', $argv)) {
-    exit(<<<EOF
-Symfony2 vendors script management.
     
-Specify a command to run:
+    $help  = "Symfony2 vendors script management.\n";
+    $help .= "Specify a command to run:\n\n";
 
- install: install vendors as specified in deps or deps.lock (recommended)
+    foreach($commands as $cmd => $info) {
- update:  update vendors to their latest versions (as specified in deps)
- lock:  lock vendors to their current versions
 
-EOF
+        $help .= str_pad($cmd, 21, ' ') . ":  $info\n";
-    );
     }
     
-if (!in_array($command = array_shift($argv), array('install', 'update', 'lock'))) {
+    exit($help . "\n");
-    exit(sprintf('Command "%s" does not exist.', $command).PHP_EOL);
 }
 
-/*
+if (!in_array($command = array_shift($argv), array_keys($commands))) {
- * Check wether this project is based on the Standard Edition that was
+    exit(sprintf("Command \"%s\" does not exist.\n", $command));
- * shipped with vendors or not.
- */
-if (is_dir($vendorDir.'/symfony') && !is_dir($vendorDir.'/symfony/.git') && !in_array('--reinstall', $argv)) {
-    exit(<<<EOF
-Your project seems to be based on a Standard Edition that includes vendors.
-
-Try to run ./bin/vendors install --reinstall
-
-
-EOF
-    );
 }
 
 if (!is_dir($vendorDir)) {
     mkdir($vendorDir, 0777, true);
 }
 
+if (strpos($command, 'submodule') !== false) {
+
+    $submodule = true;
+    $command   = str_replace('submodule:', '', $command);
+
+    if(!is_dir($rootDir . '/.git')) {
+
+        exit("This project is not a git repository. To use submodules it should be a repository :)\n");
+    }
+}
+
 // versions
 $versions = array();
 if ('install' === $command && file_exists($rootDir.'/deps.lock')) {
     foreach (file($rootDir.'/deps.lock', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) {
         $parts = array_values(array_filter(explode(' ', $line)));
         if (2 !== count($parts)) {
-            exit(sprintf('The deps version file is not valid (near "%s")', $line).PHP_EOL);
+            exit(sprintf('The deps version file is not valid (near "%s")', $line));
         }
         $versions[$parts[0]] = $parts[1];
     }
 }
 
+if('delete' === $command) {
+    $delete  = true;
+    $install = false;
+}
+
+if('reinstall' === $command) {
+    $delete  = true;    
+}
+
 $newversions = array();
 $deps        = parse_ini_file($rootDir.'/deps', true, INI_SCANNER_RAW);
-if (false === $deps) {
-    exit('The deps file is not valid ini syntax. Perhaps missing a trailing newline?'.PHP_EOL);
-}
 foreach ($deps as $name => $dep) {
-    $dep = array_map('trim', $dep);
-
-    // install dir
-    $installDir = isset($dep['target']) ? $vendorDir.'/'.$dep['target'] : $vendorDir.'/'.$name;
-    if (in_array('--reinstall', $argv) && realpath($installDir)) {
-        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
-            system(sprintf('rmdir /S /Q %s', escapeshellarg(realpath($installDir))));
-        } else {
-            system(sprintf('rm -rf %s', escapeshellarg($installDir)));
-        }
-    }
-
-    if ('install' === $command || 'update' === $command) {
-        echo '> Installing/Updating '.$name.PHP_EOL;
-
-        // url
-        if (!isset($dep['git'])) {
-            exit(sprintf('The "git" value for the "%s" dependency must be set.', $name).PHP_EOL);
-        }
-        $url = $dep['git'];
-
-        if (!is_dir($installDir)) {
-            system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir)));
-        }
-
     // revision
     if (isset($versions[$name])) {
         $rev = $versions[$name];
@@ -103,52 +98,143 @@ foreach ($deps as $name => $dep) {
         $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD';
     }
     
-        $status = system(sprintf('cd %s && git status --porcelain', escapeshellarg($installDir)));
+    // make sure to run commands on rootDir
-        if (!empty($status)) {
+    system("cd $rootDir");
-            exit(sprintf('"%s" has local modifications. Please revert or commit/push them before running this command again.', $name).PHP_EOL);
+
+    // install dir
+    if($submodule) {
+
+        $installDir = isset($dep['target']) ? $vendorName . $dep['target'] : $vendorName . '/' . $name;
+    } else {
+
+        $installDir = isset($dep['target']) ? $vendorDir . $dep['target'] : $vendorDir . '/' . $name;
     }
-        $current_rev = system(sprintf('cd %s && git rev-list --max-count=1 HEAD', escapeshellarg($installDir)));
+    
-        if ($current_rev === $rev) {
+    
-            continue;
+    
+    if($delete) {
+
+        echo "> Removing $name\n";
+
+        if($submodule) {
+
+            deleteSubmodule($installDir, $rootDir);
         }
 
+        if(PHP_OS == 'WINNT') {
+
+            system('rmdir /S /Q ' . escapeshellarg(realpath($installDir)));
+        } else {
+
+            system('rm -rf ' . escapeshellarg($installDir));
+        }
+    }
+    
+    
+    if($install) {
+    
+        echo "> Installing/Updating $name\n";
+        
+         // url
+        if (!isset($dep['git'])) {
+            exit(sprintf('The "git" value for the "%s" dependency must be set.', $name));
+        }
+        $url = $dep['git'];
+
+        if($submodule) {
+
+            $cmd  = sprintf('git submodule add %s %s', escapeshellarg($url), escapeshellarg($installDir));
+            $cmd .= ' && git submodule init';
+            
+        } else {
+        
+            $cmd = sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir));
+        }
+            
+        echo "  $cmd\n";
+        
+        system($cmd);        
+
         system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev)));
     }
     
-    if ('update' === $command || 'lock' === $command) {
+    if ('update' === $command) {
         ob_start();
         system(sprintf('cd %s && git log -n 1 --format=%%H', escapeshellarg($installDir)));
-        $newversion = trim(ob_get_clean());
+        $newversions[] = trim($name.' '.ob_get_clean());
-
-        ob_start();
-        system(sprintf('cd %s && git name-rev --tags --name-only %s', escapeshellarg($installDir), $newversion));
-        // remove trailing ^0 from tags, those are the tags themselves
-        $niceversion = preg_replace('/\^0$/', '', trim(ob_get_clean()));
-
-        // undefined is returned in case no name-rev could be found
-        if ('undefined' !== $niceversion) {
-            $newversions[] = $name.' '.$niceversion;
-        } else {
-            $newversions[] = $name.' '.$newversion;
-        }
     }
 }
 
 // update?
-if ('update' === $command || 'lock' === $command) {
+if ('update' === $command) {
-    echo '> Updating deps.lock'.PHP_EOL;
+    file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions));
-
-    file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions)."\n");
 }
 
+if($install) {
+
     // php on windows can't use the shebang line from system()
-$interpreter = defined('PHP_WINDOWS_VERSION_BUILD') ? 'php.exe' : '';
+    $interpreter = PHP_OS == 'WINNT' ? 'php.exe' : '';
 
     // Update the bootstrap files
-system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir)));
+    //system(sprintf('%s %s', $interpreter, escapeshellarg($rootDir.'/bin/build_bootstrap')));
 
     // Update assets
-system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/')));
+    system(sprintf('%s %s assets:install --symlink %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web')));
 
     // Remove the cache
     system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console')));
+}
+
+
+
+
+function deleteSubmodule($name, $rootDir) {
+
+    $gitModules = $rootDir . '/.gitmodules';
+    $gitConfig  = $rootDir . '/.git/config';
+    
+    $files = array($gitModules, $gitConfig);
+
+    foreach($files as $file) :
+    
+        if(file_exists($file)) {
+
+            $fileReturn = array();
+            $found      = false;
+        
+            foreach(file($file) as $line) {
+
+                if(strpos($line, '"' . $name . '"') !== false) {
+                
+                    $found = true;
+                    continue;
+                }
+                
+                if($found) {
+                
+                    if($line{0} != '[') {
+                    
+                        continue;
+                    }
+                    
+                    $found = false;
+                }
+                
+                array_push($fileReturn, $line);
+            }
+            
+            $handle = fopen($file, 'wt');       
+            
+            if($handle) {
+        
+                fwrite($handle, implode($fileReturn));
+                fclose($handle);
+            }
+        }
+    endforeach;
+    
+    $cmd = "git rm --cached --force $name";
+    
+    echo "  $cmd\n";
+    system($cmd);
+}