1.1 --- a/src/rlm/rlm_commands.clj	Tue Oct 18 00:57:08 2011 -0700
     1.2 +++ b/src/rlm/rlm_commands.clj	Tue Feb 28 13:26:34 2012 -0600
     1.3 @@ -1,27 +1,23 @@
     1.4  (ns rlm.rlm-commands
     1.5 -  (:require  [rlm ns-rlm shell-write]
     1.6 -	     [clojure.contrib [duck-streams :as ds]])
     1.7 -  (:use [clojure.contrib java-utils])
     1.8 +  (:use rlm.ns-rlm)
     1.9    (:use clojure.java.javadoc))
    1.10  
    1.11  
    1.12 -(defn current-directory [] (ds/file-str "/home/r/mobius"))
    1.13 +;; (defn current-directory [] (ds/file-str "/home/r/mobius"))
    1.14  
    1.15 -(defn file-re [regex & {:keys [dir recurse] :or
    1.16 -			{dir (current-directory) recurse false}}]
    1.17 -  (let [dir (ds/file-str dir)]
    1.18 -    (filter (fn [file] (re-matches regex (.getName file)))
    1.19 -	    (if recurse
    1.20 -	      (file-seq dir)
    1.21 -	      (seq (.listFiles dir))))))
    1.22 +;; (defn file-re [regex & {:keys [dir recurse] :or
    1.23 +;; 			{dir (current-directory) recurse false}}]
    1.24 +;;   (let [dir (ds/file-str dir)]
    1.25 +;;     (filter (fn [file] (re-matches regex (.getName file)))
    1.26 +;; 	    (if recurse
    1.27 +;; 	      (file-seq dir)
    1.28 +;; 	      (seq (.listFiles dir))))))
    1.29  
    1.30  (defmacro undef
    1.31    "removes symbol from the current namespace"
    1.32    [& symbols]
    1.33 - 
    1.34    `(dorun (map (partial ns-unmap *ns*) (quote ~symbols))))
    1.35  
    1.36 -
    1.37  (defn ns-reset-fn
    1.38    "unmaps all interned symbols from the current namespace (except in-ns and ns)"
    1.39    ([ns-name]
    1.40 @@ -55,11 +51,6 @@
    1.41  
    1.42  (defmacro reload []
    1.43    `(do
    1.44 -     (rlm.ns-rlm/ns-clear)
    1.45 -     (use :reload-all (quote ~(symbol (str *ns*))))))
    1.46 -
    1.47 -(defmacro reload []
    1.48 -  `(do
    1.49       (rlm.rlm-commands/ns-nuke)
    1.50       (clojure.core/use
    1.51        :reload-all
    1.52 @@ -72,47 +63,41 @@
    1.53       (clojure.core/use :reload
    1.54        (clojure.core/symbol (clojure.core/str clojure.core/*ns*)))))
    1.55  
    1.56 -(defn keymap-clojure []
    1.57 -  (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.clojure"))
    1.58 +;; (defn keymap-clojure []
    1.59 +;;   (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.clojure"))
    1.60  
    1.61 +;; (defn keymap-normal []
    1.62 +;;   (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.normal"))
    1.63  
    1.64 -
    1.65 -(defn keymap-normal []
    1.66 -  (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.normal"))
    1.67 -
    1.68 -
    1.69 -(defn rlm []
    1.70 -  (clojure.core/require 'rlm.light-base)
    1.71 -  (rlm.ns-rlm/ns-clone rlm.light-base))
    1.72 -
    1.73 +;; (defn rlm []
    1.74 +;;   (clojure.core/require 'rlm.light-base)
    1.75 +;;   (rlm.ns-rlm/ns-clone rlm.light-base))
    1.76  
    1.77  (defn help
    1.78    "load a bunch of really useful help functions"
    1.79    []
    1.80    (use
    1.81     '[rlm
    1.82 -     [function-utils :only [mix defmix runonce]]
    1.83 -     [rlm-commands :only [undef ns-reset ns-nuke reload keymap-clojure keymap-normal rlm]]
    1.84 -     [ns-rlm :only [ns-clear ns-clone ls]]
    1.85 -     [play-all :only [play-all-music]]
    1.86 +     [function-utils :only [mix defmix]]
    1.87 +     [rlm-commands :only
    1.88 +      [undef ns-reset ns-nuke reload re]]
    1.89 +     [ns-rlm :only [ls]]
    1.90 +     ;;[play-all :only [play-all-music]]
    1.91       [shell-inspect :only [command-line?]]
    1.92 -     [shell-write :only [sw]]
    1.93 -     [classpath-utils :only [classpath add-to-classpath]]
    1.94 +     ;;[shell-write :only [sw]]
    1.95 +     ;;[classpath-utils :only [classpath add-to-classpath]]
    1.96       [dreams :only [megadef silence]]
    1.97       [map-utils :only [map-keys map-vals filter-keys filter-vals]]
    1.98       [visualize :only [visual]]
    1.99       [identify :only [identify]]]
   1.100 -   '[abomination.no-parens :only [quit]]
   1.101 +
   1.102 +   ;;'[abomination.no-parens :only [quit]]
   1.103     
   1.104 -   
   1.105 -   '[clojure.contrib
   1.106 -     [duck-streams :only [file-str read-lines]]
   1.107 -     [str-utils :only [re-split re-gsub str-join]]
   1.108 -     [repl-utils :only [show expression-info]]]
   1.109 +   ;; TODO find replacement for show
   1.110      '[clojure
   1.111        [repl :only [source]]]
   1.112 -     '[clojure.java
   1.113 -       [javadoc :only [javadoc add-local-javadoc]]])
   1.114 +    '[clojure.java
   1.115 +      [javadoc :only [javadoc add-local-javadoc]]])
   1.116    (clojure.java.javadoc/add-local-javadoc "/home/r/cortex/jme3/dist/javadoc")
   1.117    (clojure.java.javadoc/add-local-javadoc "/home/r/roBin/jdk6-docs/docs/api")
   1.118    (clojure.java.javadoc/add-local-javadoc