abtlinux-svn Mailing List for ABout Time Linux (AbTLinux) (Page 15)
Status: Alpha
Brought to you by:
eschabell
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(12) |
Apr
(4) |
May
(61) |
Jun
(5) |
Jul
(12) |
Aug
(1) |
Sep
|
Oct
(29) |
Nov
(89) |
Dec
(37) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(4) |
Feb
(33) |
Mar
(12) |
Apr
|
May
(2) |
Jun
(13) |
Jul
(76) |
Aug
(7) |
Sep
(21) |
Oct
|
Nov
|
Dec
(33) |
2008 |
Jan
(32) |
Feb
(24) |
Mar
(17) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
From: <esc...@us...> - 2006-11-19 10:19:06
|
Revision: 214 http://svn.sourceforge.net/abtlinux/?rev=214&view=rev Author: eschabell Date: 2006-11-19 02:19:03 -0800 (Sun, 19 Nov 2006) Log Message: ----------- Added valid rss uri to news feed test to allow for actual testing, it passes. Modified Paths: -------------- src/trunk/TestAbtDownloadManager.rb Modified: src/trunk/TestAbtDownloadManager.rb =================================================================== --- src/trunk/TestAbtDownloadManager.rb 2006-11-18 19:22:06 UTC (rev 213) +++ src/trunk/TestAbtDownloadManager.rb 2006-11-19 10:19:03 UTC (rev 214) @@ -55,7 +55,7 @@ # Test method for 'AbtDownloadManager.testRetrieveNewsFeed()' ## def testRetrieveNewsFeed() - assert( @download.retrieveNewsFeed(), "testRetrieveNewsFeed()" ) + assert( @download.retrieveNewsFeed( $ABTNEWS ), "testRetrieveNewsFeed()" ) end ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 19:22:06
|
Revision: 213 http://svn.sourceforge.net/abtlinux/?rev=213&view=rev Author: eschabell Date: 2006-11-18 11:22:06 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtDepEngine.html src/trunk/doc/classes/AbtLogManager.html src/trunk/doc/classes/AbtPackage.html src/trunk/doc/classes/AbtPackageManager.html src/trunk/doc/classes/AbtQueueManager.html src/trunk/doc/classes/AbtReportManager.html src/trunk/doc/classes/AbtUsage.html src/trunk/doc/classes/TestAbtDepEngine.html src/trunk/doc/classes/TestAbtDownloadManager.html src/trunk/doc/classes/TestAbtLogManager.html src/trunk/doc/classes/TestAbtPackage.html src/trunk/doc/classes/TestAbtPackageManager.html src/trunk/doc/classes/TestAbtQueueManager.html src/trunk/doc/classes/TestAbtReportManager.html src/trunk/doc/classes/TestAbtSystemManager.html src/trunk/doc/created.rid src/trunk/doc/files/AbtPackageManager_rb.html src/trunk/doc/files/AbtPackage_rb.html src/trunk/doc/files/AbtQueueManager_rb.html src/trunk/doc/files/TestAbtLogManager_rb.html src/trunk/doc/files/TestAbtPackageManager_rb.html src/trunk/doc/files/TestAbtReportManager_rb.html src/trunk/doc/fr_method_index.html Modified: src/trunk/doc/classes/AbtDepEngine.html =================================================================== --- src/trunk/doc/classes/AbtDepEngine.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/AbtDepEngine.html 2006-11-18 19:22:06 UTC (rev 213) @@ -118,7 +118,7 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000084">new</a></li> + <li><a href="#M000086">new</a></li> </ul> @@ -129,7 +129,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000084"></a><b>new</b>() + <a name="M000086"></a><b>new</b>() </div> <div class="description"> <p> @@ -141,8 +141,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000084_source')" id="l_M000084_source">show source</a> ]</p> - <div id="M000084_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000086_source')" id="l_M000086_source">show source</a> ]</p> + <div id="M000086_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtDepEngine.rb, line 41</span> 41: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> Modified: src/trunk/doc/classes/AbtLogManager.html =================================================================== --- src/trunk/doc/classes/AbtLogManager.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/AbtLogManager.html 2006-11-18 19:22:06 UTC (rev 213) @@ -117,12 +117,12 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000062">cachePackage</a></li> - <li><a href="#M000061">logPackageBuild</a></li> - <li><a href="#M000060">logPackageInstall</a></li> - <li><a href="#M000058">logPackageIntegrity</a></li> - <li><a href="#M000063">logToJournal</a></li> - <li><a href="#M000059">new</a></li> + <li><a href="#M000064">cachePackage</a></li> + <li><a href="#M000063">logPackageBuild</a></li> + <li><a href="#M000062">logPackageInstall</a></li> + <li><a href="#M000060">logPackageIntegrity</a></li> + <li><a href="#M000065">logToJournal</a></li> + <li><a href="#M000061">new</a></li> </ul> @@ -133,7 +133,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000059"></a><b>new</b>() + <a name="M000061"></a><b>new</b>() </div> <div class="description"> <p> @@ -145,8 +145,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000059_source')" id="l_M000059_source">show source</a> ]</p> - <div id="M000059_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000061_source')" id="l_M000061_source">show source</a> ]</p> + <div id="M000061_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtLogManager.rb, line 55</span> 55: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -161,7 +161,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000062"></a><b>cachePackage</b>( package ) + <a name="M000064"></a><b>cachePackage</b>( package ) </div> <div class="description"> <p> @@ -177,8 +177,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000062_source')" id="l_M000062_source">show source</a> ]</p> - <div id="M000062_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000064_source')" id="l_M000064_source">show source</a> ]</p> + <div id="M000064_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtLogManager.rb, line 94</span> 94: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cachePackage</span>( <span class="ruby-identifier">package</span> ) @@ -189,7 +189,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000061"></a><b>logPackageBuild</b>( package ) + <a name="M000063"></a><b>logPackageBuild</b>( package ) </div> <div class="description"> <p> @@ -205,8 +205,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000061_source')" id="l_M000061_source">show source</a> ]</p> - <div id="M000061_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000063_source')" id="l_M000063_source">show source</a> ]</p> + <div id="M000063_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtLogManager.rb, line 82</span> 82: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageBuild</span>( <span class="ruby-identifier">package</span> ) @@ -217,7 +217,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000060"></a><b>logPackageInstall</b>( package ) + <a name="M000062"></a><b>logPackageInstall</b>( package ) </div> <div class="description"> <p> @@ -233,8 +233,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000060_source')" id="l_M000060_source">show source</a> ]</p> - <div id="M000060_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000062_source')" id="l_M000062_source">show source</a> ]</p> + <div id="M000062_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtLogManager.rb, line 70</span> 70: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageInstall</span>( <span class="ruby-identifier">package</span> ) @@ -245,7 +245,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000063"></a><b>logToJournal</b>( message ) + <a name="M000065"></a><b>logToJournal</b>( message ) </div> <div class="description"> <p> @@ -260,8 +260,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000063_source')" id="l_M000063_source">show source</a> ]</p> - <div id="M000063_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000065_source')" id="l_M000065_source">show source</a> ]</p> + <div id="M000065_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtLogManager.rb, line 105</span> 105: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logToJournal</span>( <span class="ruby-identifier">message</span> ) @@ -280,7 +280,7 @@ <div class="sectiontitle">Protected Instance methods</div> <div class="method"> <div class="title"> - <a name="M000058"></a><b>logPackageIntegrity</b>( package ) + <a name="M000060"></a><b>logPackageIntegrity</b>( package ) </div> <div class="description"> <p> @@ -297,8 +297,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000058_source')" id="l_M000058_source">show source</a> ]</p> - <div id="M000058_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000060_source')" id="l_M000060_source">show source</a> ]</p> + <div id="M000060_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtLogManager.rb, line 42</span> 42: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageIntegrity</span>( <span class="ruby-identifier">package</span> ) Modified: src/trunk/doc/classes/AbtPackage.html =================================================================== --- src/trunk/doc/classes/AbtPackage.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/AbtPackage.html 2006-11-18 19:22:06 UTC (rev 213) @@ -129,6 +129,8 @@ <li><a href="#M000030">post</a></li> <li><a href="#M000025">pre</a></li> <li><a href="#M000028">preinstall</a></li> + <li><a href="#M000032">removeBuildSources</a></li> + <li><a href="#M000031">unpackSources</a></li> </ul> @@ -359,9 +361,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000027_source')" id="l_M000027_source">show source</a> ]</p> <div id="M000027_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackage.rb, line 164</span> -164: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span> -165: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 180</span> +180: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span> +181: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -388,9 +390,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000026_source')" id="l_M000026_source">show source</a> ]</p> <div id="M000026_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackage.rb, line 156</span> -156: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure</span> -157: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 172</span> +172: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure</span> +173: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -455,9 +457,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000029_source')" id="l_M000029_source">show source</a> ]</p> <div id="M000029_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackage.rb, line 181</span> -181: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">install</span> -182: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 197</span> +197: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">install</span> +198: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -480,9 +482,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000030_source')" id="l_M000030_source">show source</a> ]</p> <div id="M000030_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackage.rb, line 189</span> -189: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post</span> -190: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 205</span> +205: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post</span> +206: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -507,7 +509,23 @@ <pre> <span class="ruby-comment cmt"># File AbtPackage.rb, line 144</span> 144: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">pre</span> -145: <span class="ruby-keyword kw">end</span> +145: <span class="ruby-identifier">downloader</span> = <span class="ruby-constant">AbtDownloadManager</span>.<span class="ruby-identifier">new</span> +146: +147: <span class="ruby-comment cmt"># download sources.</span> +148: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">downloader</span>.<span class="ruby-identifier">retrievePackageSource</span>( <span class="ruby-ivar">@name</span>.<span class="ruby-identifier">downcase</span>, <span class="ruby-identifier">$SOURCES_REPOSITORY</span> ) ) +149: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +150: <span class="ruby-keyword kw">end</span> +151: +152: <span class="ruby-comment cmt"># unpack sources.</span> +153: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">unpackSources</span> ) +154: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +155: <span class="ruby-keyword kw">end</span> +156: +157: <span class="ruby-comment cmt"># TODO: retrieve patches?</span> +158: <span class="ruby-comment cmt"># TODO: apply patches?</span> +159: +160: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +161: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -531,14 +549,84 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000028_source')" id="l_M000028_source">show source</a> ]</p> <div id="M000028_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackage.rb, line 173</span> -173: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">preinstall</span> -174: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 189</span> +189: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">preinstall</span> +190: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> +<div class="method"> + <div class="title"> + <a name="M000032"></a><b>removeBuildSources</b>() + </div> + <div class="description"> + <p> +Cleans up this packages source build directory. +</p> +<p> +<b>RETURNS:</b> <em>boolean</em> - True if the completes sucessfully, +otherwise false. +</p> + </div> +<div class="sourcecode"> + <p class="source-link">[ <a href="javascript:toggleSource('M000032_source')" id="l_M000032_source">show source</a> ]</p> + <div id="M000032_source" class="dyn-source"> +<pre> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 233</span> +233: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removeBuildSources</span> +234: <span class="ruby-identifier">buildSourcesLocation</span> = <span class="ruby-node">"#{$BUILD_LOCATION}/#{srcDir}"</span> +235: +236: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">buildSourcesLocation</span> ) ) +237: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +238: <span class="ruby-keyword kw">end</span> +239: +240: <span class="ruby-comment cmt"># TODO: system call removal?</span> +241: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm_rf</span> <span class="ruby-identifier">buildSourcesLocation</span>, <span class="ruby-identifier">:verbose</span> =<span class="ruby-operator">></span> <span class="ruby-keyword kw">true</span> ) +242: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +243: <span class="ruby-keyword kw">end</span> +244: <span class="ruby-keyword kw">end</span> +</pre> + </div> </div> +</div> +<div class="method"> + <div class="title"> + <a name="M000031"></a><b>unpackSources</b>() + </div> + <div class="description"> + <p> +Unpacks this packages source file into the standard build location. +</p> +<p> +<b>RETURNS:</b> <em>boolean</em> - True if the completes sucessfully, +otherwise false. +</p> + </div> +<div class="sourcecode"> + <p class="source-link">[ <a href="javascript:toggleSource('M000031_source')" id="l_M000031_source">show source</a> ]</p> + <div id="M000031_source" class="dyn-source"> +<pre> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 213</span> +213: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unpackSources</span> +214: <span class="ruby-identifier">sourcesToUnpack</span> = <span class="ruby-node">"#{$SOURCES_REPOSITORY}/#{File.basename( srcUrl )}"</span> +215: +216: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">sourcesToUnpack</span> ) ) +217: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +218: <span class="ruby-keyword kw">end</span> +219: +220: <span class="ruby-comment cmt"># TODO: system call removal?</span> +221: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">system</span>( <span class="ruby-node">"cd #{$BUILD_LOCATION}; tar xzvf #{sourcesToUnpack}"</span> ) ) +222: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +223: <span class="ruby-keyword kw">end</span> +224: +225: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +226: <span class="ruby-keyword kw">end</span> +</pre> + </div> +</div> +</div> +</div> </div> Modified: src/trunk/doc/classes/AbtPackageManager.html =================================================================== --- src/trunk/doc/classes/AbtPackageManager.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/AbtPackageManager.html 2006-11-18 19:22:06 UTC (rev 213) @@ -118,13 +118,13 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000042">downgradePackage</a></li> - <li><a href="#M000043">freezePackage</a></li> - <li><a href="#M000039">installPackage</a></li> - <li><a href="#M000038">new</a></li> - <li><a href="#M000040">reinstallPackage</a></li> - <li><a href="#M000041">removePackage</a></li> - <li><a href="#M000044">rootLogin</a></li> + <li><a href="#M000044">downgradePackage</a></li> + <li><a href="#M000045">freezePackage</a></li> + <li><a href="#M000041">installPackage</a></li> + <li><a href="#M000040">new</a></li> + <li><a href="#M000042">reinstallPackage</a></li> + <li><a href="#M000043">removePackage</a></li> + <li><a href="#M000046">rootLogin</a></li> </ul> @@ -135,7 +135,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000038"></a><b>new</b>() + <a name="M000040"></a><b>new</b>() </div> <div class="description"> <p> @@ -148,8 +148,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000038_source')" id="l_M000038_source">show source</a> ]</p> - <div id="M000038_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000040_source')" id="l_M000040_source">show source</a> ]</p> + <div id="M000040_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 41</span> 41: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -161,7 +161,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000042"></a><b>downgradePackage</b>( package, version ) + <a name="M000044"></a><b>downgradePackage</b>( package, version ) </div> <div class="description"> <p> @@ -179,19 +179,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000042_source')" id="l_M000042_source">show source</a> ]</p> - <div id="M000042_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000044_source')" id="l_M000044_source">show source</a> ]</p> + <div id="M000044_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 87</span> -87: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">downgradePackage</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">version</span> ) -88: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 122</span> +122: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">downgradePackage</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">version</span> ) +123: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000043"></a><b>freezePackage</b>( package ) + <a name="M000045"></a><b>freezePackage</b>( package ) </div> <div class="description"> <p> @@ -207,19 +207,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000043_source')" id="l_M000043_source">show source</a> ]</p> - <div id="M000043_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000045_source')" id="l_M000045_source">show source</a> ]</p> + <div id="M000045_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 99</span> - 99: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freezePackage</span>( <span class="ruby-identifier">package</span> ) -100: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 134</span> +134: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freezePackage</span>( <span class="ruby-identifier">package</span> ) +135: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000039"></a><b>installPackage</b>( package ) + <a name="M000041"></a><b>installPackage</b>( package ) </div> <div class="description"> <p> @@ -234,19 +234,54 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000039_source')" id="l_M000039_source">show source</a> ]</p> - <div id="M000039_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000041_source')" id="l_M000041_source">show source</a> ]</p> + <div id="M000041_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 52</span> 52: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">installPackage</span>( <span class="ruby-identifier">package</span> ) -53: <span class="ruby-keyword kw">end</span> +53: <span class="ruby-identifier">require</span> <span class="ruby-identifier">package</span> +54: <span class="ruby-identifier">sw</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) +55: +56: <span class="ruby-identifier">queuer</span> = <span class="ruby-constant">AbtQueueManager</span>.<span class="ruby-identifier">new</span> +57: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> +58: +59: <span class="ruby-comment cmt"># get package details.</span> +60: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">sw</span>.<span class="ruby-identifier">details</span> +61: +62: <span class="ruby-comment cmt"># TODO: check deps</span> +63: +64: <span class="ruby-comment cmt"># add to install queue.</span> +65: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">queuer</span>.<span class="ruby-identifier">addPackageToQueue</span>( <span class="ruby-identifier">package</span>, <span class="ruby-value str">"install"</span> ) ) +66: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to add #{package} to install queue."</span> ) +67: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +68: <span class="ruby-keyword kw">end</span> +69: +70: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">pre</span> ) +71: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to process pre-section in the package description of #{package}."</span> ) +72: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +73: <span class="ruby-keyword kw">end</span> +74: +75: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">removeBuildSources</span> ) +76: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to remove the build sources for #{package}."</span> ) +77: <span class="ruby-comment cmt">#return false # commented out as this is not a reason to fail.</span> +78: <span class="ruby-keyword kw">end</span> +79: +80: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +81: <span class="ruby-comment cmt"># TODO: finish up the following steps per install scenario:</span> +82: <span class="ruby-comment cmt">#</span> +83: <span class="ruby-comment cmt"># configure section</span> +84: <span class="ruby-comment cmt"># build section</span> +85: <span class="ruby-comment cmt"># pre install section</span> +86: <span class="ruby-comment cmt"># install section</span> +87: <span class="ruby-comment cmt"># post section</span> +88: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000040"></a><b>reinstallPackage</b>( package ) + <a name="M000042"></a><b>reinstallPackage</b>( package ) </div> <div class="description"> <p> @@ -261,19 +296,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000040_source')" id="l_M000040_source">show source</a> ]</p> - <div id="M000040_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000042_source')" id="l_M000042_source">show source</a> ]</p> + <div id="M000042_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 63</span> -63: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reinstallPackage</span>( <span class="ruby-identifier">package</span> ) -64: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 98</span> +98: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reinstallPackage</span>( <span class="ruby-identifier">package</span> ) +99: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000041"></a><b>removePackage</b>( package ) + <a name="M000043"></a><b>removePackage</b>( package ) </div> <div class="description"> <p> @@ -288,19 +323,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000041_source')" id="l_M000041_source">show source</a> ]</p> - <div id="M000041_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000043_source')" id="l_M000043_source">show source</a> ]</p> + <div id="M000043_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 74</span> -74: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removePackage</span>( <span class="ruby-identifier">package</span> ) -75: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 109</span> +109: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removePackage</span>( <span class="ruby-identifier">package</span> ) +110: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000044"></a><b>rootLogin</b>( arguments ) + <a name="M000046"></a><b>rootLogin</b>( arguments ) </div> <div class="description"> <p> @@ -314,23 +349,23 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000044_source')" id="l_M000044_source">show source</a> ]</p> - <div id="M000044_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000046_source')" id="l_M000046_source">show source</a> ]</p> + <div id="M000046_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 109</span> -109: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rootLogin</span>( <span class="ruby-identifier">arguments</span> ) -110: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Process</span>.<span class="ruby-identifier">uid</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span> ) -111: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> -112: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> -113: -114: <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword kw">in</span> <span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">length</span> -115: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] -116: <span class="ruby-keyword kw">end</span> -117: -118: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) <span class="ruby-comment cmt"># TODO: replace system call?</span> -119: <span class="ruby-identifier">exit</span> -120: <span class="ruby-keyword kw">end</span> -121: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 144</span> +144: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rootLogin</span>( <span class="ruby-identifier">arguments</span> ) +145: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">Process</span>.<span class="ruby-identifier">uid</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span> ) +146: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> +147: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> +148: +149: <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword kw">in</span> <span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">length</span> +150: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] +151: <span class="ruby-keyword kw">end</span> +152: +153: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) <span class="ruby-comment cmt"># TODO: replace system call?</span> +154: <span class="ruby-identifier">exit</span> +155: <span class="ruby-keyword kw">end</span> +156: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtQueueManager.html =================================================================== --- src/trunk/doc/classes/AbtQueueManager.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/AbtQueueManager.html 2006-11-18 19:22:06 UTC (rev 213) @@ -117,8 +117,8 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000083">addPackageToQueue</a></li> - <li><a href="#M000082">new</a></li> + <li><a href="#M000085">addPackageToQueue</a></li> + <li><a href="#M000084">new</a></li> </ul> @@ -129,7 +129,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000082"></a><b>new</b>() + <a name="M000084"></a><b>new</b>() </div> <div class="description"> <p> @@ -142,8 +142,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000082_source')" id="l_M000082_source">show source</a> ]</p> - <div id="M000082_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000084_source')" id="l_M000084_source">show source</a> ]</p> + <div id="M000084_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtQueueManager.rb, line 40</span> 40: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -158,7 +158,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000083"></a><b>addPackageToQueue</b>( package, queue ) + <a name="M000085"></a><b>addPackageToQueue</b>( package, queue ) </div> <div class="description"> <p> @@ -175,8 +175,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000083_source')" id="l_M000083_source">show source</a> ]</p> - <div id="M000083_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000085_source')" id="l_M000085_source">show source</a> ]</p> + <div id="M000085_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtQueueManager.rb, line 57</span> 57: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addPackageToQueue</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">queue</span> ) @@ -208,8 +208,9 @@ 83: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> 84: <span class="ruby-keyword kw">end</span> 85: -86: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -87: <span class="ruby-keyword kw">end</span> +86: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to open #{queueFile}."</span> ) +87: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +88: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtReportManager.html =================================================================== --- src/trunk/doc/classes/AbtReportManager.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/AbtReportManager.html 2006-11-18 19:22:06 UTC (rev 213) @@ -117,19 +117,19 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000113">generateHTMLPackageListing</a></li> - <li><a href="#M000101">new</a></li> - <li><a href="#M000110">searchPackageDescriptions</a></li> - <li><a href="#M000109">showFileOwner</a></li> - <li><a href="#M000105">showFrozenPackages</a></li> - <li><a href="#M000103">showInstalledPackages</a></li> - <li><a href="#M000108">showJournal</a></li> - <li><a href="#M000106">showPackageDependencies</a></li> - <li><a href="#M000102">showPackageDetails</a></li> - <li><a href="#M000104">showPackageLog</a></li> - <li><a href="#M000111">showQueue</a></li> - <li><a href="#M000107">showUntrackedFiles</a></li> - <li><a href="#M000112">showUpdates</a></li> + <li><a href="#M000115">generateHTMLPackageListing</a></li> + <li><a href="#M000103">new</a></li> + <li><a href="#M000112">searchPackageDescriptions</a></li> + <li><a href="#M000111">showFileOwner</a></li> + <li><a href="#M000107">showFrozenPackages</a></li> + <li><a href="#M000105">showInstalledPackages</a></li> + <li><a href="#M000110">showJournal</a></li> + <li><a href="#M000108">showPackageDependencies</a></li> + <li><a href="#M000104">showPackageDetails</a></li> + <li><a href="#M000106">showPackageLog</a></li> + <li><a href="#M000113">showQueue</a></li> + <li><a href="#M000109">showUntrackedFiles</a></li> + <li><a href="#M000114">showUpdates</a></li> </ul> @@ -140,7 +140,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000101"></a><b>new</b>() + <a name="M000103"></a><b>new</b>() </div> <div class="description"> <p> @@ -152,8 +152,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000101_source')" id="l_M000101_source">show source</a> ]</p> - <div id="M000101_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000103_source')" id="l_M000103_source">show source</a> ]</p> + <div id="M000103_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 41</span> 41: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -165,7 +165,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000113"></a><b>generateHTMLPackageListing</b>() + <a name="M000115"></a><b>generateHTMLPackageListing</b>() </div> <div class="description"> <p> @@ -176,8 +176,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000113_source')" id="l_M000113_source">show source</a> ]</p> - <div id="M000113_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000115_source')" id="l_M000115_source">show source</a> ]</p> + <div id="M000115_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 238</span> 238: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateHTMLPackageListing</span> @@ -188,7 +188,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000110"></a><b>searchPackageDescriptions</b>( searchText ) + <a name="M000112"></a><b>searchPackageDescriptions</b>( searchText ) </div> <div class="description"> <p> @@ -204,8 +204,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000110_source')" id="l_M000110_source">show source</a> ]</p> - <div id="M000110_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000112_source')" id="l_M000112_source">show source</a> ]</p> + <div id="M000112_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 186</span> 186: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">searchPackageDescriptions</span>( <span class="ruby-identifier">searchText</span> ) @@ -216,7 +216,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000109"></a><b>showFileOwner</b>( file ) + <a name="M000111"></a><b>showFileOwner</b>( file ) </div> <div class="description"> <p> @@ -230,8 +230,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000109_source')" id="l_M000109_source">show source</a> ]</p> - <div id="M000109_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000111_source')" id="l_M000111_source">show source</a> ]</p> + <div id="M000111_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 174</span> 174: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showFileOwner</span>( <span class="ruby-identifier">file</span> ) @@ -242,7 +242,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000105"></a><b>showFrozenPackages</b>() + <a name="M000107"></a><b>showFrozenPackages</b>() </div> <div class="description"> <p> @@ -253,8 +253,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000105_source')" id="l_M000105_source">show source</a> ]</p> - <div id="M000105_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000107_source')" id="l_M000107_source">show source</a> ]</p> + <div id="M000107_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 121</span> 121: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showFrozenPackages</span> @@ -265,7 +265,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000103"></a><b>showInstalledPackages</b>() + <a name="M000105"></a><b>showInstalledPackages</b>() </div> <div class="description"> <p> @@ -276,8 +276,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000103_source')" id="l_M000103_source">show source</a> ]</p> - <div id="M000103_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000105_source')" id="l_M000105_source">show source</a> ]</p> + <div id="M000105_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 97</span> 97: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showInstalledPackages</span> @@ -288,7 +288,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000108"></a><b>showJournal</b>() + <a name="M000110"></a><b>showJournal</b>() </div> <div class="description"> <p> @@ -299,8 +299,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000108_source')" id="l_M000108_source">show source</a> ]</p> - <div id="M000108_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000110_source')" id="l_M000110_source">show source</a> ]</p> + <div id="M000110_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 152</span> 152: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showJournal</span> @@ -323,7 +323,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000106"></a><b>showPackageDependencies</b>( package ) + <a name="M000108"></a><b>showPackageDependencies</b>( package ) </div> <div class="description"> <p> @@ -340,8 +340,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000106_source')" id="l_M000106_source">show source</a> ]</p> - <div id="M000106_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000108_source')" id="l_M000108_source">show source</a> ]</p> + <div id="M000108_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 134</span> 134: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showPackageDependencies</span>( <span class="ruby-identifier">package</span> ) @@ -352,7 +352,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000102"></a><b>showPackageDetails</b>( package ) + <a name="M000104"></a><b>showPackageDetails</b>( package ) </div> <div class="description"> <p> @@ -367,8 +367,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000102_source')" id="l_M000102_source">show source</a> ]</p> - <div id="M000102_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000104_source')" id="l_M000104_source">show source</a> ]</p> + <div id="M000104_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 52</span> 52: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showPackageDetails</span>( <span class="ruby-identifier">package</span> ) @@ -416,7 +416,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000104"></a><b>showPackageLog</b>( package, logType ) + <a name="M000106"></a><b>showPackageLog</b>( package, logType ) </div> <div class="description"> <p> @@ -434,8 +434,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000104_source')" id="l_M000104_source">show source</a> ]</p> - <div id="M000104_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000106_source')" id="l_M000106_source">show source</a> ]</p> + <div id="M000106_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 110</span> 110: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showPackageLog</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">logType</span> ) @@ -449,7 +449,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000111"></a><b>showQueue</b>( queueType ) + <a name="M000113"></a><b>showQueue</b>( queueType ) </div> <div class="description"> <p> @@ -464,8 +464,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000111_source')" id="l_M000111_source">show source</a> ]</p> - <div id="M000111_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000113_source')" id="l_M000113_source">show source</a> ]</p> + <div id="M000113_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 197</span> 197: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showQueue</span>( <span class="ruby-identifier">queueType</span> ) @@ -496,7 +496,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000107"></a><b>showUntrackedFiles</b>() + <a name="M000109"></a><b>showUntrackedFiles</b>() </div> <div class="description"> <p> @@ -508,8 +508,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000107_source')" id="l_M000107_source">show source</a> ]</p> - <div id="M000107_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000109_source')" id="l_M000109_source">show source</a> ]</p> + <div id="M000109_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 144</span> 144: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showUntrackedFiles</span> @@ -520,7 +520,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000112"></a><b>showUpdates</b>( target ) + <a name="M000114"></a><b>showUpdates</b>( target ) </div> <div class="description"> <p> @@ -537,8 +537,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000112_source')" id="l_M000112_source">show source</a> ]</p> - <div id="M000112_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000114_source')" id="l_M000114_source">show source</a> ]</p> + <div id="M000114_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 230</span> 230: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showUpdates</span>( <span class="ruby-identifier">target</span> ) Modified: src/trunk/doc/classes/AbtUsage.html =================================================================== --- src/trunk/doc/classes/AbtUsage.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/AbtUsage.html 2006-11-18 19:22:06 UTC (rev 213) @@ -117,13 +117,13 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000031">usage</a></li> - <li><a href="#M000035">usageDownloads</a></li> - <li><a href="#M000036">usageFix</a></li> - <li><a href="#M000034">usageGeneration</a></li> - <li><a href="#M000037">usageMaintenance</a></li> - <li><a href="#M000032">usagePackages</a></li> - <li><a href="#M000033">usageQueries</a></li> + <li><a href="#M000033">usage</a></li> + <li><a href="#M000037">usageDownloads</a></li> + <li><a href="#M000038">usageFix</a></li> + <li><a href="#M000036">usageGeneration</a></li> + <li><a href="#M000039">usageMaintenance</a></li> + <li><a href="#M000034">usagePackages</a></li> + <li><a href="#M000035">usageQueries</a></li> </ul> @@ -134,7 +134,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000031"></a><b>usage</b>( section ) + <a name="M000033"></a><b>usage</b>( section ) </div> <div class="description"> <p> @@ -148,8 +148,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000031_source')" id="l_M000031_source">show source</a> ]</p> - <div id="M000031_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000033_source')" id="l_M000033_source">show source</a> ]</p> + <div id="M000033_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtUsage.rb, line 36</span> 36: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usage</span>( <span class="ruby-identifier">section</span> ) @@ -190,7 +190,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000035"></a><b>usageDownloads</b>() + <a name="M000037"></a><b>usageDownloads</b>() </div> <div class="description"> <p> @@ -201,8 +201,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000035_source')" id="l_M000035_source">show source</a> ]</p> - <div id="M000035_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000037_source')" id="l_M000037_source">show source</a> ]</p> + <div id="M000037_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtUsage.rb, line 121</span> 121: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usageDownloads</span> @@ -217,7 +217,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000036"></a><b>usageFix</b>() + <a name="M000038"></a><b>usageFix</b>() </div> <div class="description"> <p> @@ -228,8 +228,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000036_source')" id="l_M000036_source">show source</a> ]</p> - <div id="M000036_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000038_source')" id="l_M000038_source">show source</a> ]</p> + <div id="M000038_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtUsage.rb, line 133</span> 133: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usageFix</span> @@ -248,7 +248,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000034"></a><b>usageGeneration</b>() + <a name="M000036"></a><b>usageGeneration</b>() </div> <div class="description"> <p> @@ -259,8 +259,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000034_source')" id="l_M000034_source">show source</a> ]</p> - <div id="M000034_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000036_source')" id="l_M000036_source">show source</a> ]</p> + <div id="M000036_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtUsage.rb, line 109</span> 109: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usageGeneration</span> @@ -275,7 +275,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000037"></a><b>usageMaintenance</b>() + <a name="M000039"></a><b>usageMaintenance</b>() </div> <div class="description"> <p> @@ -286,8 +286,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000037_source')" id="l_M000037_source">show source</a> ]</p> - <div id="M000037_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000039_source')" id="l_M000039_source">show source</a> ]</p> + <div id="M000039_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtUsage.rb, line 149</span> 149: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usageMaintenance</span> @@ -304,7 +304,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000032"></a><b>usagePackages</b>() + <a name="M000034"></a><b>usagePackages</b>() </div> <div class="description"> <p> @@ -315,8 +315,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000032_source')" id="l_M000032_source">show source</a> ]</p> - <div id="M000032_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000034_source')" id="l_M000034_source">show source</a> ]</p> + <div id="M000034_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtUsage.rb, line 74</span> 74: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usagePackages</span> @@ -333,7 +333,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000033"></a><b>usageQueries</b>() + <a name="M000035"></a><b>usageQueries</b>() </div> <div class="description"> <p> @@ -344,8 +344,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000033_source')" id="l_M000033_source">show source</a> ]</p> - <div id="M000033_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000035_source')" id="l_M000035_source">show source</a> ]</p> + <div id="M000035_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtUsage.rb, line 88</span> 88: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usageQueries</span> Modified: src/trunk/doc/classes/TestAbtDepEngine.html =================================================================== --- src/trunk/doc/classes/TestAbtDepEngine.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/TestAbtDepEngine.html 2006-11-18 19:22:06 UTC (rev 213) @@ -117,8 +117,8 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000093">setup</a></li> - <li><a href="#M000094">testDepEngine</a></li> + <li><a href="#M000095">setup</a></li> + <li><a href="#M000096">testDepEngine</a></li> </ul> @@ -129,7 +129,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000093"></a><b>setup</b>() + <a name="M000095"></a><b>setup</b>() </div> <div class="description"> <p> @@ -137,8 +137,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000093_source')" id="l_M000093_source">show source</a> ]</p> - <div id="M000093_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000095_source')" id="l_M000095_source">show source</a> ]</p> + <div id="M000095_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtDepEngine.rb, line 36</span> 36: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup</span> @@ -150,7 +150,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000094"></a><b>testDepEngine</b>() + <a name="M000096"></a><b>testDepEngine</b>() </div> <div class="description"> <p> @@ -158,8 +158,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000094_source')" id="l_M000094_source">show source</a> ]</p> - <div id="M000094_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000096_source')" id="l_M000096_source">show source</a> ]</p> + <div id="M000096_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtDepEngine.rb, line 43</span> 43: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testDepEngine</span> Modified: src/trunk/doc/classes/TestAbtDownloadManager.html =================================================================== --- src/trunk/doc/classes/TestAbtDownloadManager.html 2006-11-18 19:20:20 UTC (rev 212) +++ src/trunk/doc/classes/TestAbtDownloadManager.html 2006-11-18 19:22:06 UTC (rev 213) @@ -118,12 +118,12 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000076">setup</a></li> - <li><a href="#M000079">testRetrieveNewsFeed</a></li> - <li><a href="#M000077">testRetrievePackageSource</a></li> - <li><a href="#M000078">testRetrievePackageTree</a></li> - <li><a href="#M000080">testUpdatePackage</a></li> - <li><a href="#M000081">testUpdatePackageTree</a></li> + <li><a href="#M000078">setup</a></li> + <li><a href="#M000081">testRetrieveNewsFeed</a></li> + <li><a href="#M000079">testRetrievePackageSource</a>... [truncated message content] |
From: <esc...@us...> - 2006-11-18 19:20:19
|
Revision: 212 http://svn.sourceforge.net/abtlinux/?rev=212&view=rev Author: eschabell Date: 2006-11-18 11:20:20 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Added required fileutils to fix install package test error. Modified Paths: -------------- src/trunk/testSuiteAbt.rb Modified: src/trunk/testSuiteAbt.rb =================================================================== --- src/trunk/testSuiteAbt.rb 2006-11-18 19:16:41 UTC (rev 211) +++ src/trunk/testSuiteAbt.rb 2006-11-18 19:20:20 UTC (rev 212) @@ -8,6 +8,7 @@ require 'test/unit' require 'abtConfig' +require 'fileutils' require 'TestAbtDepEngine' require 'TestAbtDownloadManager' require 'TestAbtLogManager' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 19:16:44
|
Revision: 211 http://svn.sourceforge.net/abtlinux/?rev=211&view=rev Author: eschabell Date: 2006-11-18 11:16:41 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Install package is now up to unpacking and removal of the build sources into the global build directory. Modified Paths: -------------- src/trunk/AbtPackageManager.rb Modified: src/trunk/AbtPackageManager.rb =================================================================== --- src/trunk/AbtPackageManager.rb 2006-11-18 19:15:21 UTC (rev 210) +++ src/trunk/AbtPackageManager.rb 2006-11-18 19:16:41 UTC (rev 211) @@ -51,33 +51,40 @@ ## def installPackage( package ) require package - packager = eval( "#{package.capitalize}.new" ) + sw = eval( "#{package.capitalize}.new" ) queuer = AbtQueueManager.new logger = AbtLogManager.new # get package details. - details = packager.details + details = sw.details + # TODO: check deps + # add to install queue. if ( !queuer.addPackageToQueue( package, "install" ) ) logger.logToJournal( "Failed to add #{package} to install queue." ) return false end + if ( !sw.pre ) + logger.logToJournal( "Failed to process pre-section in the package description of #{package}." ) + return false + end + + if ( !sw.removeBuildSources ) + logger.logToJournal( "Failed to remove the build sources for #{package}." ) + #return false # commented out as this is not a reason to fail. + end + return true # TODO: finish up the following steps per install scenario: # - # check deps - # add missing deps to install queue - # get details - # pre section # configure section # build section # pre install section # install section # post section - # clean source build directory end ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 19:15:21
|
Revision: 210 http://svn.sourceforge.net/abtlinux/?rev=210&view=rev Author: eschabell Date: 2006-11-18 11:15:21 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Added needed global build location. Modified Paths: -------------- src/trunk/abtConfig.rb Modified: src/trunk/abtConfig.rb =================================================================== --- src/trunk/abtConfig.rb 2006-11-18 19:14:41 UTC (rev 209) +++ src/trunk/abtConfig.rb 2006-11-18 19:15:21 UTC (rev 210) @@ -26,6 +26,7 @@ ## $PACKAGE_PATH = "./packages/" $SOURCES_REPOSITORY = "/var/spool/abt/sources" +$BUILD_LOCATION = "/usr/src" $ABTNEWS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?1.2" $ABTNEWS_THREADS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?6.2" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 19:14:40
|
Revision: 209 http://svn.sourceforge.net/abtlinux/?rev=209&view=rev Author: eschabell Date: 2006-11-18 11:14:41 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Added two new helper methods to unpack and cleanup package sources. Also worked out some of the pre section. Modified Paths: -------------- src/trunk/AbtPackage.rb Modified: src/trunk/AbtPackage.rb =================================================================== --- src/trunk/AbtPackage.rb 2006-11-18 18:16:14 UTC (rev 208) +++ src/trunk/AbtPackage.rb 2006-11-18 19:14:41 UTC (rev 209) @@ -142,6 +142,22 @@ # <b>RETURNS:</b> <i>boolean</i> - True if completes sucessfully, otherwise false. ## def pre + downloader = AbtDownloadManager.new + + # download sources. + if ( !downloader.retrievePackageSource( @name.downcase, $SOURCES_REPOSITORY ) ) + return false + end + + # unpack sources. + if ( !unpackSources ) + return false + end + + # TODO: retrieve patches? + # TODO: apply patches? + + return true end ## @@ -188,4 +204,42 @@ ## def post end + + ## + # Unpacks this packages source file into the standard build location. + # + # <b>RETURNS:</b> <i>boolean</i> - True if the completes sucessfully, otherwise false. + ## + def unpackSources + sourcesToUnpack = "#{$SOURCES_REPOSITORY}/#{File.basename( srcUrl )}" + + if ( !File.exist?( sourcesToUnpack ) ) + return false + end + + # TODO: system call removal? + if ( !system( "cd #{$BUILD_LOCATION}; tar xzvf #{sourcesToUnpack}" ) ) + return false + end + + return true + end + + ## + # Cleans up this packages source build directory. + # + # <b>RETURNS:</b> <i>boolean</i> - True if the completes sucessfully, otherwise false. + ## + def removeBuildSources + buildSourcesLocation = "#{$BUILD_LOCATION}/#{srcDir}" + + if ( !File.directory?( buildSourcesLocation ) ) + return true + end + + # TODO: system call removal? + if ( !FileUtils.rm_rf buildSourcesLocation, :verbose => true ) + return false + end + end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 18:16:17
|
Revision: 208 http://svn.sourceforge.net/abtlinux/?rev=208&view=rev Author: eschabell Date: 2006-11-18 10:16:14 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Updated unit tests to make use of fortune where package name is needed. Modified Paths: -------------- src/trunk/TestAbtLogManager.rb src/trunk/TestAbtPackageManager.rb src/trunk/TestAbtReportManager.rb Modified: src/trunk/TestAbtLogManager.rb =================================================================== --- src/trunk/TestAbtLogManager.rb 2006-11-18 18:01:24 UTC (rev 207) +++ src/trunk/TestAbtLogManager.rb 2006-11-18 18:16:14 UTC (rev 208) @@ -41,7 +41,7 @@ # Test method for 'AbtLogManager.testLogPackageIntegrity()' ## def testLogPackageIntegrity() - #assert( @log.logPackageIntegrity( "dummy" ), "testLogPackageIntegrity()" ) + #assert( @log.logPackageIntegrity( "fortune" ), "testLogPackageIntegrity()" ) assert( false, "testLogPackageIntegrity()" ) end @@ -49,21 +49,21 @@ # Test method for 'AbtLogManager.testLogPackageInstall()' ## def testLogPackageInstall() - assert( @log.logPackageInstall( "dummy" ), "testLogPackageInstall()" ) + assert( @log.logPackageInstall( "fortune" ), "testLogPackageInstall()" ) end ## # Test method for 'AbtLogManager.testLogPackageBuild()' ## def testLogPackageBuild() - assert( @log.logPackageBuild( "dummy" ), "testLogPackageBuild()" ) + assert( @log.logPackageBuild( "fortune" ), "testLogPackageBuild()" ) end ## # Test method for 'AbtLogManager.testCachePackage()' ## def testCachePackage() - assert( @log.cachePackage( "dummy" ), "testCachePackage()" ) + assert( @log.cachePackage( "fortune" ), "testCachePackage()" ) end ## Modified: src/trunk/TestAbtPackageManager.rb =================================================================== --- src/trunk/TestAbtPackageManager.rb 2006-11-18 18:01:24 UTC (rev 207) +++ src/trunk/TestAbtPackageManager.rb 2006-11-18 18:16:14 UTC (rev 208) @@ -41,35 +41,35 @@ # Test method for 'AbtPackageManager.testInstallPackage()' ## def testInstallPackage - assert( @pkgMgr.installPackage( "dummy" ), "testInstallPackage()" ) + assert( @pkgMgr.installPackage( "fortune" ), "testInstallPackage()" ) end ## # Test method for 'AbtPackageManager.testReinstallPackage()' ## def testReinstallPackage - assert( @pkgMgr.reinstallPackage( "dummy" ), "testReinstallPackage()" ) + assert( @pkgMgr.reinstallPackage( "fortune" ), "testReinstallPackage()" ) end ## # Test method for 'AbtPackageManager.testRemovePackage()' ## def testRemovePackage - assert( @pkgMgr.removePackage( "dummy" ), "testRemovePackage()" ) + assert( @pkgMgr.removePackage( "fortune" ), "testRemovePackage()" ) end ## # Test method for 'AbtPackageManager.testDowngradePackage()' ## def testDowngradePackage - assert( @pkgMgr.downgradePackage( "dummy", "1.2" ), "testDowngradePackage()" ) + assert( @pkgMgr.downgradePackage( "fortune", "1.2" ), "testDowngradePackage()" ) end ## # Test method for 'AbtPackageManager.testFreezePackage()' ## def testFreezePackage - assert( @pkgMgr.freezePackage( "dummy" ), "testFreezePackage()" ) + assert( @pkgMgr.freezePackage( "fortune" ), "testFreezePackage()" ) end end Modified: src/trunk/TestAbtReportManager.rb =================================================================== --- src/trunk/TestAbtReportManager.rb 2006-11-18 18:01:24 UTC (rev 207) +++ src/trunk/TestAbtReportManager.rb 2006-11-18 18:16:14 UTC (rev 208) @@ -41,7 +41,7 @@ # Test method for 'AbtReportManager.testShowPackageDetails()' ## def testShowPackageDetails - assert( @report.showPackageDetails( "dummy" ), "testShowPackageDetails()" ) + assert( @report.showPackageDetails( "fortune" ), "testShowPackageDetails()" ) end ## @@ -55,9 +55,9 @@ # Test method for 'AbtReportManager.testShowPackageLog()' ## def testShowPackageLog - assert( @report.showPackageLog( "dummy", "install" ), "testShowPackageLog()" ) - assert( @report.showPackageLog( "dummy", "build" ), "testShowPackageLog()" ) - assert( @report.showPackageLog( "dummy", "integrity" ), "testShowPackageLog()" ) + assert( @report.showPackageLog( "fortune", "install" ), "testShowPackageLog()" ) + assert( @report.showPackageLog( "fortune", "build" ), "testShowPackageLog()" ) + assert( @report.showPackageLog( "fortune", "integrity" ), "testShowPackageLog()" ) end ## @@ -71,7 +71,7 @@ # Test method for 'AbtReportManager.testShowPackageDependencies()' ## def testShowPackageDependencies - #assert( @report.showPackageDependencies( "dummy" ), "testShowPackageDependencies()" ) + #assert( @report.showPackageDependencies( "fortune" ), "testShowPackageDependencies()" ) assert( false, "testShowPackageDependencies()" ) end @@ -93,7 +93,7 @@ # Test method for 'AbtReportManager.testShowFileOwner()' ## def testShowFileOwner - assert( @report.showFileOwner( "dummyFile" ), "testShowFileOwner()" ) + assert( @report.showFileOwner( "fortuneFile" ), "testShowFileOwner()" ) end ## @@ -114,7 +114,7 @@ # Test method for 'AbtReportManager.testShowUpdates()' ## def testShowUpdates - assert( @report.showUpdates( "dummy" ), "testShowUpdates()" ) + assert( @report.showUpdates( "fortune" ), "testShowUpdates()" ) end ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 18:01:28
|
Revision: 207 http://svn.sourceforge.net/abtlinux/?rev=207&view=rev Author: eschabell Date: 2006-11-18 10:01:24 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Moved install package code over to class where it needs to be. Modified Paths: -------------- src/trunk/AbtPackageManager.rb src/trunk/abt.rb Modified: src/trunk/AbtPackageManager.rb =================================================================== --- src/trunk/AbtPackageManager.rb 2006-11-18 17:38:57 UTC (rev 206) +++ src/trunk/AbtPackageManager.rb 2006-11-18 18:01:24 UTC (rev 207) @@ -28,9 +28,9 @@ class AbtPackageManager protected - + private - + public ## @@ -50,6 +50,34 @@ # false. ## def installPackage( package ) + require package + packager = eval( "#{package.capitalize}.new" ) + + queuer = AbtQueueManager.new + logger = AbtLogManager.new + + # get package details. + details = packager.details + + # add to install queue. + if ( !queuer.addPackageToQueue( package, "install" ) ) + logger.logToJournal( "Failed to add #{package} to install queue." ) + return false + end + + return true + # TODO: finish up the following steps per install scenario: + # + # check deps + # add missing deps to install queue + # get details + # pre section + # configure section + # build section + # pre install section + # install section + # post section + # clean source build directory end ## Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-11-18 17:38:57 UTC (rev 206) +++ src/trunk/abt.rb 2006-11-18 18:01:24 UTC (rev 207) @@ -46,7 +46,6 @@ ## manager = AbtPackageManager.new logger = AbtLogManager.new -queuer = AbtQueueManager.new reporter = AbtReportManager.new options = Hash.new show = AbtUsage.new @@ -67,39 +66,14 @@ options['package'] = ARGV[1] logger.logToJournal( "Starting to install #{options['package']}" ) - require options['package'] # pickup called package class. - package = eval( "#{options['package'].capitalize}.new" ) # evaluates package.new methode dynamically. - details = package.details + if ( manager.installPackage( options['package'] ) ) + puts "Completed install of #{options['package']}." + logger.logToJournal( "Completed install of #{options['package']}." ) + else + puts "#{options['package'].capitalize} install failed, see journal for possible reasons." + end - queuer.addPackageToQueue( options['package'], "install" ) - - # Reached point where pkg in install queue - reporter.showQueue( "install" ); - - # TODO: finish up the following steps per install scenario: - # - # check deps - # add missing deps to install queue - # get details - # pre section - # download - # unpack - # configure section - # set install location - # ./configure - # save package.configure - # build section - # make - # save package.build - # pre install section - # install section - # make install - # save pacakge.install - # save package.integrity - # post section - # clean source build directory - # notify user - + reporter.showQueue( "install" ); # DEBUG. else show.usage( "packages" ) exit @@ -406,4 +380,7 @@ show.usage( "maintenance" ) exit end # case repoAction. + + else + show.usage( "all" ) end # case ARGV[0]. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 17:38:58
|
Revision: 206 http://svn.sourceforge.net/abtlinux/?rev=206&view=rev Author: eschabell Date: 2006-11-18 09:38:57 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Added an extra log info line to the queue manager. Modified Paths: -------------- src/trunk/AbtQueueManager.rb Modified: src/trunk/AbtQueueManager.rb =================================================================== --- src/trunk/AbtQueueManager.rb 2006-11-18 15:26:43 UTC (rev 205) +++ src/trunk/AbtQueueManager.rb 2006-11-18 17:38:57 UTC (rev 206) @@ -83,6 +83,7 @@ return true end + logger.logToJournal( "Failed to open #{queueFile}." ) return false end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 15:26:42
|
Revision: 205 http://svn.sourceforge.net/abtlinux/?rev=205&view=rev Author: eschabell Date: 2006-11-18 07:26:43 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtDepEngine.html src/trunk/doc/classes/AbtLogManager.html src/trunk/doc/classes/AbtPackageManager.html src/trunk/doc/classes/AbtQueueManager.html src/trunk/doc/classes/AbtReportManager.html src/trunk/doc/classes/AbtUsage.html src/trunk/doc/classes/TestAbtDepEngine.html src/trunk/doc/classes/TestAbtLogManager.html src/trunk/doc/classes/TestAbtPackage.html src/trunk/doc/created.rid src/trunk/doc/files/AbtLogManager_rb.html src/trunk/doc/files/AbtPackageManager_rb.html src/trunk/doc/files/AbtQueueManager_rb.html src/trunk/doc/files/AbtReportManager_rb.html src/trunk/doc/files/AbtUsage_rb.html src/trunk/doc/fr_method_index.html Modified: src/trunk/doc/classes/AbtDepEngine.html =================================================================== --- src/trunk/doc/classes/AbtDepEngine.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/AbtDepEngine.html 2006-11-18 15:26:43 UTC (rev 205) @@ -118,7 +118,7 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000083">new</a></li> + <li><a href="#M000084">new</a></li> </ul> @@ -129,7 +129,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000083"></a><b>new</b>() + <a name="M000084"></a><b>new</b>() </div> <div class="description"> <p> @@ -141,8 +141,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000083_source')" id="l_M000083_source">show source</a> ]</p> - <div id="M000083_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000084_source')" id="l_M000084_source">show source</a> ]</p> + <div id="M000084_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtDepEngine.rb, line 41</span> 41: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> Modified: src/trunk/doc/classes/AbtLogManager.html =================================================================== --- src/trunk/doc/classes/AbtLogManager.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/AbtLogManager.html 2006-11-18 15:26:43 UTC (rev 205) @@ -150,8 +150,10 @@ <pre> <span class="ruby-comment cmt"># File AbtLogManager.rb, line 55</span> 55: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> -56: -57: <span class="ruby-keyword kw">end</span> +56: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">$ABT_LOGS</span> ) ) +57: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">$ABT_LOGS</span> ) <span class="ruby-comment cmt"># initialize logs.</span> +58: <span class="ruby-keyword kw">end</span> +59: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -178,9 +180,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000062_source')" id="l_M000062_source">show source</a> ]</p> <div id="M000062_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 92</span> -92: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cachePackage</span>( <span class="ruby-identifier">package</span> ) -93: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 94</span> +94: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cachePackage</span>( <span class="ruby-identifier">package</span> ) +95: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -206,9 +208,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000061_source')" id="l_M000061_source">show source</a> ]</p> <div id="M000061_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 80</span> -80: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageBuild</span>( <span class="ruby-identifier">package</span> ) -81: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 82</span> +82: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageBuild</span>( <span class="ruby-identifier">package</span> ) +83: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -234,9 +236,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000060_source')" id="l_M000060_source">show source</a> ]</p> <div id="M000060_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 68</span> -68: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageInstall</span>( <span class="ruby-identifier">package</span> ) -69: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 70</span> +70: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageInstall</span>( <span class="ruby-identifier">package</span> ) +71: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -261,17 +263,15 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000063_source')" id="l_M000063_source">show source</a> ]</p> <div id="M000063_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 103</span> -103: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logToJournal</span>( <span class="ruby-identifier">message</span> ) -104: <span class="ruby-identifier">require</span> <span class="ruby-value str">'date'</span> -105: -106: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">$JOURNAL_PATH</span> ) ) -107: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">$JOURNAL_PATH</span> ) <span class="ruby-comment cmt"># initialize logs.</span> -108: <span class="ruby-keyword kw">end</span> -109: -110: <span class="ruby-identifier">log</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">$JOURNAL</span>, <span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">WRONLY</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">APPEND</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">CREAT</span>, <span class="ruby-value">0644</span>) -111: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>.<span class="ruby-identifier">strftime</span>( <span class="ruby-value str">"%Y-%m-%d %H:%M:%S (%Z)"</span> ) <span class="ruby-operator">+</span> <span class="ruby-node">" : #{message}"</span> -112: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 105</span> +105: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logToJournal</span>( <span class="ruby-identifier">message</span> ) +106: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">log</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$JOURNAL</span>, <span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">WRONLY</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">APPEND</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">CREAT</span>, <span class="ruby-value">0644</span> ) ) +107: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{$TIMESTAMP} : #{message}"</span> +108: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">close</span> +109: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +110: <span class="ruby-keyword kw">end</span> +111: +112: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> 113: <span class="ruby-keyword kw">end</span> </pre> </div> Modified: src/trunk/doc/classes/AbtPackageManager.html =================================================================== --- src/trunk/doc/classes/AbtPackageManager.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/AbtPackageManager.html 2006-11-18 15:26:43 UTC (rev 205) @@ -327,11 +327,10 @@ 115: <span class="ruby-identifier">args</span> = <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-constant">ARGV</span>[<span class="ruby-identifier">i</span>] 116: <span class="ruby-keyword kw">end</span> 117: -118: <span class="ruby-comment cmt"># TODO: remove the ./abt call on deployment.</span> -119: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) -120: <span class="ruby-identifier">exit</span> -121: <span class="ruby-keyword kw">end</span> -122: <span class="ruby-keyword kw">end</span> +118: <span class="ruby-identifier">system</span>( <span class="ruby-value str">'su -c "./abt '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'" root'</span> ) <span class="ruby-comment cmt"># TODO: replace system call?</span> +119: <span class="ruby-identifier">exit</span> +120: <span class="ruby-keyword kw">end</span> +121: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtQueueManager.html =================================================================== --- src/trunk/doc/classes/AbtQueueManager.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/AbtQueueManager.html 2006-11-18 15:26:43 UTC (rev 205) @@ -117,6 +117,7 @@ <div class="sectiontitle">Methods</div> <ul> + <li><a href="#M000083">addPackageToQueue</a></li> <li><a href="#M000082">new</a></li> </ul> @@ -146,12 +147,74 @@ <pre> <span class="ruby-comment cmt"># File AbtQueueManager.rb, line 40</span> 40: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> -41: <span class="ruby-keyword kw">end</span> +41: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">$ABT_LOGS</span> ) ) +42: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">$ABT_LOGS</span> ) <span class="ruby-comment cmt"># initialize logs.</span> +43: <span class="ruby-keyword kw">end</span> +44: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> +<div class="sectiontitle">Public Instance methods</div> +<div class="method"> + <div class="title"> + <a name="M000083"></a><b>addPackageToQueue</b>( package, queue ) + </div> + <div class="description"> + <p> +Add a given package to the given queue. If package already in the queue +then it will not be added twice and return a positive answer. +</p> +<p> +<b>PARAM</b> <em>String</em> - the package to be added to the queue. +<b>PARAM</b> <em>String</em> - the queue to add the package to. +</p> +<p> +<b>RETURN</b> <em>boolean</em> - true if package added/exists to/in install +queue, otherwise false. +</p> + </div> +<div class="sourcecode"> + <p class="source-link">[ <a href="javascript:toggleSource('M000083_source')" id="l_M000083_source">show source</a> ]</p> + <div id="M000083_source" class="dyn-source"> +<pre> + <span class="ruby-comment cmt"># File AbtQueueManager.rb, line 57</span> +57: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addPackageToQueue</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">queue</span> ) +58: <span class="ruby-identifier">queueFile</span> = <span class="ruby-node">"#{$ABT_LOGS}/#{queue}.log"</span> +59: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> +60: +61: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">log</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">queueFile</span>, <span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">WRONLY</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">APPEND</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">CREAT</span>, <span class="ruby-value">0644</span> ) ) +62: <span class="ruby-comment cmt"># pickup queue contents to ensure no duplicates.</span> +63: <span class="ruby-identifier">checkingQueue</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">readlines</span>( <span class="ruby-identifier">queueFile</span> ) +64: +65: <span class="ruby-comment cmt"># endsure no duplicates.</span> +66: <span class="ruby-identifier">matched</span> = <span class="ruby-keyword kw">false</span> +67: <span class="ruby-identifier">checkingQueue</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span> +68: <span class="ruby-identifier">entryName</span> = <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">split</span>( <span class="ruby-value str">'|'</span> ) +69: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">entryName</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">==</span> <span class="ruby-identifier">package</span> ) +70: <span class="ruby-identifier">matched</span> = <span class="ruby-keyword kw">true</span> +71: <span class="ruby-keyword kw">end</span> +72: <span class="ruby-keyword kw">end</span> +73: +74: <span class="ruby-comment cmt"># check if package exists, otherwise add.</span> +75: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">matched</span> ) +76: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{package}|#{$TIMESTAMP}"</span> +77: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Added #{package} to #{queue} queue."</span> ) +78: <span class="ruby-keyword kw">else</span> +79: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Did not add #{package} to #{queue}, already exists."</span> ) +80: <span class="ruby-keyword kw">end</span> +81: +82: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">close</span> +83: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +84: <span class="ruby-keyword kw">end</span> +85: +86: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +87: <span class="ruby-keyword kw">end</span> +</pre> + </div> </div> +</div> +</div> </div> Modified: src/trunk/doc/classes/AbtReportManager.html =================================================================== --- src/trunk/doc/classes/AbtReportManager.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/AbtReportManager.html 2006-11-18 15:26:43 UTC (rev 205) @@ -117,19 +117,19 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000112">generateHTMLPackageListing</a></li> - <li><a href="#M000100">new</a></li> - <li><a href="#M000109">searchPackageDescriptions</a></li> - <li><a href="#M000108">showFileOwner</a></li> - <li><a href="#M000104">showFrozenPackages</a></li> - <li><a href="#M000102">showInstalledPackages</a></li> - <li><a href="#M000107">showJournal</a></li> - <li><a href="#M000105">showPackageDependencies</a></li> - <li><a href="#M000101">showPackageDetails</a></li> - <li><a href="#M000103">showPackageLog</a></li> - <li><a href="#M000110">showQueue</a></li> - <li><a href="#M000106">showUntrackedFiles</a></li> - <li><a href="#M000111">showUpdates</a></li> + <li><a href="#M000113">generateHTMLPackageListing</a></li> + <li><a href="#M000101">new</a></li> + <li><a href="#M000110">searchPackageDescriptions</a></li> + <li><a href="#M000109">showFileOwner</a></li> + <li><a href="#M000105">showFrozenPackages</a></li> + <li><a href="#M000103">showInstalledPackages</a></li> + <li><a href="#M000108">showJournal</a></li> + <li><a href="#M000106">showPackageDependencies</a></li> + <li><a href="#M000102">showPackageDetails</a></li> + <li><a href="#M000104">showPackageLog</a></li> + <li><a href="#M000111">showQueue</a></li> + <li><a href="#M000107">showUntrackedFiles</a></li> + <li><a href="#M000112">showUpdates</a></li> </ul> @@ -140,7 +140,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000100"></a><b>new</b>() + <a name="M000101"></a><b>new</b>() </div> <div class="description"> <p> @@ -152,8 +152,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000100_source')" id="l_M000100_source">show source</a> ]</p> - <div id="M000100_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000101_source')" id="l_M000101_source">show source</a> ]</p> + <div id="M000101_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 41</span> 41: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -165,7 +165,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000112"></a><b>generateHTMLPackageListing</b>() + <a name="M000113"></a><b>generateHTMLPackageListing</b>() </div> <div class="description"> <p> @@ -176,19 +176,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000112_source')" id="l_M000112_source">show source</a> ]</p> - <div id="M000112_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000113_source')" id="l_M000113_source">show source</a> ]</p> + <div id="M000113_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 169</span> -169: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateHTMLPackageListing</span> -170: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 238</span> +238: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateHTMLPackageListing</span> +239: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000109"></a><b>searchPackageDescriptions</b>( searchText ) + <a name="M000110"></a><b>searchPackageDescriptions</b>( searchText ) </div> <div class="description"> <p> @@ -204,19 +204,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000109_source')" id="l_M000109_source">show source</a> ]</p> - <div id="M000109_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000110_source')" id="l_M000110_source">show source</a> ]</p> + <div id="M000110_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 137</span> -137: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">searchPackageDescriptions</span>( <span class="ruby-identifier">searchText</span> ) -138: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 186</span> +186: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">searchPackageDescriptions</span>( <span class="ruby-identifier">searchText</span> ) +187: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000108"></a><b>showFileOwner</b>( file ) + <a name="M000109"></a><b>showFileOwner</b>( file ) </div> <div class="description"> <p> @@ -230,19 +230,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000108_source')" id="l_M000108_source">show source</a> ]</p> - <div id="M000108_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000109_source')" id="l_M000109_source">show source</a> ]</p> + <div id="M000109_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 125</span> -125: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showFileOwner</span>( <span class="ruby-identifier">file</span> ) -126: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 174</span> +174: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showFileOwner</span>( <span class="ruby-identifier">file</span> ) +175: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000104"></a><b>showFrozenPackages</b>() + <a name="M000105"></a><b>showFrozenPackages</b>() </div> <div class="description"> <p> @@ -253,19 +253,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000104_source')" id="l_M000104_source">show source</a> ]</p> - <div id="M000104_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000105_source')" id="l_M000105_source">show source</a> ]</p> + <div id="M000105_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 84</span> -84: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showFrozenPackages</span> -85: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 121</span> +121: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showFrozenPackages</span> +122: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000102"></a><b>showInstalledPackages</b>() + <a name="M000103"></a><b>showInstalledPackages</b>() </div> <div class="description"> <p> @@ -276,19 +276,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000102_source')" id="l_M000102_source">show source</a> ]</p> - <div id="M000102_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000103_source')" id="l_M000103_source">show source</a> ]</p> + <div id="M000103_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 60</span> -60: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showInstalledPackages</span> -61: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 97</span> +97: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showInstalledPackages</span> +98: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000107"></a><b>showJournal</b>() + <a name="M000108"></a><b>showJournal</b>() </div> <div class="description"> <p> @@ -299,19 +299,31 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000107_source')" id="l_M000107_source">show source</a> ]</p> - <div id="M000107_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000108_source')" id="l_M000108_source">show source</a> ]</p> + <div id="M000108_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 115</span> -115: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showJournal</span> -116: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 152</span> +152: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showJournal</span> +153: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">$JOURNAL</span> ) ) +154: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +155: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"AbTLinux journal:"</span> +156: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"================="</span> +157: <span class="ruby-identifier">log</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">readlines</span>( <span class="ruby-identifier">$JOURNAL</span> ) +158: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">each</span>{ <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span> <span class="ruby-identifier">puts</span> <span class="ruby-identifier">entry</span> } +159: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +160: <span class="ruby-keyword kw">else</span> +161: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +162: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"AbtLinux journal is empty at this time."</span> +163: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +164: <span class="ruby-keyword kw">end</span> +165: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000105"></a><b>showPackageDependencies</b>( package ) + <a name="M000106"></a><b>showPackageDependencies</b>( package ) </div> <div class="description"> <p> @@ -328,19 +340,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000105_source')" id="l_M000105_source">show source</a> ]</p> - <div id="M000105_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000106_source')" id="l_M000106_source">show source</a> ]</p> + <div id="M000106_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 97</span> -97: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showPackageDependencies</span>( <span class="ruby-identifier">package</span> ) -98: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 134</span> +134: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showPackageDependencies</span>( <span class="ruby-identifier">package</span> ) +135: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000101"></a><b>showPackageDetails</b>( package ) + <a name="M000102"></a><b>showPackageDetails</b>( package ) </div> <div class="description"> <p> @@ -355,19 +367,56 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000101_source')" id="l_M000101_source">show source</a> ]</p> - <div id="M000101_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000102_source')" id="l_M000102_source">show source</a> ]</p> + <div id="M000102_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 52</span> 52: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showPackageDetails</span>( <span class="ruby-identifier">package</span> ) -53: <span class="ruby-keyword kw">end</span> +53: <span class="ruby-identifier">require</span> <span class="ruby-identifier">package</span> +54: +55: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">package</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-node">"#{package.capitalize}.new"</span> ) ) +56: <span class="ruby-identifier">details</span> = <span class="ruby-identifier">package</span>.<span class="ruby-identifier">details</span> +57: +58: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"|====================================="</span> +59: <span class="ruby-identifier">puts</span> <span class="ruby-node">"| Package name\t: #{details['Package name']}"</span> +60: <span class="ruby-identifier">details</span>.<span class="ruby-identifier">delete</span>( <span class="ruby-value str">"Package name"</span> ) +61: <span class="ruby-identifier">puts</span> <span class="ruby-node">"| Version\t: #{details['Version']}"</span> +62: <span class="ruby-identifier">details</span>.<span class="ruby-identifier">delete</span>( <span class="ruby-value str">"Version"</span> ) +63: <span class="ruby-identifier">puts</span> <span class="ruby-node">"| Homepage\t: #{details['Homepage']}"</span> +64: <span class="ruby-identifier">details</span>.<span class="ruby-identifier">delete</span>( <span class="ruby-value str">"Homepage"</span> ) +65: <span class="ruby-identifier">puts</span> <span class="ruby-node">"| Executable\t: #{details['Executable']}"</span> +66: <span class="ruby-identifier">details</span>.<span class="ruby-identifier">delete</span>( <span class="ruby-value str">"Executable"</span> ) +67: <span class="ruby-identifier">puts</span> <span class="ruby-node">"| Source uri\t: #{details['Source uri']}"</span> +68: <span class="ruby-identifier">details</span>.<span class="ruby-identifier">delete</span>( <span class="ruby-value str">"Source uri"</span> ) +69: <span class="ruby-identifier">puts</span> <span class="ruby-node">"| Description\t: #{details['Description']}"</span> +70: <span class="ruby-identifier">details</span>.<span class="ruby-identifier">delete</span>( <span class="ruby-value str">"Description"</span> ) +71: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"|====================================="</span> +72: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"|====================================="</span> +73: +74: <span class="ruby-identifier">details</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span> +75: <span class="ruby-identifier">print</span> <span class="ruby-node">"| #{name}\t"</span> +76: +77: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">name</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator"><</span> <span class="ruby-value">14</span> ) +78: <span class="ruby-identifier">print</span> <span class="ruby-value str">"\t"</span> +79: <span class="ruby-keyword kw">end</span> +80: +81: <span class="ruby-identifier">puts</span> <span class="ruby-node">": #{value}"</span> +82: <span class="ruby-keyword kw">end</span> +83: +84: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"|====================================="</span> +85: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +86: <span class="ruby-keyword kw">end</span> +87: +88: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-value str">"[AbtReportManger::showPackageDetails] - failed to show details for ${package}."</span> ) +89: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +90: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000103"></a><b>showPackageLog</b>( package, logType ) + <a name="M000104"></a><b>showPackageLog</b>( package, logType ) </div> <div class="description"> <p> @@ -385,22 +434,22 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000103_source')" id="l_M000103_source">show source</a> ]</p> - <div id="M000103_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000104_source')" id="l_M000104_source">show source</a> ]</p> + <div id="M000104_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 73</span> -73: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showPackageLog</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">logType</span> ) -74: <span class="ruby-comment cmt"># install log</span> -75: <span class="ruby-comment cmt"># build log</span> -76: <span class="ruby-comment cmt"># integrity log</span> -77: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 110</span> +110: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showPackageLog</span>( <span class="ruby-identifier">package</span>, <span class="ruby-identifier">logType</span> ) +111: <span class="ruby-comment cmt"># install log</span> +112: <span class="ruby-comment cmt"># build log</span> +113: <span class="ruby-comment cmt"># integrity log</span> +114: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000110"></a><b>showQueue</b>( queueType ) + <a name="M000111"></a><b>showQueue</b>( queueType ) </div> <div class="description"> <p> @@ -415,19 +464,39 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000110_source')" id="l_M000110_source">show source</a> ]</p> - <div id="M000110_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000111_source')" id="l_M000111_source">show source</a> ]</p> + <div id="M000111_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 148</span> -148: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showQueue</span>( <span class="ruby-identifier">queueType</span> ) -149: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 197</span> +197: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showQueue</span>( <span class="ruby-identifier">queueType</span> ) +198: <span class="ruby-identifier">queueFile</span> = <span class="ruby-node">"#{$ABT_LOGS}/#{queueType}.log"</span> +199: <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">queueType</span> +200: +201: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">"install"</span> +202: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">queueFile</span> ) ) +203: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +204: <span class="ruby-identifier">puts</span> <span class="ruby-node">"AbTLinux #{queueType} queue:"</span> +205: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"======================="</span> +206: <span class="ruby-identifier">queue</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">readlines</span>( <span class="ruby-identifier">queueFile</span> ) +207: <span class="ruby-identifier">queue</span>.<span class="ruby-identifier">each</span>{ <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span> <span class="ruby-identifier">puts</span> <span class="ruby-identifier">entry</span> } +208: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +209: <span class="ruby-keyword kw">else</span> +210: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +211: <span class="ruby-identifier">puts</span> <span class="ruby-node">"AbtLinux #{queueType} is empty at this time."</span> +212: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> +213: <span class="ruby-keyword kw">end</span> +214: +215: <span class="ruby-keyword kw">else</span> +216: <span class="ruby-identifier">puts</span> <span class="ruby-node">"#{queueType.capitalize} is not an AbTLinux queue."</span> +217: <span class="ruby-keyword kw">end</span> +218: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000106"></a><b>showUntrackedFiles</b>() + <a name="M000107"></a><b>showUntrackedFiles</b>() </div> <div class="description"> <p> @@ -439,19 +508,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000106_source')" id="l_M000106_source">show source</a> ]</p> - <div id="M000106_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000107_source')" id="l_M000107_source">show source</a> ]</p> + <div id="M000107_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 107</span> -107: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showUntrackedFiles</span> -108: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 144</span> +144: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showUntrackedFiles</span> +145: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000111"></a><b>showUpdates</b>( target ) + <a name="M000112"></a><b>showUpdates</b>( target ) </div> <div class="description"> <p> @@ -468,12 +537,12 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000111_source')" id="l_M000111_source">show source</a> ]</p> - <div id="M000111_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000112_source')" id="l_M000112_source">show source</a> ]</p> + <div id="M000112_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtReportManager.rb, line 161</span> -161: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showUpdates</span>( <span class="ruby-identifier">target</span> ) -162: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 230</span> +230: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showUpdates</span>( <span class="ruby-identifier">target</span> ) +231: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtUsage.html =================================================================== --- src/trunk/doc/classes/AbtUsage.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/AbtUsage.html 2006-11-18 15:26:43 UTC (rev 205) @@ -209,7 +209,7 @@ 122: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\ndownloads:"</span> 123: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -d, download [package]\t\tRetrieve given package sources."</span> 124: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -u, update [package]|[tree]\tUpdate given package or tree from AbTLinux repository."</span> -125: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -n, news\t\t\t\tDisplays newsfeed from AbTLinux website.\n"</span> +125: <span class="ruby-identifier">puts</span> <span class="ruby-value str">" -n, news\t\t\t\tDisplays newsfeeds from AbTLinux website.\n"</span> 126: <span class="ruby-keyword kw">end</span> </pre> </div> Modified: src/trunk/doc/classes/TestAbtDepEngine.html =================================================================== --- src/trunk/doc/classes/TestAbtDepEngine.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/TestAbtDepEngine.html 2006-11-18 15:26:43 UTC (rev 205) @@ -117,8 +117,8 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000092">setup</a></li> - <li><a href="#M000093">testDepEngine</a></li> + <li><a href="#M000093">setup</a></li> + <li><a href="#M000094">testDepEngine</a></li> </ul> @@ -129,7 +129,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000092"></a><b>setup</b>() + <a name="M000093"></a><b>setup</b>() </div> <div class="description"> <p> @@ -137,8 +137,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000092_source')" id="l_M000092_source">show source</a> ]</p> - <div id="M000092_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000093_source')" id="l_M000093_source">show source</a> ]</p> + <div id="M000093_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtDepEngine.rb, line 36</span> 36: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup</span> @@ -150,7 +150,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000093"></a><b>testDepEngine</b>() + <a name="M000094"></a><b>testDepEngine</b>() </div> <div class="description"> <p> @@ -158,8 +158,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000093_source')" id="l_M000093_source">show source</a> ]</p> - <div id="M000093_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000094_source')" id="l_M000094_source">show source</a> ]</p> + <div id="M000094_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtDepEngine.rb, line 43</span> 43: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testDepEngine</span> Modified: src/trunk/doc/classes/TestAbtLogManager.html =================================================================== --- src/trunk/doc/classes/TestAbtLogManager.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/TestAbtLogManager.html 2006-11-18 15:26:43 UTC (rev 205) @@ -117,12 +117,12 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000094">setup</a></li> - <li><a href="#M000098">testCachePackage</a></li> - <li><a href="#M000097">testLogPackageBuild</a></li> - <li><a href="#M000096">testLogPackageInstall</a></li> - <li><a href="#M000095">testLogPackageIntegrity</a></li> - <li><a href="#M000099">testLogToJournal</a></li> + <li><a href="#M000095">setup</a></li> + <li><a href="#M000099">testCachePackage</a></li> + <li><a href="#M000098">testLogPackageBuild</a></li> + <li><a href="#M000097">testLogPackageInstall</a></li> + <li><a href="#M000096">testLogPackageIntegrity</a></li> + <li><a href="#M000100">testLogToJournal</a></li> </ul> @@ -133,7 +133,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000094"></a><b>setup</b>() + <a name="M000095"></a><b>setup</b>() </div> <div class="description"> <p> @@ -141,8 +141,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000094_source')" id="l_M000094_source">show source</a> ]</p> - <div id="M000094_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000095_source')" id="l_M000095_source">show source</a> ]</p> + <div id="M000095_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtLogManager.rb, line 36</span> 36: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup</span> @@ -154,7 +154,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000098"></a><b>testCachePackage</b>() + <a name="M000099"></a><b>testCachePackage</b>() </div> <div class="description"> <p> @@ -162,8 +162,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000098_source')" id="l_M000098_source">show source</a> ]</p> - <div id="M000098_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000099_source')" id="l_M000099_source">show source</a> ]</p> + <div id="M000099_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtLogManager.rb, line 65</span> 65: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testCachePackage</span>() @@ -175,7 +175,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000097"></a><b>testLogPackageBuild</b>() + <a name="M000098"></a><b>testLogPackageBuild</b>() </div> <div class="description"> <p> @@ -183,8 +183,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000097_source')" id="l_M000097_source">show source</a> ]</p> - <div id="M000097_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000098_source')" id="l_M000098_source">show source</a> ]</p> + <div id="M000098_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtLogManager.rb, line 58</span> 58: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testLogPackageBuild</span>() @@ -196,7 +196,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000096"></a><b>testLogPackageInstall</b>() + <a name="M000097"></a><b>testLogPackageInstall</b>() </div> <div class="description"> <p> @@ -204,8 +204,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000096_source')" id="l_M000096_source">show source</a> ]</p> - <div id="M000096_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000097_source')" id="l_M000097_source">show source</a> ]</p> + <div id="M000097_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtLogManager.rb, line 51</span> 51: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testLogPackageInstall</span>() @@ -217,7 +217,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000095"></a><b>testLogPackageIntegrity</b>() + <a name="M000096"></a><b>testLogPackageIntegrity</b>() </div> <div class="description"> <p> @@ -225,8 +225,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000095_source')" id="l_M000095_source">show source</a> ]</p> - <div id="M000095_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000096_source')" id="l_M000096_source">show source</a> ]</p> + <div id="M000096_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtLogManager.rb, line 43</span> 43: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testLogPackageIntegrity</span>() @@ -239,7 +239,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000099"></a><b>testLogToJournal</b>() + <a name="M000100"></a><b>testLogToJournal</b>() </div> <div class="description"> <p> @@ -247,8 +247,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000099_source')" id="l_M000099_source">show source</a> ]</p> - <div id="M000099_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000100_source')" id="l_M000100_source">show source</a> ]</p> + <div id="M000100_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtLogManager.rb, line 72</span> 72: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testLogToJournal</span>() Modified: src/trunk/doc/classes/TestAbtPackage.html =================================================================== --- src/trunk/doc/classes/TestAbtPackage.html 2006-11-18 15:25:35 UTC (rev 204) +++ src/trunk/doc/classes/TestAbtPackage.html 2006-11-18 15:26:43 UTC (rev 205) @@ -117,14 +117,14 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000084">setup</a></li> - <li><a href="#M000088">testBuild</a></li> - <li><a href="#M000087">testConfigure</a></li> - <li><a href="#M000085">testDetails</a></li> - <li><a href="#M000090">testInstall</a></li> - <li><a href="#M000091">testPost</a></li> - <li><a href="#M000086">testPre</a></li> - <li><a href="#M000089">testPreinstall</a></li> + <li><a href="#M000085">setup</a></li> + <li><a href="#M000089">testBuild</a></li> + <li><a href="#M000088">testConfigure</a></li> + <li><a href="#M000086">testDetails</a></li> + <li><a href="#M000091">testInstall</a></li> + <li><a href="#M000092">testPost</a></li> + <li><a href="#M000087">testPre</a></li> + <li><a href="#M000090">testPreinstall</a></li> </ul> @@ -135,7 +135,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000084"></a><b>setup</b>() + <a name="M000085"></a><b>setup</b>() </div> <div class="description"> <p> @@ -143,8 +143,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000084_source')" id="l_M000084_source">show source</a> ]</p> - <div id="M000084_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000085_source')" id="l_M000085_source">show source</a> ]</p> + <div id="M000085_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtPackage.rb, line 59</span> 59: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup</span> @@ -156,7 +156,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000088"></a><b>testBuild</b>() + <a name="M000089"></a><b>testBuild</b>() </div> <div class="description"> <p> @@ -164,8 +164,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000088_source')" id="l_M000088_source">show source</a> ]</p> - <div id="M000088_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000089_source')" id="l_M000089_source">show source</a> ]</p> + <div id="M000089_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtPackage.rb, line 102</span> 102: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testBuild</span> @@ -177,7 +177,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000087"></a><b>testConfigure</b>() + <a name="M000088"></a><b>testConfigure</b>() </div> <div class="description"> <p> @@ -185,8 +185,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000087_source')" id="l_M000087_source">show source</a> ]</p> - <div id="M000087_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000088_source')" id="l_M000088_source">show source</a> ]</p> + <div id="M000088_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtPackage.rb, line 95</span> 95: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testConfigure</span> @@ -198,7 +198,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000085"></a><b>testDetails</b>() + <a name="M000086"></a><b>testDetails</b>() </div> <div class="description"> <p> @@ -206,8 +206,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000085_source')" id="l_M000085_source">show source</a> ]</p> - <div id="M000085_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000086_source')" id="l_M000086_source">show source</a> ]</p> + <div id="M000086_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtPackage.rb, line 66</span> 66: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testDetails</span> @@ -234,7 +234,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000090"></a><b>testInstall</b>() + <a name="M000091"></a><b>testInstall</b>() </div> <div class="description"> <p> @@ -242,8 +242,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000090_source')" id="l_M000090_source">show source</a> ]</p> - <div id="M000090_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000091_source')" id="l_M000091_source">show source</a> ]</p> + <div id="M000091_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtPackage.rb, line 116</span> 116: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testInstall</span> @@ -255,7 +255,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000091"></a><b>testPost</b>() + <a name="M000092"></a><b>testPost</b>() </div> <div class="description"> <p> @@ -263,8 +263,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000091_source')" id="l_M000091_source">show source</a> ]</p> - <div id="M000091_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000092_source')" id="l_M000092_source">show source</a> ]</p> + <div id="M000092_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtPackage.rb, line 123</span> 123: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testPost</span> @@ -276,7 +276,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000086"></a><b>testPre</b>() + <a name="M000087"></a><b>testPre</b>() </div> <div class="description"> <p> @@ -284,8 +284,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000086_source')" id="l_M000086_source">show source</a> ]</p> - <div id="M000086_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000087_source')" id="l_M000087_source">show source</a> ]</p> + <div id="M000087_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtPackage.rb, line 88</span> 88: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testPre</span> @@ -297,7 +297,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000089"></a><b>testPreinstall</b>() + <a name="M000090"></a><b>testPreinstall</b>() </div> <div class="description"> <p> @@ -305,8 +305,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000089_sour... [truncated message content] |
From: <esc...@us...> - 2006-11-18 15:25:43
|
Revision: 204 http://svn.sourceforge.net/abtlinux/?rev=204&view=rev Author: eschabell Date: 2006-11-18 07:25:35 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Migrated the show-journal, show-details off to the reporting class. Made start on install package functionality, up to and including placing package in install queue (current code shows this with an install queue dump). Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtConfig.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-11-18 15:23:11 UTC (rev 203) +++ src/trunk/abt.rb 2006-11-18 15:25:35 UTC (rev 204) @@ -29,6 +29,7 @@ require 'AbtLogManager' require 'AbtReportManager' require 'AbtDownloadManager' +require 'AbtQueueManager' require 'AbtUsage' require 'fileutils' require 'net/http' @@ -43,10 +44,12 @@ # Setup needed classes and get ready # to parse arguments. ## -manager = AbtPackageManager.new -logger = AbtLogManager.new -options = Hash.new() -show = AbtUsage.new() +manager = AbtPackageManager.new +logger = AbtLogManager.new +queuer = AbtQueueManager.new +reporter = AbtReportManager.new +options = Hash.new +show = AbtUsage.new # deal with usage request. if ( ARGV.length == 0 ) @@ -60,9 +63,43 @@ case ARGV[0] when "install", "-i" - if ( ARGV.length == 2 ) + if ( ARGV.length == 2 && File.exist?( "#{$PACKAGE_PATH}#{ARGV[1]}.rb" ) ) options['package'] = ARGV[1] - puts "Installing package : " + options['package'] + logger.logToJournal( "Starting to install #{options['package']}" ) + + require options['package'] # pickup called package class. + package = eval( "#{options['package'].capitalize}.new" ) # evaluates package.new methode dynamically. + details = package.details + + queuer.addPackageToQueue( options['package'], "install" ) + + # Reached point where pkg in install queue + reporter.showQueue( "install" ); + + # TODO: finish up the following steps per install scenario: + # + # check deps + # add missing deps to install queue + # get details + # pre section + # download + # unpack + # configure section + # set install location + # ./configure + # save package.configure + # build section + # make + # save package.build + # pre install section + # install section + # make install + # save pacakge.install + # save package.integrity + # post section + # clean source build directory + # notify user + else show.usage( "packages" ) exit @@ -119,36 +156,11 @@ options['package'] = ARGV[1] logger.logToJournal( "Starting to show details for " + options['package'] ) - require options['package'] # pickup called package class. - package = eval( options['package'].capitalize + '.new' ) # evaluates package.new methode dynamically. - details = package.details - - puts "|=====================================" - puts "| Package name\t: #{details['Package name']}" - details.delete( "Package name" ) - puts "| Version\t: #{details['Version']}" - details.delete( "Version" ) - puts "| Homepage\t: #{details['Homepage']}" - details.delete( "Homepage" ) - puts "| Executable\t: #{details['Executable']}" - details.delete( "Executable" ) - puts "| Source uri\t: #{details['Source uri']}" - details.delete( "Source uri" ) - puts "| Description\t: #{details['Description']}" - details.delete( "Description" ) - puts "|=====================================" - puts "|=====================================" - - details.each do |name, value| - print "| #{name}\t" - if ( name.length < 14 ) - print "\t" - end - puts ": #{value}" + if ( reporter.showPackageDetails( options['package'] ) ) + logger.logToJournal( "Completed show details for " + options['package'] ) + else + puts "Problems processing the details for #{options['package']}." end - - puts "|=====================================" - logger.logToJournal( "Completed show details for " + options['package'] ) else show.usage( "queries" ) end @@ -203,15 +215,7 @@ show.usage( "queries" ) when "show-journal" - if ( File.exist?( $JOURNAL ) ) - puts "\n\nAbTLinux journal:" - puts "=================" - log = IO.readlines( $JOURNAL ) - log.each{ |line| puts line } - puts "\n\n" - else - puts "AbTLinux journal is empty at this time." - end + reporter.showJournal when "show-iqueue" puts "Display contents of install queue." Modified: src/trunk/abtConfig.rb =================================================================== --- src/trunk/abtConfig.rb 2006-11-18 15:23:11 UTC (rev 203) +++ src/trunk/abtConfig.rb 2006-11-18 15:25:35 UTC (rev 204) @@ -31,5 +31,7 @@ $ABTNEWS_THREADS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?6.2" $ABTNEWS_POSTS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?7.2" -$JOURNAL_PATH = "/var/log/abt" -$JOURNAL = "#{$JOURNAL_PATH}/journal.log" +$ABT_LOGS = "/var/log/abt" +$JOURNAL = "#{$ABT_LOGS}/journal.log" + +$TIMESTAMP = Time.now.strftime( "%Y-%m-%d %H:%M:%S (%Z)" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 15:23:16
|
Revision: 203 http://svn.sourceforge.net/abtlinux/?rev=203&view=rev Author: eschabell Date: 2006-11-18 07:23:11 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Constructor now constains a log directory check. Implemented addPackageToQueue method. Modified Paths: -------------- src/trunk/AbtQueueManager.rb Modified: src/trunk/AbtQueueManager.rb =================================================================== --- src/trunk/AbtQueueManager.rb 2006-11-18 15:21:40 UTC (rev 202) +++ src/trunk/AbtQueueManager.rb 2006-11-18 15:23:11 UTC (rev 203) @@ -38,6 +38,51 @@ # <b>RETURN</b> <i>AbtQueueManager</i> - an initialized AbtQueueManager object. ## def initialize + if ( !File.directory?( $ABT_LOGS ) ) + FileUtils.mkdir_p( $ABT_LOGS ) # initialize logs. + end end -end \ No newline at end of file + ## + # Add a given package to the given queue. If package already in + # the queue then it will not be added twice and return a positive + # answer. + # + # <b>PARAM</b> <i>String</i> - the package to be added to the queue. + # <b>PARAM</b> <i>String</i> - the queue to add the package to. + # + # <b>RETURN</b> <i>boolean</i> - true if package added/exists to/in install + # queue, otherwise false. + ## + def addPackageToQueue( package, queue ) + queueFile = "#{$ABT_LOGS}/#{queue}.log" + logger = AbtLogManager.new + + if ( log = File.new( queueFile, File::WRONLY|File::APPEND|File::CREAT, 0644 ) ) + # pickup queue contents to ensure no duplicates. + checkingQueue = IO.readlines( queueFile ) + + # endsure no duplicates. + matched = false + checkingQueue.each do |entry| + entryName = entry.split( '|' ) + if ( entryName[0] == package ) + matched = true + end + end + + # check if package exists, otherwise add. + if ( !matched ) + log.puts "#{package}|#{$TIMESTAMP}" + logger.logToJournal( "Added #{package} to #{queue} queue." ) + else + logger.logToJournal( "Did not add #{package} to #{queue}, already exists." ) + end + + log.close + return true + end + + return false + end +end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 15:21:40
|
Revision: 202 http://svn.sourceforge.net/abtlinux/?rev=202&view=rev Author: eschabell Date: 2006-11-18 07:21:40 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Moved log directory check off into the constructor so we check each time we want to create this class. Modified Paths: -------------- src/trunk/AbtLogManager.rb Modified: src/trunk/AbtLogManager.rb =================================================================== --- src/trunk/AbtLogManager.rb 2006-11-18 15:20:22 UTC (rev 201) +++ src/trunk/AbtLogManager.rb 2006-11-18 15:21:40 UTC (rev 202) @@ -53,7 +53,9 @@ # <b>RETURN</b> <i>AbtLogManager</i> - an initialized AbtLogManager object. ## def initialize - + if ( !File.directory?( $ABT_LOGS ) ) + FileUtils.mkdir_p( $ABT_LOGS ) # initialize logs. + end end ## @@ -101,14 +103,12 @@ # <b>RETURN</b> <i>boolean</i> True if logged, otherwise false. ## def logToJournal( message ) - require 'date' + if ( log = File.new( $JOURNAL, File::WRONLY|File::APPEND|File::CREAT, 0644 ) ) + log.puts "#{$TIMESTAMP} : #{message}" + log.close + return true + end - if ( !File.directory?( $JOURNAL_PATH ) ) - FileUtils.mkdir_p( $JOURNAL_PATH ) # initialize logs. - end - - log = File.new($JOURNAL, File::WRONLY|File::APPEND|File::CREAT, 0644) - log.puts Time.now.strftime( "%Y-%m-%d %H:%M:%S (%Z)" ) + " : #{message}" - return true + return false end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 15:20:28
|
Revision: 201 http://svn.sourceforge.net/abtlinux/?rev=201&view=rev Author: eschabell Date: 2006-11-18 07:20:22 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Migrated showQueue, showJournal and displayDetails to required class methods. Modified Paths: -------------- src/trunk/AbtReportManager.rb Modified: src/trunk/AbtReportManager.rb =================================================================== --- src/trunk/AbtReportManager.rb 2006-11-18 15:18:54 UTC (rev 200) +++ src/trunk/AbtReportManager.rb 2006-11-18 15:20:22 UTC (rev 201) @@ -50,6 +50,43 @@ # false. ## def showPackageDetails( package ) + require package + + if ( package = eval( "#{package.capitalize}.new" ) ) + details = package.details + + puts "|=====================================" + puts "| Package name\t: #{details['Package name']}" + details.delete( "Package name" ) + puts "| Version\t: #{details['Version']}" + details.delete( "Version" ) + puts "| Homepage\t: #{details['Homepage']}" + details.delete( "Homepage" ) + puts "| Executable\t: #{details['Executable']}" + details.delete( "Executable" ) + puts "| Source uri\t: #{details['Source uri']}" + details.delete( "Source uri" ) + puts "| Description\t: #{details['Description']}" + details.delete( "Description" ) + puts "|=====================================" + puts "|=====================================" + + details.each do |name, value| + print "| #{name}\t" + + if ( name.length < 14 ) + print "\t" + end + + puts ": #{value}" + end + + puts "|=====================================" + return true + end + + logger.logToJournal( "[AbtReportManger::showPackageDetails] - failed to show details for ${package}." ) + return false end ## @@ -113,6 +150,18 @@ # <b>RETURN</b> <i>void.</i> ## def showJournal + if ( File.exist?( $JOURNAL ) ) + puts "\n\n" + puts "AbTLinux journal:" + puts "=================" + log = IO.readlines( $JOURNAL ) + log.each{ |entry| puts entry } + puts "\n\n" + else + puts "\n\n" + puts "AbtLinux journal is empty at this time." + puts "\n\n" + end end ## @@ -146,6 +195,26 @@ # <b>RETURN</b> <i>void.</i> ## def showQueue( queueType ) + queueFile = "#{$ABT_LOGS}/#{queueType}.log" + case queueType + + when "install" + if ( File.exist?( queueFile ) ) + puts "\n\n" + puts "AbTLinux #{queueType} queue:" + puts "=======================" + queue = IO.readlines( queueFile ) + queue.each{ |entry| puts entry } + puts "\n\n" + else + puts "\n\n" + puts "AbtLinux #{queueType} is empty at this time." + puts "\n\n" + end + + else + puts "#{queueType.capitalize} is not an AbTLinux queue." + end end ## @@ -169,4 +238,4 @@ def generateHTMLPackageListing end -end \ No newline at end of file +end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 15:18:54
|
Revision: 200 http://svn.sourceforge.net/abtlinux/?rev=200&view=rev Author: eschabell Date: 2006-11-18 07:18:54 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Adjusted comments for removing the system call one day. Modified Paths: -------------- src/trunk/AbtPackageManager.rb Modified: src/trunk/AbtPackageManager.rb =================================================================== --- src/trunk/AbtPackageManager.rb 2006-11-18 11:57:33 UTC (rev 199) +++ src/trunk/AbtPackageManager.rb 2006-11-18 15:18:54 UTC (rev 200) @@ -115,8 +115,7 @@ args = args + " " + ARGV[i] end - # TODO: remove the ./abt call on deployment. - system( 'su -c "./abt ' + args + '" root' ) + system( 'su -c "./abt ' + args + '" root' ) # TODO: replace system call? exit end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 11:57:34
|
Revision: 199 http://svn.sourceforge.net/abtlinux/?rev=199&view=rev Author: eschabell Date: 2006-11-18 03:57:33 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Removed max number of items for news feeds, feed is limited to 9 items already. Adjusted usage to show multiple feeds instead of one. Modified Paths: -------------- src/trunk/AbtUsage.rb src/trunk/abt.rb src/trunk/abtConfig.rb Modified: src/trunk/AbtUsage.rb =================================================================== --- src/trunk/AbtUsage.rb 2006-11-18 11:13:19 UTC (rev 198) +++ src/trunk/AbtUsage.rb 2006-11-18 11:57:33 UTC (rev 199) @@ -122,7 +122,7 @@ puts "\ndownloads:" puts " -d, download [package]\t\tRetrieve given package sources." puts " -u, update [package]|[tree]\tUpdate given package or tree from AbTLinux repository." - puts " -n, news\t\t\t\tDisplays newsfeed from AbTLinux website.\n" + puts " -n, news\t\t\t\tDisplays newsfeeds from AbTLinux website.\n" end ## Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-11-18 11:13:19 UTC (rev 198) +++ src/trunk/abt.rb 2006-11-18 11:57:33 UTC (rev 199) @@ -259,11 +259,7 @@ rss.items.each_with_index do |item, itemCount| itemCount += 1 - if ( itemCount <= $MAX_NEWS_ITEMS ) - # format some of the item data. - description = item.description.sub( '[/html]', '' ) - puts "#{itemCount} #{item.link} #{item.title}" - end + puts "#{itemCount} #{item.link} #{item.title}" end end end Modified: src/trunk/abtConfig.rb =================================================================== --- src/trunk/abtConfig.rb 2006-11-18 11:13:19 UTC (rev 198) +++ src/trunk/abtConfig.rb 2006-11-18 11:57:33 UTC (rev 199) @@ -30,7 +30,6 @@ $ABTNEWS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?1.2" $ABTNEWS_THREADS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?6.2" $ABTNEWS_POSTS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?7.2" -$MAX_NEWS_ITEMS = 10 # shows last 10 items $JOURNAL_PATH = "/var/log/abt" $JOURNAL = "#{$JOURNAL_PATH}/journal.log" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 11:13:22
|
Revision: 198 http://svn.sourceforge.net/abtlinux/?rev=198&view=rev Author: eschabell Date: 2006-11-18 03:13:19 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtLogManager.html src/trunk/doc/created.rid src/trunk/doc/files/AbtLogManager_rb.html Modified: src/trunk/doc/classes/AbtLogManager.html =================================================================== --- src/trunk/doc/classes/AbtLogManager.html 2006-11-18 11:12:18 UTC (rev 197) +++ src/trunk/doc/classes/AbtLogManager.html 2006-11-18 11:13:19 UTC (rev 198) @@ -270,7 +270,7 @@ 108: <span class="ruby-keyword kw">end</span> 109: 110: <span class="ruby-identifier">log</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">$JOURNAL</span>, <span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">WRONLY</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">APPEND</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">CREAT</span>, <span class="ruby-value">0644</span>) -111: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-constant">DateTime</span><span class="ruby-operator">::</span><span class="ruby-identifier">now</span>.<span class="ruby-identifier">to_s</span> <span class="ruby-operator">+</span> <span class="ruby-value str">' : '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">message</span> +111: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>.<span class="ruby-identifier">strftime</span>( <span class="ruby-value str">"%Y-%m-%d %H:%M:%S (%Z)"</span> ) <span class="ruby-operator">+</span> <span class="ruby-node">" : #{message}"</span> 112: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> 113: <span class="ruby-keyword kw">end</span> </pre> Modified: src/trunk/doc/created.rid =================================================================== --- src/trunk/doc/created.rid 2006-11-18 11:12:18 UTC (rev 197) +++ src/trunk/doc/created.rid 2006-11-18 11:13:19 UTC (rev 198) @@ -1 +1 @@ -Fri Nov 17 16:17:28 CET 2006 +Sat Nov 18 12:12:03 CET 2006 Modified: src/trunk/doc/files/AbtLogManager_rb.html =================================================================== --- src/trunk/doc/files/AbtLogManager_rb.html 2006-11-18 11:12:18 UTC (rev 197) +++ src/trunk/doc/files/AbtLogManager_rb.html 2006-11-18 11:13:19 UTC (rev 198) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Thu Nov 16 15:13:36 CET 2006</td> + <td>Sat Nov 18 12:11:58 CET 2006</td> </tr> </table> </td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 11:12:20
|
Revision: 197 http://svn.sourceforge.net/abtlinux/?rev=197&view=rev Author: eschabell Date: 2006-11-18 03:12:18 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Adjusted abt news to report the last 10 of our new, forum threads and posts off the rss feeds. Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtConfig.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-11-18 10:30:38 UTC (rev 196) +++ src/trunk/abt.rb 2006-11-18 11:12:18 UTC (rev 197) @@ -235,42 +235,39 @@ logger.logToJournal( "Starting to retrieve AbTLinux news." ) # pick up the abtlinux.org news feed. - news = Net::HTTP.get( URI.parse( $ABTNEWS ) ) + news = Net::HTTP.get( URI.parse( $ABTNEWS ) ) + threads = Net::HTTP.get( URI.parse( $ABTNEWS_THREADS ) ) + posts = Net::HTTP.get( URI.parse( $ABTNEWS_POSTS ) ) - # display the feed neatly. - rss = nil - begin - rss = RSS::Parser.parse(news, false) + newsArray = [ news, threads, posts ] + + # display the feeds. + newsArray.each_with_index do |feed, i| + rss = nil + begin + rss = RSS::Parser.parse(feed, false) rescue RSS::Error - end + end - if ( rss.nil? ) - puts $ABTNEWS + " is not RSS 1.0/2.0." - else - puts "\n\n" - puts "=======================" - puts "= News from AbTLinux: =" - puts "=======================" - puts "\n" + + if ( rss.nil? ) + puts "Feed #{i} is not RSS 1.0/2.0." + logger.logToJournal( "Failed to display news feed as feed #{i} is not RSS 1.0/2.0." ) + else + puts "\n\n" + puts "*** #{rss.channel.title} ***" - itemCount = 0 # only printing three items. - rss.items.each do |item| - itemCount += 1 - if ( itemCount <= $MAX_NEWS_ITEMS ) - # format some of the item data. - author = item.author.split( '<' ) - description = item.description.sub( '[/html]', '' ) - - puts "************************************" - puts "Date : #{item.date}" - puts "Author : #{author[0]}" - puts "Link : #{item.link}" - puts "Title : #{item.title}" - puts "\n#{description}" - puts "************************************\n\n" + rss.items.each_with_index do |item, itemCount| + itemCount += 1 + if ( itemCount <= $MAX_NEWS_ITEMS ) + # format some of the item data. + description = item.description.sub( '[/html]', '' ) + puts "#{itemCount} #{item.link} #{item.title}" + end end end end + logger.logToJournal( "Completed the retrieval of AbTLinux news." ) # abt [-d | download ] <package> Modified: src/trunk/abtConfig.rb =================================================================== --- src/trunk/abtConfig.rb 2006-11-18 10:30:38 UTC (rev 196) +++ src/trunk/abtConfig.rb 2006-11-18 11:12:18 UTC (rev 197) @@ -26,7 +26,11 @@ ## $PACKAGE_PATH = "./packages/" $SOURCES_REPOSITORY = "/var/spool/abt/sources" + $ABTNEWS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?1.2" +$ABTNEWS_THREADS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?6.2" +$ABTNEWS_POSTS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?7.2" +$MAX_NEWS_ITEMS = 10 # shows last 10 items + $JOURNAL_PATH = "/var/log/abt" $JOURNAL = "#{$JOURNAL_PATH}/journal.log" -$MAX_NEWS_ITEMS = 3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-18 10:30:38
|
Revision: 196 http://svn.sourceforge.net/abtlinux/?rev=196&view=rev Author: eschabell Date: 2006-11-18 02:30:38 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Modified logging timestamp method to use Time class instead of DateTime, testing literature shows significant speed degredation with DateTime class. Modified Paths: -------------- src/trunk/AbtLogManager.rb Modified: src/trunk/AbtLogManager.rb =================================================================== --- src/trunk/AbtLogManager.rb 2006-11-17 15:18:33 UTC (rev 195) +++ src/trunk/AbtLogManager.rb 2006-11-18 10:30:38 UTC (rev 196) @@ -108,7 +108,7 @@ end log = File.new($JOURNAL, File::WRONLY|File::APPEND|File::CREAT, 0644) - log.puts DateTime::now.to_s + ' : ' + message + log.puts Time.now.strftime( "%Y-%m-%d %H:%M:%S (%Z)" ) + " : #{message}" return true end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-17 15:26:31
|
Revision: 195 http://svn.sourceforge.net/abtlinux/?rev=195&view=rev Author: eschabell Date: 2006-11-17 07:18:33 -0800 (Fri, 17 Nov 2006) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtPackage.html src/trunk/doc/created.rid src/trunk/doc/files/AbtPackage_rb.html Modified: src/trunk/doc/classes/AbtPackage.html =================================================================== --- src/trunk/doc/classes/AbtPackage.html 2006-11-17 15:17:53 UTC (rev 194) +++ src/trunk/doc/classes/AbtPackage.html 2006-11-17 15:18:33 UTC (rev 195) @@ -416,22 +416,22 @@ <span class="ruby-comment cmt"># File AbtPackage.rb, line 117</span> 117: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">details</span> 118: <span class="ruby-keyword kw">return</span> { -119: <span class="ruby-value str">"name"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@name</span>, -120: <span class="ruby-value str">"execName"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@execName</span>, -121: <span class="ruby-value str">"version"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@version</span>, -122: <span class="ruby-value str">"srcDir"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcDir</span>, -123: <span class="ruby-value str">"homepage"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@homepage</span>, -124: <span class="ruby-value str">"srcUrl"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcUrl</span>, -125: <span class="ruby-value str">"dependsOn"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@dependsOn</span>, -126: <span class="ruby-value str">"reliesOn"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@reliesOn</span>, -127: <span class="ruby-value str">"optionalDO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalDO</span>, -128: <span class="ruby-value str">"optionalRO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalRO</span>, -129: <span class="ruby-value str">"hashCheck"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@hashCheck</span>, -130: <span class="ruby-value str">"patches"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patches</span>, -131: <span class="ruby-value str">"patchesHashCheck"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patchesHashCheck</span>, -132: <span class="ruby-value str">"mirrorPath"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@mirrorPath</span>, -133: <span class="ruby-value str">"license"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@license</span>, -134: <span class="ruby-value str">"description"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@description</span> +119: <span class="ruby-value str">"Package name"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@name</span>, +120: <span class="ruby-value str">"Executable"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@execName</span>, +121: <span class="ruby-value str">"Version"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@version</span>, +122: <span class="ruby-value str">"Source location"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcDir</span>, +123: <span class="ruby-value str">"Homepage"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@homepage</span>, +124: <span class="ruby-value str">"Source uri"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcUrl</span>, +125: <span class="ruby-value str">"Depends On"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@dependsOn</span>, +126: <span class="ruby-value str">"Relies On"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@reliesOn</span>, +127: <span class="ruby-value str">"Optional DO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalDO</span>, +128: <span class="ruby-value str">"Optional RO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalRO</span>, +129: <span class="ruby-value str">"Security hash"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@hashCheck</span>, +130: <span class="ruby-value str">"Patches"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patches</span>, +131: <span class="ruby-value str">"Patches hash"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patchesHashCheck</span>, +132: <span class="ruby-value str">"Mirror"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@mirrorPath</span>, +133: <span class="ruby-value str">"License"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@license</span>, +134: <span class="ruby-value str">"Description"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@description</span> 135: } 136: <span class="ruby-keyword kw">end</span> </pre> Modified: src/trunk/doc/created.rid =================================================================== --- src/trunk/doc/created.rid 2006-11-17 15:17:53 UTC (rev 194) +++ src/trunk/doc/created.rid 2006-11-17 15:18:33 UTC (rev 195) @@ -1 +1 @@ -Thu Nov 16 15:13:42 CET 2006 +Fri Nov 17 16:17:28 CET 2006 Modified: src/trunk/doc/files/AbtPackage_rb.html =================================================================== --- src/trunk/doc/files/AbtPackage_rb.html 2006-11-17 15:17:53 UTC (rev 194) +++ src/trunk/doc/files/AbtPackage_rb.html 2006-11-17 15:18:33 UTC (rev 195) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Tue Nov 14 18:56:24 CET 2006</td> + <td>Fri Nov 17 16:17:20 CET 2006</td> </tr> </table> </td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-17 15:26:26
|
Revision: 194 http://svn.sourceforge.net/abtlinux/?rev=194&view=rev Author: eschabell Date: 2006-11-17 07:17:53 -0800 (Fri, 17 Nov 2006) Log Message: ----------- Fixed spacing typo. Modified Paths: -------------- src/trunk/abt.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-11-17 15:17:16 UTC (rev 193) +++ src/trunk/abt.rb 2006-11-17 15:17:53 UTC (rev 194) @@ -124,7 +124,7 @@ details = package.details puts "|=====================================" - puts "| Package name\t:#{details['Package name']}" + puts "| Package name\t: #{details['Package name']}" details.delete( "Package name" ) puts "| Version\t: #{details['Version']}" details.delete( "Version" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-17 15:26:26
|
Revision: 193 http://svn.sourceforge.net/abtlinux/?rev=193&view=rev Author: eschabell Date: 2006-11-17 07:17:16 -0800 (Fri, 17 Nov 2006) Log Message: ----------- Renamed the keys to simplify presentation of the details, now a dynamic presentation of all keys except the top six things we present per package. Future extra keys added to the AbtPackage::details will just apprear here. Modified Paths: -------------- src/trunk/AbtPackage.rb src/trunk/abt.rb Modified: src/trunk/AbtPackage.rb =================================================================== --- src/trunk/AbtPackage.rb 2006-11-17 14:15:32 UTC (rev 192) +++ src/trunk/AbtPackage.rb 2006-11-17 15:17:16 UTC (rev 193) @@ -116,22 +116,22 @@ ## def details return { - "name" => @name, - "execName" => @execName, - "version" => @version, - "srcDir" => @srcDir, - "homepage" => @homepage, - "srcUrl" => @srcUrl, - "dependsOn" => @dependsOn, - "reliesOn" => @reliesOn, - "optionalDO" => @optionalDO, - "optionalRO" => @optionalRO, - "hashCheck" => @hashCheck, - "patches" => @patches, - "patchesHashCheck" => @patchesHashCheck, - "mirrorPath" => @mirrorPath, - "license" => @license, - "description" => @description + "Package name" => @name, + "Executable" => @execName, + "Version" => @version, + "Source location" => @srcDir, + "Homepage" => @homepage, + "Source uri" => @srcUrl, + "Depends On" => @dependsOn, + "Relies On" => @reliesOn, + "Optional DO" => @optionalDO, + "Optional RO" => @optionalRO, + "Security hash" => @hashCheck, + "Patches" => @patches, + "Patches hash" => @patchesHashCheck, + "Mirror" => @mirrorPath, + "License" => @license, + "Description" => @description } end Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-11-17 14:15:32 UTC (rev 192) +++ src/trunk/abt.rb 2006-11-17 15:17:16 UTC (rev 193) @@ -123,24 +123,31 @@ package = eval( options['package'].capitalize + '.new' ) # evaluates package.new methode dynamically. details = package.details - puts "**************************************" - puts "Package name : " + details['name'] - puts "Executable : " + details['execName'] - puts "Version : " + details['version'] - puts "Source directory : " + details['srcDir'] - puts "Homepage : " + details['homepage'] - puts "Source location : " + details['srcUrl'] - puts "Depends On : " + details['dependsOn'] - puts "Relies On : " + details['reliesOn'] - puts "Optional DO : " + details['optionalDO'] - puts "Optional RO : " + details['optionalRO'] - puts "Security hash : " + details['hashCheck'] - puts "Patches : " + details['patches'] - puts "Patches hash : " + details['patchesHashCheck'] - puts "Mirror : " + details['mirrorPath'] - puts "License : " + details['license'] - puts "Description : " + details['description'] - puts "**************************************" + puts "|=====================================" + puts "| Package name\t:#{details['Package name']}" + details.delete( "Package name" ) + puts "| Version\t: #{details['Version']}" + details.delete( "Version" ) + puts "| Homepage\t: #{details['Homepage']}" + details.delete( "Homepage" ) + puts "| Executable\t: #{details['Executable']}" + details.delete( "Executable" ) + puts "| Source uri\t: #{details['Source uri']}" + details.delete( "Source uri" ) + puts "| Description\t: #{details['Description']}" + details.delete( "Description" ) + puts "|=====================================" + puts "|=====================================" + + details.each do |name, value| + print "| #{name}\t" + if ( name.length < 14 ) + print "\t" + end + puts ": #{value}" + end + + puts "|=====================================" logger.logToJournal( "Completed show details for " + options['package'] ) else show.usage( "queries" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-17 14:15:39
|
Revision: 192 http://svn.sourceforge.net/abtlinux/?rev=192&view=rev Author: eschabell Date: 2006-11-17 06:15:32 -0800 (Fri, 17 Nov 2006) Log Message: ----------- Cleaned up new command to print more information per item and to limit the list to the three most recent news items only (fit in a console easily that way). Modified Paths: -------------- src/trunk/abt.rb src/trunk/abtConfig.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-11-16 20:47:21 UTC (rev 191) +++ src/trunk/abt.rb 2006-11-17 14:15:32 UTC (rev 192) @@ -43,10 +43,10 @@ # Setup needed classes and get ready # to parse arguments. ## -manager = AbtPackageManager.new -logger = AbtLogManager.new -options = Hash.new() -show = AbtUsage.new(); +manager = AbtPackageManager.new +logger = AbtLogManager.new +options = Hash.new() +show = AbtUsage.new() # deal with usage request. if ( ARGV.length == 0 ) @@ -240,20 +240,28 @@ if ( rss.nil? ) puts $ABTNEWS + " is not RSS 1.0/2.0." else - puts "\n\nThe latest and greatest news from AbTLinux:" - puts "===========================================" + puts "\n\n" + puts "=======================" + puts "= News from AbTLinux: =" + puts "=======================" + puts "\n" - rss.items.reverse.each do |item| - title = "News item : #{item.title}" - puts "\n#{title}" - - for i in 0...title.length - print "=" + itemCount = 0 # only printing three items. + rss.items.each do |item| + itemCount += 1 + if ( itemCount <= $MAX_NEWS_ITEMS ) + # format some of the item data. + author = item.author.split( '<' ) + description = item.description.sub( '[/html]', '' ) + + puts "************************************" + puts "Date : #{item.date}" + puts "Author : #{author[0]}" + puts "Link : #{item.link}" + puts "Title : #{item.title}" + puts "\n#{description}" + puts "************************************\n\n" end - - stripped = item.description.sub( '[/html]', '' ) - stripped = stripped.sub( '[click here]', ' ' ) - puts "\n#{stripped}\n\n" end end logger.logToJournal( "Completed the retrieval of AbTLinux news." ) Modified: src/trunk/abtConfig.rb =================================================================== --- src/trunk/abtConfig.rb 2006-11-16 20:47:21 UTC (rev 191) +++ src/trunk/abtConfig.rb 2006-11-17 14:15:32 UTC (rev 192) @@ -29,3 +29,4 @@ $ABTNEWS = "http://abtlinux.org/e107_plugins/rss_menu/rss.php?1.2" $JOURNAL_PATH = "/var/log/abt" $JOURNAL = "#{$JOURNAL_PATH}/journal.log" +$MAX_NEWS_ITEMS = 3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-16 20:47:27
|
Revision: 191 http://svn.sourceforge.net/abtlinux/?rev=191&view=rev Author: eschabell Date: 2006-11-16 12:47:21 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Reversed the list of news items to show most recent news first. Also cleaned up news items (stupid tags from site gone). Modified Paths: -------------- src/trunk/abt.rb Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-11-16 14:16:50 UTC (rev 190) +++ src/trunk/abt.rb 2006-11-16 20:47:21 UTC (rev 191) @@ -242,13 +242,18 @@ else puts "\n\nThe latest and greatest news from AbTLinux:" puts "===========================================" - i = 0 - rss.items.each do |item| - i = i + 1 - puts "\nNews item number #{i}:" - puts "=========================" - puts "TITLE: #{item.title}\n" - puts "SUBJECT: #{item.description}\n" + + rss.items.reverse.each do |item| + title = "News item : #{item.title}" + puts "\n#{title}" + + for i in 0...title.length + print "=" + end + + stripped = item.description.sub( '[/html]', '' ) + stripped = stripped.sub( '[click here]', ' ' ) + puts "\n#{stripped}\n\n" end end logger.logToJournal( "Completed the retrieval of AbTLinux news." ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-11-16 14:46:03
|
Revision: 189 http://svn.sourceforge.net/abtlinux/?rev=189&view=rev Author: eschabell Date: 2006-11-16 06:14:50 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtLogManager.html src/trunk/doc/classes/TestAbtLogManager.html src/trunk/doc/created.rid src/trunk/doc/files/AbtLogManager_rb.html src/trunk/doc/files/TestAbtLogManager_rb.html Modified: src/trunk/doc/classes/AbtLogManager.html =================================================================== --- src/trunk/doc/classes/AbtLogManager.html 2006-11-16 14:13:01 UTC (rev 188) +++ src/trunk/doc/classes/AbtLogManager.html 2006-11-16 14:14:50 UTC (rev 189) @@ -148,10 +148,10 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000059_source')" id="l_M000059_source">show source</a> ]</p> <div id="M000059_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 58</span> -58: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> -59: -60: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 55</span> +55: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> +56: +57: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -178,9 +178,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000062_source')" id="l_M000062_source">show source</a> ]</p> <div id="M000062_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 95</span> -95: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cachePackage</span>( <span class="ruby-identifier">package</span> ) -96: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 92</span> +92: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cachePackage</span>( <span class="ruby-identifier">package</span> ) +93: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -206,9 +206,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000061_source')" id="l_M000061_source">show source</a> ]</p> <div id="M000061_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 83</span> -83: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageBuild</span>( <span class="ruby-identifier">package</span> ) -84: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 80</span> +80: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageBuild</span>( <span class="ruby-identifier">package</span> ) +81: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -234,9 +234,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000060_source')" id="l_M000060_source">show source</a> ]</p> <div id="M000060_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 71</span> -71: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageInstall</span>( <span class="ruby-identifier">package</span> ) -72: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 68</span> +68: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageInstall</span>( <span class="ruby-identifier">package</span> ) +69: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -261,18 +261,18 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000063_source')" id="l_M000063_source">show source</a> ]</p> <div id="M000063_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 106</span> -106: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logToJournal</span>( <span class="ruby-identifier">message</span> ) -107: <span class="ruby-identifier">require</span> <span class="ruby-value str">'date'</span> -108: -109: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">$LOG_PATH</span> ) ) -110: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">$LOG_PATH</span> ) <span class="ruby-comment cmt"># initialize logs.</span> -111: <span class="ruby-keyword kw">end</span> -112: -113: <span class="ruby-identifier">log</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">$JOURNAL</span>, <span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">WRONLY</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">APPEND</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">CREAT</span>, <span class="ruby-value">0644</span>) -114: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-constant">DateTime</span><span class="ruby-operator">::</span><span class="ruby-identifier">now</span>.<span class="ruby-identifier">to_s</span> <span class="ruby-operator">+</span> <span class="ruby-value str">' : '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">message</span> -115: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -116: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 103</span> +103: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logToJournal</span>( <span class="ruby-identifier">message</span> ) +104: <span class="ruby-identifier">require</span> <span class="ruby-value str">'date'</span> +105: +106: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>( <span class="ruby-identifier">$JOURNAL_PATH</span> ) ) +107: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">$JOURNAL_PATH</span> ) <span class="ruby-comment cmt"># initialize logs.</span> +108: <span class="ruby-keyword kw">end</span> +109: +110: <span class="ruby-identifier">log</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">$JOURNAL</span>, <span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">WRONLY</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">APPEND</span><span class="ruby-operator">|</span><span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">CREAT</span>, <span class="ruby-value">0644</span>) +111: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-constant">DateTime</span><span class="ruby-operator">::</span><span class="ruby-identifier">now</span>.<span class="ruby-identifier">to_s</span> <span class="ruby-operator">+</span> <span class="ruby-value str">' : '</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">message</span> +112: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +113: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -300,9 +300,9 @@ <p class="source-link">[ <a href="javascript:toggleSource('M000058_source')" id="l_M000058_source">show source</a> ]</p> <div id="M000058_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtLogManager.rb, line 45</span> -45: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageIntegrity</span>( <span class="ruby-identifier">package</span> ) -46: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtLogManager.rb, line 42</span> +42: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageIntegrity</span>( <span class="ruby-identifier">package</span> ) +43: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/TestAbtLogManager.html =================================================================== --- src/trunk/doc/classes/TestAbtLogManager.html 2006-11-16 14:13:01 UTC (rev 188) +++ src/trunk/doc/classes/TestAbtLogManager.html 2006-11-16 14:14:50 UTC (rev 189) @@ -252,7 +252,7 @@ <pre> <span class="ruby-comment cmt"># File TestAbtLogManager.rb, line 72</span> 72: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testLogToJournal</span>() -73: <span class="ruby-identifier">assert</span>( <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-value str">"Test message."</span> ), <span class="ruby-value str">"testLogToJournal()"</span> ) +73: <span class="ruby-identifier">assert</span>( <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-value str">"Test message from AbtTestSuite."</span> ), <span class="ruby-value str">"testLogToJournal()"</span> ) 74: <span class="ruby-keyword kw">end</span> </pre> </div> Modified: src/trunk/doc/created.rid =================================================================== --- src/trunk/doc/created.rid 2006-11-16 14:13:01 UTC (rev 188) +++ src/trunk/doc/created.rid 2006-11-16 14:14:50 UTC (rev 189) @@ -1 +1 @@ -Wed Nov 15 15:38:48 CET 2006 +Thu Nov 16 15:13:42 CET 2006 Modified: src/trunk/doc/files/AbtLogManager_rb.html =================================================================== --- src/trunk/doc/files/AbtLogManager_rb.html 2006-11-16 14:13:01 UTC (rev 188) +++ src/trunk/doc/files/AbtLogManager_rb.html 2006-11-16 14:14:50 UTC (rev 189) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Wed Nov 15 15:38:44 CET 2006</td> + <td>Thu Nov 16 15:13:36 CET 2006</td> </tr> </table> </td></tr> Modified: src/trunk/doc/files/TestAbtLogManager_rb.html =================================================================== --- src/trunk/doc/files/TestAbtLogManager_rb.html 2006-11-16 14:13:01 UTC (rev 188) +++ src/trunk/doc/files/TestAbtLogManager_rb.html 2006-11-16 14:14:50 UTC (rev 189) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Wed May 31 17:28:30 CEST 2006</td> + <td>Thu Nov 16 15:13:36 CET 2006</td> </tr> </table> </td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |