Author: tkoomzaaskz
Date: 2010-09-13 21:16:51 +0200 (Mon, 13 Sep 2010)
New Revision: 30902
Modified:
plugins/sfApplicationMapPlugin/branches/1.2/lib/task/sfProjectApplicationMapTask.class.php
plugins/sfApplicationMapPlugin/branches/1.2/package.xml
plugins/sfApplicationMapPlugin/branches/1.4/lib/task/sfProjectApplicationMapTask.class.php
plugins/sfApplicationMapPlugin/branches/1.4/package.xml
plugins/sfApplicationMapPlugin/trunk/lib/task/sfProjectApplicationMapTask.class.php
plugins/sfApplicationMapPlugin/trunk/package.xml
Log:
[application_map] support for windows added - new releases
Modified:
plugins/sfApplicationMapPlugin/branches/1.2/lib/task/sfProjectApplicationMapTask.class.php
===================================================================
---
plugins/sfApplicationMapPlugin/branches/1.2/lib/task/sfProjectApplicationMapTask.class.php
2010-09-13 17:41:16 UTC (rev 30901)
+++
plugins/sfApplicationMapPlugin/branches/1.2/lib/task/sfProjectApplicationMapTask.class.php
2010-09-13 19:16:51 UTC (rev 30902)
@@ -15,63 +15,63 @@
class sfProjectApplicationMapTask extends sfBaseTask
{
/**
- * Relative repositry path for the generated files
+ * Relative repositry path for the generated files.
*
* @var string
*/
const GRAPH_DIR = "doc/graph";
/**
- * Name of the file containing dot code
+ * Name of the file containing dot code.
*
* @var string
*/
const DOT_EXT = "dot";
/**
- * Name of the image file created by the dot command
+ * Name of the image file created by the dot command.
*
* @var string
*/
const IMG_DOT_EXT = "dot.png";
/**
- * Name of the image file created by the neato command
+ * Name of the image file created by the neato command.
*
* @var string
*/
const IMG_NEATO_EXT = "neato.png";
/**
- * Name of the image file created by the twopi command
+ * Name of the image file created by the twopi command.
*
* @var string
*/
const IMG_TWOPI_EXT = "twopi.png";
/**
- * Name of the image file created by the circo command
+ * Name of the image file created by the circo command.
*
* @var string
*/
const IMG_CIRCO_EXT = "circo.png";
/**
- * Name of the image file created by the fdp command
+ * Name of the image file created by the fdp command.
*
* @var string
*/
const IMG_FDP_EXT = "fdp.png";
/**
- * Max length (in characters) of each line of action comment
+ * Max length (in characters) of each line of action comment.
*
* @var integer
*/
const MAX_LINE_LENGTH = 12;
/**
- * Label shown for admin-generator modules
+ * Label shown for admin-generator modules.
*
* @var string
*/
@@ -95,7 +95,7 @@
}
/**
- * Checks if a given directory is correct
+ * Checks if a given directory is correct.
*
* @param String $dir - name of the directory
* @return Boolean - whether given parameter is a correct directory
@@ -106,7 +106,7 @@
}
/**
- * Generates HTML format of comment to be nicely displayed by the graph
+ * Generates HTML format of comment to be nicely displayed by the graph.
*
* @param $text - original comment content
* @return String - HTML formatted comment
@@ -155,7 +155,7 @@
while (false !== ($file_app = readdir($handle_app)))
{
// everything except for '.', '..' and '.svn'
- if ($this->correct_dir($file_app))
+ if (is_dir($dir_app.$file_app) && $this->correct_dir($file_app))
{
// single application content subarray
$content[$file_app] = array();
@@ -170,7 +170,7 @@
while (false !== ($file_mod = readdir($handle_mod)))
{
// everything except for '.', '..' and '.svn'
- if ($this->correct_dir($file_mod))
+ if (is_dir($dir_mod.$file_mod) && $this->correct_dir($file_mod))
{
// single module content subarray
$content[$file_app][$file_mod] = array();
@@ -431,9 +431,9 @@
}
/**
- * Executes the current task. The task will analyse the whole application
structure,
- * create graph representation for the map graph and then generate the graph
based
- * image maps in in 5 different formats.
+ * Executes the current task. The task will analyse the whole application
+ * structure, create graph representation for the map graph and then generate
+ * the graph based image maps in in 5 different formats.
*
* @param array $arguments An array of arguments
* @param array $options An array of options
@@ -474,11 +474,11 @@
file_put_contents($baseDir . '/' . $name . '.' . self::DOT_EXT,
$graph->parse());
// executing image files generating
- $this->getFilesystem()->sh('dot ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' . self::IMG_DOT_EXT);
- $this->getFilesystem()->sh('neato ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_NEATO_EXT);
- $this->getFilesystem()->sh('twopi ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_TWOPI_EXT);
- $this->getFilesystem()->sh('circo ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_CIRCO_EXT);
- $this->getFilesystem()->sh('fdp ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' . self::IMG_FDP_EXT);
+ $this->getFilesystem()->sh('dot ' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::IMG_DOT_EXT ) );
+ $this->getFilesystem()->sh('neato ' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::IMG_NEATO_EXT ) );
+ $this->getFilesystem()->sh('twopi ' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::IMG_TWOPI_EXT ) );
+ $this->getFilesystem()->sh('circo ' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::IMG_CIRCO_EXT ) );
+ $this->getFilesystem()->sh('fdp ' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/' .
$name . '.' . self::IMG_FDP_EXT ) );
}
}
}
Modified: plugins/sfApplicationMapPlugin/branches/1.2/package.xml
===================================================================
--- plugins/sfApplicationMapPlugin/branches/1.2/package.xml 2010-09-13
17:41:16 UTC (rev 30901)
+++ plugins/sfApplicationMapPlugin/branches/1.2/package.xml 2010-09-13
19:16:51 UTC (rev 30902)
@@ -4,61 +4,61 @@
<channel>plugins.symfony-project.org</channel>
<summary>Generates application-module-action map images</summary>
<description>Provides you with a task generating images of
appliaction-module-action structure of the project using the graphviz
tool.</description>
- <lead>
- <name>Tomasz Ducin</name>
- <user>tkoomzaaskz</user>
- <email>[email protected]</email>
- <active>yes</active>
- </lead>
- <date>2010-08-16</date>
- <time>11:00:00</time>
- <version>
- <release>1.0.5</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
+ <lead>
+ <name>Tomasz Ducin</name>
+ <user>tkoomzaaskz</user>
+ <email>[email protected]</email>
+ <active>yes</active>
+ </lead>
+ <date>2010-09-13</date>
+ <time>11:00:00</time>
+ <version>
+ <release>1.0.6</release>
+ <api>1.0.6</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
<license uri="http://www.symfony-project.com/license";>MIT</license>
<notes>-</notes>
- <contents>
- <dir name="/">
- <dir name="config">
- <file name="map.ini" role="data" />
- </dir>
- <dir name="lib">
- <dir name="task">
- <file name="sfProjectApplicationMapTask.class.php" role="data" />
- </dir>
- <dir name="vendor">
- <dir name="Image_GraphViz">
- <file name="GraphViz.php" role="data" />
- </dir>
- </dir>
- </dir>
- <file name="LICENSE" role="data" />
- <file name="README" role="data" />
- </dir>
- </contents>
+ <contents>
+ <dir name="/">
+ <dir name="config">
+ <file name="map.ini" role="data" />
+ </dir>
+ <dir name="lib">
+ <dir name="task">
+ <file name="sfProjectApplicationMapTask.class.php" role="data" />
+ </dir>
+ <dir name="vendor">
+ <dir name="Image_GraphViz">
+ <file name="GraphViz.php" role="data" />
+ </dir>
+ </dir>
+ </dir>
+ <file name="LICENSE" role="data" />
+ <file name="README" role="data" />
+ </dir>
+ </contents>
<dependencies>
- <required>
- <php>
- <min>5.1.0</min>
- </php>
- <pearinstaller>
- <min>1.4.1</min>
- </pearinstaller>
- <package>
- <name>symfony</name>
- <channel>pear.symfony-project.com</channel>
- <min>1.2.0</min>
- <max>1.3.0</max>
- <exclude>1.3.0</exclude>
- </package>
- </required>
+ <required>
+ <php>
+ <min>5.1.0</min>
+ </php>
+ <pearinstaller>
+ <min>1.4.1</min>
+ </pearinstaller>
+ <package>
+ <name>symfony</name>
+ <channel>pear.symfony-project.com</channel>
+ <min>1.2.0</min>
+ <max>1.3.0</max>
+ <exclude>1.3.0</exclude>
+ </package>
+ </required>
</dependencies>
<phprelease>
@@ -66,108 +66,125 @@
<changelog>
- <release>
- <version>
- <release>1.0.5</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-08-16</date>
- <license>MIT</license>
- <notes>
- * added separate application graphs (1 graph for entire project + 1 for
each application)
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.0.6</release>
+ <api>1.0.6</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-09-13</date>
+ <license>MIT</license>
+ <notes>
+ * added support for Windows (thanks to Gordon Bazeley)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.0.4</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-05-07</date>
- <license>MIT</license>
- <notes>
- * fixed bug reported by Kamil Kraśnik (wrong comment included when used
non-execute methods)
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.0.5</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-08-16</date>
+ <license>MIT</license>
+ <notes>
+ * added separate application graphs (1 graph for entire project + 1
for each application)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.0.3</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-05-02</date>
- <license>MIT</license>
- <notes>
- * distinguish between actions and components
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.0.4</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-05-07</date>
+ <license>MIT</license>
+ <notes>
+ * fixed bug reported by Kamil Kraśnik (wrong comment included when
used non-execute methods)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.0.2</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-01-01</date>
- <license>MIT</license>
- <notes>
- * visual settings configuration added
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.0.3</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-05-02</date>
+ <license>MIT</license>
+ <notes>
+ * distinguish between actions and components
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.0.1</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2009-12-21</date>
- <license>MIT</license>
- <notes>
- * README updated - for different symfony branches
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.0.2</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-01-01</date>
+ <license>MIT</license>
+ <notes>
+ * visual settings configuration added
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.0.0</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2009-12-18</date>
- <license>MIT</license>
- <notes>
- * initial import
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.0.1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2009-12-21</date>
+ <license>MIT</license>
+ <notes>
+ * README updated - for different symfony branches
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>1.0.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2009-12-18</date>
+ <license>MIT</license>
+ <notes>
+ * initial import
+ </notes>
+ </release>
+
</changelog>
</package>
\ No newline at end of file
Modified:
plugins/sfApplicationMapPlugin/branches/1.4/lib/task/sfProjectApplicationMapTask.class.php
===================================================================
---
plugins/sfApplicationMapPlugin/branches/1.4/lib/task/sfProjectApplicationMapTask.class.php
2010-09-13 17:41:16 UTC (rev 30901)
+++
plugins/sfApplicationMapPlugin/branches/1.4/lib/task/sfProjectApplicationMapTask.class.php
2010-09-13 19:16:51 UTC (rev 30902)
@@ -15,63 +15,63 @@
class sfProjectApplicationMapTask extends sfBaseTask
{
/**
- * Relative repositry path for the generated files
+ * Relative repositry path for the generated files.
*
* @var string
*/
const GRAPH_DIR = "doc/graph";
/**
- * Name of the file containing dot code
+ * Name of the file containing dot code.
*
* @var string
*/
const DOT_EXT = "dot";
/**
- * Name of the image file created by the dot command
+ * Name of the image file created by the dot command.
*
* @var string
*/
const IMG_DOT_EXT = "dot.png";
/**
- * Name of the image file created by the neato command
+ * Name of the image file created by the neato command.
*
* @var string
*/
const IMG_NEATO_EXT = "neato.png";
/**
- * Name of the image file created by the twopi command
+ * Name of the image file created by the twopi command.
*
* @var string
*/
const IMG_TWOPI_EXT = "twopi.png";
/**
- * Name of the image file created by the circo command
+ * Name of the image file created by the circo command.
*
* @var string
*/
const IMG_CIRCO_EXT = "circo.png";
/**
- * Name of the image file created by the fdp command
+ * Name of the image file created by the fdp command.
*
* @var string
*/
const IMG_FDP_EXT = "fdp.png";
/**
- * Max length (in characters) of each line of action comment
+ * Max length (in characters) of each line of action comment.
*
* @var integer
*/
const MAX_LINE_LENGTH = 12;
/**
- * Label shown for admin-generator modules
+ * Label shown for admin-generator modules.
*
* @var string
*/
@@ -95,7 +95,7 @@
}
/**
- * Checks if a given directory is correct
+ * Checks if a given directory is correct.
*
* @param String $dir - name of the directory
* @return Boolean - whether given parameter is a correct directory
@@ -106,7 +106,7 @@
}
/**
- * Generates HTML format of comment to be nicely displayed by the graph
+ * Generates HTML format of comment to be nicely displayed by the graph.
*
* @param $text - original comment content
* @return String - HTML formatted comment
@@ -155,7 +155,7 @@
while (false !== ($file_app = readdir($handle_app)))
{
// everything except for '.', '..' and '.svn'
- if ($this->correct_dir($file_app))
+ if (is_dir($dir_app.$file_app) && $this->correct_dir($file_app))
{
// single application content subarray
$content[$file_app] = array();
@@ -170,7 +170,7 @@
while (false !== ($file_mod = readdir($handle_mod)))
{
// everything except for '.', '..' and '.svn'
- if ($this->correct_dir($file_mod))
+ if (is_dir($dir_mod.$file_mod) && $this->correct_dir($file_mod))
{
// single module content subarray
$content[$file_app][$file_mod] = array();
@@ -431,9 +431,9 @@
}
/**
- * Executes the current task. The task will analyse the whole application
structure,
- * create graph representation for the map graph and then generate the graph
based
- * image maps in in 5 different formats.
+ * Executes the current task. The task will analyse the whole application
+ * structure, create graph representation for the map graph and then generate
+ * the graph based image maps in in 5 different formats.
*
* @param array $arguments An array of arguments
* @param array $options An array of options
@@ -474,11 +474,11 @@
file_put_contents($baseDir . '/' . $name . '.' . self::DOT_EXT,
$graph->parse());
// executing image files generating
- $this->getFilesystem()->execute('dot ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' . self::IMG_DOT_EXT);
- $this->getFilesystem()->execute('neato ' . $baseDir . '/' . $name . '.'
. self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_NEATO_EXT);
- $this->getFilesystem()->execute('twopi ' . $baseDir . '/' . $name . '.'
. self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_TWOPI_EXT);
- $this->getFilesystem()->execute('circo ' . $baseDir . '/' . $name . '.'
. self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_CIRCO_EXT);
- $this->getFilesystem()->execute('fdp ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' . self::IMG_FDP_EXT);
+ $this->getFilesystem()->execute('dot ' . escapeshellarg( $baseDir . '/'
. $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/'
. $name . '.' . self::IMG_DOT_EXT ) );
+ $this->getFilesystem()->execute('neato ' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::IMG_NEATO_EXT ) );
+ $this->getFilesystem()->execute('twopi ' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::IMG_TWOPI_EXT ) );
+ $this->getFilesystem()->execute('circo ' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::IMG_CIRCO_EXT ) );
+ $this->getFilesystem()->execute('fdp ' . escapeshellarg( $baseDir . '/'
. $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/'
. $name . '.' . self::IMG_FDP_EXT ) );
}
}
}
Modified: plugins/sfApplicationMapPlugin/branches/1.4/package.xml
===================================================================
--- plugins/sfApplicationMapPlugin/branches/1.4/package.xml 2010-09-13
17:41:16 UTC (rev 30901)
+++ plugins/sfApplicationMapPlugin/branches/1.4/package.xml 2010-09-13
19:16:51 UTC (rev 30902)
@@ -4,61 +4,61 @@
<channel>plugins.symfony-project.org</channel>
<summary>Generates application-module-action map images</summary>
<description>Provides you with a task generating images of
appliaction-module-action structure of the project using the graphviz
tool.</description>
- <lead>
- <name>Tomasz Ducin</name>
- <user>tkoomzaaskz</user>
- <email>[email protected]</email>
- <active>yes</active>
- </lead>
- <date>2010-08-16</date>
- <time>11:00:00</time>
- <version>
- <release>1.2.3</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
+ <lead>
+ <name>Tomasz Ducin</name>
+ <user>tkoomzaaskz</user>
+ <email>[email protected]</email>
+ <active>yes</active>
+ </lead>
+ <date>2010-09-13</date>
+ <time>11:00:00</time>
+ <version>
+ <release>1.2.4</release>
+ <api>1.2.4</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
<license uri="http://www.symfony-project.com/license";>MIT</license>
<notes>-</notes>
- <contents>
- <dir name="/">
- <dir name="config">
- <file name="map.ini" role="data" />
- </dir>
- <dir name="lib">
- <dir name="task">
- <file name="sfProjectApplicationMapTask.class.php" role="data" />
- </dir>
- <dir name="vendor">
- <dir name="Image_GraphViz">
- <file name="GraphViz.php" role="data" />
- </dir>
- </dir>
- </dir>
- <file name="LICENSE" role="data" />
- <file name="README" role="data" />
- </dir>
- </contents>
+ <contents>
+ <dir name="/">
+ <dir name="config">
+ <file name="map.ini" role="data" />
+ </dir>
+ <dir name="lib">
+ <dir name="task">
+ <file name="sfProjectApplicationMapTask.class.php" role="data" />
+ </dir>
+ <dir name="vendor">
+ <dir name="Image_GraphViz">
+ <file name="GraphViz.php" role="data" />
+ </dir>
+ </dir>
+ </dir>
+ <file name="LICENSE" role="data" />
+ <file name="README" role="data" />
+ </dir>
+ </contents>
<dependencies>
- <required>
- <php>
- <min>5.1.0</min>
- </php>
- <pearinstaller>
- <min>1.4.1</min>
- </pearinstaller>
- <package>
- <name>symfony</name>
- <channel>pear.symfony-project.com</channel>
- <min>1.3.0</min>
- <max>1.5.0</max>
- <exclude>1.5.0</exclude>
- </package>
- </required>
+ <required>
+ <php>
+ <min>5.1.0</min>
+ </php>
+ <pearinstaller>
+ <min>1.4.1</min>
+ </pearinstaller>
+ <package>
+ <name>symfony</name>
+ <channel>pear.symfony-project.com</channel>
+ <min>1.3.0</min>
+ <max>1.5.0</max>
+ <exclude>1.5.0</exclude>
+ </package>
+ </required>
</dependencies>
<phprelease>
@@ -66,126 +66,143 @@
<changelog>
- <release>
- <version>
- <release>1.2.3</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-08-16</date>
- <license>MIT</license>
- <notes>
- * added separate application graphs (1 graph for entire project + 1 for
each application)
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.4</release>
+ <api>1.2.4</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-09-13</date>
+ <license>MIT</license>
+ <notes>
+ * support for Windows systems (thanks to Gordon Bazeley)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.2.2</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-05-22</date>
- <license>MIT</license>
- <notes>
- * task lib documentaion updated
- * more examples of generated maps - for medium-size projects
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.3</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-08-16</date>
+ <license>MIT</license>
+ <notes>
+ * added separate application graphs (1 graph for entire project + 1
for each application)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.2.1</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-05-07</date>
- <license>MIT</license>
- <notes>
- * fixed bug reported by Kamil Kraśnik (wrong comment included when used
non-execute methods)
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.2</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-05-22</date>
+ <license>MIT</license>
+ <notes>
+ * task lib documentaion updated
+ * more examples of generated maps - for medium-size projects
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.2.0</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-05-02</date>
- <license>MIT</license>
- <notes>
- * distinguish between actions and components
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-05-07</date>
+ <license>MIT</license>
+ <notes>
+ * fixed bug reported by Kamil Kraśnik (wrong comment included when
used non-execute methods)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.1.1</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-01-01</date>
- <license>MIT</license>
- <notes>
- * visual settings configuration added
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-05-02</date>
+ <license>MIT</license>
+ <notes>
+ * distinguish between actions and components
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.1.0</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2009-12-21</date>
- <license>MIT</license>
- <notes>
- * created plugin branch for symfony version 1.4
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.1.1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-01-01</date>
+ <license>MIT</license>
+ <notes>
+ * visual settings configuration added
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.0.0</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2009-12-18</date>
- <license>MIT</license>
- <notes>
- * initial import
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.1.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2009-12-21</date>
+ <license>MIT</license>
+ <notes>
+ * created plugin branch for symfony version 1.4
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>1.0.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2009-12-18</date>
+ <license>MIT</license>
+ <notes>
+ * initial import
+ </notes>
+ </release>
+
</changelog>
</package>
\ No newline at end of file
Modified:
plugins/sfApplicationMapPlugin/trunk/lib/task/sfProjectApplicationMapTask.class.php
===================================================================
---
plugins/sfApplicationMapPlugin/trunk/lib/task/sfProjectApplicationMapTask.class.php
2010-09-13 17:41:16 UTC (rev 30901)
+++
plugins/sfApplicationMapPlugin/trunk/lib/task/sfProjectApplicationMapTask.class.php
2010-09-13 19:16:51 UTC (rev 30902)
@@ -15,63 +15,63 @@
class sfProjectApplicationMapTask extends sfBaseTask
{
/**
- * Relative repositry path for the generated files
+ * Relative repositry path for the generated files.
*
* @var string
*/
const GRAPH_DIR = "doc/graph";
/**
- * Name of the file containing dot code
+ * Name of the file containing dot code.
*
* @var string
*/
const DOT_EXT = "dot";
/**
- * Name of the image file created by the dot command
+ * Name of the image file created by the dot command.
*
* @var string
*/
const IMG_DOT_EXT = "dot.png";
/**
- * Name of the image file created by the neato command
+ * Name of the image file created by the neato command.
*
* @var string
*/
const IMG_NEATO_EXT = "neato.png";
/**
- * Name of the image file created by the twopi command
+ * Name of the image file created by the twopi command.
*
* @var string
*/
const IMG_TWOPI_EXT = "twopi.png";
/**
- * Name of the image file created by the circo command
+ * Name of the image file created by the circo command.
*
* @var string
*/
const IMG_CIRCO_EXT = "circo.png";
/**
- * Name of the image file created by the fdp command
+ * Name of the image file created by the fdp command.
*
* @var string
*/
const IMG_FDP_EXT = "fdp.png";
/**
- * Max length (in characters) of each line of action comment
+ * Max length (in characters) of each line of action comment.
*
* @var integer
*/
const MAX_LINE_LENGTH = 12;
/**
- * Label shown for admin-generator modules
+ * Label shown for admin-generator modules.
*
* @var string
*/
@@ -95,7 +95,7 @@
}
/**
- * Checks if a given directory is correct
+ * Checks if a given directory is correct.
*
* @param String $dir - name of the directory
* @return Boolean - whether given parameter is a correct directory
@@ -106,7 +106,7 @@
}
/**
- * Generates HTML format of comment to be nicely displayed by the graph
+ * Generates HTML format of comment to be nicely displayed by the graph.
*
* @param $text - original comment content
* @return String - HTML formatted comment
@@ -155,7 +155,7 @@
while (false !== ($file_app = readdir($handle_app)))
{
// everything except for '.', '..' and '.svn'
- if ($this->correct_dir($file_app))
+ if (is_dir($dir_app.$file_app) && $this->correct_dir($file_app))
{
// single application content subarray
$content[$file_app] = array();
@@ -170,7 +170,7 @@
while (false !== ($file_mod = readdir($handle_mod)))
{
// everything except for '.', '..' and '.svn'
- if ($this->correct_dir($file_mod))
+ if (is_dir($dir_mod.$file_mod) && $this->correct_dir($file_mod))
{
// single module content subarray
$content[$file_app][$file_mod] = array();
@@ -431,9 +431,9 @@
}
/**
- * Executes the current task. The task will analyse the whole application
structure,
- * create graph representation for the map graph and then generate the graph
based
- * image maps in in 5 different formats.
+ * Executes the current task. The task will analyse the whole application
+ * structure, create graph representation for the map graph and then generate
+ * the graph based image maps in in 5 different formats.
*
* @param array $arguments An array of arguments
* @param array $options An array of options
@@ -474,11 +474,11 @@
file_put_contents($baseDir . '/' . $name . '.' . self::DOT_EXT,
$graph->parse());
// executing image files generating
- $this->getFilesystem()->execute('dot ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' . self::IMG_DOT_EXT);
- $this->getFilesystem()->execute('neato ' . $baseDir . '/' . $name . '.'
. self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_NEATO_EXT);
- $this->getFilesystem()->execute('twopi ' . $baseDir . '/' . $name . '.'
. self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_TWOPI_EXT);
- $this->getFilesystem()->execute('circo ' . $baseDir . '/' . $name . '.'
. self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' .
self::IMG_CIRCO_EXT);
- $this->getFilesystem()->execute('fdp ' . $baseDir . '/' . $name . '.' .
self::DOT_EXT . ' -Tpng -o' . $baseDir . '/' . $name . '.' . self::IMG_FDP_EXT);
+ $this->getFilesystem()->execute('dot ' . escapeshellarg( $baseDir . '/'
. $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/'
. $name . '.' . self::IMG_DOT_EXT ) );
+ $this->getFilesystem()->execute('neato ' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::IMG_NEATO_EXT ) );
+ $this->getFilesystem()->execute('twopi ' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::IMG_TWOPI_EXT ) );
+ $this->getFilesystem()->execute('circo ' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir .
'/' . $name . '.' . self::IMG_CIRCO_EXT ) );
+ $this->getFilesystem()->execute('fdp ' . escapeshellarg( $baseDir . '/'
. $name . '.' . self::DOT_EXT ) . ' -Tpng -o' . escapeshellarg( $baseDir . '/'
. $name . '.' . self::IMG_FDP_EXT ) );
}
}
}
Modified: plugins/sfApplicationMapPlugin/trunk/package.xml
===================================================================
--- plugins/sfApplicationMapPlugin/trunk/package.xml 2010-09-13 17:41:16 UTC
(rev 30901)
+++ plugins/sfApplicationMapPlugin/trunk/package.xml 2010-09-13 19:16:51 UTC
(rev 30902)
@@ -4,61 +4,61 @@
<channel>plugins.symfony-project.org</channel>
<summary>Generates application-module-action map images</summary>
<description>Provides you with a task generating images of
appliaction-module-action structure of the project using the graphviz
tool.</description>
- <lead>
- <name>Tomasz Ducin</name>
- <user>tkoomzaaskz</user>
- <email>[email protected]</email>
- <active>yes</active>
- </lead>
- <date>2010-08-16</date>
- <time>11:00:00</time>
- <version>
- <release>1.2.3</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
+ <lead>
+ <name>Tomasz Ducin</name>
+ <user>tkoomzaaskz</user>
+ <email>[email protected]</email>
+ <active>yes</active>
+ </lead>
+ <date>2010-09-13</date>
+ <time>11:00:00</time>
+ <version>
+ <release>1.2.4</release>
+ <api>1.2.4</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
<license uri="http://www.symfony-project.com/license";>MIT</license>
<notes>-</notes>
- <contents>
- <dir name="/">
- <dir name="config">
- <file name="map.ini" role="data" />
- </dir>
- <dir name="lib">
- <dir name="task">
- <file name="sfProjectApplicationMapTask.class.php" role="data" />
- </dir>
- <dir name="vendor">
- <dir name="Image_GraphViz">
- <file name="GraphViz.php" role="data" />
- </dir>
- </dir>
- </dir>
- <file name="LICENSE" role="data" />
- <file name="README" role="data" />
- </dir>
- </contents>
+ <contents>
+ <dir name="/">
+ <dir name="config">
+ <file name="map.ini" role="data" />
+ </dir>
+ <dir name="lib">
+ <dir name="task">
+ <file name="sfProjectApplicationMapTask.class.php" role="data" />
+ </dir>
+ <dir name="vendor">
+ <dir name="Image_GraphViz">
+ <file name="GraphViz.php" role="data" />
+ </dir>
+ </dir>
+ </dir>
+ <file name="LICENSE" role="data" />
+ <file name="README" role="data" />
+ </dir>
+ </contents>
<dependencies>
- <required>
- <php>
- <min>5.1.0</min>
- </php>
- <pearinstaller>
- <min>1.4.1</min>
- </pearinstaller>
- <package>
- <name>symfony</name>
- <channel>pear.symfony-project.com</channel>
- <min>1.3.0</min>
- <max>1.5.0</max>
- <exclude>1.5.0</exclude>
- </package>
- </required>
+ <required>
+ <php>
+ <min>5.1.0</min>
+ </php>
+ <pearinstaller>
+ <min>1.4.1</min>
+ </pearinstaller>
+ <package>
+ <name>symfony</name>
+ <channel>pear.symfony-project.com</channel>
+ <min>1.3.0</min>
+ <max>1.5.0</max>
+ <exclude>1.5.0</exclude>
+ </package>
+ </required>
</dependencies>
<phprelease>
@@ -66,125 +66,143 @@
<changelog>
- <release>
- <version>
- <release>1.2.3</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-08-16</date>
- <license>MIT</license>
- <notes>
- * added separate application graphs (1 graph for entire project + 1 for
each application) </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.4</release>
+ <api>1.2.4</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-09-13</date>
+ <license>MIT</license>
+ <notes>
+ * support for Windows systems (thanks to Gordon Bazeley)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.2.2</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-05-22</date>
- <license>MIT</license>
- <notes>
- * task lib documentaion updated
- * more examples of generated maps - for medium-size projects
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.3</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-08-16</date>
+ <license>MIT</license>
+ <notes>
+ * added separate application graphs (1 graph for entire project + 1
for each application)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.2.1</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-05-07</date>
- <license>MIT</license>
- <notes>
- * fixed bug reported by Kamil Kraśnik (wrong comment included when used
non-execute methods)
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.2</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-05-22</date>
+ <license>MIT</license>
+ <notes>
+ * task lib documentaion updated
+ * more examples of generated maps - for medium-size projects
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.2.0</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-05-02</date>
- <license>MIT</license>
- <notes>
- * distinguish between actions and components
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-05-07</date>
+ <license>MIT</license>
+ <notes>
+ * fixed bug reported by Kamil Kraśnik (wrong comment included when
used non-execute methods)
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.1.1</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2010-01-01</date>
- <license>MIT</license>
- <notes>
- * visual settings configuration added
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.2.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-05-02</date>
+ <license>MIT</license>
+ <notes>
+ * distinguish between actions and components
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.1.0</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2009-12-21</date>
- <license>MIT</license>
- <notes>
- * created plugin branch for symfony version 1.4
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.1.1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2010-01-01</date>
+ <license>MIT</license>
+ <notes>
+ * visual settings configuration added
+ </notes>
+ </release>
- <release>
- <version>
- <release>1.0.0</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <date>2009-12-18</date>
- <license>MIT</license>
- <notes>
- * initial import
- </notes>
- </release>
+ <release>
+ <version>
+ <release>1.1.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2009-12-21</date>
+ <license>MIT</license>
+ <notes>
+ * created plugin branch for symfony version 1.4
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>1.0.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT
license</license>
+ <date>2009-12-18</date>
+ <license>MIT</license>
+ <notes>
+ * initial import
+ </notes>
+ </release>
+
</changelog>
</package>
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
