cake/*env* -> cake/*shell-env*

samnardoni · Sep 22, 2010 · 95e2f2c · 95e2f2c
1 parent a2d01dc
commit 95e2f2c
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/Support/bin/autocomplete.clj b/Support/bin/autocomplete.clj
@@ -3,7 +3,7 @@
 (clojure.core/require '[clojure.contrib.repl-utils :as ru])
 (clojure.core/require '[clojure.java.io :as io])
 (clojure.core/require '[clojure.repl :as repl])
-(clojure.core/load-file (clojure.core/str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(clojure.core/load-file (clojure.core/str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 
 ; (println "symbol:" (get-symbol-to-autocomplete))
 ; (println (ns-refers (file-ns)) "<br>")

diff --git a/Support/bin/compile_file.clj b/Support/bin/compile_file.clj
@@ -3,9 +3,9 @@
 (clojure.core/refer 'clojure.core)
 (require '[clojure.string :as string])
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 
-(let [tm-filepath (cake/*env* "TM_FILEPATH")]
+(let [tm-filepath (cake/*shell-env* "TM_FILEPATH")]
   (if (not (= tm-filepath ""))
     (do
       (swap! *compiled-files* conj tm-filepath)

diff --git a/Support/bin/eval.clj b/Support/bin/eval.clj
@@ -1,5 +1,5 @@
 #!/usr/bin/env cake run
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 (in-ns 'textmate)
 (display-form-eval (get-selected-sexpr))
diff --git a/Support/bin/eval_last_sexpr.clj b/Support/bin/eval_last_sexpr.clj
@@ -1,5 +1,5 @@
 #!/usr/bin/env cake run
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 (in-ns 'textmate)
 (display-form-eval (get-last-sexpr))
diff --git a/Support/bin/eval_pprint.clj b/Support/bin/eval_pprint.clj
@@ -1,6 +1,6 @@
 #!/usr/bin/env cake run
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 (in-ns 'textmate)
 (clojure.core/require '[clojure.pprint :as pprint])
 
@@ -13,6 +13,6 @@
         (textmate/htmlize
           (pprint/with-pprint-dispatch pprint/code-dispatch
             (pprint/write (clojure.core/eval 
-              (clojure.core/read-string (cake/*env* "TM_SELECTED_TEXT")))
+              (clojure.core/read-string (cake/*shell-env* "TM_SELECTED_TEXT")))
               :pretty true :stream nil)))
         "</pre>")))
diff --git a/Support/bin/jump_to_definition.clj b/Support/bin/jump_to_definition.clj
@@ -1,6 +1,6 @@
 #!/usr/bin/env cake run
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 (in-ns 'textmate)
 
 (when-let [symb	 (get-current-symbol)]
@@ -10,4 +10,4 @@
               line 
               (if (.startsWith file "/") 
                 file 
-                (str (cake/*env* "TM_PROJECT_DIRECTORY") "/src/" file))))))
+                (str (cake/*shell-env* "TM_PROJECT_DIRECTORY") "/src/" file))))))
diff --git a/Support/bin/load_file.clj b/Support/bin/load_file.clj
@@ -1,8 +1,8 @@
 #!/usr/bin/env cake run
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 (in-ns 'textmate)
-(let [tm-filepath (cake/*env* "TM_FILEPATH")]
+(let [tm-filepath (cake/*shell-env* "TM_FILEPATH")]
   (when (not (= tm-filepath ""))
     (attempt
       (load-file tm-filepath)

diff --git a/Support/bin/macroexpand.clj b/Support/bin/macroexpand.clj
@@ -3,7 +3,7 @@
 (clojure.core/refer 'clojure.core)
 (require '[clojure.string :as string])
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 
 (enter-file-ns)
 
@@ -17,6 +17,6 @@
          (pprint/with-pprint-dispatch pprint/code-dispatch
            (binding [pprint/*print-suppress-namespaces* true]
              (pprint/write (clojure.core/macroexpand 
-               (read-string (cake/*env* "TM_SELECTED_TEXT")))
+               (read-string (cake/*shell-env* "TM_SELECTED_TEXT")))
              :pretty true :stream nil))))
        "</pre>")))
diff --git a/Support/bin/macroexpand_all.clj b/Support/bin/macroexpand_all.clj
@@ -3,7 +3,7 @@
 (clojure.core/refer 'clojure.core)
 (require '[clojure.string :as string])
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 
 (enter-file-ns)
 
@@ -18,6 +18,6 @@
          (pprint/with-pprint-dispatch pprint/code-dispatch
            (binding [pprint/*print-suppress-namespaces* true]
              (pprint/write (macro-utils/mexpand-all 
-               (read-string (cake/*env* "TM_SELECTED_TEXT")))
+               (read-string (cake/*shell-env* "TM_SELECTED_TEXT")))
              :pretty true :stream nil))))
        "</pre>")))
diff --git a/Support/bin/show_doc.clj b/Support/bin/show_doc.clj
@@ -3,7 +3,7 @@
 (clojure.core/require '[clojure.contrib.repl-utils :as ru])
 (clojure.core/require '[clojure.java.io :as io])
 (clojure.core/require '[clojure.repl :as repl])
-(clojure.core/load-file (clojure.core/str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(clojure.core/load-file (clojure.core/str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 
 (textmate/attempt
  (if-let [symb (get-current-symbol)]

diff --git a/Support/bin/show_source.clj b/Support/bin/show_source.clj
@@ -3,15 +3,15 @@
 (clojure.core/refer 'clojure.core)
 (require '[clojure.string :as string])
 (require '[clojure.java.io :as io])
-(load-file (str (io/file (cake/*env* "TM_BUNDLE_SUPPORT") "utils.clj")))
+(load-file (str (io/file (cake/*shell-env* "TM_BUNDLE_SUPPORT") "utils.clj")))
 
 (enter-file-ns)
 
 (clojure.core/require '[clojure.contrib.repl-utils :as repl-utils])
 
 (textmate/attempt
-  (let [sym (symbol (or (cake/*env* "TM_SELECTED_TEXT")
-                        (cake/*env* "TM_CURRENT_WORD")))
+  (let [sym (symbol (or (cake/*shell-env* "TM_SELECTED_TEXT")
+                        (cake/*shell-env* "TM_CURRENT_WORD")))
         src (repl-utils/get-source sym)]
     (if src
       (clojure.core/println (str "<pre>" src "</pre>"))

diff --git a/Support/utils.clj b/Support/utils.clj
@@ -71,7 +71,7 @@
    can't be found"
   []
   (let [forms 
-          (-> (cake/*env* "TM_FILEPATH")
+          (-> (cake/*shell-env* "TM_FILEPATH")
               slurp
               text-forms)
         ns-form? 
@@ -118,17 +118,17 @@
       r#)))
 
 (defn project-relative-src-path []
-   (let [user-dir (str (cake/*env* "TM_PROJECT_DIRECTORY") "/src/")
-        path-to-file (string/replace (cake/*env* "TM_FILEPATH")  user-dir "")]
+   (let [user-dir (str (cake/*shell-env* "TM_PROJECT_DIRECTORY") "/src/")
+        path-to-file (string/replace (cake/*shell-env* "TM_FILEPATH")  user-dir "")]
   path-to-file))
 
 (defn carret-info
   "returns [path line-index column-index] info
    about current location of cursor"
   []
-  [(cake/*env* "TM_FILEPATH")
-    (dec (Integer/parseInt (cake/*env* "TM_LINE_NUMBER")))
-    (dec (Integer/parseInt (cake/*env* "TM_COLUMN_NUMBER")))])
+  [(cake/*shell-env* "TM_FILEPATH")
+    (dec (Integer/parseInt (cake/*shell-env* "TM_LINE_NUMBER")))
+    (dec (Integer/parseInt (cake/*shell-env* "TM_COLUMN_NUMBER")))])
 
 (defn text-before-carret []
   (let [[path,line-index,column-index] (carret-info)
@@ -150,7 +150,7 @@
   (or (Character/isLetterOrDigit c) ((hash-set \_ \! \. \? \- \/) c))) 
 
 (defn get-symbol-to-autocomplete []
-  (let [#^String line (-> "TM_CURRENT_LINE" cake/*env* escape-str)
+  (let [#^String line (-> "TM_CURRENT_LINE" cake/*shell-env* escape-str)
         stop    (dec (last (carret-info)))]
     (loop [index stop]
       (cond (zero? index) (.substring line 0 stop)
@@ -161,7 +161,7 @@
 (defn get-current-symbol-str
   "Get the string of the current symbol of the cursor"
   []
-  (let [#^String line (-> "TM_CURRENT_LINE" cake/*env* escape-str)
+  (let [#^String line (-> "TM_CURRENT_LINE" cake/*shell-env* escape-str)
         index    (int (last (carret-info)))
         symbol-index?
           (fn [index]
@@ -249,4 +249,4 @@
 (defn get-selected-sexpr
   "Get highlighted sexpr"
   []
-  (-> "TM_SELECTED_TEXT" cake/*env* escape-str clojure.core/read-string))
+  (-> "TM_SELECTED_TEXT" cake/*shell-env* escape-str clojure.core/read-string))