Use ecukes-cli as an entry point for CLI functions.

ecukes

@@ -35,8 +35,7 @@
 
 ECUKES_HOME=$(dirname $BASH_SOURCE)
 ECUKES_CLI=$ECUKES_HOME/ecukes-cli.el
-ECUKES_TERM_EL=$ECUKES_HOME/ecukes-term.el
-ECUKES_NEW=$ECUKES_HOME/ecukes-new.el
+ECUKES_TERM=$ECUKES_HOME/ecukes-term.el
 
 if [ -z "$ECUKES_EMACS" ] ; then
   if [ -z "$EMACS" ] ; then
@@ -51,16 +50,16 @@ if [ "$1" == "-h" -o "$1" == "--help" ] ; then
 elif [ "$1" == "--list-steps" ] ; then
   "$ECUKES_EMACS" --script "$ECUKES_CLI" -f ecukes-cli-print-steps "${@:2}"
 elif [ "$1" == "--new" ] ; then
-  "$ECUKES_EMACS" --script "$ECUKES_NEW" --eval "(ecukes-new)"
+  "$ECUKES_EMACS" --script "$ECUKES_CLI" -f ecukes-new
 elif [ "$1" == "--script" ] ; then
-  "$ECUKES_EMACS" --script "$ECUKES_TERM_EL" "${@:2}"
+  "$ECUKES_EMACS" --script "$ECUKES_TERM" "${@:2}"
 else
   export ECUKES_OUTFILE=$(mktemp /tmp/ecukes.XXX)
-  
+
   if [[ "$1" == "--win" ]]; then
-    "$ECUKES_EMACS" --load "$ECUKES_TERM_EL" -Q "$@"
+    "$ECUKES_EMACS" --load "$ECUKES_TERM" -Q "$@"
   else
-    "$ECUKES_EMACS" -nw --load "$ECUKES_TERM_EL" -Q "$@"
+    "$ECUKES_EMACS" -nw --load "$ECUKES_TERM" -Q "$@"
   fi
 
   STATUS=$?

ecukes-cli.el

@@ -10,10 +10,10 @@
 (require 'ecukes-setup)
 (require 'ecukes-project)
 (require 'ecukes-print)
-
-(ecukes-setup)
+(require 'ecukes-new)
 
 (defun ecukes-cli-print-steps ()
+  (ecukes-setup)
   (let ((has (lambda (flag)
                (when (member flag command-line-args-left)
                  (setq command-line-args-left

ecukes-new.el

@@ -1,11 +1,5 @@
 ;;; ecukes-new.el --- Setup up Ecukes for a project
 
-(defvar ecukes-path
-  (file-name-directory load-file-name)
-  "Path to ecukes.")
-
-(add-to-list 'load-path ecukes-path)
-
 (require 's)
 (require 'dash)
 (require 'ansi)