Menu
▾
▴
rubyeclipse-commit — Every CVS commit creates a post to this list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(41) |
Apr
(9) |
May
|
Jun
|
Jul
(39) |
Aug
(38) |
Sep
(135) |
Oct
(220) |
Nov
(75) |
Dec
(74) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(44) |
Feb
(160) |
Mar
(49) |
Apr
(69) |
May
(40) |
Jun
(52) |
Jul
(47) |
Aug
(51) |
Sep
(19) |
Oct
(22) |
Nov
(36) |
Dec
(76) |
| 2007 |
Jan
(154) |
Feb
(165) |
Mar
(186) |
Apr
(143) |
May
(175) |
Jun
(133) |
Jul
(203) |
Aug
(177) |
Sep
(136) |
Oct
|
Nov
|
Dec
|
|
From: David C. <dc...@us...> - 2005-10-02 17:19:06
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8215/.settings Log Message: Directory /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/.settings added to the repository |
|
From: David C. <dc...@us...> - 2005-10-02 17:18:50
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui.tests/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8204/.settings Log Message: Directory /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui.tests/.settings added to the repository |
|
From: David C. <dc...@us...> - 2005-10-02 17:18:46
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8190/.settings Log Message: Directory /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/.settings added to the repository |
|
From: David C. <dc...@us...> - 2005-10-02 17:15:30
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7487 Modified Files: plugin.xml Log Message: Fix illegal id. Index: plugin.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/plugin.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** plugin.xml 28 Jul 2005 11:57:11 -0000 1.13 --- plugin.xml 2 Oct 2005 17:15:18 -0000 1.14 *************** *** 28,37 **** </requires> ! <extension-point id="internal-testRunTabs" name="%testRunTabs.name" schema="schema/internal-testRunTabs.exsd"/> ! <extension ! point="org.rubypeople.rdt.testunit.internal-testRunTabs"> ! <testRunTab ! class="org.rubypeople.rdt.testunit.views.FailureTab"/> <testRunTab class="org.rubypeople.rdt.testunit.views.TestHierarchyTab"/> </extension> --- 28,35 ---- </requires> ! <extension-point id="internalTestRunTabs" name="%testRunTabs.name" schema="schema/internal-testRunTabs.exsd"/> ! <extension point="org.rubypeople.rdt.testunit.internalTestRunTabs"> ! <testRunTab class="org.rubypeople.rdt.testunit.views.FailureTab"/> <testRunTab class="org.rubypeople.rdt.testunit.views.TestHierarchyTab"/> </extension> |
|
From: David C. <dc...@us...> - 2005-10-02 17:15:30
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7487/src/org/rubypeople/rdt/testunit/views Modified Files: TestUnitView.java Log Message: Fix illegal id. Index: TestUnitView.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/views/TestUnitView.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestUnitView.java 12 Mar 2005 15:29:04 -0000 1.9 --- TestUnitView.java 2 Oct 2005 17:15:18 -0000 1.10 *************** *** 69,73 **** static final int REFRESH_INTERVAL = 200; ! public static final String ID_EXTENSION_POINT_TESTRUN_TABS = TestunitPlugin.PLUGIN_ID + "." + "internal-testRunTabs"; //$NON-NLS-1$ //$NON-NLS-2$ //orientations --- 69,73 ---- static final int REFRESH_INTERVAL = 200; ! public static final String ID_EXTENSION_POINT_TESTRUN_TABS = TestunitPlugin.PLUGIN_ID + "." + "internalTestRunTabs"; //$NON-NLS-1$ //$NON-NLS-2$ //orientations |
|
From: David C. <dc...@us...> - 2005-10-02 16:34:31
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.tests.all/src/org/rubypeople/rdt/tests/all In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12512/src/org/rubypeople/rdt/tests/all Modified Files: TS_RdtAllUnitTests.java TS_RdtAllFunctionalTests.java Log Message: Cleanup a whole bunch of 'unused warnings" Index: TS_RdtAllFunctionalTests.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.tests.all/src/org/rubypeople/rdt/tests/all/TS_RdtAllFunctionalTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TS_RdtAllFunctionalTests.java 1 Oct 2005 22:58:05 -0000 1.2 --- TS_RdtAllFunctionalTests.java 1 Oct 2005 23:10:55 -0000 1.3 *************** *** 4,13 **** import junit.framework.TestSuite; - import org.rubypeople.rdt.internal.core.TS_Core; - import org.rubypeople.rdt.internal.formatter.TC_CodeFormatter; import org.rubypeople.rdt.debug.core.tests.TS_Debug; - import org.rubypeople.rdt.internal.debug.ui.tests.launcher.TS_Launcher; - import org.rubypeople.rdt.internal.launching.TS_Launching; - import org.rubypeople.rdt.internal.ui.TS_UiTests; public class TS_RdtAllFunctionalTests { --- 4,8 ---- Index: TS_RdtAllUnitTests.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.tests.all/src/org/rubypeople/rdt/tests/all/TS_RdtAllUnitTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TS_RdtAllUnitTests.java 1 Oct 2005 22:58:05 -0000 1.2 --- TS_RdtAllUnitTests.java 1 Oct 2005 23:10:55 -0000 1.3 *************** *** 5,11 **** import org.rubypeople.rdt.internal.core.TS_Core; - import org.rubypeople.rdt.internal.formatter.TC_CodeFormatter; - import org.rubypeople.rdt.debug.core.tests.TS_Debug; import org.rubypeople.rdt.internal.debug.ui.tests.launcher.TS_Launcher; import org.rubypeople.rdt.internal.launching.TS_Launching; import org.rubypeople.rdt.internal.ui.TS_UiTests; --- 5,10 ---- import org.rubypeople.rdt.internal.core.TS_Core; import org.rubypeople.rdt.internal.debug.ui.tests.launcher.TS_Launcher; + import org.rubypeople.rdt.internal.formatter.TC_CodeFormatter; import org.rubypeople.rdt.internal.launching.TS_Launching; import org.rubypeople.rdt.internal.ui.TS_UiTests; |
|
From: Markus B. <mba...@us...> - 2005-09-28 23:30:18
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.webpage/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29046/htdocs Modified Files: welcome.php Log Message: added news for 0.6.0 release Index: welcome.php =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.webpage/htdocs/welcome.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** welcome.php 2 Sep 2005 18:06:28 -0000 1.3 --- welcome.php 28 Sep 2005 23:30:08 -0000 1.4 *************** *** 31,34 **** --- 31,45 ---- <!-- INSERT NEW NEWS HERE!!! --> <table> + <tr> + <td align="right" valign="top" width="20"><img src="images/arrow.gif" alt="->" border="0" height="16" width="16"></td> + <td valign="top"><font face="arial,helvetica,geneva" size="-1"><b>0.6.0 Released (2005-09-29)</b> + <br/> + Release 0.6.0 is out: read the <a href="http://sourceforge.net/forum/forum.php?forum_id=499503">news</a>, + check the <a href="http://rubyeclipse.sourceforge.net/userdoc/html/ch04.html">documentation</a>, <a href="http://rubyeclipse.sourceforge.net/download.rdt.html">download</a> and enjoy, + <a href="http://rubyeclipse.sourceforge.net/contact.rdt.html">feedback</a> very much appreciated! + </p> + </font> + </td> + </tr> <tr> <td align="right" valign="top" width="20"><img src="images/arrow.gif" alt="->" border="0" height="16" width="16"></td> |
|
From: Markus B. <mba...@us...> - 2005-09-26 22:22:54
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13287/bootstrap Modified Files: customTargets.xml Log Message: changed cvs method from pserver to ext for fetching the update site Index: customTargets.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap/customTargets.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** customTargets.xml 22 Sep 2005 21:40:10 -0000 1.12 --- customTargets.xml 26 Sep 2005 22:22:46 -0000 1.13 *************** *** 192,196 **** <!-- Grab the rest of the site out of CVS --> <mkdir dir="${buildDirectory}/temp.updatesite"/> ! <property name="cvsRoot" value=":pserver:ano...@cv...:/cvsroot/rubyeclipse" /> <cvs cvsroot="${cvsRoot}" package="${sitePackagePrefix}" dest="${buildDirectory}/temp.updatesite" tag="${fetchTag}"/> <!-- Copy to staging area --> --- 192,196 ---- <!-- Grab the rest of the site out of CVS --> <mkdir dir="${buildDirectory}/temp.updatesite"/> ! <property name="cvsRoot" value=":ext:cvs.sf.net:/cvsroot/rubyeclipse" /> <cvs cvsroot="${cvsRoot}" package="${sitePackagePrefix}" dest="${buildDirectory}/temp.updatesite" tag="${fetchTag}"/> <!-- Copy to staging area --> |
|
From: Markus B. <mba...@us...> - 2005-09-26 21:48:42
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1606/src/org/rubypeople/rdt/core Modified Files: RubyCore.java Log Message: handle osg.install.area (more?) platform independently, done in a pair programming session with David, thanks! Index: RubyCore.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/RubyCore.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RubyCore.java 7 Sep 2005 21:21:08 -0000 1.13 --- RubyCore.java 26 Sep 2005 21:48:31 -0000 1.14 *************** *** 16,19 **** --- 16,20 ---- import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; + import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; *************** *** 277,284 **** if (!pluginDirFile.exists()) { String installArea = System.getProperty("osgi.install.area"); ! if (installArea.startsWith("file:/")) ! installArea = installArea.substring("file:/".length()); ! File installFile = new File(installArea); pluginDirFile = new File(installFile, pluginDir); if (!pluginDirFile.exists()) --- 278,290 ---- if (!pluginDirFile.exists()) { + // pluginDirFile is a relative path, if the working directory is different from + // the location of the eclipse executable, we try this ... String installArea = System.getProperty("osgi.install.area"); ! if (installArea.startsWith("file:")) { ! installArea = installArea.substring("file:".length()); ! } ! // Path.toOSString() removes a leading slash if on windows, e.g. ! // /D:/Eclipse => D:/Eclipse ! File installFile = new File(new Path(installArea).toOSString()); pluginDirFile = new File(installFile, pluginDir); if (!pluginDirFile.exists()) |
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8087/src/org/rubypeople/rdt/internal/launching Modified Files: RubyInterpreter.java InterpreterRunner.java DebuggerRunner.java InterpreterRunnerConfiguration.java Log Message: Converted all 'launchers' to list-based command line construction. Index: InterpreterRunner.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunner.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** InterpreterRunner.java 21 Sep 2005 21:00:17 -0000 1.15 --- InterpreterRunner.java 25 Sep 2005 17:57:01 -0000 1.16 *************** *** 2,6 **** --- 2,8 ---- import java.io.File; + import java.util.ArrayList; import java.util.HashMap; + import java.util.List; import java.util.Map; *************** *** 15,19 **** public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) throws CoreException { ! String commandLine = renderCommandLine(configuration); File workingDirectory = configuration.getAbsoluteWorkingDirectory(); --- 17,21 ---- public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) throws CoreException { ! List commandLine = renderCommandLine(configuration); File workingDirectory = configuration.getAbsoluteWorkingDirectory(); *************** *** 23,27 **** defaultAttributes.put(IProcess.ATTR_PROCESS_TYPE, "ruby"); IProcess process = DebugPlugin.newProcess(launch, nativeRubyProcess, renderLabel(configuration), defaultAttributes); ! process.setAttribute(RdtLaunchingPlugin.PLUGIN_ID + ".launcher.cmdline", commandLine); return process ; } --- 25,29 ---- defaultAttributes.put(IProcess.ATTR_PROCESS_TYPE, "ruby"); IProcess process = DebugPlugin.newProcess(launch, nativeRubyProcess, renderLabel(configuration), defaultAttributes); ! process.setAttribute(RdtLaunchingPlugin.PLUGIN_ID + ".launcher.cmdline", commandLine.toString()); return process ; } *************** *** 45,66 **** } ! protected String renderCommandLine(InterpreterRunnerConfiguration configuration) { RubyInterpreter interpreter = configuration.getInterpreter(); ! StringBuffer buffer = new StringBuffer(); ! buffer.append(this.getDebugCommandLineArgument()); ! buffer.append(configuration.renderLoadPath()); ! buffer.append(" " + configuration.getInterpreterArguments()); ! buffer.append(interpreter.endOfOptionsDelimeter); ! buffer.append(RdtLaunchingPlugin.osDependentPath(configuration.getAbsoluteFileName())); ! buffer.append(" " + configuration.getProgramArguments()); ! return buffer.toString(); } ! ! protected String getDebugCommandLineArgument() { ! return "" ; } --- 47,66 ---- } ! private List renderCommandLine(InterpreterRunnerConfiguration configuration) { ! List commandLine = new ArrayList(); RubyInterpreter interpreter = configuration.getInterpreter(); ! addDebugCommandLineArgument(commandLine); ! commandLine.addAll(configuration.renderLoadPath()); ! commandLine.addAll(ArgumentSplitter.split(configuration.getInterpreterArguments())); ! commandLine.add(RubyInterpreter.END_OF_OPTIONS_DELIMITER); ! commandLine.add(RdtLaunchingPlugin.osDependentPath(configuration.getAbsoluteFileName())); ! commandLine.addAll(ArgumentSplitter.split(configuration.getProgramArguments())); ! return commandLine; } ! protected void addDebugCommandLineArgument(List commandLine) { } Index: DebuggerRunner.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DebuggerRunner.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DebuggerRunner.java 5 Mar 2005 15:13:34 -0000 1.18 --- DebuggerRunner.java 25 Sep 2005 17:57:01 -0000 1.19 *************** *** 2,5 **** --- 2,6 ---- import java.io.File; + import java.util.List; import org.eclipse.core.runtime.CoreException; *************** *** 30,39 **** } ! protected String getDebugCommandLineArgument() { ! String debugLoadPathAddition = RdtLaunchingPlugin.osDependentPath(DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar)); if (RdtDebugCorePlugin.isRubyDebuggerVerbose()) { ! return " -reclipseDebugVerbose -I " + debugLoadPathAddition ; } ! return " -reclipseDebug -I "+ debugLoadPathAddition ; } --- 31,43 ---- } ! protected void addDebugCommandLineArgument(List commandLine) { if (RdtDebugCorePlugin.isRubyDebuggerVerbose()) { ! commandLine.add("-reclipseDebugVerbose"); ! } else { ! commandLine.add("-reclipseDebug"); } ! ! commandLine.add("-I"); ! commandLine.add(RdtLaunchingPlugin.osDependentPath(DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar))); } Index: RubyInterpreter.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RubyInterpreter.java 24 Sep 2005 20:19:41 -0000 1.12 --- RubyInterpreter.java 25 Sep 2005 17:57:01 -0000 1.13 *************** *** 13,17 **** public class RubyInterpreter { ! public final String endOfOptionsDelimeter = " -- "; protected IPath installLocation; --- 13,17 ---- public class RubyInterpreter { ! public static final String END_OF_OPTIONS_DELIMITER = "--"; protected IPath installLocation; *************** *** 47,55 **** } - public Process exec(String arguments, File workingDirectory) throws CoreException { - return exec(ArgumentSplitter.split(arguments), workingDirectory); - } - - public Process exec(List args, File workingDirectory) throws CoreException { --- 47,50 ---- Index: InterpreterRunnerConfiguration.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunnerConfiguration.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** InterpreterRunnerConfiguration.java 29 Aug 2005 16:06:44 -0000 1.12 --- InterpreterRunnerConfiguration.java 25 Sep 2005 17:57:01 -0000 1.13 *************** *** 2,6 **** --- 2,8 ---- import java.io.File; + import java.util.ArrayList; import java.util.Iterator; + import java.util.List; import org.eclipse.core.resources.IProject; *************** *** 96,109 **** } ! protected void addToLoadPath(StringBuffer loadPath, IProject project) { if (!project.isAccessible()) { return ; } ! loadPath.append(" -I " + RdtLaunchingPlugin.osDependentPath(project.getLocation().toOSString())); } - - protected String renderLoadPath() { - StringBuffer loadPath = new StringBuffer(); RubyProject project = this.getProject(); addToLoadPath(loadPath, project.getProject()); --- 98,115 ---- } ! protected void addToLoadPath(List loadPath, IProject project) { if (!project.isAccessible()) { return ; } ! addToLoadPath(loadPath, project.getLocation().toOSString()); } + private void addToLoadPath(List loadPath, String pathDirectory) { + loadPath.add("-I"); + loadPath.add(RdtLaunchingPlugin.osDependentPath(pathDirectory)); + } + + protected List renderLoadPath() { + List loadPath = new ArrayList(); RubyProject project = this.getProject(); addToLoadPath(loadPath, project.getProject()); *************** *** 114,120 **** } if (new Path(this.getFileName()).segmentCount() > 1) { ; ! loadPath.append(" -I " + RdtLaunchingPlugin.osDependentPath(this.getAbsoluteFileDirectory())) ; } ! return loadPath.toString(); } } --- 120,126 ---- } if (new Path(this.getFileName()).segmentCount() > 1) { ; ! addToLoadPath(loadPath, this.getAbsoluteFileDirectory()); } ! return loadPath; } } |
|
From: David C. <dc...@us...> - 2005-09-25 17:57:08
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8072/src/org/rubypeople/rdt/internal/launching/tests Modified Files: TC_RunnerLaunching.java Log Message: Converted all 'launchers' to list-based command line construction. Index: TC_RunnerLaunching.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/tests/TC_RunnerLaunching.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TC_RunnerLaunching.java 2 Mar 2005 00:53:28 -0000 1.9 --- TC_RunnerLaunching.java 25 Sep 2005 17:56:58 -0000 1.10 *************** *** 5,8 **** --- 5,9 ---- import java.io.OutputStream; import java.util.ArrayList; + import java.util.Arrays; import java.util.List; import java.util.Map; *************** *** 24,28 **** import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.Launch; - import org.eclipse.debug.internal.core.LaunchConfigurationType; import org.rubypeople.eclipse.shams.debug.core.ShamLaunchConfigurationType; import org.rubypeople.eclipse.testutils.ResourceTools; --- 25,28 ---- *************** *** 36,41 **** private final static String PROJECT_NAME = "Simple Project"; private final static String RUBY_LIB_DIR = "someRubyDir"; // dir inside project ! private final static String RUBY_FILE_NAME = "rubyFile.rb"; ! private final static String INTERPRETER_ARGUMENTS = "interpreterArguments"; private final static String PROGRAM_ARGUMENTS = "programArguments"; private final static String RUBY_COMMAND = "rubyw"; --- 36,41 ---- private final static String PROJECT_NAME = "Simple Project"; private final static String RUBY_LIB_DIR = "someRubyDir"; // dir inside project ! private final static String RUBY_FILE_NAME = "rubyFile.rb"; ! private final static String INTERPRETER_ARGUMENTS = "interpreter Arguments"; private final static String PROGRAM_ARGUMENTS = "programArguments"; private final static String RUBY_COMMAND = "rubyw"; *************** *** 48,56 **** } ! protected String getCommandLine(IProject project, boolean debug) { ! String quotation = BootLoader.getOS().equals(BootLoader.OS_WIN32) ? "\"" : ""; ! StringBuffer commandLine = new StringBuffer(); if (debug) { ! commandLine.append(" -reclipseDebug"); } if (debug) { --- 48,55 ---- } ! protected List getCommandLine(IProject project, boolean debug) { ! List commandLine = new ArrayList(); if (debug) { ! commandLine.add("-reclipseDebug"); } if (debug) { *************** *** 59,76 **** dirOfRubyDebuggerFile = dirOfRubyDebuggerFile.substring(1) ; } ! commandLine.append( ! " -I " ! + quotation ! + dirOfRubyDebuggerFile ! + quotation); } ! commandLine.append(" -I " + quotation + project.getLocation().toOSString() + quotation); ! commandLine.append(" -I " + quotation + project.getLocation().toOSString() + File.separator + RUBY_LIB_DIR + quotation) ; ! commandLine.append(" " + INTERPRETER_ARGUMENTS + " -- "); // use always forward slashes for path relative to project dir ! commandLine.append( ! quotation + project.getLocation().toOSString() + "/" + RUBY_LIB_DIR + "/" + RUBY_FILE_NAME + quotation); ! commandLine.append(" " + PROGRAM_ARGUMENTS); ! return commandLine.toString(); } --- 58,74 ---- dirOfRubyDebuggerFile = dirOfRubyDebuggerFile.substring(1) ; } ! commandLine.add("-I"); ! commandLine.add(dirOfRubyDebuggerFile); } ! commandLine.add("-I"); ! commandLine.add( project.getLocation().toOSString()); ! commandLine.add("-I"); ! commandLine.add(project.getLocation().toOSString() + File.separator + RUBY_LIB_DIR) ; ! commandLine.addAll(Arrays.asList(INTERPRETER_ARGUMENTS.split("\\s+"))); ! commandLine.add("--"); // use always forward slashes for path relative to project dir ! commandLine.add(project.getLocation().toOSString() + "/" + RUBY_LIB_DIR + "/" + RUBY_FILE_NAME); ! commandLine.add(PROGRAM_ARGUMENTS); ! return commandLine; } *************** *** 107,111 **** assertEquals("One process has been spawned", 1, launch.getProcesses().length); ! assertEquals("Assembled command line.", getCommandLine(project, debug), interpreter.getArguments()); assertEquals( "Process label.", --- 105,111 ---- assertEquals("One process has been spawned", 1, launch.getProcesses().length); ! List expected = getCommandLine(project, debug); ! List actual = interpreter.getArguments(); ! assertEquals("Assembled command line.", expected, actual); assertEquals( "Process label.", *************** *** 239,244 **** super(aName, validInstallLocation); } ! private String arguments; ! public String getArguments() { return arguments; } --- 239,244 ---- super(aName, validInstallLocation); } ! private List arguments; ! public List getArguments() { return arguments; } *************** *** 246,250 **** return RUBY_COMMAND; } ! public Process exec(String args, File workingDirectory) { arguments = args; return new ShamProcess(); --- 246,250 ---- return RUBY_COMMAND; } ! public Process exec(List args, File workingDirectory) { arguments = args; return new ShamProcess(); |
|
From: David C. <dc...@us...> - 2005-09-25 17:57:02
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8060/src/org/rubypeople/rdt/testunit/launcher Modified Files: TestUnitRunnerConfiguration.java Log Message: Converted all 'launchers' to list-based command line construction. Index: TestUnitRunnerConfiguration.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitRunnerConfiguration.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TestUnitRunnerConfiguration.java 5 Sep 2005 16:44:24 -0000 1.13 --- TestUnitRunnerConfiguration.java 25 Sep 2005 17:56:54 -0000 1.14 *************** *** 2,5 **** --- 2,6 ---- import java.io.File; + import java.util.List; import org.eclipse.core.runtime.CoreException; *************** *** 75,82 **** } ! public String renderLoadPath() { ! String absoluteTestFilePath = RdtLaunchingPlugin.osDependentPath(this.getAbsoluteTestFileName()); ! if (absoluteTestFilePath.length() == 0) { return super.renderLoadPath(); } ! return super.renderLoadPath() + " -I " + absoluteTestFilePath; } --- 76,88 ---- } ! public List renderLoadPath() { ! List loadPath = super.renderLoadPath(); ! ! String absoluteTestFileName = this.getAbsoluteTestFileName(); ! if (absoluteTestFileName.length() != 0) { ! loadPath.add("-I"); ! loadPath.add(absoluteTestFileName); ! } ! return loadPath; } |
|
From: Markus B. <mba...@us...> - 2005-09-25 16:49:53
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25000/src/org/rubypeople/rdt/internal/launching Modified Files: RdtLaunchingMessages.properties RubyApplicationLaunchConfigurationDelegate.java Log Message: fixed rdoc launch error in linux, use RubyInterpreter.exec for launching the interpreter for rdoc, externalized messages Index: RdtLaunchingMessages.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RdtLaunchingMessages.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RdtLaunchingMessages.properties 5 Mar 2005 15:13:34 -0000 1.3 --- RdtLaunchingMessages.properties 25 Sep 2005 16:49:46 -0000 1.4 *************** *** 10,12 **** RdtLaunchingPlugin.internalErrorOccurred=Internal error occurred RdtLaunchingPlugin.processTerminatedBecauseNoDebuggerConnection=Ruby process terminated because no connection to the debugger could me made ! RdtLaunchingPlugin.interpreterNotFound=Please check the location of the following interpreter: {0} \ No newline at end of file --- 10,14 ---- RdtLaunchingPlugin.internalErrorOccurred=Internal error occurred RdtLaunchingPlugin.processTerminatedBecauseNoDebuggerConnection=Ruby process terminated because no connection to the debugger could me made ! RdtLaunchingPlugin.interpreterNotFound=Please check the location of the following interpreter: {0} ! RdtLaunchingPlugin.noInterpreterSelectedTitle=No interpreter selected ! RdtLaunchingPlugin.noInterpreterSelected=There is currently no ruby interpreter defined. Use preferences to define and select the active interpreter. \ No newline at end of file Index: RubyApplicationLaunchConfigurationDelegate.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyApplicationLaunchConfigurationDelegate.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RubyApplicationLaunchConfigurationDelegate.java 18 Jan 2005 21:59:29 -0000 1.10 --- RubyApplicationLaunchConfigurationDelegate.java 25 Sep 2005 16:49:46 -0000 1.11 *************** *** 22,26 **** public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { if (RubyRuntime.getDefault().getSelectedInterpreter() == null) { ! throw new CoreException(new Status(IStatus.ERROR, RdtLaunchingPlugin.PLUGIN_ID, IStatus.OK, "You must define an interpreter before running Ruby Applications.", null)); } --- 22,26 ---- public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { if (RubyRuntime.getDefault().getSelectedInterpreter() == null) { ! throw new CoreException(new Status(IStatus.ERROR, RdtLaunchingPlugin.PLUGIN_ID, IStatus.OK, RdtLaunchingMessages.getString("RdtLaunchingPlugin.noInterpreterSelected"), null)); } |
|
From: Markus B. <mba...@us...> - 2005-09-25 16:49:50
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/src/org/rubypeople/rdt/internal/ui Modified Files: RubyUIMessages.properties Log Message: fixed rdoc launch error in linux, use RubyInterpreter.exec for launching the interpreter for rdoc, externalized messages Index: RubyUIMessages.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyUIMessages.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RubyUIMessages.properties 18 Sep 2005 18:47:24 -0000 1.6 --- RubyUIMessages.properties 25 Sep 2005 16:49:42 -0000 1.7 *************** *** 119,121 **** HTMLTextPresenter.ellipsis=... ! HTML2TextReader.listItemPrefix=\t- \ No newline at end of file --- 119,129 ---- HTMLTextPresenter.ellipsis=... ! HTML2TextReader.listItemPrefix=\t- ! ! RDocPathErrorTitle=RDoc path error ! RDocPathError=The input path for RDoc is blank or incorrect. Use preferences to enter a valid RDoc path. ! RDocExecutionErrorTitle=Ruby process exited with value {0} ! RDocExecutionError=Ruby running rdoc exited abnormally. A possble reason is a wrong Rdoc path. Please check the path for rdoc in the preference page. ! RDocExecutionErrorAdditionalMessageWithStderr=The process was started with: {0}. The last line of stderr of the ruby process: {0}. ! RDocExecutionErrorAdditionalMessage=The process was started with: {0}. The process did not write any messages to stderr. ! ErrorRunningRdocTitle=Error running RDoc \ No newline at end of file |
|
From: Markus B. <mba...@us...> - 2005-09-25 16:49:50
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rdocexport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/src/org/rubypeople/rdt/internal/ui/rdocexport Modified Files: RDocUtility.java Log Message: fixed rdoc launch error in linux, use RubyInterpreter.exec for launching the interpreter for rdoc, externalized messages Index: RDocUtility.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rdocexport/RDocUtility.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RDocUtility.java 19 Sep 2005 21:46:49 -0000 1.2 --- RDocUtility.java 25 Sep 2005 16:49:42 -0000 1.3 *************** *** 3,19 **** import java.io.BufferedReader; import java.io.File; - import java.io.IOException; import java.io.InputStreamReader; import java.util.HashSet; import java.util.Iterator; import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.ErrorDialog; import org.rubypeople.rdt.internal.launching.RubyRuntime; import org.rubypeople.rdt.internal.ui.RubyPlugin; import org.rubypeople.rdt.internal.ui.dialogs.StatusInfo; import org.rubypeople.rdt.ui.PreferenceConstants; --- 3,25 ---- import java.io.BufferedReader; import java.io.File; import java.io.InputStreamReader; + import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; + import java.util.List; import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.ErrorDialog; + import org.eclipse.jface.dialogs.MessageDialog; + import org.rubypeople.rdt.internal.launching.RdtLaunchingMessages; + import org.rubypeople.rdt.internal.launching.RubyInterpreter; import org.rubypeople.rdt.internal.launching.RubyRuntime; import org.rubypeople.rdt.internal.ui.RubyPlugin; + import org.rubypeople.rdt.internal.ui.RubyUIMessages; import org.rubypeople.rdt.internal.ui.dialogs.StatusInfo; import org.rubypeople.rdt.ui.PreferenceConstants; *************** *** 29,33 **** private static Set listeners = new HashSet(); ! private static boolean isDebug = false ; public static void addRdocListener(RdocListener listener) { --- 35,39 ---- private static Set listeners = new HashSet(); ! private static boolean isDebug = false; public static void addRdocListener(RdocListener listener) { *************** *** 38,46 **** listeners.remove(listener); } ! public static void setDebugging(boolean isDebug) { ! RDocUtility.isDebug = isDebug ; } ! public static void generateDocumentation(IResource resource) { RubyInvoker invoker = new RubyInvoker(resource); --- 44,52 ---- listeners.remove(listener); } ! public static void setDebugging(boolean isDebug) { ! RDocUtility.isDebug = isDebug; } ! public static void generateDocumentation(IResource resource) { RubyInvoker invoker = new RubyInvoker(resource); *************** *** 62,70 **** while (!isProject(project)) { project = project.getParent(); ! if (project == null) ! break; } ! if (project != null && isProject(project)) ! this.resource = project; } --- 68,74 ---- while (!isProject(project)) { project = project.getParent(); ! if (project == null) break; } ! if (project != null && isProject(project)) this.resource = project; } *************** *** 73,83 **** } - protected String getArgString() { - return " -r " + resource.getLocation().toOSString(); - } - private void log(String message) { if (RDocUtility.isDebug) { ! System.out.println(message) ; } } --- 77,83 ---- } private void log(String message) { if (RDocUtility.isDebug) { ! System.out.println(message); } } *************** *** 85,93 **** public final void invoke() { log("Generating RDoc for " + resource.getName()); ! IPath rubyPath = RubyRuntime.getDefault().getSelectedInterpreter() ! .getInstallLocation(); ! IPath rdocPath = new Path(RubyPlugin.getDefault() ! .getPreferenceStore().getString( ! PreferenceConstants.RDOC_PATH)); // check the rdoc path for existence. It might have been --- 85,97 ---- public final void invoke() { log("Generating RDoc for " + resource.getName()); ! ! RdtLaunchingMessages.getString("RdtLaunchingPlugin.noInterpreterSelected"); ! RubyInterpreter interpreter = RubyRuntime.getDefault().getSelectedInterpreter(); ! if (interpreter == null) { ! MessageDialog.openInformation(RubyPlugin.getActiveWorkbenchShell(), RdtLaunchingMessages.getString("RdtLaunchingPlugin.noInterpreterSelectedTitle"), RdtLaunchingMessages.getString("RdtLaunchingPlugin.noInterpreterSelected")); ! return ; ! } ! ! IPath rdocPath = new Path(RubyPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.RDOC_PATH)); // check the rdoc path for existence. It might have been *************** *** 98,119 **** // If we can't find it ourselves then display an error to the user if (!file.exists() || !file.isFile()) { ! // TODO Extract the displayed strings to a properties file ! String message = "The input path for RDoc is blank or incorrect."; ! ErrorDialog.openError(RubyPlugin.getActiveWorkbenchShell(), ! "Rdoc location incorrect", message, new StatusInfo( ! StatusInfo.ERROR, message)); return; } ! String riCmd = "\"" + rubyPath + "\" \"" + rdocPath.toString() + "\""; ! String call = riCmd + getArgString(); try { ! log(call); ! final Process p = Runtime.getRuntime().exec(call); ! handleOutput(p, call); ! } catch (IOException e) { RubyPlugin.log(e); log(e.getMessage()); ! ErrorDialog.openError(RubyPlugin.getActiveWorkbenchShell(), "Error running Rdoc", e.getMessage(), new StatusInfo(StatusInfo.ERROR, e.getMessage())); } } --- 102,120 ---- // If we can't find it ourselves then display an error to the user if (!file.exists() || !file.isFile()) { ! MessageDialog.openError(RubyPlugin.getActiveWorkbenchShell(), RubyUIMessages.getString("RDocPathErrorTitle"), RubyUIMessages.getString("RDocPathError")) ; return; } ! List args = new ArrayList(); ! args.add(rdocPath.toString()); ! args.add("-r"); ! args.add(resource.getLocation().toOSString()); try { ! final Process p = interpreter.exec(args, null); ! handleOutput(p, args); ! } catch (CoreException e) { RubyPlugin.log(e); log(e.getMessage()); ! ErrorDialog.openError(RubyPlugin.getActiveWorkbenchShell(), RubyUIMessages.getString("ErrorRunningRdocTitle"), e.getMessage(), new StatusInfo(StatusInfo.ERROR, e.getMessage())); } } *************** *** 127,133 **** * The Process. */ ! private void handleOutput(Process p, String cmdLine) { BufferedReader reader = null; ! String lastLine = null ; try { reader = new BufferedReader(new InputStreamReader(p.getErrorStream())); --- 128,134 ---- * The Process. */ ! private void handleOutput(Process p, List cmdLine) { BufferedReader reader = null; ! String lastLine = null; try { reader = new BufferedReader(new InputStreamReader(p.getErrorStream())); *************** *** 135,139 **** while ((line = reader.readLine()) != null) { log(line); ! lastLine = line ; } } catch (Exception e) { --- 136,140 ---- while ((line = reader.readLine()) != null) { log(line); ! lastLine = line; } } catch (Exception e) { *************** *** 143,158 **** p.waitFor(); if (p.exitValue() != 0) { ! String message = "Ruby running rdoc exited abnormally. A possble reason is a wrong Rdoc path. Please check the path for rdoc in the preference page."; ! String additionalMessage = null ; if (lastLine != null) { ! additionalMessage = "The process was started with: "+ cmdLine + ". The last line of stderr of the ruby process: " + lastLine ; ! } ! else { ! additionalMessage = "The process was started with: "+ cmdLine + ". The process did not write any messages to stderr." ; } ! ErrorDialog.openError( RubyPlugin.getActiveWorkbenchShell(), "Ruby process exited with value " + p.exitValue(), message, new StatusInfo(StatusInfo.ERROR, additionalMessage)); } } catch (InterruptedException e) { ! log("InterruptedException while waiting for rdoc process to finish." + e.getMessage()) ; } log("Done generating RDoc"); --- 144,159 ---- p.waitFor(); if (p.exitValue() != 0) { ! String message = RubyUIMessages.getFormattedString("RDocExecutionError", Integer.toString(p.exitValue())) ; ! String additionalMessage = null; if (lastLine != null) { ! additionalMessage = RubyUIMessages.getFormattedString("RDocExecutionErrorAdditionalMessageWithStderr", new String[] { cmdLine.toString(), lastLine }); ! } else { ! additionalMessage = RubyUIMessages.getFormattedString("RDocExecutionErrorAdditionalMessage", cmdLine.toString()); } ! String title = RubyUIMessages.getFormattedString("RDocExecutionErrorTitle", Integer.toString(p.exitValue())) ; ! ErrorDialog.openError(RubyPlugin.getActiveWorkbenchShell(), title, message, new StatusInfo(StatusInfo.ERROR, additionalMessage)); } } catch (InterruptedException e) { ! log("InterruptedException while waiting for rdoc process to finish." + e.getMessage()); } log("Done generating RDoc"); *************** *** 162,166 **** /** * Notify registered listeners that the rdoc has changed ! * */ public static void notifyListeners() { --- 163,167 ---- /** * Notify registered listeners that the rdoc has changed ! * */ public static void notifyListeners() { |
|
From: Markus B. <mba...@us...> - 2005-09-25 09:36:59
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt-feature In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6239 Modified Files: feature.xml Log Message: changed formatting Index: feature.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt-feature/feature.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** feature.xml 19 Sep 2005 14:09:40 -0000 1.30 --- feature.xml 25 Sep 2005 09:36:50 -0000 1.31 *************** *** 12,25 **** <license> The Ruby Development Tools (RDT) plugin for eclipse is subject ! to the Common Public License (CPL) v 1.0. All files of the RDT ! are copyright of RubyPeople. RubyPeople is not a legal entity, ! but consists of the following people who have contributed to ! the RDT. Currently these are (in alphabetical order): Markus Barchfeld, David Corbin, Zach Dennis, Adam Williams and Chris Williams. See www.rubypeople.org for more information. ! The RDT feature contains the RegExp plug-in from http://e-p-i-c.sourceforge.net ! and JRuby from http://jruby.sourceforge.net. ! Furthermore RDT is bundled with the kxml2 pull parser, which is under ! CPL as well. The file org.rubypeople.rdt.launching/ruby/eclipseDebug.rb is based on the debug.rb file, which is part of the ruby 1.6.8 release. Because of the nature of developing this plugin, many --- 12,32 ---- <license> The Ruby Development Tools (RDT) plugin for eclipse is subject ! to the Common Public License (CPL) v 1.0. All files of the RDT except ! for the external plug-ins and libraries named below are copyright of RubyPeople. ! RubyPeople is not a legal entity, but consists of the following people ! who have contributed to the RDT. Currently these are (in alphabetical order): ! Markus Barchfeld, David Corbin, Zach Dennis, Adam Williams and Chris Williams. See www.rubypeople.org for more information. ! ! The RDT feature contains the following plug-ins and libraries from external providers: ! ! RegExp plug-in, http://e-p-i-c.sourceforge.net ! ! JRuby, http://jruby.sourceforge.net ! ! kxml2, http://kxml.sourceforge.net ! ! The file org.rubypeople.rdt.launching/ruby/eclipseDebug.rb is based on the debug.rb file, which is part of the ruby 1.6.8 release. Because of the nature of developing this plugin, many |
|
From: David C. <dc...@us...> - 2005-09-24 20:19:54
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28314/src/org/rubypeople/rdt/internal/launching/tests Modified Files: TS_Launching.java Added Files: TC_ArgumentSplitter.java Log Message: Fixed splitting of arguments to allow quotes. Index: TS_Launching.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/tests/TS_Launching.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TS_Launching.java 14 Nov 2002 23:02:14 -0000 1.3 --- TS_Launching.java 24 Sep 2005 20:19:44 -0000 1.4 *************** *** 12,15 **** --- 12,16 ---- suite.addTestSuite(TC_RubyRuntime.class); suite.addTestSuite(TC_RunnerLaunching.class) ; + suite.addTestSuite(TC_ArgumentSplitter.class) ; return suite; } --- NEW FILE: TC_ArgumentSplitter.java --- package org.rubypeople.rdt.internal.launching.tests; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import junit.framework.TestCase; import org.rubypeople.rdt.internal.launching.ArgumentSplitter; public class TC_ArgumentSplitter extends TestCase { public void testNoArgs() { verifySplit(new String[]{}, ""); verifySplit(new String[]{}, " "); verifySplit(new String[]{}, " "); } public void testSimpleSplit() { verifySplit(new String[]{"foo"}, "foo"); verifySplit(new String[]{"foo"}, " foo "); verifySplit(new String[]{"foo", "bar"}, "foo bar"); verifySplit(new String[]{"foo", "bar"}, " foo bar "); } public void testSimpleQuotes() { verifySplit(new String[]{"foo"}, "'foo'"); verifySplit(new String[]{"foo bar"}, "'foo bar'"); verifySplit(new String[]{"foo bar","red blue"}, "'foo bar' 'red blue'"); verifySplit(new String[]{"foo"}, "\"foo\""); } public void testEmptyQuotes() { verifySplit(new String[]{""}, "''"); verifySplit(new String[]{"F", "", "B", "X"}, "F '' B \"X"); verifySplit(new String[]{"F", "", "B"}, "F '' B \""); } public void testMixedQuotes() { verifySplit(new String[]{"f\"oo"}, "'f\"oo'"); verifySplit(new String[]{"f'oo"}, "\"f'oo\""); } private void verifySplit(String[] expected, String input) { List args = ArgumentSplitter.split(input); assertEquals("For input: "+input, new ArrayList(Arrays.asList(expected)), args); } } |
|
From: David C. <dc...@us...> - 2005-09-24 20:19:54
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28302/src/org/rubypeople/rdt/internal/launching Modified Files: RubyInterpreter.java Added Files: ArgumentSplitter.java Log Message: Fixed splitting of arguments to allow quotes. --- NEW FILE: ArgumentSplitter.java --- package org.rubypeople.rdt.internal.launching; import java.util.ArrayList; import java.util.List; public class ArgumentSplitter { private List args; private StringBuffer currentArg; private boolean inQuotedArg; private char expectedCloseQuote; public static List split(String input) { return new ArgumentSplitter().internalSplit(input); } private ArgumentSplitter() {} private List internalSplit(String input) { currentArg = new StringBuffer(); args = new ArrayList(); for (int i=0; i< input.length(); i++) { char c = input.charAt(i); if (isEnddingQuote(c)) { recordArg(true); continue; } if (isStartingQuote(c)) { startQuotedArgument(c); continue; } if (isArgumentSeparator(c)) { recordArg(false); continue; } currentArg.append(c); } recordArg(false); return args; } private void startQuotedArgument(char c) { inQuotedArg = true; expectedCloseQuote = c; } private boolean isArgumentSeparator(char c) { return c == ' ' && !inQuotedArg; } private boolean isStartingQuote(char c) { return isQuote(c) && !inQuotedArg; } private boolean isEnddingQuote(char c) { return isQuote(c) && inQuotedArg && c == expectedCloseQuote; } private boolean isQuote(char c) { return c == '\'' || c == '\"'; } private void recordArg(boolean allowEmptyArg) { String arg = currentArg.toString(); if (allowEmptyArg || arg.length() > 0) args.add(arg); currentArg = new StringBuffer(); inQuotedArg = false; } } Index: RubyInterpreter.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** RubyInterpreter.java 24 Sep 2005 12:44:02 -0000 1.11 --- RubyInterpreter.java 24 Sep 2005 20:19:41 -0000 1.12 *************** *** 5,9 **** import java.text.MessageFormat; import java.util.ArrayList; - import java.util.Arrays; import java.util.List; --- 5,8 ---- *************** *** 49,54 **** public Process exec(String arguments, File workingDirectory) throws CoreException { ! List argList = Arrays.asList(arguments.trim().split("\\s+")); ! return exec(argList, workingDirectory); } --- 48,52 ---- public Process exec(String arguments, File workingDirectory) throws CoreException { ! return exec(ArgumentSplitter.split(arguments), workingDirectory); } |
|
From: Markus B. <mba...@us...> - 2005-09-24 15:12:07
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30503/bootstrap Modified Files: Tag: build_0_6_0 build.properties Log Message: build 0_6_0 from build.properties branch Index: build.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap/build.properties,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** build.properties 24 Sep 2005 15:00:19 -0000 1.10 --- build.properties 24 Sep 2005 15:11:59 -0000 1.10.2.1 *************** *** 22,26 **** # The CVS tag to use when fetching the map files from the repository ! mapVersionTag=HEAD # The CVS tag to use when fetching elements to build. By default the --- 22,26 ---- # The CVS tag to use when fetching the map files from the repository ! mapVersionTag=R2005-09-18_MB_0-6-0 # The CVS tag to use when fetching elements to build. By default the *************** *** 28,32 **** # for example, when doing a nightly build out of HEAD ! fetchTag=HEAD ############## BUILD / GENERATION CONTROL ################ # The directory into which the build elements will be fetched and where --- 28,32 ---- # for example, when doing a nightly build out of HEAD ! fetchTag=R2005-09-18_MB_0-6-0 ############## BUILD / GENERATION CONTROL ################ # The directory into which the build elements will be fetched and where *************** *** 40,44 **** # one of I, N, M, S, ... # If you change this, please also see the featureVersion and baseFeatureVersion properties below ! buildType=N # ID of the build. Used in naming the build output. (the zip file) --- 40,44 ---- # one of I, N, M, S, ... # If you change this, please also see the featureVersion and baseFeatureVersion properties below ! buildType=S # ID of the build. Used in naming the build output. (the zip file) *************** *** 113,117 **** # The baseFeatureVersion must be set, because it is used to replace the version in the # feature.xml files of the rdt feature.xml and the test feature.xml with the created featureVersion ! baseFeatureVersion=0.6.0 # B) Every other Build type --- 113,117 ---- # The baseFeatureVersion must be set, because it is used to replace the version in the # feature.xml files of the rdt feature.xml and the test feature.xml with the created featureVersion ! #baseFeatureVersion=0.6.0 # B) Every other Build type *************** *** 119,126 **** # and for calling the appropriate test suite in customTargets.xml # ! #featureVersion=0.6.0 # if the buildType is N a property featureVersion will be created in # customTargets.xml. The featureVersion consists of the nightlyBuildFeatureVersionPrefix # concatenated with a timestamp in the format yyyyMMddhhmm ! nightlyBuildFeatureVersionPrefix=0.6. \ No newline at end of file --- 119,126 ---- # and for calling the appropriate test suite in customTargets.xml # ! featureVersion=0.6.0 # if the buildType is N a property featureVersion will be created in # customTargets.xml. The featureVersion consists of the nightlyBuildFeatureVersionPrefix # concatenated with a timestamp in the format yyyyMMddhhmm ! #nightlyBuildFeatureVersionPrefix=0.6. \ No newline at end of file |
|
From: Markus B. <mba...@us...> - 2005-09-24 15:00:27
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28569/bootstrap Modified Files: build.properties Log Message: switch back to building nightly with HEAD Index: build.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap/build.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.properties 18 Sep 2005 21:20:22 -0000 1.9 --- build.properties 24 Sep 2005 15:00:19 -0000 1.10 *************** *** 28,32 **** # for example, when doing a nightly build out of HEAD ! fetchTag=R2005-09-18_MB_0-6-0 ############## BUILD / GENERATION CONTROL ################ # The directory into which the build elements will be fetched and where --- 28,32 ---- # for example, when doing a nightly build out of HEAD ! fetchTag=HEAD ############## BUILD / GENERATION CONTROL ################ # The directory into which the build elements will be fetched and where *************** *** 40,44 **** # one of I, N, M, S, ... # If you change this, please also see the featureVersion and baseFeatureVersion properties below ! buildType=S # ID of the build. Used in naming the build output. (the zip file) --- 40,44 ---- # one of I, N, M, S, ... # If you change this, please also see the featureVersion and baseFeatureVersion properties below ! buildType=N # ID of the build. Used in naming the build output. (the zip file) *************** *** 113,117 **** # The baseFeatureVersion must be set, because it is used to replace the version in the # feature.xml files of the rdt feature.xml and the test feature.xml with the created featureVersion ! #baseFeatureVersion=0.6.0 # B) Every other Build type --- 113,117 ---- # The baseFeatureVersion must be set, because it is used to replace the version in the # feature.xml files of the rdt feature.xml and the test feature.xml with the created featureVersion ! baseFeatureVersion=0.6.0 # B) Every other Build type *************** *** 119,126 **** # and for calling the appropriate test suite in customTargets.xml # ! featureVersion=0.6.0 # if the buildType is N a property featureVersion will be created in # customTargets.xml. The featureVersion consists of the nightlyBuildFeatureVersionPrefix # concatenated with a timestamp in the format yyyyMMddhhmm ! #nightlyBuildFeatureVersionPrefix=0.6. \ No newline at end of file --- 119,126 ---- # and for calling the appropriate test suite in customTargets.xml # ! #featureVersion=0.6.0 # if the buildType is N a property featureVersion will be created in # customTargets.xml. The featureVersion consists of the nightlyBuildFeatureVersionPrefix # concatenated with a timestamp in the format yyyyMMddhhmm ! nightlyBuildFeatureVersionPrefix=0.6. \ No newline at end of file |
|
From: David C. <dc...@us...> - 2005-09-24 12:44:10
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3554/src/org/rubypeople/rdt/internal/launching Modified Files: RubyInterpreter.java Log Message: Fix problem in "arg parsing". Index: RubyInterpreter.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RubyInterpreter.java 22 Sep 2005 00:49:57 -0000 1.10 --- RubyInterpreter.java 24 Sep 2005 12:44:02 -0000 1.11 *************** *** 48,57 **** } - //public Process exec(String arguments, File workingDirectory) throws IOException, IllegalCommandException { - // return Runtime.getRuntime().exec(this.getCommand() + " " + arguments, null, workingDirectory); - //} - public Process exec(String arguments, File workingDirectory) throws CoreException { ! List argList = Arrays.asList(arguments.split("\\s+")); return exec(argList, workingDirectory); } --- 48,53 ---- } public Process exec(String arguments, File workingDirectory) throws CoreException { ! List argList = Arrays.asList(arguments.trim().split("\\s+")); return exec(argList, workingDirectory); } |
|
From: Markus B. <mba...@us...> - 2005-09-22 21:40:23
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9233/bootstrap Modified Files: customTargets.xml Log Message: replace original version with nightly build version also in MANIFEST.MF Index: customTargets.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap/customTargets.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** customTargets.xml 19 Sep 2005 22:55:44 -0000 1.11 --- customTargets.xml 22 Sep 2005 21:40:10 -0000 1.12 *************** *** 103,106 **** --- 103,110 ---- <replacefilter token="${baseFeatureVersion}" value="${featureVersion}" /> </replace> + <replace dir="${buildDirectory}/plugins"> + <include name="org.rubypeople.*/META-INF/MANIFEST.MF"/> + <replacefilter token="Bundle-Version: ${baseFeatureVersion}" value="Bundle-Version: ${featureVersion}" /> + </replace> </target> <!-- ===================================================================== --> |
|
From: David C. <dc...@us...> - 2005-09-22 00:50:11
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4195/src/org/rubypeople/rdt/internal/ui/infoviews Modified Files: RIView.java Log Message: Changed exec to use alternate exec call. Index: RIView.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RIView.java 21 Sep 2005 21:06:32 -0000 1.9 --- RIView.java 22 Sep 2005 00:50:02 -0000 1.10 *************** *** 239,244 **** } } ! protected String getArgString() { ! return "--no-pager -l "; } }; --- 239,248 ---- } } ! ! protected List getArgList() { ! List args = new ArrayList(); ! args.add("--no-pager"); ! args.add("-l"); ! return args; } }; *************** *** 289,294 **** private RubyInvoker invoker = new RubyInvoker() { ! protected String getArgString() { ! return "--no-pager -f html " + searchValue; } --- 293,303 ---- private RubyInvoker invoker = new RubyInvoker() { ! protected List getArgList() { ! ArrayList args = new ArrayList(); ! args.add("--no-pager"); ! args.add("-f"); ! args.add("html"); ! args.add(searchValue); ! return args; } *************** *** 337,341 **** private abstract class RubyInvoker { ! protected abstract String getArgString(); protected abstract void handleOutput(Process process); protected void beforeInvoke(){} --- 346,350 ---- private abstract class RubyInvoker { ! protected abstract List getArgList(); protected abstract void handleOutput(Process process); protected void beforeInvoke(){} *************** *** 360,364 **** try { ! final Process p = RubyRuntime.getDefault().getSelectedInterpreter().exec("\"" + riPath.toString() + "\" " + getArgString(), null); handleOutput(p); } catch (CoreException coreException) { --- 369,375 ---- try { ! List args = getArgList(); ! args.add(0, riPath.toString()); ! final Process p = RubyRuntime.getDefault().getSelectedInterpreter().exec(args, null); handleOutput(p); } catch (CoreException coreException) { |
|
From: David C. <dc...@us...> - 2005-09-22 00:50:07
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4177/src/org/rubypeople/rdt/internal/launching Modified Files: RubyInterpreter.java Log Message: Changed exec to use alternate exec call. Index: RubyInterpreter.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RubyInterpreter.java 21 Sep 2005 21:00:17 -0000 1.9 --- RubyInterpreter.java 22 Sep 2005 00:49:57 -0000 1.10 *************** *** 4,7 **** --- 4,10 ---- import java.io.IOException; import java.text.MessageFormat; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.List; import org.eclipse.core.runtime.CoreException; *************** *** 48,60 **** // return Runtime.getRuntime().exec(this.getCommand() + " " + arguments, null, workingDirectory); //} ! public Process exec(String commandLine, File workingDirectory) throws CoreException { try { ! RdtLaunchingPlugin.debug("Launching: " + commandLine) ; RdtLaunchingPlugin.debug("Working Dir: " + workingDirectory) ; ! return Runtime.getRuntime().exec(this.getCommand() + " " + commandLine, null, workingDirectory); } catch (IOException e) { ! throw new RuntimeException("Unable to execute interpreter: " + commandLine + workingDirectory); } catch (IllegalCommandException ex) { --- 51,72 ---- // return Runtime.getRuntime().exec(this.getCommand() + " " + arguments, null, workingDirectory); //} + + public Process exec(String arguments, File workingDirectory) throws CoreException { + List argList = Arrays.asList(arguments.split("\\s+")); + return exec(argList, workingDirectory); + } + ! public Process exec(List args, File workingDirectory) throws CoreException { try { ! RdtLaunchingPlugin.debug("Launching: " + args) ; RdtLaunchingPlugin.debug("Working Dir: " + workingDirectory) ; ! List rubyCmd = new ArrayList(); ! rubyCmd.add(this.getCommand()); ! rubyCmd.addAll(args); ! return Runtime.getRuntime().exec((String[]) rubyCmd.toArray(new String[0]), null, workingDirectory); } catch (IOException e) { ! throw new RuntimeException("Unable to execute interpreter: " + args + workingDirectory); } catch (IllegalCommandException ex) { |
|
From: Christopher W. <caw...@us...> - 2005-09-21 22:14:41
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5655/src/org/rubypeople/rdt/internal/debug/ui/preferences Modified Files: RubyInterpreterPreferencePage.java Log Message: If a user adds a new interpreter and has none already selected, automatically select the newly added interpreter Index: RubyInterpreterPreferencePage.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RubyInterpreterPreferencePage.java 20 Mar 2004 15:38:56 -0000 1.8 --- RubyInterpreterPreferencePage.java 21 Sep 2005 22:14:31 -0000 1.9 *************** *** 151,156 **** editor.create(); editor.setInterpreterToEdit(newInterpreter); ! if (EditInterpreterDialog.OK == editor.open()) tableViewer.add(newInterpreter); } --- 151,161 ---- editor.create(); editor.setInterpreterToEdit(newInterpreter); ! if (EditInterpreterDialog.OK == editor.open()) { tableViewer.add(newInterpreter); + Object[] checked = tableViewer.getCheckedElements(); + if(checked == null || checked.length == 0) { + tableViewer.setChecked(newInterpreter, true); + } + } } |
