sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[CHANGED] new version 0.9.3 of mojo.el

Browse source
This commit is contained in:
Sami Samhuri 2009-11-21 22:26:26 -08:00
parent d30d7784d7
commit f3ad9b9ea9
1 changed files with 79 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
emacs.d/mojo.el
View file

@ -1,5 +1,6 @@
;;; mojo.el --- Interactive functions to aid the development of webOS apps ;;; mojo.el --- Interactive functions to aid the development of webOS apps
(defconst mojo-version "0.9.2") ;; 2009-11-21 22:24:51
(defconst mojo-version "0.9.3")
(require 'json) (require 'json)
@ -37,22 +38,25 @@ This package is in early beta. I am open to any contributions or
ideas. Send me a pull request on github if you hack on mojo.el.") ideas. Send me a pull request on github if you hack on mojo.el.")
;;; Installation: ;;; Installation:
;; Put json.el and mojo.el somewhere in your load-path. ;;
;; (Use M-x show-variable RET load-path to see what your load path is.) ;; 1. Put json.el and mojo.el somewhere in your load-path.
;; Add this to your Emacs init file. ;; (Use M-x show-variable RET load-path to see what your load path is.)
;(require 'mojo) ;;
;; ;; 2. Add this to your Emacs init file: (require 'mojo)
;; Make sure you customize the variables: ;;
;; `mojo-project-directory', `mojo-sdk-directory' and `mojo-build-directory' ;; 3. Make sure you customize the variables:
;; ;; mojo-project-directory, mojo-sdk-directory and mojo-build-directory
;; I recommend that you define a few keyboard shortcuts in your .emacs file. ;; (Use M-x customize-group RET mojo RET)
;; Maybe something like this: ;;
;; ;; (optional)
;; (global-set-key [f2] 'mojo-generate-scene) ;;
;; (global-set-key [f3] 'mojo-emulate) ;; 4. I recommend that you define a few keyboard shortcuts in your Emacs init
;; (global-set-key [f4] 'mojo-package) ;; file. Maybe something like this:
;; (global-set-key [f5] 'mojo-package-install-and-inspect) ;;
;; ;; (global-set-key [f2] mojo-generate-scene)
;; (global-set-key [f3] mojo-emulate)
;; (global-set-key [f4] mojo-package)
;; (global-set-key [f5] mojo-package-install-and-inspect)
;; ;;
;;; Commands: ;;; Commands:
@ -86,14 +90,21 @@ ideas. Send me a pull request on github if you hack on mojo.el.")
;; Package, install, and launch the current app. ;; Package, install, and launch the current app.
;; `mojo-package-install-and-inspect' ;; `mojo-package-install-and-inspect'
;; Package, install, and launch the current app for inspection. ;; Package, install, and launch the current app for inspection.
;; ;; `mojo-target-device'
;; Set the target to a USB device.
;; `mojo-target-emulator'
;; Set the target to the emulator.
;;; Customizable Options: ;;; Customizable Options:
;; ;;
;; Below are customizable option list: ;; Below are customizable option list:
;; ;;
;; `mojo-sdk-directory' ;; `mojo-sdk-directory'
;; Path to where the mojo SDK is. ;; Path to where the mojo SDK is.
;; default = (case system-type ((windows-nt) "c:/progra~1/palm/sdk") (t "")) ;; default = (case system-type
;; ((windows-nt) "c:/progra~1/palm/sdk")
;; ((darwin) "/opt/PalmSDK/Current")
;; (t ""))
;; `mojo-project-directory' ;; `mojo-project-directory'
;; Directory where all your Mojo projects are located. ;; Directory where all your Mojo projects are located.
;; default = "" ;; default = ""
@ -103,40 +114,46 @@ ideas. Send me a pull request on github if you hack on mojo.el.")
;; Run Mojo in debug mode. Assumed true while in such an early version. ;; Run Mojo in debug mode. Assumed true while in such an early version.
;; default = t ;; default = t
;;; TODO: ;; CHANGELOG
;; =========
;; ;;
;; sjs 2009-11-21
;;; CHANGELOG: ;; v 0.9.3 (one more bug fix for today)
;; ;;
;; - Don't pass -d switch to commands that don't accept it.
;;
;; sjs 2009-11-21
;; v 0.9.2 (bug fixes) ;; v 0.9.2 (bug fixes)
;; ;;
;; - reading json files no longer messes up your buffer history. ;; - reading json files no longer messes up your buffer history.
;; ;;
;; - app list completion works now (caching bug) ;; - app list completion works now (caching bug)
;; ;;
;; sjs 2009-11-21
;; v 0.9.1 ;; v 0.9.1
;; ;;
;; - Added mojo-package-install-and-launch. ;; - Added mojo-package-install-and-launch.
;; ;;
;; - New variable for specifying whether commands target the ;; - New variable for specifying whether commands target the
;; device or emulator, *mojo-target*. Set it to 'usb' for a ;; device or emulator, *mojo-target*. Set it to 'usb' for a
;; real device and 'tcp' for the emulator. Defaults to 'tcp'. ;; real device and 'tcp' for the emulator. Defaults to 'tcp'.
;; To set the default target you can use the convenience ;; To set the default target you can use the convenience
;; functions mojo-target-device and mojo-target-emulator. ;; functions mojo-target-device and mojo-target-emulator.
;;
;; sjs 2009-11-20
;; v 0.9 ;; v 0.9
;; ;;
;; - Automatically find Mojo project root by searching upwards ;; - Automatically find Mojo project root by searching upwards
;; for appinfo.json. ;; for appinfo.json.
;; ;;
;; - Added command for generating new scenes, ;; - Added command for generating new scenes,
;; mojo-generate-scene. ;; mojo-generate-scene.
;; ;;
;; - mojo-package now operates only on the current project. ;; - mojo-package now operates only on the current project.
;; ;;
;; - Parse appinfo.json to get version, used for installing & ;; - Parse appinfo.json to get version, used for installing &
;; launching with less interaction. ;; launching with less interaction.
;; ;;
;; - mojo-install, mojo-launch, mojo-inspect, and mojo-delete ;; - mojo-install, mojo-launch, mojo-inspect, and mojo-delete
;; still read in arguments but have the current project/app as ;; still read in arguments but have the current project/app as
;; the default values. ;; the default values.
@ -144,18 +161,20 @@ ideas. Send me a pull request on github if you hack on mojo.el.")
;; - New convenience method: mojo-package-install-and-inspect ;; - New convenience method: mojo-package-install-and-inspect
;; This function only operates on the active app and does not ;; This function only operates on the active app and does not
;; read in any input. ;; read in any input.
;; ;;
;; - Remembered filenames and app ids are cleared when the Mojo ;; - Remembered filenames and app ids are cleared when the Mojo
;; project root changes. (DWIM) ;; project root changes. (DWIM)
;; ;;
;; - Parse output of `palm-install --list` for app id ;; - Parse output of `palm-install --list` for app id
;; completion. App id completion was ported from cheat.el. ;; completion. App id completion was ported from cheat.el.
;;
;; v 0.2 - Fixed some minor bugs ;; v 0.2 - Fixed some minor bugs
;; v 0.1 - Initial release ;; v 0.1 - Initial release
;;; Code: ;;; Code:
(defcustom mojo-sdk-directory (defcustom mojo-sdk-directory
(case system-type (case system-type
((windows-nt) "c:/progra~1/palm/sdk") ((windows-nt) "c:/progra~1/palm/sdk")
@ -230,39 +249,39 @@ NAME is the name of the scene."
(defun mojo-install () (defun mojo-install ()
"Install the package named by `MOJO-PACKAGE-FILENAME'. The emulator needs to be running." "Install the package named by `MOJO-PACKAGE-FILENAME'. The emulator needs to be running."
(interactive) (interactive)
(mojo-cmd "palm-install" (list (expand-file-name (mojo-read-package-filename)))) (mojo-cmd-with-target "palm-install" (list (expand-file-name (mojo-read-package-filename))))
(mojo-invalidate-app-cache)) (mojo-invalidate-app-cache))
;;* interactive ;;* interactive
(defun mojo-list () (defun mojo-list ()
"List all installed packages." "List all installed packages."
(interactive) (interactive)
(mojo-cmd "palm-install" (list "--list"))) (mojo-cmd-with-target "palm-install" (list "--list")))
;;* interactive ;;* interactive
(defun mojo-delete () (defun mojo-delete ()
"Remove the current application using `MOJO-APP-ID'." "Remove the current application using `MOJO-APP-ID'."
(interactive) (interactive)
(mojo-cmd "palm-install" (list "-r" (mojo-read-app-id))) (mojo-cmd-with-target "palm-install" (list "-r" (mojo-read-app-id)))
(mojo-invalidate-app-cache)) (mojo-invalidate-app-cache))
;;* interactive ;;* interactive
(defun mojo-launch () (defun mojo-launch ()
"Launch the current application in an emulator." "Launch the current application in an emulator."
(interactive) (interactive)
(mojo-cmd "palm-launch" (list (mojo-read-app-id)))) (mojo-cmd-with-target "palm-launch" (list (mojo-read-app-id))))
;;* interactive ;;* interactive
(defun mojo-close () (defun mojo-close ()
"Close launched application." "Close launched application."
(interactive) (interactive)
(mojo-cmd "palm-launch" (list "-c" (mojo-read-app-id)))) (mojo-cmd-with-target "palm-launch" (list "-c" (mojo-read-app-id))))
;;* launch interactive ;;* launch interactive
(defun mojo-inspect () (defun mojo-inspect ()
"Run the DOM inspector on the current application." "Run the DOM inspector on the current application."
(interactive) (interactive)
(mojo-cmd "palm-launch" (list "-i" (mojo-read-app-id)))) (mojo-cmd-with-target "palm-launch" (list "-i" (mojo-read-app-id))))
;;* emulator interactive ;;* emulator interactive
(defun mojo-hard-reset () (defun mojo-hard-reset ()
@ -280,16 +299,16 @@ NAME is the name of the scene."
"Package, install, and launch the current application for inspection." "Package, install, and launch the current application for inspection."
(interactive) (interactive)
(mojo-package) (mojo-package)
(mojo-cmd "palm-install" (list (expand-file-name (mojo-package-filename)))) (mojo-cmd-with-target "palm-install" (list (expand-file-name (mojo-package-filename))))
(mojo-cmd "palm-launch" (list "-i" (mojo-app-id)))) (mojo-cmd-with-target "palm-launch" (list "-i" (mojo-app-id))))
;;* interactive ;;* interactive
(defun mojo-package-install-and-launch () (defun mojo-package-install-and-launch ()
"Package, install, and launch the current application." "Package, install, and launch the current application."
(interactive) (interactive)
(mojo-package) (mojo-package)
(mojo-cmd "palm-install" (list (expand-file-name (mojo-package-filename)))) (mojo-cmd-with-target "palm-install" (list (expand-file-name (mojo-package-filename))))
(mojo-cmd "palm-launch" (list (mojo-app-id)))) (mojo-cmd-with-target "palm-launch" (list (mojo-app-id))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -529,7 +548,7 @@ Sets `*mojo-target*' to \"tcp\"."
(t (concat mojo-sdk-directory "/bin/" cmd)))) (t (concat mojo-sdk-directory "/bin/" cmd))))
;;* lowlevel cmd ;;* lowlevel cmd
(defun mojo-cmd (cmd args &optional target) (defun mojo-cmd (cmd args)
"General interface for running mojo-sdk commands. "General interface for running mojo-sdk commands.
CMD is the name of the command (without path or extension) to execute. CMD is the name of the command (without path or extension) to execute.
@ -537,11 +556,21 @@ CMD is the name of the command (without path or extension) to execute.
ARGS is a list of all arguments to the command. ARGS is a list of all arguments to the command.
These arguments are NOT shell quoted." These arguments are NOT shell quoted."
(let ((cmd (mojo-path-to-cmd cmd)) (let ((cmd (mojo-path-to-cmd cmd))
(args (concat "-d " (or target *mojo-target*) " " (args (string-join " " args)))
(string-join " " args))))
(if mojo-debug (message "running %s with args %s " cmd args)) (if mojo-debug (message "running %s with args %s " cmd args))
(shell-command (concat cmd " " args)))) (shell-command (concat cmd " " args))))
;;* lowlevel cmd
(defun mojo-cmd-with-target (cmd args &optional target)
"General interface for running mojo-sdk commands that accept a target device.
CMD is the name of the command (without path or extension) to
execute. Automagically shell quoted. ARGS is a list of all
arguments to the command. These arguments are NOT shell quoted.
TARGET specifies the target device, \"tcp\" or \"usb\"."
(let ((args (cons "-d" (cons (or target *mojo-target*) args))))
(mojo-cmd cmd args)))
;;* lowlevel cmd ;;* lowlevel cmd
(defun mojo-cmd-to-string (cmd args &optional target) (defun mojo-cmd-to-string (cmd args &optional target)
"General interface for running mojo-sdk commands and capturing the output "General interface for running mojo-sdk commands and capturing the output
@ -559,4 +588,5 @@ ARGS is a list of all arguments to the command.
(provide 'mojo) (provide 'mojo)
;;; mojo ends here ;;; mojo ends here