Changeset 392

Timestamp:

10/08/07 21:56:27 (1 year ago)

Author:

bermiferrer

Message:

- Adding new command line script for managing plugins.
- Improved the AkPluginManager? to use subversion when available.
- Fixed bug in Ak::directory_delete which prevented removing directories that contained files which started with a dot.
- Fixing bug #57. Setup directories should be removed now on unix and windows
- Adding timeout options to Ak::url_get_contents, and setting CURLOPT_RETURNTRANSFER for following redirects. FIxed a referrer bug.
- Updating doc packages for other scripts.

Files:

• trunk/app/models/framework_setup.php (modified) (1 diff)
• trunk/lib/Ak.php (modified) (4 diffs)
• trunk/lib/AkPlugin/AkPluginManager.php (modified) (10 diffs)
• trunk/script/console (modified) (1 diff)
• trunk/script/migrate (modified) (1 diff)
• trunk/script/plugin (added)
• trunk/script/test (modified) (1 diff)
• trunk/test/unit/lib/utils/_Ak_file_functions.php (modified) (1 diff)

trunk/app/models/framework_setup.php

@@ -738 +738 @@
-        AK_APP_DIR.DS.'installers'.DS.'framework_version.txt',
-        AK_APP_DIR.DS.'models'.DS.'framework_setup.php',
-
+
+
+
-        AK_APP_DIR.DS.'views'.DS.'framework_setup',
-        AK_APP_DIR.DS.'locales'.DS.'framework_setup'

trunk/lib/Ak.php

