diff --git a/eclim-debug.el b/eclim-debug.el index 80d152c..a66549d 100644 --- a/eclim-debug.el +++ b/eclim-debug.el @@ -60,11 +60,11 @@ (s-join ":" (-mapcat 'eclim--debug-project-sourcepath projects)))) (defun eclim--debug-project-dir (project) - (cdr (assoc 'path (eclim/project-info project)))) + (file-name-as-directory (cdr (assoc 'path (eclim/project-info project))))) (defun eclim--debug-project-sourcepath (project) (eclim--debug-read-sourcepath - (concat (file-name-as-directory (eclim--debug-project-dir project)) + (concat (eclim--debug-project-dir project) ".classpath"))) (defun eclim--debug-read-sourcepath (classpath-file) diff --git a/eclim-java-run.el b/eclim-java-run.el new file mode 100644 index 0000000..4029ea4 --- /dev/null +++ b/eclim-java-run.el @@ -0,0 +1,101 @@ +;; eclim-java-run.el --- an interface to the Eclipse IDE. -*- lexical-binding: t; -*- +;; +;; Copyright (C) 2015 Łukasz Klich +;; +;; Author: Lukasz Klich +;; +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY 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 this program. If not, see . +;; +;;; Contributors +;; +;;; Conventions +;; +;; Conventions used in this file: Name internal variables and functions +;; "eclim--", and name external program invocations +;; "eclim/command-name", like eclim/project-list. +;;; Description +;; +;; eclim-java-run.el -- java run configurations for eclim +;; + +(require 'eclim) +(require 'eclim-project) +(require 'eclim-java) +(require 'eclim-debug) + +(define-key eclim-mode-map (kbd "C-c C-e u r") 'eclim-java-run-run) + +(defun eclim-java-run--get-string-from-file (file-path) + (with-temp-buffer + (insert-file-contents file-path) + (buffer-string))) + +(defun eclim-java-run--load-configurations (project) + (let* ((configurations-path (concat (eclim--debug-project-dir project) ".eclim")) + (configurations (read (eclim-java-run--get-string-from-file configurations-path)))) + configurations)) + +(defun eclim-java-run--get-value (key alist) + (cdr (assoc key alist))) + +(defun eclim-java-run--jdb? (config) + (and (eclim-java-run--get-value 'debug config) + (not (eclim-java-run--get-value 'debug-port config)))) + +(defun eclim-java-run--java-vm-args (classpath) + (lambda (config) + (concat "-classpath" (when (not (eclim-java-run--jdb? config)) " ") + classpath " " + (eclim-java-run--get-value 'vm-args config)))) + +(defun eclim-java-run--command (config vm-args-fn) + (s-join " " (-flatten + (list + (if (eclim-java-run--jdb? config) "jdb" "java") + (funcall vm-args-fn config) + (eclim-java-run--get-value 'main-class config) + (eclim-java-run--get-value 'program-args config))))) + +(defun eclim-java-run--run (config classpath project-dir) + (let* ((name (eclim-java-run--get-value 'name config)) + (command (eclim-java-run--command config (eclim-java-run--java-vm-args classpath))) + (new-buffer-name (concat "*" name "*"))) + (when (buffer-live-p (get-buffer new-buffer-name)) (kill-buffer new-buffer-name)) + (with-temp-buffer + (setq default-directory project-dir) + (switch-to-buffer (process-buffer + (start-process-shell-command name new-buffer-name command)))))) + +(defun eclim-java-run--configuration (name confs) + (car + (--filter (string-equal (cdr (assoc 'name it)) name) confs))) + +(defun eclim-java-run--ask-which-configuration () + (completing-read "Which configuration do you want to run?" + (--map (cdr (assoc 'name it)) + (eclim-java-run--load-configurations eclim-project-name)) + nil t)) + +(defun eclim-java-run-run (configuration-name) + (interactive (list (eclim-java-run--ask-which-configuration))) + (let* ((configurations (eclim-java-run--load-configurations eclim-project-name)) + (configuration (eclim-java-run--configuration configuration-name configurations)) + (project-dir (eclim--debug-project-dir eclim-project-name)) + (classpath (eclim/java-classpath eclim-project-name))) + (eclim-java-run--run configuration + classpath + project-dir))) + +(provide 'eclim-java-run) +;;; eclim-java-run.el ends here diff --git a/eclim.el b/eclim.el index 69506ad..ffc23c8 100644 --- a/eclim.el +++ b/eclim.el @@ -542,6 +542,7 @@ the use of eclim to java and ant files." (require 'eclim-maven) (require 'eclim-problems) (require 'eclim-debug) +(require 'eclim-java-run) (defun eclim-modeline-string () (when eclim-mode diff --git a/tests/run-tests.el b/tests/run-tests.el new file mode 100644 index 0000000..48d6bba --- /dev/null +++ b/tests/run-tests.el @@ -0,0 +1,39 @@ + +(require 'eclim-java-run) + +(ert-deftest command-for-java-configuration () + (let* ((conf '((name . "Test run") + (main-class . "com.acme.Project") + (program-args . "arg1 arg2") + (vm-args . "-Dvm-arg1=42"))) + (run-command (eclim-java-run--command conf + (eclim-java-run--java-vm-args "/opt/lib.jar")))) + (should (string-equal run-command + "java -classpath /opt/lib.jar -Dvm-arg1=42 com.acme.Project arg1 arg2")))) + +(ert-deftest command-for-debug-configuration () + (let* ((conf '((name . "Debug test run") + (main-class . "com.acme.Project") + (program-args . "arg1 arg2") + (vm-args . "-Dvm-arg1=42") + (debug . t))) + (run-command (eclim-java-run--command conf + (eclim-java-run--java-vm-args "/opt/lib.jar")))) + (should (string-equal run-command + "jdb -classpath/opt/lib.jar -Dvm-arg1=42 com.acme.Project arg1 arg2")))) + +(ert-deftest choose-configuration () + (let* ((conf1 '((name . "Debug"))) + (conf2 '((name . "Run"))) + (choosen-conf (eclim-java-run--configuration "Run" (list conf1 conf2)))) + (should (equal choosen-conf conf2)))) + +(ert-deftest run-java-opens-buffer-in-correct-dir-with-correct-name () + (let* ((conf '((name . "Run") + (main-class . "com.acme.Project") + (program-args . "arg1") + (vm-args . "-Dvm-args1=42"))) + (buffer (eclim-java-run--run conf "/opt/lib.jar" "/tmp/"))) + (with-current-buffer buffer + (should (string-equal default-directory "/tmp/")) + (should (string-equal (buffer-name) "*Run*")))))