abtlinux-svn Mailing List for ABout Time Linux (AbTLinux) (Page 12)
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...> - 2007-02-25 12:45:43
|
Revision: 286 http://svn.sourceforge.net/abtlinux/?rev=286&view=rev Author: eschabell Date: 2007-02-25 04:45:43 -0800 (Sun, 25 Feb 2007) Log Message: ----------- Added abtconfig as a require to get this test file to run solo. Modified Paths: -------------- src/trunk/TestAbtLogManager.rb Modified: src/trunk/TestAbtLogManager.rb =================================================================== --- src/trunk/TestAbtLogManager.rb 2007-02-25 12:43:17 UTC (rev 285) +++ src/trunk/TestAbtLogManager.rb 2007-02-25 12:45:43 UTC (rev 286) @@ -2,6 +2,7 @@ require 'test/unit/testcase' require 'test/unit/autorunner' +require 'abtconfig' require 'AbtLogManager' ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-02-25 12:43:25
|
Revision: 285 http://svn.sourceforge.net/abtlinux/?rev=285&view=rev Author: eschabell Date: 2007-02-25 04:43:17 -0800 (Sun, 25 Feb 2007) Log Message: ----------- Some small fixes to this unit test file to make it work properly if run without the central test suite file. Still unable to get testRetrievePackageSources to run without an error, it can't find the package 'fortune' as it does not apply the 'ruby -I./packages' search path. This apperantly needs to be added by the initial ruby file which calls ruby with its interpreter options. From the unit testing framework this call is made before the TestAbtDownloadManager.rb file is called so the option has no effect here. No solution found yet... Modified Paths: -------------- src/trunk/TestAbtDownloadManager.rb Modified: src/trunk/TestAbtDownloadManager.rb =================================================================== --- src/trunk/TestAbtDownloadManager.rb 2007-02-03 20:39:25 UTC (rev 284) +++ src/trunk/TestAbtDownloadManager.rb 2007-02-25 12:43:17 UTC (rev 285) @@ -2,7 +2,10 @@ require 'test/unit/testcase' require 'test/unit/autorunner' +require 'abtconfig' require 'AbtDownloadManager' +require 'AbtLogManager' +#require 'packages/fortune' ## # TestAbtDownloadManager.rb This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-02-03 20:39:25
|
Revision: 284 http://svn.sourceforge.net/abtlinux/?rev=284&view=rev Author: eschabell Date: 2007-02-03 12:39:25 -0800 (Sat, 03 Feb 2007) Log Message: ----------- Updated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtPackage.html src/trunk/doc/classes/AbtPackageManager.html src/trunk/doc/created.rid src/trunk/doc/files/AbtPackageManager_rb.html src/trunk/doc/files/AbtPackage_rb.html Modified: src/trunk/doc/classes/AbtPackage.html =================================================================== --- src/trunk/doc/classes/AbtPackage.html 2007-02-03 20:33:04 UTC (rev 283) +++ src/trunk/doc/classes/AbtPackage.html 2007-02-03 20:39:25 UTC (rev 284) @@ -361,9 +361,20 @@ <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 253</span> -253: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span> -254: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 250</span> +250: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span> +251: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-node">"#{$BUILD_LOCATION}/#{@srcDir}"</span> ) +252: +253: <span class="ruby-comment cmt"># TODO: not some better way to deal with this than system and tee?</span> +254: <span class="ruby-keyword kw">if</span>( <span class="ruby-operator">!</span><span class="ruby-identifier">system</span>( <span class="ruby-node">"make | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.build"</span> ) ) +255: <span class="ruby-comment cmt"># TODO: put this in failure file.</span> +256: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.build] - unable to build."</span> +257: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +258: <span class="ruby-keyword kw">end</span> +259: +260: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.build] - build went fine!"</span> +261: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +262: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -392,21 +403,18 @@ <pre> <span class="ruby-comment cmt"># File AbtPackage.rb, line 231</span> 231: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure</span> -232: <span class="ruby-identifier">buildSite</span> = <span class="ruby-node">"#{$BUILD_LOCATION}/#{@srcDir}"</span> -233: -234: <span class="ruby-comment cmt"># TODO: this should not use tee, but in wrapper deal with stdout to file.</span> -235: <span class="ruby-comment cmt"># also need to expand directory with @srcDir/@srcDir.configure.</span> -236: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">buildSite</span> ) -237: -238: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">system</span>( <span class="ruby-node">"./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.configure"</span> ) ) -239: <span class="ruby-comment cmt"># TODO: put this in failure file.</span> -240: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - unable to configure."</span> -241: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -242: <span class="ruby-keyword kw">end</span> -243: -244: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - configure went fine!"</span> -245: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -246: <span class="ruby-keyword kw">end</span> +232: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-node">"#{$BUILD_LOCATION}/#{@srcDir}"</span> ) +233: +234: <span class="ruby-comment cmt"># TODO: not some better way to deal with this than system and tee?</span> +235: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">system</span>( <span class="ruby-node">"./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.configure"</span> ) ) +236: <span class="ruby-comment cmt"># TODO: put this in failure file.</span> +237: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - unable to configure."</span> +238: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +239: <span class="ruby-keyword kw">end</span> +240: +241: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - configure went fine!"</span> +242: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +243: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -471,9 +479,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 270</span> -270: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">install</span> -271: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 278</span> +278: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">install</span> +279: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -496,9 +504,9 @@ <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 278</span> -278: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post</span> -279: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 286</span> +286: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post</span> +287: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -565,9 +573,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 262</span> -262: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">preinstall</span> -263: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 270</span> +270: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">preinstall</span> +271: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -589,22 +597,22 @@ <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 286</span> -286: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removeBuild</span> -287: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">$REMOVE_BUILD_SOURCES</span> ) -288: <span class="ruby-identifier">buildSourcesLocation</span> = <span class="ruby-node">"#{$BUILD_LOCATION}/#{srcDir}"</span> -289: -290: <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> ) ) -291: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -292: <span class="ruby-keyword kw">end</span> -293: -294: <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> ) -295: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -296: <span class="ruby-keyword kw">end</span> -297: <span class="ruby-keyword kw">end</span> -298: -299: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -300: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 294</span> +294: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removeBuild</span> +295: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">$REMOVE_BUILD_SOURCES</span> ) +296: <span class="ruby-identifier">buildSourcesLocation</span> = <span class="ruby-node">"#{$BUILD_LOCATION}/#{srcDir}"</span> +297: +298: <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> ) ) +299: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +300: <span class="ruby-keyword kw">end</span> +301: +302: <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> ) +303: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +304: <span class="ruby-keyword kw">end</span> +305: <span class="ruby-keyword kw">end</span> +306: +307: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +308: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtPackageManager.html =================================================================== --- src/trunk/doc/classes/AbtPackageManager.html 2007-02-03 20:33:04 UTC (rev 283) +++ src/trunk/doc/classes/AbtPackageManager.html 2007-02-03 20:39:25 UTC (rev 284) @@ -182,9 +182,9 @@ <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 138</span> -138: <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> ) -139: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 146</span> +146: <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> ) +147: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -210,9 +210,9 @@ <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 150</span> -150: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freezePackage</span>( <span class="ruby-identifier">package</span> ) -151: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 158</span> +158: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">freezePackage</span>( <span class="ruby-identifier">package</span> ) +159: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -276,21 +276,29 @@ 87: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"DEBUG: finished #{package} configure section."</span> ) 88: <span class="ruby-keyword kw">end</span> 89: - 90: <span class="ruby-comment cmt"># TODO: finish up the following steps per install scenario:</span> - 91: <span class="ruby-comment cmt">#</span> - 92: <span class="ruby-comment cmt"># build section</span> - 93: <span class="ruby-comment cmt"># pre install section</span> - 94: <span class="ruby-comment cmt"># install section</span> - 95: <span class="ruby-comment cmt"># post section</span> - 96: <span class="ruby-comment cmt"># remove build sources.</span> - 97: <span class="ruby-comment cmt">#</span> - 98: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">removeBuild</span> ) - 99: <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> ) -100: <span class="ruby-comment cmt">#return false # commented out as this is not a reason to fail.</span> -101: <span class="ruby-keyword kw">end</span> -102: -103: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -104: <span class="ruby-keyword kw">end</span> + 90: <span class="ruby-comment cmt"># build section</span> + 91: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">build</span> ) + 92: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to process build section in the package description of #{package}."</span> ) + 93: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> + 94: <span class="ruby-keyword kw">else</span> + 95: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"DEBUG: finished #{package} build section."</span> ) + 96: <span class="ruby-keyword kw">end</span> + 97: + 98: + 99: <span class="ruby-comment cmt"># TODO: finish up the following steps per install scenario:</span> +100: <span class="ruby-comment cmt">#</span> +101: <span class="ruby-comment cmt"># pre install section</span> +102: <span class="ruby-comment cmt"># install section</span> +103: <span class="ruby-comment cmt"># post section</span> +104: <span class="ruby-comment cmt"># remove build sources.</span> +105: <span class="ruby-comment cmt">#</span> +106: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">sw</span>.<span class="ruby-identifier">removeBuild</span> ) +107: <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> ) +108: <span class="ruby-comment cmt">#return false # commented out as this is not a reason to fail.</span> +109: <span class="ruby-keyword kw">end</span> +110: +111: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +112: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -315,9 +323,9 @@ <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 114</span> -114: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reinstallPackage</span>( <span class="ruby-identifier">package</span> ) -115: <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">reinstallPackage</span>( <span class="ruby-identifier">package</span> ) +123: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -342,9 +350,9 @@ <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 125</span> -125: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removePackage</span>( <span class="ruby-identifier">package</span> ) -126: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 133</span> +133: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removePackage</span>( <span class="ruby-identifier">package</span> ) +134: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -368,20 +376,20 @@ <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 160</span> -160: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rootLogin</span>( <span class="ruby-identifier">arguments</span> ) -161: <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> ) -162: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> -163: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> -164: -165: <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> -166: <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>] -167: <span class="ruby-keyword kw">end</span> -168: -169: <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> ) -170: <span class="ruby-identifier">exit</span> -171: <span class="ruby-keyword kw">end</span> -172: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackageManager.rb, line 168</span> +168: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rootLogin</span>( <span class="ruby-identifier">arguments</span> ) +169: <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> ) +170: <span class="ruby-identifier">args</span> = <span class="ruby-value str">""</span> +171: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\nEnter root password:"</span> +172: +173: <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> +174: <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>] +175: <span class="ruby-keyword kw">end</span> +176: +177: <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> ) +178: <span class="ruby-identifier">exit</span> +179: <span class="ruby-keyword kw">end</span> +180: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/created.rid =================================================================== --- src/trunk/doc/created.rid 2007-02-03 20:33:04 UTC (rev 283) +++ src/trunk/doc/created.rid 2007-02-03 20:39:25 UTC (rev 284) @@ -1 +1 @@ -Tue Jan 23 21:22:41 CET 2007 +Sat Feb 03 21:36:27 CET 2007 Modified: src/trunk/doc/files/AbtPackageManager_rb.html =================================================================== --- src/trunk/doc/files/AbtPackageManager_rb.html 2007-02-03 20:33:04 UTC (rev 283) +++ src/trunk/doc/files/AbtPackageManager_rb.html 2007-02-03 20:39:25 UTC (rev 284) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Fri Dec 29 00:42:38 CET 2006</td> + <td>Sat Feb 03 21:35:25 CET 2007</td> </tr> </table> </td></tr> Modified: src/trunk/doc/files/AbtPackage_rb.html =================================================================== --- src/trunk/doc/files/AbtPackage_rb.html 2007-02-03 20:33:04 UTC (rev 283) +++ src/trunk/doc/files/AbtPackage_rb.html 2007-02-03 20:39:25 UTC (rev 284) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Tue Jan 23 21:22:33 CET 2007</td> + <td>Sat Feb 03 21:35:25 CET 2007</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...> - 2007-02-03 20:33:05
|
Revision: 283 http://svn.sourceforge.net/abtlinux/?rev=283&view=rev Author: eschabell Date: 2007-02-03 12:33:04 -0800 (Sat, 03 Feb 2007) Log Message: ----------- Implemented basic build framework (for make). Modified Paths: -------------- src/trunk/AbtPackage.rb src/trunk/AbtPackageManager.rb Modified: src/trunk/AbtPackage.rb =================================================================== --- src/trunk/AbtPackage.rb 2007-02-03 19:02:10 UTC (rev 282) +++ src/trunk/AbtPackage.rb 2007-02-03 20:33:04 UTC (rev 283) @@ -229,11 +229,9 @@ # <b>RETURNS:</b> <i>boolean</i> - True if the completes sucessfully, otherwise false. ## def configure - buildSite = "#{$BUILD_LOCATION}/#{@srcDir}" - + Dir.chdir( "#{$BUILD_LOCATION}/#{@srcDir}" ) + # TODO: not some better way to deal with this than system and tee? - Dir.chdir( buildSite ) - if ( !system( "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.configure" ) ) # TODO: put this in failure file. puts "DEBUG: [AbtPackage.configure] - unable to configure." @@ -250,6 +248,17 @@ # <b>RETURNS:</b> <i>boolean</i> - True if the completes sucessfully, otherwise false. ## def build + Dir.chdir( "#{$BUILD_LOCATION}/#{@srcDir}" ) + + # TODO: not some better way to deal with this than system and tee? + if( !system( "make | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.build" ) ) + # TODO: put this in failure file. + puts "DEBUG: [AbtPackage.build] - unable to build." + return false + end + + puts "DEBUG: [AbtPackage.build] - build went fine!" + return true end ## Modified: src/trunk/AbtPackageManager.rb =================================================================== --- src/trunk/AbtPackageManager.rb 2007-02-03 19:02:10 UTC (rev 282) +++ src/trunk/AbtPackageManager.rb 2007-02-03 20:33:04 UTC (rev 283) @@ -87,9 +87,17 @@ logger.logToJournal( "DEBUG: finished #{package} configure section." ) end + # build section + if ( !sw.build ) + logger.logToJournal( "Failed to process build section in the package description of #{package}." ) + return false + else + logger.logToJournal( "DEBUG: finished #{package} build section." ) + end + + # TODO: finish up the following steps per install scenario: # - # build section # pre install section # install section # post section This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-02-03 19:02:20
|
Revision: 282 http://svn.sourceforge.net/abtlinux/?rev=282&view=rev Author: eschabell Date: 2007-02-03 11:02:10 -0800 (Sat, 03 Feb 2007) Log Message: ----------- Removed obsolete comments. Modified Paths: -------------- src/trunk/AbtPackage.rb Modified: src/trunk/AbtPackage.rb =================================================================== --- src/trunk/AbtPackage.rb 2007-01-23 20:24:55 UTC (rev 281) +++ src/trunk/AbtPackage.rb 2007-02-03 19:02:10 UTC (rev 282) @@ -231,8 +231,7 @@ def configure buildSite = "#{$BUILD_LOCATION}/#{@srcDir}" - # TODO: this should not use tee, but in wrapper deal with stdout to file. - # also need to expand directory with @srcDir/@srcDir.configure. + # TODO: not some better way to deal with this than system and tee? Dir.chdir( buildSite ) if ( !system( "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.configure" ) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-01-23 20:24:55
|
Revision: 281 http://svn.sourceforge.net/abtlinux/?rev=281&view=rev Author: eschabell Date: 2007-01-23 12:24:55 -0800 (Tue, 23 Jan 2007) Log Message: ----------- Regenerated docs. Modified Paths: -------------- src/trunk/doc/classes/AbtPackage.html src/trunk/doc/classes/TestAbtReportManager.html src/trunk/doc/created.rid src/trunk/doc/files/AbtPackage_rb.html src/trunk/doc/files/TestAbtReportManager_rb.html Modified: src/trunk/doc/classes/AbtPackage.html =================================================================== --- src/trunk/doc/classes/AbtPackage.html 2007-01-23 20:21:26 UTC (rev 280) +++ src/trunk/doc/classes/AbtPackage.html 2007-01-23 20:24:55 UTC (rev 281) @@ -361,9 +361,9 @@ <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 268</span> -268: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span> -269: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 253</span> +253: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span> +254: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -396,32 +396,17 @@ 233: 234: <span class="ruby-comment cmt"># TODO: this should not use tee, but in wrapper deal with stdout to file.</span> 235: <span class="ruby-comment cmt"># also need to expand directory with @srcDir/@srcDir.configure.</span> -236: <span class="ruby-comment cmt">#command = "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/{@srcDir}.configure"</span> -237: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">buildSite</span> ) -238: <span class="ruby-identifier">stdin</span>, <span class="ruby-identifier">stdout</span>, <span class="ruby-identifier">stderr</span> = -239: <span class="ruby-constant">Open3</span>.<span class="ruby-identifier">popen3</span>( <span class="ruby-node">"./configure --prefix=#{$DEFAULT_PREFIX}"</span> ) -240: -241: <span class="ruby-comment cmt"># check for errors.</span> -242: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">stderr</span>.<span class="ruby-identifier">eof</span> ) -243: <span class="ruby-comment cmt"># TODO: put this in failure file.</span> -244: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - stderr:"</span> -245: <span class="ruby-identifier">puts</span> <span class="ruby-identifier">stderr</span>.<span class="ruby-identifier">read</span> -246: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -247: <span class="ruby-keyword kw">else</span> -248: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - nothing in stderr."</span> -249: <span class="ruby-keyword kw">end</span> -250: -251: <span class="ruby-comment cmt"># check for output.</span> -252: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">stdout</span>.<span class="ruby-identifier">eof</span> ) -253: <span class="ruby-comment cmt"># TODO: put this in #{$PACKAGE_INSTALLED}/{@srcDir}.configure.</span> -254: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - stdout:"</span> -255: <span class="ruby-identifier">puts</span> <span class="ruby-identifier">stdout</span>.<span class="ruby-identifier">read</span> -256: <span class="ruby-keyword kw">else</span> -257: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - nothing in stdout."</span> -258: <span class="ruby-keyword kw">end</span> -259: -260: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -261: <span class="ruby-keyword kw">end</span> +236: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">buildSite</span> ) +237: +238: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">system</span>( <span class="ruby-node">"./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.configure"</span> ) ) +239: <span class="ruby-comment cmt"># TODO: put this in failure file.</span> +240: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - unable to configure."</span> +241: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +242: <span class="ruby-keyword kw">end</span> +243: +244: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - configure went fine!"</span> +245: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +246: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -486,9 +471,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 285</span> -285: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">install</span> -286: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 270</span> +270: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">install</span> +271: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -511,9 +496,9 @@ <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 293</span> -293: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post</span> -294: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 278</span> +278: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post</span> +279: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -580,9 +565,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 277</span> -277: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">preinstall</span> -278: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 262</span> +262: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">preinstall</span> +263: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -604,22 +589,22 @@ <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 301</span> -301: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removeBuild</span> -302: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">$REMOVE_BUILD_SOURCES</span> ) -303: <span class="ruby-identifier">buildSourcesLocation</span> = <span class="ruby-node">"#{$BUILD_LOCATION}/#{srcDir}"</span> -304: -305: <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> ) ) -306: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -307: <span class="ruby-keyword kw">end</span> -308: -309: <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> ) -310: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -311: <span class="ruby-keyword kw">end</span> -312: <span class="ruby-keyword kw">end</span> -313: -314: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -315: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 286</span> +286: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">removeBuild</span> +287: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">$REMOVE_BUILD_SOURCES</span> ) +288: <span class="ruby-identifier">buildSourcesLocation</span> = <span class="ruby-node">"#{$BUILD_LOCATION}/#{srcDir}"</span> +289: +290: <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> ) ) +291: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +292: <span class="ruby-keyword kw">end</span> +293: +294: <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> ) +295: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +296: <span class="ruby-keyword kw">end</span> +297: <span class="ruby-keyword kw">end</span> +298: +299: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +300: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/TestAbtReportManager.html =================================================================== --- src/trunk/doc/classes/TestAbtReportManager.html 2007-01-23 20:21:26 UTC (rev 280) +++ src/trunk/doc/classes/TestAbtReportManager.html 2007-01-23 20:24:55 UTC (rev 281) @@ -372,9 +372,9 @@ <span class="ruby-comment cmt"># File TestAbtReportManager.rb, line 109</span> 109: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testShowQueue</span> 110: <span class="ruby-keyword kw">if</span> ( <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">showQueue</span>( <span class="ruby-value str">"install"</span> ) ) -111: <span class="ruby-identifier">assert</span> ( <span class="ruby-keyword kw">false</span>, <span class="ruby-value str">"testShowQueue()"</span> ) +111: <span class="ruby-identifier">assert</span>(<span class="ruby-keyword kw">false</span>, <span class="ruby-value str">"testShowQueue()"</span>) 112: <span class="ruby-keyword kw">else</span> -113: <span class="ruby-identifier">assert</span> ( <span class="ruby-keyword kw">true</span>, <span class="ruby-value str">"testShowQueue()"</span> ) +113: <span class="ruby-identifier">assert</span>(<span class="ruby-keyword kw">true</span>, <span class="ruby-value str">"testShowQueue()"</span>) 114: <span class="ruby-keyword kw">end</span> 115: <span class="ruby-keyword kw">end</span> </pre> Modified: src/trunk/doc/created.rid =================================================================== --- src/trunk/doc/created.rid 2007-01-23 20:21:26 UTC (rev 280) +++ src/trunk/doc/created.rid 2007-01-23 20:24:55 UTC (rev 281) @@ -1 +1 @@ -Fri Dec 29 23:17:31 CET 2006 +Tue Jan 23 21:22:41 CET 2007 Modified: src/trunk/doc/files/AbtPackage_rb.html =================================================================== --- src/trunk/doc/files/AbtPackage_rb.html 2007-01-23 20:21:26 UTC (rev 280) +++ src/trunk/doc/files/AbtPackage_rb.html 2007-01-23 20:24:55 UTC (rev 281) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Fri Dec 29 22:46:32 CET 2006</td> + <td>Tue Jan 23 21:22:33 CET 2007</td> </tr> </table> </td></tr> Modified: src/trunk/doc/files/TestAbtReportManager_rb.html =================================================================== --- src/trunk/doc/files/TestAbtReportManager_rb.html 2007-01-23 20:21:26 UTC (rev 280) +++ src/trunk/doc/files/TestAbtReportManager_rb.html 2007-01-23 20:24:55 UTC (rev 281) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Fri Dec 29 22:46:32 CET 2006</td> + <td>Mon Jan 08 23:23:36 CET 2007</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...> - 2007-01-23 20:21:28
|
Revision: 280 http://svn.sourceforge.net/abtlinux/?rev=280&view=rev Author: eschabell Date: 2007-01-23 12:21:26 -0800 (Tue, 23 Jan 2007) Log Message: ----------- Removed a bit of unnecessary comments. Modified Paths: -------------- src/trunk/AbtPackage.rb Modified: src/trunk/AbtPackage.rb =================================================================== --- src/trunk/AbtPackage.rb 2007-01-23 18:44:18 UTC (rev 279) +++ src/trunk/AbtPackage.rb 2007-01-23 20:21:26 UTC (rev 280) @@ -233,7 +233,6 @@ # TODO: this should not use tee, but in wrapper deal with stdout to file. # also need to expand directory with @srcDir/@srcDir.configure. - #command = "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/{@srcDir}.configure" Dir.chdir( buildSite ) if ( !system( "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.configure" ) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-01-23 18:44:19
|
Revision: 279 http://svn.sourceforge.net/abtlinux/?rev=279&view=rev Author: eschabell Date: 2007-01-23 10:44:18 -0800 (Tue, 23 Jan 2007) Log Message: ----------- Dumped the open3 helper class, is not very good to have to wait for output until the end of a configure run. Modified Paths: -------------- src/trunk/AbtPackage.rb src/trunk/abt.rb Modified: src/trunk/AbtPackage.rb =================================================================== --- src/trunk/AbtPackage.rb 2007-01-08 22:24:40 UTC (rev 278) +++ src/trunk/AbtPackage.rb 2007-01-23 18:44:18 UTC (rev 279) @@ -235,28 +235,14 @@ # also need to expand directory with @srcDir/@srcDir.configure. #command = "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/{@srcDir}.configure" Dir.chdir( buildSite ) - stdin, stdout, stderr = - Open3.popen3( "./configure --prefix=#{$DEFAULT_PREFIX}" ) - - # check for errors. - if ( !stderr.eof ) + + if ( !system( "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/#{@srcDir}.configure" ) ) # TODO: put this in failure file. - puts "DEBUG: [AbtPackage.configure] - stderr:" - puts stderr.read + puts "DEBUG: [AbtPackage.configure] - unable to configure." return false - else - puts "DEBUG: [AbtPackage.configure] - nothing in stderr." end - # check for output. - if ( !stdout.eof ) - # TODO: put this in #{$PACKAGE_INSTALLED}/{@srcDir}.configure. - puts "DEBUG: [AbtPackage.configure] - stdout:" - puts stdout.read - else - puts "DEBUG: [AbtPackage.configure] - nothing in stdout." - end - + puts "DEBUG: [AbtPackage.configure] - configure went fine!" return true end Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2007-01-08 22:24:40 UTC (rev 278) +++ src/trunk/abt.rb 2007-01-23 18:44:18 UTC (rev 279) @@ -33,7 +33,6 @@ require 'AbtSystemManager' require 'AbtUsage' require 'fileutils' -require 'open3' ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2007-01-08 22:24:39
|
Revision: 278 http://svn.sourceforge.net/abtlinux/?rev=278&view=rev Author: eschabell Date: 2007-01-08 14:24:40 -0800 (Mon, 08 Jan 2007) Log Message: ----------- Applied small fix, thanks for pointing this out Bas van Gils. Modified Paths: -------------- src/trunk/TestAbtReportManager.rb Modified: src/trunk/TestAbtReportManager.rb =================================================================== --- src/trunk/TestAbtReportManager.rb 2006-12-29 22:19:16 UTC (rev 277) +++ src/trunk/TestAbtReportManager.rb 2007-01-08 22:24:40 UTC (rev 278) @@ -108,9 +108,9 @@ ## def testShowQueue if ( @report.showQueue( "install" ) ) - assert ( false, "testShowQueue()" ) + assert(false, "testShowQueue()") else - assert ( true, "testShowQueue()" ) + assert(true, "testShowQueue()") end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-12-29 22:19:16
|
Revision: 277 http://svn.sourceforge.net/abtlinux/?rev=277&view=rev Author: eschabell Date: 2006-12-29 14:19:16 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/TestAbtPackage.html src/trunk/doc/classes/TestAbtQueueManager.html src/trunk/doc/created.rid src/trunk/doc/files/TestAbtPackage_rb.html src/trunk/doc/files/TestAbtQueueManager_rb.html src/trunk/doc/fr_method_index.html Modified: src/trunk/doc/classes/TestAbtPackage.html =================================================================== --- src/trunk/doc/classes/TestAbtPackage.html 2006-12-29 22:05:44 UTC (rev 276) +++ src/trunk/doc/classes/TestAbtPackage.html 2006-12-29 22:19:16 UTC (rev 277) @@ -211,22 +211,22 @@ <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> -67: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'name'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'name'</span>], <span class="ruby-value str">"testDetails()"</span> ) -68: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'execName'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'execName'</span>], <span class="ruby-value str">"testDetails()"</span> ) -69: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'version'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'version'</span>], <span class="ruby-value str">"testDetails()"</span> ) -70: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'srcDir'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'srcDir'</span>], <span class="ruby-value str">"testDetails()"</span> ) -71: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'homepage'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'homepage'</span>], <span class="ruby-value str">"testDetails()"</span> ) -72: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'srcUrl'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'srcUrl'</span>], <span class="ruby-value str">"testDetails()"</span> ) -73: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'dependsOn'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'dependsOn'</span>], <span class="ruby-value str">"testDetails()"</span> ) -74: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'reliesOn'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'reliesOn'</span>], <span class="ruby-value str">"testDetails()"</span> ) -75: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'optionalDO'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'optionalDO'</span>], <span class="ruby-value str">"testDetails()"</span> ) -76: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'optionalRO'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'optionalRO'</span>], <span class="ruby-value str">"testDetails()"</span> ) -77: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'hashCheck'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'hashCheck'</span>], <span class="ruby-value str">"testDetails()"</span> ) -78: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'patches'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'patches'</span>], <span class="ruby-value str">"testDetails()"</span> ) -79: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'patchesHashCheck'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'patchesHashCheck'</span>], <span class="ruby-value str">"testDetails()"</span> ) -80: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'mirrorPath'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'mirrorPath'</span>], <span class="ruby-value str">"testDetails()"</span> ) -81: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'license'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'license'</span>], <span class="ruby-value str">"testDetails()"</span> ) -82: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'description'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'description'</span>], <span class="ruby-value str">"testDetails()"</span> ) +67: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'name'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Package name'</span>], <span class="ruby-value str">"testDetails()"</span> ) +68: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'execName'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Executable'</span>], <span class="ruby-value str">"testDetails()"</span> ) +69: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'version'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Version'</span>], <span class="ruby-value str">"testDetails()"</span> ) +70: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'srcDir'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Source location'</span>], <span class="ruby-value str">"testDetails()"</span> ) +71: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'homepage'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Homepage'</span>], <span class="ruby-value str">"testDetails()"</span> ) +72: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'srcUrl'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Source uri'</span>], <span class="ruby-value str">"testDetails()"</span> ) +73: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'dependsOn'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Depends On'</span>], <span class="ruby-value str">"testDetails()"</span> ) +74: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'reliesOn'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Relies On'</span>], <span class="ruby-value str">"testDetails()"</span> ) +75: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'optionalDO'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Optional DO'</span>], <span class="ruby-value str">"testDetails()"</span> ) +76: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'optionalRO'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Optional RO'</span>], <span class="ruby-value str">"testDetails()"</span> ) +77: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'hashCheck'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Security hash'</span>], <span class="ruby-value str">"testDetails()"</span> ) +78: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'patches'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Patches'</span>], <span class="ruby-value str">"testDetails()"</span> ) +79: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'patchesHashCheck'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Patches hash'</span>], <span class="ruby-value str">"testDetails()"</span> ) +80: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'mirrorPath'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Mirror'</span>], <span class="ruby-value str">"testDetails()"</span> ) +81: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'license'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'License'</span>], <span class="ruby-value str">"testDetails()"</span> ) +82: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-identifier">$data</span>[<span class="ruby-value str">'description'</span>], <span class="ruby-ivar">@fortune</span>.<span class="ruby-identifier">details</span>[<span class="ruby-value str">'Description'</span>], <span class="ruby-value str">"testDetails()"</span> ) 83: <span class="ruby-keyword kw">end</span> </pre> </div> Modified: src/trunk/doc/classes/TestAbtQueueManager.html =================================================================== --- src/trunk/doc/classes/TestAbtQueueManager.html 2006-12-29 22:05:44 UTC (rev 276) +++ src/trunk/doc/classes/TestAbtQueueManager.html 2006-12-29 22:19:16 UTC (rev 277) @@ -118,7 +118,7 @@ <div class="sectiontitle">Methods</div> <ul> <li><a href="#M000076">setup</a></li> - <li><a href="#M000077">testQueueManager</a></li> + <li><a href="#M000077">testAddPackageToQueue</a></li> </ul> @@ -151,11 +151,12 @@ </div> <div class="method"> <div class="title"> - <a name="M000077"></a><b>testQueueManager</b>() + <a name="M000077"></a><b>testAddPackageToQueue</b>() </div> <div class="description"> <p> -Test method for ‘AbtQueueManager.testQueueMananger()’ +Test method for ‘<a +href="AbtQueueManager.html#M000085">AbtQueueManager.addPackageToQueue</a>()’ </p> </div> <div class="sourcecode"> @@ -163,8 +164,8 @@ <div id="M000077_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File TestAbtQueueManager.rb, line 43</span> -43: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testQueueManager</span> -44: <span class="ruby-identifier">assert_equal</span>( <span class="ruby-keyword kw">false</span>, <span class="ruby-keyword kw">true</span>, <span class="ruby-value str">"testQueueManager()"</span> ) +43: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testAddPackageToQueue</span> +44: <span class="ruby-identifier">assert</span>( <span class="ruby-ivar">@queue</span>.<span class="ruby-identifier">addPackageToQueue</span>( <span class="ruby-value str">"fortune"</span>, <span class="ruby-value str">"install"</span> ), <span class="ruby-value str">"testQueueManager()"</span> ) 45: <span class="ruby-keyword kw">end</span> </pre> </div> Modified: src/trunk/doc/created.rid =================================================================== --- src/trunk/doc/created.rid 2006-12-29 22:05:44 UTC (rev 276) +++ src/trunk/doc/created.rid 2006-12-29 22:19:16 UTC (rev 277) @@ -1 +1 @@ -Fri Dec 29 22:46:38 CET 2006 +Fri Dec 29 23:17:31 CET 2006 Modified: src/trunk/doc/files/TestAbtPackage_rb.html =================================================================== --- src/trunk/doc/files/TestAbtPackage_rb.html 2006-12-29 22:05:44 UTC (rev 276) +++ src/trunk/doc/files/TestAbtPackage_rb.html 2006-12-29 22:19:16 UTC (rev 277) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Sun Nov 19 14:56:45 CET 2006</td> + <td>Fri Dec 29 23:17:23 CET 2006</td> </tr> </table> </td></tr> Modified: src/trunk/doc/files/TestAbtQueueManager_rb.html =================================================================== --- src/trunk/doc/files/TestAbtQueueManager_rb.html 2006-12-29 22:05:44 UTC (rev 276) +++ src/trunk/doc/files/TestAbtQueueManager_rb.html 2006-12-29 22:19:16 UTC (rev 277) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Wed May 31 17:28:30 CEST 2006</td> + <td>Fri Dec 29 23:17:23 CET 2006</td> </tr> </table> </td></tr> Modified: src/trunk/doc/fr_method_index.html =================================================================== --- src/trunk/doc/fr_method_index.html 2006-12-29 22:05:44 UTC (rev 276) +++ src/trunk/doc/fr_method_index.html 2006-12-29 22:19:16 UTC (rev 277) @@ -81,11 +81,11 @@ <a href="classes/AbtSystemManager.html#M000010">setPackageTreeLocation (AbtSystemManager)</a><br> <a href="classes/TestAbtDepEngine.html#M000095">setup (TestAbtDepEngine)</a><br> <a href="classes/TestAbtDownloadManager.html#M000078">setup (TestAbtDownloadManager)</a><br> -<a href="classes/TestAbtQueueManager.html#M000076">setup (TestAbtQueueManager)</a><br> +<a href="classes/TestAbtLogManager.html#M000097">setup (TestAbtLogManager)</a><br> <a href="classes/TestAbtReportManager.html#M000047">setup (TestAbtReportManager)</a><br> <a href="classes/TestAbtSystemManager.html#M000066">setup (TestAbtSystemManager)</a><br> <a href="classes/TestAbtPackage.html#M000087">setup (TestAbtPackage)</a><br> -<a href="classes/TestAbtLogManager.html#M000097">setup (TestAbtLogManager)</a><br> +<a href="classes/TestAbtQueueManager.html#M000076">setup (TestAbtQueueManager)</a><br> <a href="classes/TestAbtPackageManager.html#M000017">setup (TestAbtPackageManager)</a><br> <a href="classes/AbtReportManager.html#M000111">showFileOwner (AbtReportManager)</a><br> <a href="classes/AbtReportManager.html#M000107">showFrozenPackages (AbtReportManager)</a><br> @@ -97,6 +97,7 @@ <a href="classes/AbtReportManager.html#M000113">showQueue (AbtReportManager)</a><br> <a href="classes/AbtReportManager.html#M000109">showUntrackedFiles (AbtReportManager)</a><br> <a href="classes/AbtReportManager.html#M000114">showUpdates (AbtReportManager)</a><br> +<a href="classes/TestAbtQueueManager.html#M000077">testAddPackageToQueue (TestAbtQueueManager)</a><br> <a href="classes/TestAbtPackage.html#M000091">testBuild (TestAbtPackage)</a><br> <a href="classes/TestAbtLogManager.html#M000101">testCachePackage (TestAbtLogManager)</a><br> <a href="classes/TestAbtSystemManager.html#M000068">testCleanupLogs (TestAbtSystemManager)</a><br> @@ -117,7 +118,6 @@ <a href="classes/TestAbtPackage.html#M000094">testPost (TestAbtPackage)</a><br> <a href="classes/TestAbtPackage.html#M000089">testPre (TestAbtPackage)</a><br> <a href="classes/TestAbtPackage.html#M000092">testPreinstall (TestAbtPackage)</a><br> -<a href="classes/TestAbtQueueManager.html#M000077">testQueueManager (TestAbtQueueManager)</a><br> <a href="classes/TestAbtPackageManager.html#M000019">testReinstallPackage (TestAbtPackageManager)</a><br> <a href="classes/TestAbtPackageManager.html#M000020">testRemovePackage (TestAbtPackageManager)</a><br> <a href="classes/TestAbtDownloadManager.html#M000081">testRetrieveNewsFeed (TestAbtDownloadManager)</a><br> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-12-29 22:05:44
|
Revision: 276 http://svn.sourceforge.net/abtlinux/?rev=276&view=rev Author: eschabell Date: 2006-12-29 14:05:44 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Replaced queue manager test placeholder with valid test for adding a package to a queue. Modified Paths: -------------- src/trunk/TestAbtQueueManager.rb Modified: src/trunk/TestAbtQueueManager.rb =================================================================== --- src/trunk/TestAbtQueueManager.rb 2006-12-29 21:58:22 UTC (rev 275) +++ src/trunk/TestAbtQueueManager.rb 2006-12-29 22:05:44 UTC (rev 276) @@ -38,10 +38,10 @@ end ## - # Test method for 'AbtQueueManager.testQueueMananger()' + # Test method for 'AbtQueueManager.addPackageToQueue()' ## - def testQueueManager - assert_equal( false, true, "testQueueManager()" ) + def testAddPackageToQueue + assert( @queue.addPackageToQueue( "fortune", "install" ), "testQueueManager()" ) end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-12-29 21:58:22
|
Revision: 275 http://svn.sourceforge.net/abtlinux/?rev=275&view=rev Author: eschabell Date: 2006-12-29 13:58:22 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Passing another test after adjustment to naming of hash elements in test. Modified Paths: -------------- src/trunk/TestAbtPackage.rb Modified: src/trunk/TestAbtPackage.rb =================================================================== --- src/trunk/TestAbtPackage.rb 2006-12-29 21:48:28 UTC (rev 274) +++ src/trunk/TestAbtPackage.rb 2006-12-29 21:58:22 UTC (rev 275) @@ -64,22 +64,22 @@ # Test method for 'AbtPackage.testDetails()' ## def testDetails - assert_equal( $data['name'], @fortune.details['name'], "testDetails()" ) - assert_equal( $data['execName'], @fortune.details['execName'], "testDetails()" ) - assert_equal( $data['version'], @fortune.details['version'], "testDetails()" ) - assert_equal( $data['srcDir'], @fortune.details['srcDir'], "testDetails()" ) - assert_equal( $data['homepage'], @fortune.details['homepage'], "testDetails()" ) - assert_equal( $data['srcUrl'], @fortune.details['srcUrl'], "testDetails()" ) - assert_equal( $data['dependsOn'], @fortune.details['dependsOn'], "testDetails()" ) - assert_equal( $data['reliesOn'], @fortune.details['reliesOn'], "testDetails()" ) - assert_equal( $data['optionalDO'], @fortune.details['optionalDO'], "testDetails()" ) - assert_equal( $data['optionalRO'], @fortune.details['optionalRO'], "testDetails()" ) - assert_equal( $data['hashCheck'], @fortune.details['hashCheck'], "testDetails()" ) - assert_equal( $data['patches'], @fortune.details['patches'], "testDetails()" ) - assert_equal( $data['patchesHashCheck'], @fortune.details['patchesHashCheck'], "testDetails()" ) - assert_equal( $data['mirrorPath'], @fortune.details['mirrorPath'], "testDetails()" ) - assert_equal( $data['license'], @fortune.details['license'], "testDetails()" ) - assert_equal( $data['description'], @fortune.details['description'], "testDetails()" ) + assert_equal( $data['name'], @fortune.details['Package name'], "testDetails()" ) + assert_equal( $data['execName'], @fortune.details['Executable'], "testDetails()" ) + assert_equal( $data['version'], @fortune.details['Version'], "testDetails()" ) + assert_equal( $data['srcDir'], @fortune.details['Source location'], "testDetails()" ) + assert_equal( $data['homepage'], @fortune.details['Homepage'], "testDetails()" ) + assert_equal( $data['srcUrl'], @fortune.details['Source uri'], "testDetails()" ) + assert_equal( $data['dependsOn'], @fortune.details['Depends On'], "testDetails()" ) + assert_equal( $data['reliesOn'], @fortune.details['Relies On'], "testDetails()" ) + assert_equal( $data['optionalDO'], @fortune.details['Optional DO'], "testDetails()" ) + assert_equal( $data['optionalRO'], @fortune.details['Optional RO'], "testDetails()" ) + assert_equal( $data['hashCheck'], @fortune.details['Security hash'], "testDetails()" ) + assert_equal( $data['patches'], @fortune.details['Patches'], "testDetails()" ) + assert_equal( $data['patchesHashCheck'], @fortune.details['Patches hash'], "testDetails()" ) + assert_equal( $data['mirrorPath'], @fortune.details['Mirror'], "testDetails()" ) + assert_equal( $data['license'], @fortune.details['License'], "testDetails()" ) + assert_equal( $data['description'], @fortune.details['Description'], "testDetails()" ) end ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-12-29 21:48:29
|
Revision: 274 http://svn.sourceforge.net/abtlinux/?rev=274&view=rev Author: eschabell Date: 2006-12-29 13:48:28 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtPackage.html src/trunk/doc/classes/AbtQueueManager.html src/trunk/doc/classes/AbtReportManager.html src/trunk/doc/classes/TestAbtReportManager.html src/trunk/doc/created.rid src/trunk/doc/files/AbtPackage_rb.html src/trunk/doc/files/AbtQueueManager_rb.html src/trunk/doc/files/AbtReportManager_rb.html src/trunk/doc/files/TestAbtReportManager_rb.html Modified: src/trunk/doc/classes/AbtPackage.html =================================================================== --- src/trunk/doc/classes/AbtPackage.html 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/classes/AbtPackage.html 2006-12-29 21:48:28 UTC (rev 274) @@ -447,22 +447,22 @@ <span class="ruby-comment cmt"># File AbtPackage.rb, line 174</span> 174: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">details</span> 175: <span class="ruby-keyword kw">return</span> { -176: <span class="ruby-value str">"Package name"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@name</span>, -177: <span class="ruby-value str">"Executable"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@execName</span>, -178: <span class="ruby-value str">"Version"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@version</span>, -179: <span class="ruby-value str">"Source location"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcDir</span>, -180: <span class="ruby-value str">"Homepage"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@homepage</span>, -181: <span class="ruby-value str">"Source uri"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcUrl</span>, -182: <span class="ruby-value str">"Depends On"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@dependsOn</span>, -183: <span class="ruby-value str">"Relies On"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@reliesOn</span>, -184: <span class="ruby-value str">"Optional DO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalDO</span>, -185: <span class="ruby-value str">"Optional RO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalRO</span>, -186: <span class="ruby-value str">"Security hash"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@hashCheck</span>, -187: <span class="ruby-value str">"Patches"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patches</span>, -188: <span class="ruby-value str">"Patches hash"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patchesHashCheck</span>, -189: <span class="ruby-value str">"Mirror"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@mirrorPath</span>, -190: <span class="ruby-value str">"License"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@license</span>, -191: <span class="ruby-value str">"Description"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@description</span> +176: <span class="ruby-value str">"Package name"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@name</span>, +177: <span class="ruby-value str">"Executable"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@execName</span>, +178: <span class="ruby-value str">"Version"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@version</span>, +179: <span class="ruby-value str">"Source location"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcDir</span>, +180: <span class="ruby-value str">"Homepage"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@homepage</span>, +181: <span class="ruby-value str">"Source uri"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcUrl</span>, +182: <span class="ruby-value str">"Depends On"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@dependsOn</span>, +183: <span class="ruby-value str">"Relies On"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@reliesOn</span>, +184: <span class="ruby-value str">"Optional DO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalDO</span>, +185: <span class="ruby-value str">"Optional RO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalRO</span>, +186: <span class="ruby-value str">"Security hash"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@hashCheck</span>, +187: <span class="ruby-value str">"Patches"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patches</span>, +188: <span class="ruby-value str">"Patches hash"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patchesHashCheck</span>, +189: <span class="ruby-value str">"Mirror"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@mirrorPath</span>, +190: <span class="ruby-value str">"License"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@license</span>, +191: <span class="ruby-value str">"Description"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@description</span> 192: } 193: <span class="ruby-keyword kw">end</span> </pre> Modified: src/trunk/doc/classes/AbtQueueManager.html =================================================================== --- src/trunk/doc/classes/AbtQueueManager.html 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/classes/AbtQueueManager.html 2006-12-29 21:48:28 UTC (rev 274) @@ -177,37 +177,34 @@ <pre> <span class="ruby-comment cmt"># File AbtQueueManager.rb, line 54</span> 54: <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> ) -55: <span class="ruby-identifier">queueFile</span> = <span class="ruby-node">"#{$ABT_LOGS}/#{queue}.log"</span> -56: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> -57: -58: <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> ) ) -59: <span class="ruby-comment cmt"># pickup queue contents to ensure no duplicates.</span> -60: <span class="ruby-identifier">checkingQueue</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">readlines</span>( <span class="ruby-identifier">queueFile</span> ) -61: -62: <span class="ruby-comment cmt"># endsure no duplicates.</span> -63: <span class="ruby-identifier">matched</span> = <span class="ruby-keyword kw">false</span> -64: <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> -65: <span class="ruby-identifier">entryName</span> = <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">split</span>( <span class="ruby-value str">'|'</span> ) -66: <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> ) -67: <span class="ruby-identifier">matched</span> = <span class="ruby-keyword kw">true</span> -68: <span class="ruby-keyword kw">end</span> -69: <span class="ruby-keyword kw">end</span> -70: -71: <span class="ruby-comment cmt"># check if package exists, otherwise add.</span> -72: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">matched</span> ) -73: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{package}|#{$TIMESTAMP}"</span> -74: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Added #{package} to #{queue} queue."</span> ) -75: <span class="ruby-keyword kw">else</span> -76: <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> ) -77: <span class="ruby-keyword kw">end</span> -78: -79: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">close</span> -80: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -81: <span class="ruby-keyword kw">end</span> -82: -83: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to open #{queueFile}."</span> ) -84: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -85: <span class="ruby-keyword kw">end</span> +55: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> +56: +57: <span class="ruby-comment cmt"># want to name install queue differently from log files.</span> +58: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">queue</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'install'</span> ) +59: <span class="ruby-identifier">queueFile</span> = <span class="ruby-node">"#{$ABT_LOGS}/#{queue}.queue"</span> +60: <span class="ruby-keyword kw">else</span> +61: <span class="ruby-identifier">queueFile</span> = <span class="ruby-node">"#{$ABT_LOGS}/#{queue}.log"</span> +62: <span class="ruby-keyword kw">end</span> +63: +64: <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> ) ) +65: <span class="ruby-comment cmt"># pickup queue contents to ensure no duplicates.</span> +66: <span class="ruby-identifier">checkingQueue</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">readlines</span>( <span class="ruby-identifier">queueFile</span> ) +67: +68: <span class="ruby-comment cmt"># check if package exists, otherwise add.</span> +69: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span> <span class="ruby-identifier">checkingQueue</span>.<span class="ruby-identifier">collect</span>{ <span class="ruby-operator">|</span><span class="ruby-identifier">i</span><span class="ruby-operator">|</span> <span class="ruby-identifier">i</span>.<span class="ruby-identifier">split</span>( <span class="ruby-value str">'|'</span> )[<span class="ruby-value">0</span>] }.<span class="ruby-identifier">include?</span>( <span class="ruby-identifier">package</span> ) ) +70: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{package}|#{$TIMESTAMP}"</span> +71: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Added #{package} to #{queue} queue."</span> ) +72: <span class="ruby-keyword kw">else</span> +73: <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> ) +74: <span class="ruby-keyword kw">end</span> +75: +76: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">close</span> +77: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +78: <span class="ruby-keyword kw">end</span> +79: +80: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to open #{queueFile}."</span> ) +81: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +82: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtReportManager.html =================================================================== --- src/trunk/doc/classes/AbtReportManager.html 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/classes/AbtReportManager.html 2006-12-29 21:48:28 UTC (rev 274) @@ -179,9 +179,9 @@ <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 242</span> -242: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateHTMLPackageListing</span> -243: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 241</span> +241: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateHTMLPackageListing</span> +242: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -474,15 +474,15 @@ <pre> <span class="ruby-comment cmt"># File AbtReportManager.rb, line 201</span> 201: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showQueue</span>( <span class="ruby-identifier">queueType</span> ) -202: <span class="ruby-identifier">queueFile</span> = <span class="ruby-node">"#{$ABT_LOGS}/#{queueType}.log"</span> +202: 203: <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">queueType</span> 204: 205: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">"install"</span> -206: <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> ) ) +206: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-node">"#{$ABT_LOGS}/#{queueType}.queue"</span> ) ) 207: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> 208: <span class="ruby-identifier">puts</span> <span class="ruby-node">"AbTLinux #{queueType} queue:"</span> 209: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"======================="</span> -210: <span class="ruby-identifier">queue</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">readlines</span>( <span class="ruby-identifier">queueFile</span> ) +210: <span class="ruby-identifier">queue</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">readlines</span>( <span class="ruby-node">"#{$ABT_LOGS}/#{queueType}.queue"</span> ) 211: <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> } 212: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> 213: <span class="ruby-keyword kw">else</span> @@ -490,11 +490,10 @@ 215: <span class="ruby-identifier">puts</span> <span class="ruby-node">"AbtLinux #{queueType} is empty at this time."</span> 216: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n\n"</span> 217: <span class="ruby-keyword kw">end</span> -218: -219: <span class="ruby-keyword kw">else</span> -220: <span class="ruby-identifier">puts</span> <span class="ruby-node">"#{queueType.capitalize} is not an AbTLinux queue."</span> -221: <span class="ruby-keyword kw">end</span> -222: <span class="ruby-keyword kw">end</span> +218: <span class="ruby-keyword kw">else</span> +219: <span class="ruby-identifier">puts</span> <span class="ruby-node">"#{queueType.capitalize} is not an AbTLinux queue."</span> +220: <span class="ruby-keyword kw">end</span> +221: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -545,9 +544,9 @@ <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 234</span> -234: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showUpdates</span>( <span class="ruby-identifier">target</span> ) -235: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtReportManager.rb, line 233</span> +233: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">showUpdates</span>( <span class="ruby-identifier">target</span> ) +234: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/TestAbtReportManager.html =================================================================== --- src/trunk/doc/classes/TestAbtReportManager.html 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/classes/TestAbtReportManager.html 2006-12-29 21:48:28 UTC (rev 274) @@ -175,10 +175,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 TestAbtReportManager.rb, line 123</span> -123: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testGenerateHTMLPackageListing</span> -124: <span class="ruby-identifier">assert</span>( <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">generateHTMLPackageListing</span>(), <span class="ruby-value str">"testGenerateHTMLPackageListing()"</span> ) -125: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File TestAbtReportManager.rb, line 127</span> +127: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testGenerateHTMLPackageListing</span> +128: <span class="ruby-identifier">assert</span>( <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">generateHTMLPackageListing</span>(), <span class="ruby-value str">"testGenerateHTMLPackageListing()"</span> ) +129: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -371,8 +371,12 @@ <pre> <span class="ruby-comment cmt"># File TestAbtReportManager.rb, line 109</span> 109: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testShowQueue</span> -110: <span class="ruby-identifier">assert</span>( <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">showQueue</span>( <span class="ruby-value str">"install"</span> ), <span class="ruby-value str">"testShowQueue()"</span> ) -111: <span class="ruby-keyword kw">end</span> +110: <span class="ruby-keyword kw">if</span> ( <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">showQueue</span>( <span class="ruby-value str">"install"</span> ) ) +111: <span class="ruby-identifier">assert</span> ( <span class="ruby-keyword kw">false</span>, <span class="ruby-value str">"testShowQueue()"</span> ) +112: <span class="ruby-keyword kw">else</span> +113: <span class="ruby-identifier">assert</span> ( <span class="ruby-keyword kw">true</span>, <span class="ruby-value str">"testShowQueue()"</span> ) +114: <span class="ruby-keyword kw">end</span> +115: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -411,10 +415,10 @@ <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 TestAbtReportManager.rb, line 116</span> -116: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testShowUpdates</span> -117: <span class="ruby-identifier">assert</span>( <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">showUpdates</span>( <span class="ruby-value str">"fortune"</span> ), <span class="ruby-value str">"testShowUpdates()"</span> ) -118: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File TestAbtReportManager.rb, line 120</span> +120: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">testShowUpdates</span> +121: <span class="ruby-identifier">assert</span>( <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">showUpdates</span>( <span class="ruby-value str">"fortune"</span> ), <span class="ruby-value str">"testShowUpdates()"</span> ) +122: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/created.rid =================================================================== --- src/trunk/doc/created.rid 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/created.rid 2006-12-29 21:48:28 UTC (rev 274) @@ -1 +1 @@ -Fri Dec 29 00:42:55 CET 2006 +Fri Dec 29 22:46:38 CET 2006 Modified: src/trunk/doc/files/AbtPackage_rb.html =================================================================== --- src/trunk/doc/files/AbtPackage_rb.html 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/files/AbtPackage_rb.html 2006-12-29 21:48:28 UTC (rev 274) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Fri Dec 29 00:42:38 CET 2006</td> + <td>Fri Dec 29 22:46:32 CET 2006</td> </tr> </table> </td></tr> Modified: src/trunk/doc/files/AbtQueueManager_rb.html =================================================================== --- src/trunk/doc/files/AbtQueueManager_rb.html 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/files/AbtQueueManager_rb.html 2006-12-29 21:48:28 UTC (rev 274) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Fri Dec 29 00:42:38 CET 2006</td> + <td>Fri Dec 29 22:46:32 CET 2006</td> </tr> </table> </td></tr> Modified: src/trunk/doc/files/AbtReportManager_rb.html =================================================================== --- src/trunk/doc/files/AbtReportManager_rb.html 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/files/AbtReportManager_rb.html 2006-12-29 21:48:28 UTC (rev 274) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Fri Dec 29 00:42:38 CET 2006</td> + <td>Fri Dec 29 22:46:32 CET 2006</td> </tr> </table> </td></tr> Modified: src/trunk/doc/files/TestAbtReportManager_rb.html =================================================================== --- src/trunk/doc/files/TestAbtReportManager_rb.html 2006-12-29 21:47:33 UTC (rev 273) +++ src/trunk/doc/files/TestAbtReportManager_rb.html 2006-12-29 21:48:28 UTC (rev 274) @@ -63,7 +63,7 @@ </tr> <tr> <td>Modified:</td> - <td>Sun Dec 03 12:16:35 CET 2006</td> + <td>Fri Dec 29 22:46:32 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-12-29 21:47:35
|
Revision: 273 http://svn.sourceforge.net/abtlinux/?rev=273&view=rev Author: eschabell Date: 2006-12-29 13:47:33 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Implemented show-iqueue. Passing another test after adjusted assert to work as it should, not as I thought it would. Modified Paths: -------------- src/trunk/TestAbtReportManager.rb src/trunk/abt.rb Modified: src/trunk/TestAbtReportManager.rb =================================================================== --- src/trunk/TestAbtReportManager.rb 2006-12-29 21:10:02 UTC (rev 272) +++ src/trunk/TestAbtReportManager.rb 2006-12-29 21:47:33 UTC (rev 273) @@ -1,4 +1,4 @@ -#!/usr/bin/ruby -w +#!/usr/bin/ruby -wI./packages require 'test/unit/testcase' require 'test/unit/autorunner' @@ -107,7 +107,11 @@ # Test method for 'AbtReportManager.testShowQueue()' ## def testShowQueue - assert( @report.showQueue( "install" ), "testShowQueue()" ) + if ( @report.showQueue( "install" ) ) + assert ( false, "testShowQueue()" ) + else + assert ( true, "testShowQueue()" ) + end end ## Modified: src/trunk/abt.rb =================================================================== --- src/trunk/abt.rb 2006-12-29 21:10:02 UTC (rev 272) +++ src/trunk/abt.rb 2006-12-29 21:47:33 UTC (rev 273) @@ -203,8 +203,7 @@ reporter.showJournal( $JOURNAL ) when "show-iqueue" - puts "Display contents of install queue." - show.usage( "queries" ) + reporter.showQueue( "install" ) when "show-patches" puts "Display currently available patches for installed package tree." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-12-29 21:10:03
|
Revision: 272 http://svn.sourceforge.net/abtlinux/?rev=272&view=rev Author: eschabell Date: 2006-12-29 13:10:02 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Naming of install queue moved off the generic <name>.log format to install.queue. Modified Paths: -------------- src/trunk/AbtQueueManager.rb src/trunk/AbtReportManager.rb Modified: src/trunk/AbtQueueManager.rb =================================================================== --- src/trunk/AbtQueueManager.rb 2006-12-29 14:00:52 UTC (rev 271) +++ src/trunk/AbtQueueManager.rb 2006-12-29 21:10:02 UTC (rev 272) @@ -52,9 +52,15 @@ # queue, otherwise false. ## def addPackageToQueue( package, queue ) - queueFile = "#{$ABT_LOGS}/#{queue}.log" logger = AbtLogManager.new + # want to name install queue differently from log files. + if ( queue == 'install' ) + queueFile = "#{$ABT_LOGS}/#{queue}.queue" + else + queueFile = "#{$ABT_LOGS}/#{queue}.log" + end + if ( log = File.new( queueFile, File::WRONLY|File::APPEND|File::CREAT, 0644 ) ) # pickup queue contents to ensure no duplicates. checkingQueue = IO.readlines( queueFile ) Modified: src/trunk/AbtReportManager.rb =================================================================== --- src/trunk/AbtReportManager.rb 2006-12-29 14:00:52 UTC (rev 271) +++ src/trunk/AbtReportManager.rb 2006-12-29 21:10:02 UTC (rev 272) @@ -199,15 +199,15 @@ # <b>RETURN</b> <i>void.</i> ## def showQueue( queueType ) - queueFile = "#{$ABT_LOGS}/#{queueType}.log" + case queueType when "install" - if ( File.exist?( queueFile ) ) + if ( File.exist?( "#{$ABT_LOGS}/#{queueType}.queue" ) ) puts "\n\n" puts "AbTLinux #{queueType} queue:" puts "=======================" - queue = IO.readlines( queueFile ) + queue = IO.readlines( "#{$ABT_LOGS}/#{queueType}.queue" ) queue.each{ |entry| puts entry } puts "\n\n" else @@ -215,7 +215,6 @@ puts "AbtLinux #{queueType} is empty at this time." puts "\n\n" end - else puts "#{queueType.capitalize} is not an AbTLinux queue." end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-12-29 14:00:52
|
Revision: 271 http://svn.sourceforge.net/abtlinux/?rev=271&view=rev Author: eschabell Date: 2006-12-29 06:00:52 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Some beautification. Modified Paths: -------------- src/trunk/AbtPackage.rb Modified: src/trunk/AbtPackage.rb =================================================================== --- src/trunk/AbtPackage.rb 2006-12-29 13:52:49 UTC (rev 270) +++ src/trunk/AbtPackage.rb 2006-12-29 14:00:52 UTC (rev 271) @@ -173,22 +173,22 @@ ## def details return { - "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 + "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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-12-29 13:52:49
|
Revision: 270 http://svn.sourceforge.net/abtlinux/?rev=270&view=rev Author: eschabell Date: 2006-12-29 05:52:49 -0800 (Fri, 29 Dec 2006) Log Message: ----------- Simplified check for duplicates before adding package to given queue, with thanks to Bas van Gils for the tips. Modified Paths: -------------- src/trunk/AbtQueueManager.rb Modified: src/trunk/AbtQueueManager.rb =================================================================== --- src/trunk/AbtQueueManager.rb 2006-12-28 23:44:58 UTC (rev 269) +++ src/trunk/AbtQueueManager.rb 2006-12-29 13:52:49 UTC (rev 270) @@ -59,17 +59,8 @@ # 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 ) + if ( ! checkingQueue.collect{ |i| i.split( '|' )[0] }.include?( package ) ) log.puts "#{package}|#{$TIMESTAMP}" logger.logToJournal( "Added #{package} to #{queue} queue." ) else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <esc...@us...> - 2006-12-28 23:44:57
|
Revision: 269 http://svn.sourceforge.net/abtlinux/?rev=269&view=rev Author: eschabell Date: 2006-12-28 15:44:58 -0800 (Thu, 28 Dec 2006) Log Message: ----------- Regenerated api docs. Modified Paths: -------------- src/trunk/doc/classes/AbtDepEngine.html src/trunk/doc/classes/AbtDownloadManager.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/AbtSystemManager.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/AbtDepEngine_rb.html src/trunk/doc/files/AbtDownloadManager_rb.html src/trunk/doc/files/AbtLogManager_rb.html 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/AbtReportManager_rb.html src/trunk/doc/files/AbtSystemManager_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-12-28 23:43:31 UTC (rev 268) +++ src/trunk/doc/classes/AbtDepEngine.html 2006-12-28 23:44:58 UTC (rev 269) @@ -118,7 +118,7 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000087">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="M000087"></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('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('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/AbtDownloadManager.html =================================================================== --- src/trunk/doc/classes/AbtDownloadManager.html 2006-12-28 23:43:31 UTC (rev 268) +++ src/trunk/doc/classes/AbtDownloadManager.html 2006-12-28 23:44:58 UTC (rev 269) @@ -117,12 +117,12 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000012">new</a></li> - <li><a href="#M000015">retrieveNewsFeed</a></li> - <li><a href="#M000013">retrievePackageSource</a></li> - <li><a href="#M000014">retrievePackageTree</a></li> - <li><a href="#M000016">updatePackage</a></li> - <li><a href="#M000017">updatePackageTree</a></li> + <li><a href="#M000011">new</a></li> + <li><a href="#M000014">retrieveNewsFeed</a></li> + <li><a href="#M000012">retrievePackageSource</a></li> + <li><a href="#M000013">retrievePackageTree</a></li> + <li><a href="#M000015">updatePackage</a></li> + <li><a href="#M000016">updatePackageTree</a></li> </ul> @@ -133,7 +133,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000012"></a><b>new</b>() + <a name="M000011"></a><b>new</b>() </div> <div class="description"> <p> @@ -147,8 +147,8 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000012_source')" id="l_M000012_source">show source</a> ]</p> - <div id="M000012_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000011_source')" id="l_M000011_source">show source</a> ]</p> + <div id="M000011_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 41</span> 41: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> @@ -160,7 +160,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000015"></a><b>retrieveNewsFeed</b>( uri, cleanLog = "false" ) + <a name="M000014"></a><b>retrieveNewsFeed</b>( uri, cleanLog = "false" ) </div> <div class="description"> <p> @@ -175,61 +175,61 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000015_source')" id="l_M000015_source">show source</a> ]</p> - <div id="M000015_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show source</a> ]</p> + <div id="M000014_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 95</span> - 95: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieveNewsFeed</span>( <span class="ruby-identifier">uri</span>, <span class="ruby-identifier">cleanLog</span> = <span class="ruby-value str">"false"</span> ) - 96: <span class="ruby-identifier">require</span> <span class="ruby-value str">'net/http'</span> - 97: <span class="ruby-identifier">require</span> <span class="ruby-value str">'uri'</span> - 98: <span class="ruby-identifier">require</span> <span class="ruby-value str">'rss/1.0'</span> - 99: <span class="ruby-identifier">require</span> <span class="ruby-value str">'rss/2.0'</span> -100: <span class="ruby-identifier">newsLog</span> = <span class="ruby-value str">""</span> -101: -102: <span class="ruby-comment cmt"># ensure we have our news logfile.</span> -103: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">cleanLog</span> <span class="ruby-operator">==</span> <span class="ruby-value str">"true"</span> ) -104: <span class="ruby-identifier">newsLog</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$ABTNEWS_LOG</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">TRUNC</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">644</span> ) -105: <span class="ruby-keyword kw">else</span> -106: <span class="ruby-identifier">newsLog</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$ABTNEWS_LOG</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">644</span> ) -107: <span class="ruby-keyword kw">end</span> -108: -109: <span class="ruby-comment cmt"># pick up the abtlinux.org news feed.</span> -110: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">news</span> = <span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">get</span>( <span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>( <span class="ruby-identifier">uri</span> ) ) ) -111: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to retrieve news feed #{uri}."</span> ) -112: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -113: <span class="ruby-keyword kw">end</span> -114: -115: <span class="ruby-comment cmt"># display the feeds.</span> -116: <span class="ruby-identifier">rss</span> = <span class="ruby-keyword kw">nil</span> -117: <span class="ruby-keyword kw">begin</span> -118: <span class="ruby-identifier">rss</span> = <span class="ruby-constant">RSS</span><span class="ruby-operator">::</span><span class="ruby-constant">Parser</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-identifier">news</span>, <span class="ruby-keyword kw">false</span>) -119: <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">RSS</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span> -120: <span class="ruby-keyword kw">end</span> -121: -122: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">rss</span>.<span class="ruby-identifier">nil?</span> ) -123: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to display news feed as feed #{uri} is not RSS 1.0/2.0."</span> ) -124: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -125: <span class="ruby-keyword kw">else</span> -126: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"*** #{rss.channel.title} ***"</span> -127: -128: <span class="ruby-identifier">rss</span>.<span class="ruby-identifier">items</span>.<span class="ruby-identifier">each_with_index</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">item</span>, <span class="ruby-identifier">itemCount</span><span class="ruby-operator">|</span> -129: <span class="ruby-identifier">itemCount</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> -130: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{itemCount} #{item.link} #{item.title}"</span> -131: <span class="ruby-keyword kw">end</span> -132: <span class="ruby-keyword kw">end</span> -133: -134: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n"</span> -135: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">close</span> -136: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -137: -138: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 94</span> + 94: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieveNewsFeed</span>( <span class="ruby-identifier">uri</span>, <span class="ruby-identifier">cleanLog</span> = <span class="ruby-value str">"false"</span> ) + 95: <span class="ruby-identifier">require</span> <span class="ruby-value str">'net/http'</span> + 96: <span class="ruby-identifier">require</span> <span class="ruby-value str">'uri'</span> + 97: <span class="ruby-identifier">require</span> <span class="ruby-value str">'rss/1.0'</span> + 98: <span class="ruby-identifier">require</span> <span class="ruby-value str">'rss/2.0'</span> + 99: <span class="ruby-identifier">newsLog</span> = <span class="ruby-value str">""</span> +100: +101: <span class="ruby-comment cmt"># ensure we have our news logfile.</span> +102: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">cleanLog</span> <span class="ruby-operator">==</span> <span class="ruby-value str">"true"</span> ) +103: <span class="ruby-identifier">newsLog</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$ABTNEWS_LOG</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">TRUNC</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">644</span> ) +104: <span class="ruby-keyword kw">else</span> +105: <span class="ruby-identifier">newsLog</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">$ABTNEWS_LOG</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">644</span> ) +106: <span class="ruby-keyword kw">end</span> +107: +108: <span class="ruby-comment cmt"># pick up the abtlinux.org news feed.</span> +109: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">news</span> = <span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">get</span>( <span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>( <span class="ruby-identifier">uri</span> ) ) ) +110: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to retrieve news feed #{uri}."</span> ) +111: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +112: <span class="ruby-keyword kw">end</span> +113: +114: <span class="ruby-comment cmt"># display the feeds.</span> +115: <span class="ruby-identifier">rss</span> = <span class="ruby-keyword kw">nil</span> +116: <span class="ruby-keyword kw">begin</span> +117: <span class="ruby-identifier">rss</span> = <span class="ruby-constant">RSS</span><span class="ruby-operator">::</span><span class="ruby-constant">Parser</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-identifier">news</span>, <span class="ruby-keyword kw">false</span>) +118: <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">RSS</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span> +119: <span class="ruby-keyword kw">end</span> +120: +121: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">rss</span>.<span class="ruby-identifier">nil?</span> ) +122: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Failed to display news feed as feed #{uri} is not RSS 1.0/2.0."</span> ) +123: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +124: <span class="ruby-keyword kw">else</span> +125: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"*** #{rss.channel.title} ***"</span> +126: +127: <span class="ruby-identifier">rss</span>.<span class="ruby-identifier">items</span>.<span class="ruby-identifier">each_with_index</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">item</span>, <span class="ruby-identifier">itemCount</span><span class="ruby-operator">|</span> +128: <span class="ruby-identifier">itemCount</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> +129: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{itemCount} #{item.link} #{item.title}"</span> +130: <span class="ruby-keyword kw">end</span> +131: <span class="ruby-keyword kw">end</span> +132: +133: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">"\n"</span> +134: <span class="ruby-identifier">newsLog</span>.<span class="ruby-identifier">close</span> +135: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +136: +137: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000013"></a><b>retrievePackageSource</b>( packageName, destination ) + <a name="M000012"></a><b>retrievePackageSource</b>( packageName, destination ) </div> <div class="description"> <p> @@ -247,36 +247,35 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000013_source')" id="l_M000013_source">show source</a> ]</p> - <div id="M000013_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000012_source')" id="l_M000012_source">show source</a> ]</p> + <div id="M000012_source" class="dyn-source"> <pre> <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 55</span> 55: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrievePackageSource</span>( <span class="ruby-identifier">packageName</span>, <span class="ruby-identifier">destination</span> ) 56: <span class="ruby-identifier">require</span> <span class="ruby-identifier">packageName</span> 57: <span class="ruby-identifier">logger</span> = <span class="ruby-constant">AbtLogManager</span>.<span class="ruby-identifier">new</span> -58: <span class="ruby-identifier">systemMgr</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> -59: <span class="ruby-identifier">package</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-identifier">packageName</span>.<span class="ruby-identifier">capitalize</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'.new'</span> ) -60: -61: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">destination</span> <span class="ruby-operator">+</span> <span class="ruby-value str">"/"</span> <span class="ruby-operator">+</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>( <span class="ruby-identifier">package</span>.<span class="ruby-identifier">srcUrl</span> ) ) ) -62: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-value str">"Download not needed, existing source found for "</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">packageName</span> ) -63: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -64: <span class="ruby-keyword kw">end</span> -65: -66: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">destination</span> ) -67: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">systemMgr</span>.<span class="ruby-identifier">runSystemCall</span>( <span class="ruby-node">"wget #{package.srcUrl}"</span> ) ) -68: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-value str">"Download completed for "</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">packageName</span> ) -69: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -70: <span class="ruby-keyword kw">end</span> -71: -72: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-comment cmt"># download failed.</span> -73: <span class="ruby-keyword kw">end</span> +58: <span class="ruby-identifier">package</span> = <span class="ruby-identifier">eval</span>( <span class="ruby-identifier">packageName</span>.<span class="ruby-identifier">capitalize</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'.new'</span> ) +59: +60: <span class="ruby-keyword kw">if</span> ( <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>( <span class="ruby-identifier">destination</span> <span class="ruby-operator">+</span> <span class="ruby-value str">"/"</span> <span class="ruby-operator">+</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>( <span class="ruby-identifier">package</span>.<span class="ruby-identifier">srcUrl</span> ) ) ) +61: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-value str">"Download not needed, existing source found for "</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">packageName</span> ) +62: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +63: <span class="ruby-keyword kw">end</span> +64: +65: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">destination</span> ) +66: <span class="ruby-keyword kw">if</span> ( <span class="ruby-identifier">system</span>( <span class="ruby-node">"wget #{package.srcUrl}"</span> ) ) +67: <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-value str">"Download completed for "</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">packageName</span> ) +68: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +69: <span class="ruby-keyword kw">end</span> +70: +71: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-comment cmt"># download failed.</span> +72: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000014"></a><b>retrievePackageTree</b>( packageTreeName ) + <a name="M000013"></a><b>retrievePackageTree</b>( packageTreeName ) </div> <div class="description"> <p> @@ -292,19 +291,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show source</a> ]</p> - <div id="M000014_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000013_source')" id="l_M000013_source">show source</a> ]</p> + <div id="M000013_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 83</span> -83: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrievePackageTree</span>( <span class="ruby-identifier">packageTreeName</span> ) -84: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 82</span> +82: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrievePackageTree</span>( <span class="ruby-identifier">packageTreeName</span> ) +83: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000016"></a><b>updatePackage</b>() + <a name="M000015"></a><b>updatePackage</b>() </div> <div class="description"> <p> @@ -319,19 +318,19 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000016_source')" id="l_M000016_source">show source</a> ]</p> - <div id="M000016_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000015_source')" id="l_M000015_source">show source</a> ]</p> + <div id="M000015_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 148</span> -148: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">updatePackage</span> -149: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 147</span> +147: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">updatePackage</span> +148: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000017"></a><b>updatePackageTree</b>() + <a name="M000016"></a><b>updatePackageTree</b>() </div> <div class="description"> <p> @@ -343,12 +342,12 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000017_source')" id="l_M000017_source">show source</a> ]</p> - <div id="M000017_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000016_source')" id="l_M000016_source">show source</a> ]</p> + <div id="M000016_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 157</span> -157: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">updatePackageTree</span> -158: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtDownloadManager.rb, line 156</span> +156: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">updatePackageTree</span> +157: <span class="ruby-keyword kw">end</span> </pre> </div> </div> Modified: src/trunk/doc/classes/AbtLogManager.html =================================================================== --- src/trunk/doc/classes/AbtLogManager.html 2006-12-28 23:43:31 UTC (rev 268) +++ src/trunk/doc/classes/AbtLogManager.html 2006-12-28 23:44:58 UTC (rev 269) @@ -117,12 +117,12 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000065">cachePackage</a></li> - <li><a href="#M000064">logPackageBuild</a></li> - <li><a href="#M000063">logPackageInstall</a></li> - <li><a href="#M000061">logPackageIntegrity</a></li> - <li><a href="#M000066">logToJournal</a></li> - <li><a href="#M000062">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="M000062"></a><b>new</b>() + <a name="M000061"></a><b>new</b>() </div> <div class="description"> <p> @@ -146,20 +146,20 @@ </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('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 57</span> 57: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> -58: [<span class="ruby-identifier">$ABT_LOGS</span>, <span class="ruby-identifier">$ABT_CACHES</span>, <span class="ruby-identifier">$BUILD_LOCATION</span>, <span class="ruby-identifier">$PACKAGE_INSTALLED</span>, -59: <span class="ruby-identifier">$SOURCES_REPOSITORY</span>].<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">dir</span><span class="ruby-operator">|</span> -60: -61: <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">dir</span> ) ) -62: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">dir</span> ) -63: <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Created directory: #{dir}."</span> ) -64: <span class="ruby-keyword kw">end</span> -65: } -66: <span class="ruby-keyword kw">end</span> +58: [<span class="ruby-identifier">$ABT_LOGS</span>, <span class="ruby-identifier">$ABT_CACHES</span>, <span class="ruby-identifier">$BUILD_LOCATION</span>, <span class="ruby-identifier">$PACKAGE_INSTALLED</span>, +59: <span class="ruby-identifier">$SOURCES_REPOSITORY</span>].<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">dir</span><span class="ruby-operator">|</span> +60: +61: <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">dir</span> ) ) +62: <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">mkdir_p</span>( <span class="ruby-identifier">dir</span> ) +63: <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">logToJournal</span>( <span class="ruby-node">"Created directory: #{dir}."</span> ) +64: <span class="ruby-keyword kw">end</span> +65: } +66: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -167,7 +167,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000065"></a><b>cachePackage</b>( package ) + <a name="M000064"></a><b>cachePackage</b>( package ) </div> <div class="description"> <p> @@ -183,8 +183,8 @@ </p> </div> <div class="sourcecode"> - <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"> + <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 101</span> 101: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cachePackage</span>( <span class="ruby-identifier">package</span> ) @@ -195,7 +195,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000064"></a><b>logPackageBuild</b>( package ) + <a name="M000063"></a><b>logPackageBuild</b>( package ) </div> <div class="description"> <p> @@ -211,8 +211,8 @@ </p> </div> <div class="sourcecode"> - <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"> + <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 89</span> 89: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageBuild</span>( <span class="ruby-identifier">package</span> ) @@ -223,7 +223,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000063"></a><b>logPackageInstall</b>( package ) + <a name="M000062"></a><b>logPackageInstall</b>( package ) </div> <div class="description"> <p> @@ -239,8 +239,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('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 77</span> 77: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logPackageInstall</span>( <span class="ruby-identifier">package</span> ) @@ -251,7 +251,7 @@ </div> <div class="method"> <div class="title"> - <a name="M000066"></a><b>logToJournal</b>( message ) + <a name="M000065"></a><b>logToJournal</b>( message ) </div> <div class="description"> <p> @@ -266,18 +266,18 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000066_source')" id="l_M000066_source">show source</a> ]</p> - <div id="M000066_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 112</span> 112: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">logToJournal</span>( <span class="ruby-identifier">message</span> ) -113: <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> ) ) -114: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{$TIMESTAMP} : #{message}"</span> -115: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">close</span> -116: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -117: <span class="ruby-keyword kw">end</span> +113: <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> ) ) +114: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">"#{$TIMESTAMP} : #{message}"</span> +115: <span class="ruby-identifier">log</span>.<span class="ruby-identifier">close</span> +116: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +117: <span class="ruby-keyword kw">end</span> 118: -119: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +119: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> 120: <span class="ruby-keyword kw">end</span> </pre> </div> @@ -286,7 +286,7 @@ <div class="sectiontitle">Protected Instance methods</div> <div class="method"> <div class="title"> - <a name="M000061"></a><b>logPackageIntegrity</b>( package ) + <a name="M000060"></a><b>logPackageIntegrity</b>( package ) </div> <div class="description"> <p> @@ -303,8 +303,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('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-12-28 23:43:31 UTC (rev 268) +++ src/trunk/doc/classes/AbtPackage.html 2006-12-28 23:44:58 UTC (rev 269) @@ -121,16 +121,16 @@ <div class="sectiontitle">Methods</div> <ul> - <li><a href="#M000029">build</a></li> - <li><a href="#M000028">configure</a></li> - <li><a href="#M000026">details</a></li> - <li><a href="#M000031">install</a></li> - <li><a href="#M000025">new</a></li> - <li><a href="#M000032">post</a></li> - <li><a href="#M000027">pre</a></li> - <li><a href="#M000030">preinstall</a></li> - <li><a href="#M000033">removeBuild</a></li> - <li><a href="#M000024">unpackSources</a></li> + <li><a href="#M000028">build</a></li> + <li><a href="#M000027">configure</a></li> + <li><a href="#M000025">details</a></li> + <li><a href="#M000030">install</a></li> + <li><a href="#M000024">new</a></li> + <li><a href="#M000031">post</a></li> + <li><a href="#M000026">pre</a></li> + <li><a href="#M000029">preinstall</a></li> + <li><a href="#M000032">removeBuild</a></li> + <li><a href="#M000023">unpackSources</a></li> </ul> @@ -304,7 +304,7 @@ <div class="sectiontitle">Public Class methods</div> <div class="method"> <div class="title"> - <a name="M000025"></a><b>new</b>( data ) + <a name="M000024"></a><b>new</b>( data ) </div> <div class="description"> <p> @@ -316,28 +316,28 @@ </p> </div> <div class="sourcecode"> - <p class="source-link">[ <a href="javascript:toggleSource('M000025_source')" id="l_M000025_source">show source</a> ]</p> - <div id="M000025_source" class="dyn-source"> + <p class="source-link">[ <a href="javascript:toggleSource('M000024_source')" id="l_M000024_source">show source</a> ]</p> + <div id="M000024_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackage.rb, line 151</span> -151: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>( <span class="ruby-identifier">data</span> ) -152: <span class="ruby-ivar">@name</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'name'</span>] -153: <span class="ruby-ivar">@execName</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'execName'</span>] -154: <span class="ruby-ivar">@version</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'version'</span>] -155: <span class="ruby-ivar">@srcDir</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'srcDir'</span>] -156: <span class="ruby-ivar">@homepage</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'homepage'</span>] -157: <span class="ruby-ivar">@srcUrl</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'srcUrl'</span>] -158: <span class="ruby-ivar">@dependsOn</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'dependsOn'</span>] -159: <span class="ruby-ivar">@reliesOn</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'reliesOn'</span>] -160: <span class="ruby-ivar">@optionalDO</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'optionalDO'</span>] -161: <span class="ruby-ivar">@optionalRO</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'optionalRO'</span>] -162: <span class="ruby-ivar">@hashCheck</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'hashCheck'</span>] -163: <span class="ruby-ivar">@patches</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'patches'</span>] -164: <span class="ruby-ivar">@patchesHashCheck</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'patchesHashCheck'</span>] -165: <span class="ruby-ivar">@mirrorPath</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'mirrorPath'</span>] -166: <span class="ruby-ivar">@license</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'license'</span>] -167: <span class="ruby-ivar">@description</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'description'</span>] -168: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 150</span> +150: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>( <span class="ruby-identifier">data</span> ) +151: <span class="ruby-ivar">@name</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'name'</span>] +152: <span class="ruby-ivar">@execName</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'execName'</span>] +153: <span class="ruby-ivar">@version</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'version'</span>] +154: <span class="ruby-ivar">@srcDir</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'srcDir'</span>] +155: <span class="ruby-ivar">@homepage</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'homepage'</span>] +156: <span class="ruby-ivar">@srcUrl</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'srcUrl'</span>] +157: <span class="ruby-ivar">@dependsOn</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'dependsOn'</span>] +158: <span class="ruby-ivar">@reliesOn</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'reliesOn'</span>] +159: <span class="ruby-ivar">@optionalDO</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'optionalDO'</span>] +160: <span class="ruby-ivar">@optionalRO</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'optionalRO'</span>] +161: <span class="ruby-ivar">@hashCheck</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'hashCheck'</span>] +162: <span class="ruby-ivar">@patches</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'patches'</span>] +163: <span class="ruby-ivar">@patchesHashCheck</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'patchesHashCheck'</span>] +164: <span class="ruby-ivar">@mirrorPath</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'mirrorPath'</span>] +165: <span class="ruby-ivar">@license</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'license'</span>] +166: <span class="ruby-ivar">@description</span> = <span class="ruby-identifier">data</span>[<span class="ruby-value str">'description'</span>] +167: <span class="ruby-keyword kw">end</span> </pre> </div> </div> @@ -345,7 +345,7 @@ <div class="sectiontitle">Public Instance methods</div> <div class="method"> <div class="title"> - <a name="M000029"></a><b>build</b>() + <a name="M000028"></a><b>build</b>() </div> <div class="description"> <p> @@ -358,19 +358,19 @@ </p> </div> <div class="sourcecode"> - <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"> + <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 269</span> -269: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span> -270: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 268</span> +268: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span> +269: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000028"></a><b>configure</b>() + <a name="M000027"></a><b>configure</b>() </div> <div class="description"> <p> @@ -387,48 +387,48 @@ </p> </div> <div class="sourcecode"> - <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"> + <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 232</span> -232: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure</span> -233: <span class="ruby-identifier">systemMgr</span> = <span class="ruby-constant">AbtSystemManager</span>.<span class="ruby-identifier">new</span> -234: <span class="ruby-identifier">buildSite</span> = <span class="ruby-node">"#{$BUILD_LOCATION}/#{@srcDir}"</span> -235: -236: <span class="ruby-comment cmt"># TODO: this should not use tee, but in wrapper deal with stdout to file.</span> -237: <span class="ruby-comment cmt"># also need to expand directory with @srcDir/@srcDir.configure.</span> -238: <span class="ruby-comment cmt">#command = "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/{@srcDir}.configure"</span> -239: <span class="ruby-identifier">command</span> = <span class="ruby-node">"./configure --prefix=#{$DEFAULT_PREFIX}"</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 231</span> +231: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure</span> +232: <span class="ruby-identifier">buildSite</span> = <span class="ruby-node">"#{$BUILD_LOCATION}/#{@srcDir}"</span> +233: +234: <span class="ruby-comment cmt"># TODO: this should not use tee, but in wrapper deal with stdout to file.</span> +235: <span class="ruby-comment cmt"># also need to expand directory with @srcDir/@srcDir.configure.</span> +236: <span class="ruby-comment cmt">#command = "./configure --prefix=#{$DEFAULT_PREFIX} | tee #{$PACKAGE_INSTALLED}/{@srcDir}.configure"</span> +237: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">buildSite</span> ) +238: <span class="ruby-identifier">stdin</span>, <span class="ruby-identifier">stdout</span>, <span class="ruby-identifier">stderr</span> = +239: <span class="ruby-constant">Open3</span>.<span class="ruby-identifier">popen3</span>( <span class="ruby-node">"./configure --prefix=#{$DEFAULT_PREFIX}"</span> ) 240: -241: <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">buildSite</span> ) -242: <span class="ruby-identifier">stdin</span>, <span class="ruby-identifier">stdout</span>, <span class="ruby-identifier">stderr</span> = <span class="ruby-constant">Open3</span>.<span class="ruby-identifier">popen3</span>( <span class="ruby-identifier">command</span> ) -243: -244: <span class="ruby-comment cmt"># check for errors.</span> -245: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">stderr</span>.<span class="ruby-identifier">eof</span> ) -246: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - stderr:"</span> -247: <span class="ruby-identifier">puts</span> <span class="ruby-identifier">stderr</span>.<span class="ruby-identifier">read</span> -248: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> -249: <span class="ruby-keyword kw">else</span> -250: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - nothing in stderr."</span> -251: <span class="ruby-keyword kw">end</span> -252: -253: <span class="ruby-comment cmt"># check for output.</span> -254: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">stdout</span>.<span class="ruby-identifier">eof</span> ) -255: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - stdout:"</span> -256: <span class="ruby-identifier">puts</span> <span class="ruby-identifier">stdout</span>.<span class="ruby-identifier">read</span> -257: <span class="ruby-keyword kw">else</span> -258: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - nothing in stdout."</span> -259: <span class="ruby-keyword kw">end</span> -260: -261: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> -262: <span class="ruby-keyword kw">end</span> +241: <span class="ruby-comment cmt"># check for errors.</span> +242: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">stderr</span>.<span class="ruby-identifier">eof</span> ) +243: <span class="ruby-comment cmt"># TODO: put this in failure file.</span> +244: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - stderr:"</span> +245: <span class="ruby-identifier">puts</span> <span class="ruby-identifier">stderr</span>.<span class="ruby-identifier">read</span> +246: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> +247: <span class="ruby-keyword kw">else</span> +248: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - nothing in stderr."</span> +249: <span class="ruby-keyword kw">end</span> +250: +251: <span class="ruby-comment cmt"># check for output.</span> +252: <span class="ruby-keyword kw">if</span> ( <span class="ruby-operator">!</span><span class="ruby-identifier">stdout</span>.<span class="ruby-identifier">eof</span> ) +253: <span class="ruby-comment cmt"># TODO: put this in #{$PACKAGE_INSTALLED}/{@srcDir}.configure.</span> +254: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - stdout:"</span> +255: <span class="ruby-identifier">puts</span> <span class="ruby-identifier">stdout</span>.<span class="ruby-identifier">read</span> +256: <span class="ruby-keyword kw">else</span> +257: <span class="ruby-identifier">puts</span> <span class="ruby-value str">"DEBUG: [AbtPackage.configure] - nothing in stdout."</span> +258: <span class="ruby-keyword kw">end</span> +259: +260: <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> +261: <span class="ruby-keyword kw">end</span> </pre> </div> </div> </div> <div class="method"> <div class="title"> - <a name="M000026"></a><b>details</b>() + <a name="M000025"></a><b>details</b>() </div> <div class="description"> <p> @@ -441,37 +441,37 @@ </p> </div> <div class="sourcecode"> - <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"> + <p class="source-link">[ <a href="javascript:toggleSource('M000025_source')" id="l_M000025_source">show source</a> ]</p> + <div id="M000025_source" class="dyn-source"> <pre> - <span class="ruby-comment cmt"># File AbtPackage.rb, line 175</span> -175: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">details</span> -176: <span class="ruby-keyword kw">return</span> { -177: <span class="ruby-value str">"Package name"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@name</span>, -178: <span class="ruby-value str">"Executable"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@execName</span>, -179: <span class="ruby-value str">"Version"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@version</span>, -180: <span class="ruby-value str">"Source location"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcDir</span>, -181: <span class="ruby-value str">"Homepage"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@homepage</span>, -182: <span class="ruby-value str">"Source uri"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcUrl</span>, -183: <span class="ruby-value str">"Depends On"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@dependsOn</span>, -184: <span class="ruby-value str">"Relies On"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@reliesOn</span>, -185: <span class="ruby-value str">"Optional DO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalDO</span>, -186: <span class="ruby-value str">"Optional RO"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@optionalRO</span>, -187: <span class="ruby-value str">"Security hash"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@hashCheck</span>, -188: <span class="ruby-value str">"Patches"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patches</span>, -189: <span class="ruby-value str">"Patches hash"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@patchesHashCheck</span>, -190: <span class="ruby-value str">"Mirror"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@mirrorPath</span>, -191: <span class="ruby-value str">"License"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@license</span>, -192: <span class="ruby-value str">"Description"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@description</span> -193: } -194: <span class="ruby-keyword kw">end</span> + <span class="ruby-comment cmt"># File AbtPackage.rb, line 174</span> +174: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">details</span> +175: <span class="ruby-keyword kw">return</span> { +176: <span class="ruby-value str">"Package name"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@name</span>, +177: <span class="ruby-value str">"Executable"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@execName</span>, +178: <span class="ruby-value str">"Version"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@version</span>, +179: <span class="ruby-value str">"Source location"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcDir</span>, +180: <span class="ruby-value str">"Homepage"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@homepage</span>, +181: <span class="ruby-value str">"Source uri"</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@srcUrl</span>, +182: <span class="ruby-value str... [truncated message content] |
From: <esc...@us...> - 2006-12-28 23:43:31
|
Revision: 268 http://svn.sourceforge.net/abtlinux/?rev=268&view=rev Author: eschabell Date: 2006-12-28 15:43:31 -0800 (Thu, 28 Dec 2006) Log Message: ----------- Removed wrapper, rolled back usage of shell and applied system calls to all locations (shell is generating many undocumented warnings). Modified Paths: -------------- src/trunk/AbtDownloadManager.rb src/trunk/AbtPackage.rb src/trunk/AbtPackageManager.rb src/trunk/AbtSystemManager.rb Modified: src/trunk/AbtDownloadManager.rb =================================================================== --- src/trunk/AbtDownloadManager.rb 2006-12-28 23:29:55 UTC (rev 267) +++ src/trunk/AbtDownloadManager.rb 2006-12-28 23:43:31 UTC (rev 268) @@ -1,7 +1,7 @@ #!/usr/bin/ruby -w ## -# AbtDownloadManager.rb +# AbtDownloadManager.rb # # AbtDownloadManager class handles all downloading of components needed for # AbTLinux. @@ -20,7 +20,7 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more # details. -# +# # You should have received a copy of the GNU General Public License along with # AbTLinux; if not, write to the Free Software Foundation, Inc., 51 Franklin # St, Fifth Floor, Boston, MA 02110-1301 USA @@ -28,22 +28,22 @@ class AbtDownloadManager protected - + private - + public ## # Constructor for the AbtDownloadManager class. # - # <b>RETURN</b> <i>AbtDownloadManager</i> - an initialized AbtDownloadManager object. + # <b>RETURN</b> <i>AbtDownloadManager</i> - an initialized AbtDownloadManager object. ## def initialize end - + ## # Downloads a given package source. If the file already exists, returns - # true as if download completed. + # true as if download completed. # # <b>PARAM</b> <i>String</i> - the name of the package for which the source # is to be downloaded. @@ -53,26 +53,24 @@ # downloaded, otherwise false. ## def retrievePackageSource( packageName, destination ) - require packageName - require "shell" - Shell.def_system_command "wget" - logger = AbtLogManager.new - package = eval( packageName.capitalize + '.new' ) + require packageName + logger = AbtLogManager.new + package = eval( packageName.capitalize + '.new' ) + + if ( File.exist?( destination + "/" + File.basename( package.srcUrl ) ) ) + logger.logToJournal( "Download not needed, existing source found for " + packageName ) + return true + end - if ( File.exist?( destination + "/" + File.basename( package.srcUrl ) ) ) - logger.logToJournal( "Download not needed, existing source found for " + packageName ) - return true - end + Dir.chdir( destination ) + if ( system( "wget #{package.srcUrl}" ) ) + logger.logToJournal( "Download completed for " + packageName ) + return true + end - retrieve = Shell.cd( destination ) - if ( retrieve.wget( package.srcUrl ) ) - logger.logToJournal( "Download completed for " + packageName ) - return true - end - - return false # download failed. + return false # download failed. end - + ## # Downloads a given pacakge tree. # @@ -83,61 +81,61 @@ ## def retrievePackageTree( packageTreeName ) end - + ## # Retrieves the given feed and displays the news items. # - # <b>PARAM</b> <i>String</i> - the uri of the rss news feed to be retrieved. - # <b>PARAM</b> <i>String</i> - pass the value 'true' to empty the log file, - # otherwise it will be appended. + # <b>PARAM</b> <i>String</i> - the uri of the rss news feed to be retrieved. + # <b>PARAM</b> <i>String</i> - pass the value 'true' to empty the log file, + # otherwise it will be appended. # <b>RETURN</b> <i>boolean</i> - True if the AbTLinux news feed has been # retrieved, otherwise false. ## def retrieveNewsFeed( uri, cleanLog = "false" ) - require 'net/http' - require 'uri' - require 'rss/1.0' - require 'rss/2.0' - newsLog = "" + require 'net/http' + require 'uri' + require 'rss/1.0' + require 'rss/2.0' + newsLog = "" - # ensure we have our news logfile. - if ( cleanLog == "true" ) - newsLog = File.new( $ABTNEWS_LOG, File::WRONLY|File::TRUNC|File::CREAT, 644 ) - else - newsLog = File.new( $ABTNEWS_LOG, File::WRONLY|File::APPEND|File::CREAT, 644 ) - end + # ensure we have our news logfile. + if ( cleanLog == "true" ) + newsLog = File.new( $ABTNEWS_LOG, File::WRONLY|File::TRUNC|File::CREAT, 644 ) + else + newsLog = File.new( $ABTNEWS_LOG, File::WRONLY|File::APPEND|File::CREAT, 644 ) + end + + # pick up the abtlinux.org news feed. + if ( !news = Net::HTTP.get( URI.parse( uri ) ) ) + logger.logToJournal( "Failed to retrieve news feed #{uri}." ) + return false + end - # pick up the abtlinux.org news feed. - if ( !news = Net::HTTP.get( URI.parse( uri ) ) ) - logger.logToJournal( "Failed to retrieve news feed #{uri}." ) - return false - end + # display the feeds. + rss = nil + begin + rss = RSS::Parser.parse(news, false) + rescue RSS::Error + end + + if ( rss.nil? ) + logger.logToJournal( "Failed to display news feed as feed #{uri} is not RSS 1.0/2.0." ) + return false + else + newsLog.puts "*** #{rss.channel.title} ***" + + rss.items.each_with_index do |item, itemCount| + itemCount += 1 + newsLog.puts "#{itemCount} #{item.link} #{item.title}" + end + end - # display the feeds. - rss = nil - begin - rss = RSS::Parser.parse(news, false) - rescue RSS::Error - end + newsLog.puts "\n" + newsLog.close + return true - if ( rss.nil? ) - logger.logToJournal( "Failed to display news feed as feed #{uri} is not RSS 1.0/2.0." ) - return false - else - newsLog.puts "*** #{rss.channel.title} ***" - - rss.items.each_with_index do |item, itemCount| - itemCount += 1 - newsLog.puts "#{itemCount} #{item.link} #{item.title}" - end - end - - newsLog.puts "\n" - newsLog.close - return true - end - + ## # Updates a given package with available patches (version updates). # @@ -148,7 +146,7 @@ ## def updatePackage end - + ## # Updates the package tree. # @@ -157,5 +155,5 @@ ## def updatePackageTree end - + end Modified: src/trunk/AbtPackage.rb =================================================================== --- src/trunk/AbtPackage.rb 2006-12-28 23:29:55 UTC (rev 267) +++ src/trunk/AbtPackage.rb 2006-12-28 23:43:31 UTC (rev 268) @@ -37,7 +37,6 @@ # <b>RETURNS:</b> <i>boolean</i> - True if the completes sucessfully, otherwise false. ## def unpackSources - systemMgr = AbtSystemManager.new srcFile = File.basename( @srcUrl ) sourcesToUnpack = "#{$SOURCES_REPOSITORY}/#{srcFile}" unpackTool = "" @@ -82,7 +81,7 @@ #logger.logToJournal( "DEBUG: unpack tool will be '#{unpackTool}'." ) Dir.chdir( $BUILD_LOCATION ) - if ( !systemMgr.runSystemCall( "#{unpackTool} #{sourcesToUnpack}" ) ) + if ( !system( "#{unpackTool} #{sourcesToUnpack}" ) ) return false end @@ -230,7 +229,6 @@ # <b>RETURNS:</b> <i>boolean</i> - True if the completes sucessfully, otherwise false. ## def configure - systemMgr = AbtSystemManager.new buildSite = "#{$BUILD_LOCATION}/#{@srcDir}" # TODO: this should not use tee, but in wrapper deal with stdout to file. Modified: src/trunk/AbtPackageManager.rb =================================================================== --- src/trunk/AbtPackageManager.rb 2006-12-28 23:29:55 UTC (rev 267) +++ src/trunk/AbtPackageManager.rb 2006-12-28 23:43:31 UTC (rev 268) @@ -158,8 +158,6 @@ # <b>RETURN</b> <i>void</i> ## def rootLogin( arguments ) - systemMgr = AbtSystemManager.new - if ( Process.uid != 0 ) args = "" puts "\nEnter root password:" @@ -168,7 +166,7 @@ args = args + " " + ARGV[i] end - systemMgr.runSystemCall( 'su -c "./abt ' + args + '" root' ) + system( 'su -c "./abt ' + args + '" root' ) exit end end Modified: src/trunk/AbtSystemManager.rb =================================================================== --- src/trunk/AbtSystemManager.rb 2006-12-28 23:29:55 UTC (rev 267) +++ src/trunk/AbtSystemManager.rb 2006-12-28 23:43:31 UTC (rev 268) @@ -139,22 +139,4 @@ ## def setPackageTreeLocation( location ) end - - ## - # Our in house system call wrapper. Used to control any system calls made in - # abt. Need to sort out tracking of stderr, stdout, stdin with open3? - # Eventually replace any need for system here. - # - # <b>PARAM</b> <i>String</i> - the call to pass to system. - # - # <b>RETURN</b> <i>boolean</i> - True if system call successful, otherwise - # false. - ## - def runSystemCall( command ) - if ( !system( command ) ) - return false - end - - 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-12-28 23:29:55
|
Revision: 267 http://svn.sourceforge.net/abtlinux/?rev=267&view=rev Author: eschabell Date: 2006-12-28 15:29:55 -0800 (Thu, 28 Dec 2006) Log Message: ----------- First attempt with Shell to remove the system calls to download sources. Modified Paths: -------------- src/trunk/AbtDownloadManager.rb Modified: src/trunk/AbtDownloadManager.rb =================================================================== --- src/trunk/AbtDownloadManager.rb 2006-12-07 23:29:31 UTC (rev 266) +++ src/trunk/AbtDownloadManager.rb 2006-12-28 23:29:55 UTC (rev 267) @@ -54,8 +54,9 @@ ## def retrievePackageSource( packageName, destination ) require packageName + require "shell" + Shell.def_system_command "wget" logger = AbtLogManager.new - systemMgr = AbtSystemManager.new package = eval( packageName.capitalize + '.new' ) if ( File.exist?( destination + "/" + File.basename( package.srcUrl ) ) ) @@ -63,8 +64,8 @@ return true end - Dir.chdir( destination ) - if ( systemMgr.runSystemCall( "wget #{package.srcUrl}" ) ) + retrieve = Shell.cd( destination ) + if ( retrieve.wget( package.srcUrl ) ) logger.logToJournal( "Download completed for " + packageName ) return true end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: ABout T. L. <esc...@us...> - 2006-12-13 10:35:33
|
IzE6IEdVSSBmb3IgYWJ0DQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogIFJlcG9ydGVyOiAgZXJpY3Mg ICAgICB8ICAgICAgIE93bmVyOiAgZXJpY3MgICAgICANCiAgICAgIFR5cGU6ICB3aXNobGlzdCAg IHwgICAgICBTdGF0dXM6ICBuZXcgICAgICAgIA0KICBQcmlvcml0eTogIHRyaXZpYWwgICAgfCAg IE1pbGVzdG9uZTogIHZlcnNpb25fMS54DQogQ29tcG9uZW50OiAgZGVwRW5naW5lICB8ICAgICBW ZXJzaW9uOiAgMC45ICAgICAgICANClJlc29sdXRpb246ICAgICAgICAgICAgIHwgICAgS2V5d29y ZHM6ICAgICAgICAgICAgIA0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KQ29tbWVudCAoYnkgc29hYTA1 MTIyMDA2YWEpOg0KDQogS2VlcCBhIGdvb2Qgam9iIHVwISAgbWF0dHJhc3MgaGFuZGJhZyBodHRw Oi8vaGlmcmllbjA1MTIyMDA2LmluZm8NCg0KLS0gDQpUaWNrZXQgVVJMOiA8aHR0cDovL3RyYWMu YWJ0bGludXgub3JnL3RpY2tldC8xI2NvbW1lbnQ6Pg0KQUJvdXQgVGltZSBMaW51eCA8aHR0cDov L2FidGxpbnV4Lm9yZz4NCkl0J3MgYWJvdXQgdGltZSBzb21lb25lIGRpZCBpdCByaWdodC4uLg== |
From: ABout T. L. <esc...@us...> - 2006-12-08 11:15:26
|
IzU6IFByb3ZpZGUgYSBsaXZlLUNEIGJhc2VkIG9uIEFiVExpbnV4DQotLS0tLS0tLS0tLS0tLS0t LS0tLS0tLSstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tDQogIFJlcG9ydGVyOiAgZXJpY3MgICAgIHwgICAgICAgT3duZXI6ICBsb3cgICAgICAgIA0K ICAgICAgVHlwZTogIHdpc2hsaXN0ICB8ICAgICAgU3RhdHVzOiAgbmV3ICAgICAgICANCiAgUHJp b3JpdHk6ICBtaW5vciAgICAgfCAgIE1pbGVzdG9uZTogIHZlcnNpb25fMS54DQogQ29tcG9uZW50 OiAgaXNvICAgICAgIHwgICAgIFZlcnNpb246ICAxLjAgICAgICAgIA0KUmVzb2x1dGlvbjogICAg ICAgICAgICB8ICAgIEtleXdvcmRzOiAgICAgICAgICAgICANCi0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0N CkNvbW1lbnQgKGJ5IEdlb3JnZSk6DQoNCiBUaGlzIGlzIGdldHRpbmcgdG8gYmUgYSB2ZXJ5IGlu Zm9ybWF0aXZlIHNpdGUsIHdlIGp1c3QgaGF2ZSB0byB0YWtlIHRoZQ0KIHRpbWUgdG8gc2VuZCBh bG9uZyBtb3JlIGluZm8gYW5kIG5ld3MgdG8gbWFrZSBpdCB0aGF0IG11Y2ggYmV0dGVyICA8YQ0K IGhyZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvZGlz Y291bnQtYXV0aGVudGljLQ0KIGNvYWNoLWhhbmRiYWcuaHRtbCI+ZGlzY291bnQgYXV0aGVudGlj IGNvYWNoIGhhbmRiYWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nf c2FsZS9jb2FjaC1oYW5kYmFncy9jb2FjaC1zaWduYXR1cmUtDQogaGFuZGJhZy1iYWcuaHRtbCI+ Y29hY2ggc2lnbmF0dXJlIGhhbmRiYWcgYmFnPC9hPiA8YQ0KIGhyZWY9Imh0dHA6Ly93ZWIudGlz Y2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvY29hY2gtZGVzaWduZXItDQogZGlzY291 bnQtaGFuZGJhZy5odG1sIj5jb2FjaCBkZXNpZ25lciBkaXNjb3VudCBoYW5kYmFnPC9hPiA8YQ0K IGhyZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvYXV0 aGVudGljLWNoZWFwLQ0KIGNvYWNoLWhhbmRiYWcuaHRtbCI+YXV0aGVudGljIGNoZWFwIGNvYWNo IGhhbmRiYWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9j b2FjaC1oYW5kYmFncy9jb2FjaC1vcHRpYy0NCiBoYW5kYmFnLmh0bWwiPmNvYWNoIG9wdGljIGhh bmRiYWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2Fj aC1oYW5kYmFncy9hY2Nlc3NvcnktY29hY2gtDQogaGFuZGJhZy5odG1sIj5hY2Nlc3NvcnkgY29h Y2ggaGFuZGJhZzwvYT4gPGENCiBocmVmPSJodHRwOi8vd2ViLnRpc2NhbGkuaXQvYmFnc19zYWxl L2NvYWNoLWhhbmRiYWdzL2NvYWNoLWhhbmRiYWctDQogc3RvcmUuaHRtbCI+Y29hY2ggaGFuZGJh ZyBzdG9yZTwvYT4gPGENCiBocmVmPSJodHRwOi8vd2ViLnRpc2NhbGkuaXQvYmFnc19zYWxlL2Nv YWNoLWhhbmRiYWdzL3JlYWwtY29hY2gtDQogaGFuZGJhZy5odG1sIj5yZWFsIGNvYWNoIGhhbmRi YWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1o YW5kYmFncy9jb2FjaC1taW5pLXNpZ25hdHVyZS0NCiBoYW5kYmFnLmh0bWwiPmNvYWNoIG1pbmkg c2lnbmF0dXJlIGhhbmRiYWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2Jh Z3Nfc2FsZS9jb2FjaC1oYW5kYmFncy9jb2FjaC1zdWVkZS0NCiBoYW5kYmFnLmh0bWwiPmNvYWNo IHN1ZWRlIGhhbmRiYWc8L2E+DQoNCi0tIA0KVGlja2V0IFVSTDogPGh0dHA6Ly90cmFjLmFidGxp bnV4Lm9yZy90aWNrZXQvNSNjb21tZW50Oj4NCkFCb3V0IFRpbWUgTGludXggPGh0dHA6Ly9hYnRs aW51eC5vcmc+DQpJdCdzIGFib3V0IHRpbWUgc29tZW9uZSBkaWQgaXQgcmlnaHQuLi4= |
From: ABout T. L. <esc...@us...> - 2006-12-08 11:15:23
|
IzM6IENvbmZpZ3VyYXRpb24gc25hcHNob3RzDQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSstLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogIFJlcG9y dGVyOiAgZXJpY3MgICAgIHwgICAgICAgT3duZXI6ICBlcmljcyAgICAgIA0KICAgICAgVHlwZTog IHdpc2hsaXN0ICB8ICAgICAgU3RhdHVzOiAgbmV3ICAgICAgICANCiAgUHJpb3JpdHk6ICBtaW5v ciAgICAgfCAgIE1pbGVzdG9uZTogIHZlcnNpb25fMS54DQogQ29tcG9uZW50OiAgYWJ0ICAgICAg IHwgICAgIFZlcnNpb246ICAxLjAgICAgICAgIA0KUmVzb2x1dGlvbjogICAgICAgICAgICB8ICAg IEtleXdvcmRzOiAgICAgICAgICAgICANCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCkNvbW1lbnQgKGJ5 IEdlb3JnZSk6DQoNCiBUaGlzIGlzIGdldHRpbmcgdG8gYmUgYSB2ZXJ5IGluZm9ybWF0aXZlIHNp dGUsIHdlIGp1c3QgaGF2ZSB0byB0YWtlIHRoZQ0KIHRpbWUgdG8gc2VuZCBhbG9uZyBtb3JlIGlu Zm8gYW5kIG5ld3MgdG8gbWFrZSBpdCB0aGF0IG11Y2ggYmV0dGVyICA8YQ0KIGhyZWY9Imh0dHA6 Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvZGlzY291bnQtYXV0aGVu dGljLQ0KIGNvYWNoLWhhbmRiYWcuaHRtbCI+ZGlzY291bnQgYXV0aGVudGljIGNvYWNoIGhhbmRi YWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1o YW5kYmFncy9jb2FjaC1zaWduYXR1cmUtDQogaGFuZGJhZy1iYWcuaHRtbCI+Y29hY2ggc2lnbmF0 dXJlIGhhbmRiYWcgYmFnPC9hPiA8YQ0KIGhyZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdz X3NhbGUvY29hY2gtaGFuZGJhZ3MvY29hY2gtZGVzaWduZXItDQogZGlzY291bnQtaGFuZGJhZy5o dG1sIj5jb2FjaCBkZXNpZ25lciBkaXNjb3VudCBoYW5kYmFnPC9hPiA8YQ0KIGhyZWY9Imh0dHA6 Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvYXV0aGVudGljLWNoZWFw LQ0KIGNvYWNoLWhhbmRiYWcuaHRtbCI+YXV0aGVudGljIGNoZWFwIGNvYWNoIGhhbmRiYWc8L2E+ IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1oYW5kYmFn cy9jb2FjaC1vcHRpYy0NCiBoYW5kYmFnLmh0bWwiPmNvYWNoIG9wdGljIGhhbmRiYWc8L2E+IDxh DQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1oYW5kYmFncy9h Y2Nlc3NvcnktY29hY2gtDQogaGFuZGJhZy5odG1sIj5hY2Nlc3NvcnkgY29hY2ggaGFuZGJhZzwv YT4gPGENCiBocmVmPSJodHRwOi8vd2ViLnRpc2NhbGkuaXQvYmFnc19zYWxlL2NvYWNoLWhhbmRi YWdzL2NvYWNoLWhhbmRiYWctDQogc3RvcmUuaHRtbCI+Y29hY2ggaGFuZGJhZyBzdG9yZTwvYT4g PGENCiBocmVmPSJodHRwOi8vd2ViLnRpc2NhbGkuaXQvYmFnc19zYWxlL2NvYWNoLWhhbmRiYWdz L3JlYWwtY29hY2gtDQogaGFuZGJhZy5odG1sIj5yZWFsIGNvYWNoIGhhbmRiYWc8L2E+IDxhDQog aHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1oYW5kYmFncy9jb2Fj aC1taW5pLXNpZ25hdHVyZS0NCiBoYW5kYmFnLmh0bWwiPmNvYWNoIG1pbmkgc2lnbmF0dXJlIGhh bmRiYWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2Fj aC1oYW5kYmFncy9jb2FjaC1zdWVkZS0NCiBoYW5kYmFnLmh0bWwiPmNvYWNoIHN1ZWRlIGhhbmRi YWc8L2E+DQoNCi0tIA0KVGlja2V0IFVSTDogPGh0dHA6Ly90cmFjLmFidGxpbnV4Lm9yZy90aWNr ZXQvMyNjb21tZW50Oj4NCkFCb3V0IFRpbWUgTGludXggPGh0dHA6Ly9hYnRsaW51eC5vcmc+DQpJ dCdzIGFib3V0IHRpbWUgc29tZW9uZSBkaWQgaXQgcmlnaHQuLi4= |
From: ABout T. L. <esc...@us...> - 2006-12-08 11:15:23
|
IzY6IENyZWF0ZSBpc28gZnJvbSBpbnN0YWxsZWQgc3lzdGVtDQotLS0tLS0tLS0tLS0tLS0tLS0t LS0tLSstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t DQogIFJlcG9ydGVyOiAgZXJpY3MgICAgIHwgICAgICAgT3duZXI6ICBsb3cgICAgICAgIA0KICAg ICAgVHlwZTogIHdpc2hsaXN0ICB8ICAgICAgU3RhdHVzOiAgbmV3ICAgICAgICANCiAgUHJpb3Jp dHk6ICBtaW5vciAgICAgfCAgIE1pbGVzdG9uZTogIHZlcnNpb25fMS54DQogQ29tcG9uZW50OiAg aXNvICAgICAgIHwgICAgIFZlcnNpb246ICAxLjAgICAgICAgIA0KUmVzb2x1dGlvbjogICAgICAg ICAgICB8ICAgIEtleXdvcmRzOiAgICAgICAgICAgICANCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCkNv bW1lbnQgKGJ5IEdlb3JnZSk6DQoNCiBUaGlzIGlzIGdldHRpbmcgdG8gYmUgYSB2ZXJ5IGluZm9y bWF0aXZlIHNpdGUsIHdlIGp1c3QgaGF2ZSB0byB0YWtlIHRoZQ0KIHRpbWUgdG8gc2VuZCBhbG9u ZyBtb3JlIGluZm8gYW5kIG5ld3MgdG8gbWFrZSBpdCB0aGF0IG11Y2ggYmV0dGVyICA8YQ0KIGhy ZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvZGlzY291 bnQtYXV0aGVudGljLQ0KIGNvYWNoLWhhbmRiYWcuaHRtbCI+ZGlzY291bnQgYXV0aGVudGljIGNv YWNoIGhhbmRiYWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2Fs ZS9jb2FjaC1oYW5kYmFncy9jb2FjaC1zaWduYXR1cmUtDQogaGFuZGJhZy1iYWcuaHRtbCI+Y29h Y2ggc2lnbmF0dXJlIGhhbmRiYWcgYmFnPC9hPiA8YQ0KIGhyZWY9Imh0dHA6Ly93ZWIudGlzY2Fs aS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvY29hY2gtZGVzaWduZXItDQogZGlzY291bnQt aGFuZGJhZy5odG1sIj5jb2FjaCBkZXNpZ25lciBkaXNjb3VudCBoYW5kYmFnPC9hPiA8YQ0KIGhy ZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvYXV0aGVu dGljLWNoZWFwLQ0KIGNvYWNoLWhhbmRiYWcuaHRtbCI+YXV0aGVudGljIGNoZWFwIGNvYWNoIGhh bmRiYWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2Fj aC1oYW5kYmFncy9jb2FjaC1vcHRpYy0NCiBoYW5kYmFnLmh0bWwiPmNvYWNoIG9wdGljIGhhbmRi YWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1o YW5kYmFncy9hY2Nlc3NvcnktY29hY2gtDQogaGFuZGJhZy5odG1sIj5hY2Nlc3NvcnkgY29hY2gg aGFuZGJhZzwvYT4gPGENCiBocmVmPSJodHRwOi8vd2ViLnRpc2NhbGkuaXQvYmFnc19zYWxlL2Nv YWNoLWhhbmRiYWdzL2NvYWNoLWhhbmRiYWctDQogc3RvcmUuaHRtbCI+Y29hY2ggaGFuZGJhZyBz dG9yZTwvYT4gPGENCiBocmVmPSJodHRwOi8vd2ViLnRpc2NhbGkuaXQvYmFnc19zYWxlL2NvYWNo LWhhbmRiYWdzL3JlYWwtY29hY2gtDQogaGFuZGJhZy5odG1sIj5yZWFsIGNvYWNoIGhhbmRiYWc8 L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1oYW5k YmFncy9jb2FjaC1taW5pLXNpZ25hdHVyZS0NCiBoYW5kYmFnLmh0bWwiPmNvYWNoIG1pbmkgc2ln bmF0dXJlIGhhbmRiYWc8L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nf c2FsZS9jb2FjaC1oYW5kYmFncy9jb2FjaC1zdWVkZS0NCiBoYW5kYmFnLmh0bWwiPmNvYWNoIHN1 ZWRlIGhhbmRiYWc8L2E+DQoNCi0tIA0KVGlja2V0IFVSTDogPGh0dHA6Ly90cmFjLmFidGxpbnV4 Lm9yZy90aWNrZXQvNiNjb21tZW50Oj4NCkFCb3V0IFRpbWUgTGludXggPGh0dHA6Ly9hYnRsaW51 eC5vcmc+DQpJdCdzIGFib3V0IHRpbWUgc29tZW9uZSBkaWQgaXQgcmlnaHQuLi4= |
From: ABout T. L. <esc...@us...> - 2006-12-08 11:15:23
|
IzQ6IENyZWF0ZSBhIGhpamFjayBmdW50aW9uIQ0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KICBSZXBv cnRlcjogIGVyaWNzICAgICB8ICAgICAgIE93bmVyOiAgZXJpY3MgICAgICANCiAgICAgIFR5cGU6 ICB3aXNobGlzdCAgfCAgICAgIFN0YXR1czogIG5ldyAgICAgICAgDQogIFByaW9yaXR5OiAgbWlu b3IgICAgIHwgICBNaWxlc3RvbmU6ICB2ZXJzaW9uXzEueA0KIENvbXBvbmVudDogIGFidCAgICAg ICB8ICAgICBWZXJzaW9uOiAgMS4wICAgICAgICANClJlc29sdXRpb246ICAgICAgICAgICAgfCAg ICBLZXl3b3JkczogICAgICAgICAgICAgDQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSstLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQpDb21tZW50IChi eSBHZW9yZ2UpOg0KDQogVGhpcyBpcyBnZXR0aW5nIHRvIGJlIGEgdmVyeSBpbmZvcm1hdGl2ZSBz aXRlLCB3ZSBqdXN0IGhhdmUgdG8gdGFrZSB0aGUNCiB0aW1lIHRvIHNlbmQgYWxvbmcgbW9yZSBp bmZvIGFuZCBuZXdzIHRvIG1ha2UgaXQgdGhhdCBtdWNoIGJldHRlciAgPGENCiBocmVmPSJodHRw Oi8vd2ViLnRpc2NhbGkuaXQvYmFnc19zYWxlL2NvYWNoLWhhbmRiYWdzL2Rpc2NvdW50LWF1dGhl bnRpYy0NCiBjb2FjaC1oYW5kYmFnLmh0bWwiPmRpc2NvdW50IGF1dGhlbnRpYyBjb2FjaCBoYW5k YmFnPC9hPiA8YQ0KIGhyZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gt aGFuZGJhZ3MvY29hY2gtc2lnbmF0dXJlLQ0KIGhhbmRiYWctYmFnLmh0bWwiPmNvYWNoIHNpZ25h dHVyZSBoYW5kYmFnIGJhZzwvYT4gPGENCiBocmVmPSJodHRwOi8vd2ViLnRpc2NhbGkuaXQvYmFn c19zYWxlL2NvYWNoLWhhbmRiYWdzL2NvYWNoLWRlc2lnbmVyLQ0KIGRpc2NvdW50LWhhbmRiYWcu aHRtbCI+Y29hY2ggZGVzaWduZXIgZGlzY291bnQgaGFuZGJhZzwvYT4gPGENCiBocmVmPSJodHRw Oi8vd2ViLnRpc2NhbGkuaXQvYmFnc19zYWxlL2NvYWNoLWhhbmRiYWdzL2F1dGhlbnRpYy1jaGVh cC0NCiBjb2FjaC1oYW5kYmFnLmh0bWwiPmF1dGhlbnRpYyBjaGVhcCBjb2FjaCBoYW5kYmFnPC9h PiA8YQ0KIGhyZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJh Z3MvY29hY2gtb3B0aWMtDQogaGFuZGJhZy5odG1sIj5jb2FjaCBvcHRpYyBoYW5kYmFnPC9hPiA8 YQ0KIGhyZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3Mv YWNjZXNzb3J5LWNvYWNoLQ0KIGhhbmRiYWcuaHRtbCI+YWNjZXNzb3J5IGNvYWNoIGhhbmRiYWc8 L2E+IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1oYW5k YmFncy9jb2FjaC1oYW5kYmFnLQ0KIHN0b3JlLmh0bWwiPmNvYWNoIGhhbmRiYWcgc3RvcmU8L2E+ IDxhDQogaHJlZj0iaHR0cDovL3dlYi50aXNjYWxpLml0L2JhZ3Nfc2FsZS9jb2FjaC1oYW5kYmFn cy9yZWFsLWNvYWNoLQ0KIGhhbmRiYWcuaHRtbCI+cmVhbCBjb2FjaCBoYW5kYmFnPC9hPiA8YQ0K IGhyZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29hY2gtaGFuZGJhZ3MvY29h Y2gtbWluaS1zaWduYXR1cmUtDQogaGFuZGJhZy5odG1sIj5jb2FjaCBtaW5pIHNpZ25hdHVyZSBo YW5kYmFnPC9hPiA8YQ0KIGhyZWY9Imh0dHA6Ly93ZWIudGlzY2FsaS5pdC9iYWdzX3NhbGUvY29h Y2gtaGFuZGJhZ3MvY29hY2gtc3VlZGUtDQogaGFuZGJhZy5odG1sIj5jb2FjaCBzdWVkZSBoYW5k YmFnPC9hPg0KDQotLSANClRpY2tldCBVUkw6IDxodHRwOi8vdHJhYy5hYnRsaW51eC5vcmcvdGlj a2V0LzQjY29tbWVudDo+DQpBQm91dCBUaW1lIExpbnV4IDxodHRwOi8vYWJ0bGludXgub3JnPg0K SXQncyBhYm91dCB0aW1lIHNvbWVvbmUgZGlkIGl0IHJpZ2h0Li4u |