@@ -1,2 +1,3 @@ *~ *.elc +ELPA .gitignore @@ -5,6 +5,24 @@ MYDIR = File.dirname(__FILE__) DOCDIR = "#{MYDIR}/doc" TESTDIR = "#{MYDIR}/test" +desc "extract and clean files for submission to ELPA" +task :elpa do + elpa_dir = File.join(MYDIR, "ELPA") + FileUtils.rm_rf(elpa_dir) if File.exists?(elpa_dir) + FileUtils.mkdir(elpa_dir) + ["rinari.el", + File.join("util", "ruby-mode.el"), + File.join("util", "inf-ruby.el"), + File.join("util", "ruby-compilation.el")].each do |file| + FileUtils.cp(file, elpa_dir) + file = File.join(elpa_dir, File.basename(file)) + contents = File.read(file) + File.open(file, 'w') do |f| + f.write(contents.gsub(/;;;\#\#\#begin-elpa-ignore[\s\S]+;;;\#\#\#end-elpa-ignore[\r\n]/m, '')) + end + end +end + namespace "test" do desc "Run tests using `emacs-snapshot'" Rakefile @@ -1,12 +1,12 @@ # -*- mode: org -*- -# #+TITLE: TODO #+SEQ_TODO: TODO WAITING | DONE CANCELLED MAYBE PARTIAL #+DRAWERS: SNIP #+CATEGORY: rinari -List of pending/completed tasks for rinari +List of tasks for rinari +for documentation see [[http://rinari.rubyforge.org/]] for background see http://groups.google.com/group/emacs-on-rails * TODO full test coverage (ERT) [0/2] @@ -25,30 +25,7 @@ for background see http://groups.google.com/group/emacs-on-rails switch from using elunit.el to ert.el for testing -* TODO create a screencast -promotion!! - -- [[http://www.emacswiki.org/cgi-bin/wiki/EmacsScreencasts]] - -** script -1) download rinari -2) install rinari (with changes to .init file) - 1) this should probably be on a fresh emacs install which has had - some of the required modes (yaml, javascript, etc...) put into - place - 2) should this example be made using the emacs starter kit? -3) - -** tools -- http://www.emacswiki.org/emacs/CommandLogMode -- probably want to produce this on the mac - -** where to post -probably would be best either on github, or on rubyforge. - -I don't think this is possible to do on rubyforge - -* TODO Merb support [1/4] +* TODO Merb support [2/4] :PROPERTIES: :suggested-by: Jorge Calás Lozano :END: @@ -59,7 +36,7 @@ I think it's better to rely on config/init.rb that file should be on every merb project, merb.thor doesn't, in fact my "library" project doesn't have it. -** TODO pull into rinari-merb +** DONE pull into rinari-merb rinari-merb (minami? why not just rinari-merb? what if someone create a rinari version for sinatra? sinasi?) @@ -87,7 +64,16 @@ In the current merb you don't don't have spec/controllers or spec/views (although you can, of course) but spec/requests is encourage. So app/controllers/assets.rb should map spec/requests/assets_spec.rb -* TODO add find-by context +* DONE submit to ELPA +get rinari (and all of it's dependencies) into [[http://tromey.com/elpa/][ELPA]] the Emacs Lisp +Package Archive + +* DONE create a screencast +promotion!! + +now up with the online documentation [[http://rinari.rubyforge.org/]] + +* DONE add find-by context :PROPERTIES: :suggested-by: vylu :END: @@ -108,7 +94,7 @@ Follow any of the following within two lines (up or down) - submit_tag - render -* TODO improvements to finders +* DONE improvements to finders :PROPERTIES: :suggested-by: vylu :END: @@ -175,7 +161,7 @@ Thanks for the suggestion -- Eric need to add =git submodule init; git submodule update= to clone the submodules as well -* PARTIAL windows support +* MAYBE windows support :PROPERTIES: :tested-by: Darren Syzling :END: @@ -223,18 +209,7 @@ comp-buffer-name) (let* ... ...)) comp-buffer-name) call-interactively(rinari-rake) #+END_EXAMPLE -* PARTIAL bundles -** DONE rhtml (from original rinari) -see -- [[http://rinari.rubyforge.org/rhtml_002dMode.html#rhtml_002dMode]] -- [[http://github.com/eschulte/rhtml/tree/master]] - -** rdebug -- [[http://bashdb.sourceforge.net/ruby-debug.html#SEC_Top]] -** DONE snippets -see http://github.com/eschulte/yasnippets-rails/tree/master - -* MAYBE inf-ruby enhancement +* MAYBE inf-ruby missing errors found an example of an error that the `inferior-ruby-error-regexp-alist' in inf-ruby.el doesn't match @@ -245,7 +220,7 @@ this was the error line SyntaxError: /home/eschulte/united/org/work/arf/arf/lib/cluster.rb:35: syntax error, unexpec :END: -* MAYBE ruby-compilation enhancement +* MAYBE ruby-compilation missing errors found a line which didn't match the error-regexp-alist @@ -544,6 +519,17 @@ easy enough LocalWords: elsif elseif keybinding + +* CANCELLED bundles +** DONE rhtml (from original rinari) +see +- [[http://rinari.rubyforge.org/rhtml_002dMode.html#rhtml_002dMode]] +- [[http://github.com/eschulte/rhtml/tree/master]] + +** rdebug +- [[http://bashdb.sourceforge.net/ruby-debug.html#SEC_Top]] +** DONE snippets +see http://github.com/eschulte/yasnippets-rails/tree/master * CANCELLED adjust eshell/shell environment to highlight ruby errors not sure this is possible, at least not easily TODO @@ -4,14 +4,11 @@ ;; Authors: Phil Hagelberg, Eric Schulte ;; URL: http://rinari.rubyforge.org -;; Version: 2.0 +;; Version: 2.1 ;; Created: 2006-11-10 ;; Keywords: ruby, rails, project, convenience, web ;; EmacsWiki: Rinari -;; Package-Requires: ((ruby-mode "1.0") -;; (inf-ruby "2.0") -;; (ruby-compilation "0.5") -;; (jump "2.0")) +;; Package-Requires: ((ruby-mode "1.1") (inf-ruby "2.1") (ruby-compilation "0.7") (jump "2.0")) ;; This file is NOT part of GNU Emacs. @@ -40,27 +37,32 @@ ;; aimed towards making Emacs into a top-notch Ruby and Rails ;; development environment. -;; Copy the directory containing this file into your Emacs lisp -;; directory, assumed here to be ~/.emacs.d. Add these lines of code -;; to your .emacs file: +;; Rinari can be installed through ELPA (see http://tromey.com/elpa/) + +;; To install from source, copy the directory containing this file +;; into your Emacs lisp directory, assumed here to be ~/.emacs.d. Add +;; these lines of code to your .emacs file: -;; ;; ido -;; (require 'ido) -;; (ido-mode t) ;; ;; rinari ;; (add-to-list 'load-path "~/.emacs.d/rinari") ;; (require 'rinari) -;; Note: if you cloned this from a git repo, you probably have to grab -;; the submodules which can be done simply with the following commands -;; from the root of the rinari directory +;; Whether installed through ELPA or from source you probably want to +;; add the following lines to your .emacs file: + +;; ;; ido +;; (require 'ido) +;; (ido-mode t) + +;; Note: if you cloned this from a git repo, you will have to grab the +;; submodules which can be done by running the following commands from +;; the root of the rinari directory ;; git submodule init ;; git submodule update -;; See TODO file in this directory. - ;;; Code: +;;;###begin-elpa-ignore (let* ((this-dir (file-name-directory (or load-file-name buffer-file-name))) (util-dir (file-name-as-directory (expand-file-name "util" this-dir))) @@ -69,6 +71,7 @@ (add-to-list 'load-path this-dir) (add-to-list 'load-path util-dir) (add-to-list 'load-path jump-dir)) +;;;###end-elpa-ignore (require 'ruby-mode) (require 'inf-ruby) (require 'ruby-compilation) rinari.el @@ -6,8 +6,8 @@ ;; URL: http://www.emacswiki.org/cgi-bin/wiki/RubyMode ;; Created: 8 April 1998 ;; Keywords: languages ruby -;; Version: 2.0 -;; Package-Requires: (("ruby-mode")) +;; Version: 2.1 +;; Package-Requires: ((ruby-mode "1.1")) ;;; Commentary: ;; @@ -186,7 +186,7 @@ run)." (run-ruby command impl))) ;;;###autoload -(defun run-ruby (command &optional name) +(defun run-ruby (&optional command name) "Run an inferior Ruby process, input and output via buffer *ruby*. If there is a process already running in `*ruby*', switch to that buffer. With argument, allows you to edit the command line (default is value util/inf-ruby.el @@ -4,10 +4,10 @@ ;; Author: Eric Schulte ;; URL: http://www.emacswiki.org/cgi-bin/emacs/ruby-compilation.el -;; Version: 0.5 +;; Version: 0.7 ;; Created: 2008-08-23 ;; Keywords: test convenience -;; Package-Requires: (("ruby-mode") ("inf-ruby")) +;; Package-Requires: ((ruby-mode "1.1") (inf-ruby "2.1")) ;;; License: @@ -49,7 +49,7 @@ ;;; Code: (require 'ansi-color) -(require 'pcmpl-rake) +(require 'pcomplete) (require 'compile) (require 'inf-ruby) (require 'which-func) @@ -76,6 +76,30 @@ "Whether to re-use the same comint buffer for focussed tests.") ;;;###autoload +(defun pcomplete/rake () + (pcomplete-here (pcmpl-rake-tasks))) + +(defun pcmpl-rake-tasks () + "Return a list of all the rake tasks defined in the current +projects. I know this is a hack to put all the logic in the +exec-to-string command, but it works and seems fast" + (delq nil (mapcar '(lambda(line) + (if (string-match "rake \\([^ ]+\\)" line) (match-string 1 line))) + (split-string (shell-command-to-string "rake -T") "[\n]")))) + +;;;###autoload +(defun pcomplete/cap () + (pcomplete-here (pcmpl-cap-tasks))) + +(defun pcmpl-cap-tasks () + "Return a list of all the cap tasks defined in the current +project. I know this is a hack to put all the logic in the +exec-to-string command, but it works and seems fast" + (delq nil (mapcar '(lambda(line) + (if (string-match "cap \\([^ ]+\\)" line) (match-string 1 line))) + (split-string (shell-command-to-string "cap -T") "[\n]")))) + +;;;###autoload (defun ruby-compilation-run (cmd) "Run a ruby process dumping output to a ruby compilation buffer." (interactive "FRuby Comand: ") util/ruby-compilation.el @@ -6,7 +6,7 @@ ;; URL: http://www.emacswiki.org/cgi-bin/wiki/RubyMode ;; Created: Fri Feb 4 14:49:13 JST 1994 ;; Keywords: languages ruby -;; Version: 1.0 +;; Version: 1.1 ;; This file is not yet part of GNU Emacs. @@ -1411,11 +1411,12 @@ See `font-lock-syntax-table'.") (add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode)) ;;;###autoload -(add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode)) -(add-to-list 'interpreter-mode-alist '("rbx" . ruby-mode)) -(add-to-list 'interpreter-mode-alist '("jruby" . ruby-mode)) -(add-to-list 'interpreter-mode-alist '("ruby1.9" . ruby-mode)) -(add-to-list 'interpreter-mode-alist '("ruby1.8" . ruby-mode)) +(progn + (add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode)) + (add-to-list 'interpreter-mode-alist '("rbx" . ruby-mode)) + (add-to-list 'interpreter-mode-alist '("jruby" . ruby-mode)) + (add-to-list 'interpreter-mode-alist '("ruby1.9" . ruby-mode)) + (add-to-list 'interpreter-mode-alist '("ruby1.8" . ruby-mode))) (provide 'ruby-mode) ;;; ruby-mode.el ends here util/ruby-mode.el util/pcmpl-rake.el b036e2f511298e5503945ba1a4e8c1c6497bb5ae Eric Schulte schulte.eric@gmail.com http://github.com/eschulte/rinari/commit/beec6fadc023c74032b6ca456e9a675f1693f171 beec6fadc023c74032b6ca456e9a675f1693f171 2009-02-14T11:11:20-08:00 2009-02-14T11:11:20-08:00 ELPA integration - updated headers - added Rake tast to export to ELPA - submitting updated versions of rinari and ruby-compilation to ELPA d652d45553d23c38c282a3d5a0eb5633bd0a4c9d Eric Schulte schulte.eric@gmail.com