From cdc7295a53b0264b47523ef3983ec5999b0a862d Mon Sep 17 00:00:00 2001
From: Johan Andersson <johan.rejeep@gmail.com>
Date: Fri, 14 Jun 2013 21:40:51 +0200
Subject: [PATCH] Use Carton for running Ecukes tests.

---
 .gitignore                               | 1 +
 .gitmodules                              | 8 +-------
 .travis.yml                              | 3 +++
 Carton                                   | 7 +++++++
 features/step-definitions/melpa-steps.el | 2 ++
 run-travis-ci.sh                         | 2 +-
 util/ecukes                              | 1 -
 util/espuds                              | 1 -
 8 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 Carton
 delete mode 160000 util/ecukes
 delete mode 160000 util/espuds

diff --git a/.gitignore b/.gitignore
index d1115e2f..3b5fb01b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /recipes/.dirstamp
 /html/updates.rss
 /download_counts.json
+/elpa
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 4a195db4..9e18c05f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule "epkgs"]
 	path = epkgs
-	url = https://github.com/milkypostman/epkgs.git
-[submodule "util/ecukes"]
-	path = util/ecukes
-	url = https://github.com/rejeep/ecukes.git
-[submodule "util/espuds"]
-	path = util/espuds
-	url = https://github.com/rejeep/espuds.git
+	url = https://github.com/milkypostman/epkgs.git
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 1540884c..7a5b474a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,9 @@ before_install:
       sudo apt-get install -qq
           emacs24 emacs24-el emacs24-common-non-dfsg;
     fi
+  - curl -fsSkL https://raw.github.com/rejeep/carton/master/go | sh
+  - export PATH="/home/travis/.carton/bin:$PATH"
+  - carton
 env:
   #- EMACS=emacs
   - EMACS=emacs24
diff --git a/Carton b/Carton
new file mode 100644
index 00000000..d2804848
--- /dev/null
+++ b/Carton
@@ -0,0 +1,7 @@
+(source "melpa" "http://melpa.milkbox.net/packages/")
+
+(package-file "melpa.el")
+
+(development
+ (depends-on "ecukes")
+ (depends-on "espuds"))
diff --git a/features/step-definitions/melpa-steps.el b/features/step-definitions/melpa-steps.el
index 0def72ce..333a5bd9 100644
--- a/features/step-definitions/melpa-steps.el
+++ b/features/step-definitions/melpa-steps.el
@@ -1,3 +1,5 @@
+(require 'cl)
+
 (Given "^read recipes$"
        (lambda ()
          (pb/read-recipes)))
diff --git a/run-travis-ci.sh b/run-travis-ci.sh
index df43a595..c52bac1a 100755
--- a/run-travis-ci.sh
+++ b/run-travis-ci.sh
@@ -11,4 +11,4 @@ echo
 
 "$ECUKES_EMACS" --batch --eval "(unless (ignore-errors (require 'cl-lib)) (package-refresh-contents) (package-install 'cl-lib))"
 
-exec ./util/ecukes/ecukes --graphical
+carton exec $(find elpa/ecukes-*/ecukes | tail -1)
diff --git a/util/ecukes b/util/ecukes
deleted file mode 160000
index b2c449cf..00000000
--- a/util/ecukes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b2c449cf01163df3aa41f401b9aeac4887b3177c
diff --git a/util/espuds b/util/espuds
deleted file mode 160000
index 62ef75cb..00000000
--- a/util/espuds
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 62ef75cb51eef76c547d33a81cb2b6b6e384aefc