@@ -448 +448 @@
-            return AkFtp::delete($dir_name);
-        }else{
-
+
+
+
+
-                $items_to_delete = array('directories'=>array(), 'files'=>array());
-                foreach($fs_items as $fs_item) {
-
+
+
+
-                }
-                foreach ($items_to_delete['files'] as $file){
@@ -579 +584 @@
-        'referer' => $url,
-        'method' => 'post',
+        'timeout' => 100,
-        'params' => '',
-        'browser_name' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)',
@@ -590 +596 @@
-        $ch = curl_init();
-
-
-
-
+
+
+
+
-
-        if(!empty($options['params']) && $options['method'] == 'post'){
@@ -601 +608 @@
-        }
-
-url
-
- 
-100
+options['referer']
+
+
+$options['timeout']
-
-        $result = curl_exec ($ch);

trunk/lib/AkPlugin/AkPluginManager.php

@@ -70 +70 @@
-    function getAvailableRepositories($force_reload = false)
-    {
+        if(!empty($this->tmp_repositories)){
+            return $this->tmp_repositories;
+        }
+
-        if($force_reload || empty($this->repositories)){
-            $this->repositories = array($this->main_repository);
@@ -97 +101 @@
-    function addRepository($repository_path)
-    {
-
+
+
+
-    }
-
@@ -135 +141 @@
-    function getPlugins($force_update = false)
-    {
-!
+
-            if(!$this->_updateRemotePluginsList()){
-                return array();
@@ -141 +147 @@
-        }
-
-Ak::convert('yaml', 'array', Ak::file_get_contents($this->_getRepositoriesCahePath(
+array_map('trim', Ak::convert('yaml', 'array', Ak::file_get_contents($this->_getRepositoriesCahePath()
-    }
-
@@ -171 +177 @@
-     * @param  string  $plugin_name Plugin name
-     * @param  unknown $repository   An Apache mod_svn interface to subversion. If not provided it will use a trusted repository.
+     * @param  array $options  
+     * - externals: Use svn:externals to grab the plugin. Enables plugin updates and plugin versioning.
+     * - checkout:  Use svn checkout to grab the plugin. Enables updating but does not add a svn:externals entry.
+     * - revision:  Checks out the given revision from subversion. Ignored if subversion is not used.
+     * - force:     Overwrite existing files.
-     * @return mixed Returns false if the plugin can't be found.
-     * @access public 
-     */
-
-
+
+
+
+
+
+
+
+
+
+
+
-        $plugin_name = Ak::sanitize_include($plugin_name, 'high');
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     * 
-     * @param  string  $plugin_name Plugin name
-     * @param  string $repository   An Apache mod_svn interface to subversion. If not provided it will use a trusted repository.
-mixed Returns false if the plugin can't be found, true if is already updated and null when there is an update
+null
-     * @access public 
-     */
-    function updatePlugin($plugin_name, $repository = null)
-    {
+        $options = array(
+        'externals' => true,
+        'checkout' => true
+        );
+
-        $plugin_name = Ak::sanitize_include($plugin_name, 'high');
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-
@@ -225 +273 @@
-        $this->_runInstaller($plugin_name, 'uninstall');
-        Ak::directory_delete(AK_PLUGINS_DIR.DS.$plugin_name);
+
+        if($this->_shouldUseSvnExternals()){
+            $this->_uninstallExternals($plugin_name);
+        }
-    }
-
@@ -246 +298 @@
-     * @param  string  $repository  If a repository name is provided it will check for the plugin name existance.
-     * @return mixed Repository URL or false if plugin can't be found   
-rivate
-
-_
+ublic
+
+
-    {
-        if(empty($repository)){
@@ -282 +334 @@
-        $plugin_dir = AK_PLUGINS_DIR.DS.$plugin_name;
-        if(file_exists($plugin_dir.DS.'installer'.DS.$plugin_name.'_installer.php')){
+            require_once(AK_LIB_DIR.DS.'AkInstaller.php');
-            require_once($plugin_dir.DS.'installer'.DS.$plugin_name.'_installer.php');
-            $class_name = AkInflector::camelize($plugin_name.'_installer');
-            if(class_exists($class_name)){
-                $Installer =& new $class_name();
+                $Installer->db->debug = false;
-                $Installer->warn_if_same_version = false;
-                $Installer->$install_or_uninstall();
@@ -437 +491 @@
-    function _getRepositoriesConfigPath()
-    {
-
+
+
+
+
+
-    }
-
@@ -452 +510 @@
-        return AK_TMP_DIR.DS.'plugin_repositories.yaml';
-    }
+
+
+    
+    function _shouldUseSvnExternals()
+    {
+        return is_dir(AK_PLUGINS_DIR.DS.'.svn');
+    }
+
+    function _shouldUseSvnCheckout()
+    {
+        return is_dir(AK_PLUGINS_DIR.DS.'.svn');
+    }
+
+    function _installUsingCheckout($name, $uri, $rev = null, $force = false)
+    {
+        $rev = empty($rev) ? '' : " -r $rev ";
+        $force = $force ? ' --force ' : '';
+        $plugin_dir = AK_PLUGINS_DIR.DS.$name;
+        `svn co $force $rev $uri/$name $plugin_dir`;
+    }
+
+    function _updateUsingCheckout($name)
+    {
+        $plugin_dir = AK_PLUGINS_DIR.DS.$name;
+        `svn update $plugin_dir`;
+    }
+
+    function _installUsingExport($name, $uri, $rev = null, $force = false)
+    {
+        $rev = empty($rev) ? '' : " -r $rev ";
+        $force = $force ? ' --force ' : '';
+        $plugin_dir = AK_PLUGINS_DIR.DS.$name;
+        `svn export $force $rev $uri/$name $plugin_dir`;
+    }
+    
+    function _updateUsingExport($name, $uri)
+    {
+        $plugin_dir = AK_PLUGINS_DIR.DS.$name;
+        `svn export --force $uri/$name $plugin_dir`;
+    }
+
+    function _installUsingExternals($name, $uri, $rev = null, $force = false)
+    {
+        $extras = empty($rev) ? '' : " -r $rev ";
+        $extras .= ($force ? ' --force ' : '');
+        $externals = $this->_getExternals();
+        $externals[$name] = $uri;
+        $this->_setExternals($externals, $extras);
+        $this->_installUsingCheckout($name, $uri, $rev, $force);
+    }
+    
+    function _updateUsingExternals($name)
+    {
+        $this->_updateUsingCheckout($name);
+    }
+    
+    function _updateUsingHttp($name, $uri)
+    {
+        if(is_file(AK_PLUGINS_DIR.DS.$name.DS.'CHANGELOG') &&
+        md5(Ak::url_get_contents(rtrim($uri, '/').'/'.$name.'/CHANGELOG')) == md5_file(AK_PLUGINS_DIR.DS.$name.DS.'CHANGELOG')){
+            return false;
+        }
+        $this->_copyRemoteDir(rtrim($uri, '/').'/'.$name.'/', AK_PLUGINS_DIR);
+    }
+    
+    
+    function _setExternals($items, $extras = '')
+    {
+        $externals = array();
+        foreach ($items as $name => $uri){
+            $externals[] = "$name ".rtrim($uri, '/');
+        }
+        $tmp_file = AK_TMP_DIR.DS.Ak::uuid();
+        $plugins_dir = AK_PLUGINS_DIR;
+        Ak::file_put_contents($tmp_file, join("\n", $externals));
+        `svn propset $extras -q svn:externals -F "$tmp_file" "$plugins_dir"`;
+        Ak::file_delete($tmp_file);
+    }
+
+    function _uninstallExternals($name)
+    {
+        $externals = $this->_getExternals();
+        unset($externals[$name]);
+        $this->_setExternals($externals);
+    }
+
+    function _getExternals()
+    {
+        if($this->_shouldUseSvnExternals()){
+            $plugins_dir = AK_PLUGINS_DIR;
+            $svn_externals = array_diff(array_map('trim',(array)explode("\n", `svn propget svn:externals "$plugins_dir"`)), array(''));
+            $externals = array();
+            foreach ($svn_externals as $svn_external){
+                list($name, $uri) = explode(' ', trim($svn_external));
+                $externals[$name] = $uri;
+            }
+            return $externals;
+        }else{
+            return array();
+        }
+    }
+
+    function _installUsingHttp($name, $uri)
+    {
+        $this->_copyRemoteDir(rtrim($uri, '/').'/'.$name.'/', AK_PLUGINS_DIR);
+    }
+    
-}
-

trunk/script/console

@@ -11 +11 @@
-
-/**
-kelosFramework
-Generator
+ctiveSupport
+Script
- * @author Bermi Ferrer <bermi a.t akelos c.om>
- * @copyright Copyright (c) 2002-2006, Akelos Media, S.L. http://www.akelos.org

trunk/script/migrate

@@ -11 +11 @@
-
-/**
-kelosFramework
-Installer
+ctiveSupport
+Scripts
- * @author Bermi Ferrer <bermi a.t akelos c.om>
- * @copyright Copyright (c) 2002-2006, Akelos Media, S.L. http://www.akelos.org

trunk/script/test

@@ -11 +11 @@
-
-/**
-kelosFramework
-Testing
+ctiveSupport
+Scripts
- * @author Bermi Ferrer <bermi a.t akelos c.om>
- * @copyright Copyright (c) 2002-2006, Akelos Media, S.L. http://www.akelos.org

trunk/test/unit/lib/utils/_Ak_file_functions.php

@@ -126 +126 @@
-        }
-    }
+    
+    function test_should_delete_nested_directories_when_include_hidden_files()
+    {
+        $dir_name = AK_TMP_DIR.Ak::randomString();
+        Ak::make_dir($dir_name);
+        Ak::make_dir($dir_name.DS.'.hidden');
+        $this->assertTrue(is_dir($dir_name), 'Could not create test directory '.$dir_name);
+        $this->assertTrue(Ak::directory_delete($dir_name));
+        clearstatcache();
+        $this->assertFalse(is_dir($dir_name));
+    }
-}
-