This is an automated email from the git hooks/post-receive script. pini pushed a commit to tag upstream/1.1.0_beta1 in repository sikuli.
commit 3693ef23d2f80ae4bba8321e5d642b4dc458f56c Author: Raimund Hocke <[email protected]> Date: Sat Feb 8 14:53:23 2014 +0100 JRubyScriptRunner: implemented runnability from command line (xxx.sikuli containing xxx.rb) --- API/pom.xml | 5 +++++ .../src/main/java/org/sikuli/basics/FileManager.java | 2 +- IDE/src/main/java/org/sikuli/ide/SikuliIDE.java | 1 + .../org/sikuli/scriptrunner/JRubyScriptRunner.java | 20 +++++++++++++------- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/API/pom.xml b/API/pom.xml index 2bdbef9..9041505 100755 --- a/API/pom.xml +++ b/API/pom.xml @@ -30,6 +30,11 @@ </dependency> <dependency> <groupId>org.sikuli</groupId> + <artifactId>SikuliX-JRuby</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.sikuli</groupId> <artifactId>SikuliX-Basics</artifactId> <version>${project.version}</version> </dependency> diff --git a/Basics/src/main/java/org/sikuli/basics/FileManager.java b/Basics/src/main/java/org/sikuli/basics/FileManager.java index 685fde6..ccaa796 100644 --- a/Basics/src/main/java/org/sikuli/basics/FileManager.java +++ b/Basics/src/main/java/org/sikuli/basics/FileManager.java @@ -672,7 +672,7 @@ public class FileManager { } } //TODO should be possible,to have more than one script type in one .sikuli - String[] supported = new String[] {"py"}; + String[] supported = new String[] {"py", "rb"}; String runType = "py"; for (File f : content) { for (String suffix : supported) { diff --git a/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java b/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java index bfe23e7..4c881bb 100755 --- a/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java +++ b/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java @@ -1964,6 +1964,7 @@ public class SikuliIDE extends JFrame { protected void runPython(File f) throws Exception { File path = new File(SikuliIDE.getInstance().getCurrentBundlePath()); File parent = path.getParentFile(); + //TODO implement alternative script types IScriptRunner srunner = SikuliX.getScriptRunner("jython", null, Settings.getArgs()); if (srunner == null) { Debug.error("Could not load the Jython script runner"); diff --git a/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java b/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java index a76b8bf..46c50a1 100644 --- a/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java +++ b/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java @@ -24,13 +24,14 @@ public class JRubyScriptRunner implements IScriptRunner { @Override public void init(String[] args) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + //TODO classpath and other path handlings } @Override public int runScript(File scriptfile, File imagedirectory, String[] scriptArgs, String[] forIDE) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } + log(-1, "not supported yet"); + return 1; + } @Override public int runTest(File scriptfile, File imagedirectory, String[] scriptArgs, String[] forIDE) { @@ -59,18 +60,23 @@ public class JRubyScriptRunner implements IScriptRunner { @Override public String[] getFileEndings() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return new String[]{"rb"}; } @Override public String hasFileEnding(String ending) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + for (String suf : getFileEndings()) { + if (suf.equals(ending.toLowerCase())) { + return suf; + } + } + return null; } @Override public void close() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } + //TODO something todo? + } @Override public boolean doSomethingSpecial(String action, Object[] args) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
