refactor for cask

Author: sigma

.ert-runner

@@ -0,0 +1 @@
+-L .

.gitignore

@@ -1,3 +1,5 @@
 /docs/build/doctrees/
 /docs/build/texinfo/
-TAGS
+TAGS
+/.cask
+/elpa

.travis.yml

@@ -1,26 +1,19 @@
-language: python
-python:
-  - "2.7"
+language: emacs-lisp
 env:
   matrix:
-    - EMACS=emacs
-    - EMACS=emacs24
-    - EMACS=emacs-snapshot
-before_install:
-  - if [ "$EMACS" = "emacs24" ]; then
-        sudo add-apt-repository -y ppa:cassou/emacs &&
-        sudo apt-get update -qq &&
-        sudo apt-get install -qq emacs24 emacs24-el;
-    fi
-  - if [ "$EMACS" = 'emacs-snapshot' ]; then
-      sudo add-apt-repository -y ppa:cassou/emacs &&
-      sudo apt-get update -qq &&
-      sudo apt-get install -qq
-          emacs-snapshot-el emacs-snapshot;
-    fi
-  - pip install --use-mirrors virtualenv-emacs
-  - virtualenv_install_emacs --with-emacs=`which "$EMACS"` --marmalade
-  - elpa-get eieio pcache logito mocker
-  - emacs --version
+    - EVM_EMACS=emacs-24.1-bin
+    - EVM_EMACS=emacs-24.2-bin
+    - EVM_EMACS=emacs-24.3-bin
+    - EVM_EMACS=emacs-24.4-bin
+    - EVM_EMACS=emacs-24.5-bin
+install:
+  - sudo mkdir /usr/local/evm
+  - sudo chown $(id -u):$(id -g) /usr/local/evm
+  - curl -fsSkL --max-time 10 --retry 10 --retry-delay 10 https://raw.github.com/rejeep/evm/master/go | bash
+  - export PATH="$HOME/.evm/bin:$PATH"
+  - evm install $EVM_EMACS --use
+  - curl -fsSkL --max-time 10 --retry 10 --retry-delay 10 https://raw.github.com/cask/cask/master/go | python
+  - export PATH="$HOME/.cask/bin:$PATH"
+  - cask
 script:
-  make test
+  make travis-ci

Cask

@@ -0,0 +1,18 @@
+(source gnu)
+(source marmalade)
+(source melpa-stable)
+
+(package "gh" "1.0.0"
+         "Github API client libraries.")
+
+(depends-on "emacs" "24.1")
+(depends-on "s" "1.9.0")
+(depends-on "dash" "2.9.0")
+(depends-on "pcache" "0.3.1")
+(depends-on "logito" "0.1")
+(depends-on "marshal" "0.5.0")
+
+(development
+  (depends-on "ert-runner")
+  (depends-on "shut-up")
+  (depends-on "mocker"))

Makefile

@@ -1,88 +1,23 @@
-PKGNAME = gh
-VERSION = 1.0.0
-SNAPDIR = $(PKGNAME)-$(VERSION)
+EMACS ?= emacs
+CASK ?= cask
 
-PKGDEF    = $(PKGNAME)-pkg.el
-AUTODEF   = $(PKGNAME)-auto.el
-SPECIAL   = $(PKGDEF) $(AUTODEF)
-ALLSOURCE = $(wildcard *.el)
+test: unit-tests
 
-SOURCE  = $(filter-out $(SPECIAL), $(ALLSOURCE))
-TARGET  = $(patsubst %.el,%.elc, $(SOURCE))
-README  = README.md
+unit-tests: elpa
+	${CASK} exec ert-runner
 
-EMACS    = emacs
-SITEFLAG = --no-site-file
-EFLAGS   =
-BATCH    = $(EMACS) $(EFLAGS) $(SITEFLAG) -batch -q -L .
+elpa: Cask *.el
+	mkdir -p elpa
+	${CASK} install 2> elpa/install.log
 
-PREFIX   = /usr/local
-ELISPDIR = $(PREFIX)/share/emacs/site-lisp/$(PKGNAME)
+clean-elpa:
+	rm -rf elpa
 
-TEXI2HTML = makeinfo --html --number-sections
+clean-elc:
+	rm -f *.elc test/*.elc
 
-# Location of Emacs Lisp Package Archive entries
-ELPA=../../elpa
+clean: clean-elpa clean-elc
 
-all: lisp docs
-
-lisp: $(TARGET)
-
-autoloads: $(AUTODEF)
-
-$(AUTODEF): $(PKGNAME)-auto.in $(SOURCE)
-	cp $(PKGNAME)-auto.in $(AUTODEF)
-	rm -f $(AUTODEF)c
-	@$(BATCH) -l $(PKGNAME)-auto \
-		-f gh-generate-autoloads \
-		$(shell pwd | sed -e 's|^/cygdrive/\([a-z]\)|\1:|')/$(AUTODEF) .
-
-%.elc: %.el
-	@$(BATCH) -f batch-byte-compile $<
-
-clean:
-	rm -f *~ $(TARGET) $(PKGNAME).info $(PKGNAME).html
-
-realclean: clean docsclean
-	rm -f $(AUTODEF)
-
-install-bin: lisp
-	install -d $(ELISPDIR)
-	install -m 0644 $(ALLSOURCE) $(TARGET) $(ELISPDIR)
-
-install: install-bin
-
-distclean: clean
-	rm -Rf ../$(SNAPDIR)
-
-release: autoloads distclean
-	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
-	cp $(SPECIAL) $(SOURCE) ../$(SNAPDIR)
-	(cd .. && tar cjf $(PKGNAME)-$(VERSION).tar.bz2 $(SNAPDIR)/*)
-
-elpa: info
-	rm -fR $(ELPA)/$(SNAPDIR)
-	rm -f $(ELPA)/$(PKGNAME)-$(VERSION).tar
-	mkdir -p $(ELPA)/$(SNAPDIR) && chmod 0755 $(ELPA)/$(SNAPDIR)
-	cp $(SOURCE) $(ELPA)/$(SNAPDIR)
-	pandoc -f markdown_github -t plain $(README) | tail -n +3 > $(ELPA)/$(SNAPDIR)/README
-	cp docs/build/texinfo/$(PKGNAME).info $(ELPA)/$(SNAPDIR)
-	sed -e "s/%VERSION%/$(VERSION)/g" < $(PKGDEF) \
-		> $(ELPA)/$(SNAPDIR)/$(PKGDEF)
-	(cd $(ELPA) && tar cf $(PKGNAME)-$(VERSION).tar $(SNAPDIR))
-
-info:
-	$(MAKE) -C docs info
-
-html:
-	$(MAKE) -C docs html
-
-docs: info html
-
-docsclean:
-	rm -f doc/$(PKGNAME).info doc/$(PKGNAME).html
-
-test: lisp
-	@$(BATCH) -l tests/gh-tests.el -l tests/gh-gist-tests.el  \
-		-l tests/gh-issues-tests.el -l tests/gh-orgs-tests.el \
-		-f ert-run-tests-batch-and-exit
+print-deps:
+	${EMACS} --version
+	@echo CASK=${CASK}

gh-auto.in

@@ -1,4 +1,4 @@
-;;; gh-gist-tests.el --- tests for gh-gist.el
+;;; gh-gist-test.el --- test for gh-gist.el
 
 ;; Copyright (C) 2012  Yann Hodique
 
@@ -26,38 +26,38 @@
 
 ;;; Code:
 
-(require 'gh-tests)
+(require 'gh-test)
 (require 'gh-gist)
 
-(defun gh-gist-tests:test-regular-gist (gist)
-  (should (equal (oref gist :id) "1"))
+(defun gh-gist-test:test-regular-gist (gist)
+  (should (equal (oref gist :id) "aa5a315d61ae9438b18d"))
   (should (oref gist :public))
   (should (equal (length (oref gist :files)) 1)))
 
-(ert-deftest gh-gist-tests:regular-list ()
-  (let* ((api (gh-tests-mock-api 'gh-gist-api))
+(ert-deftest gh-gist-test:regular-list ()
+  (let* ((api (gh-test-mock-api 'gh-gist-api))
          (gists
-          (gh-tests-with-traces-buffers ((gists-buf "list_gists_sample.txt"))
-            (gh-tests-mock-url ((:record-cls mocker-stub-record
+          (gh-test-with-traces-buffers ((gists-buf "list_gists_sample.txt"))
+            (gh-test-mock-url ((:record-cls mocker-stub-record
                                              :output gists-buf))
                                (oref (gh-gist-list api "octocat") :data)))))
     (should (equal (length gists) 1))
     (let ((gist (car gists)))
       (should (object-of-class-p gist 'gh-gist-gist-stub))
-      (gh-gist-tests:test-regular-gist gist))))
+      (gh-gist-test:test-regular-gist gist))))
 
-(ert-deftest gh-gist-tests:regular-get ()
-  (let* ((api (gh-tests-mock-api 'gh-gist-api))
+(ert-deftest gh-gist-test:regular-get ()
+  (let* ((api (gh-test-mock-api 'gh-gist-api))
          (gist
-          (gh-tests-with-traces-buffers ((gist-buf "get_gist_sample.txt"))
-            (gh-tests-mock-url ((:record-cls mocker-stub-record
+          (gh-test-with-traces-buffers ((gist-buf "get_gist_sample.txt"))
+            (gh-test-mock-url ((:record-cls mocker-stub-record
                                              :output gist-buf))
                                (oref (gh-gist-get api "1") :data)))))
     (should (object-of-class-p gist 'gh-gist-gist))
-    (gh-gist-tests:test-regular-gist gist)))
+    (gh-gist-test:test-regular-gist gist)))
 
-(ert-deftest gh-gist-tests:regular-new ()
-  (let* ((api (gh-tests-mock-api 'gh-gist-api))
+(ert-deftest gh-gist-test:regular-new ()
+  (let* ((api (gh-test-mock-api 'gh-gist-api))
          (gist-stub
           (make-instance 'gh-gist-gist-stub
                          :description "description of gist"
@@ -67,12 +67,12 @@
                                                 :filename "ring.erl"
                                                 :content "contents of gist"))))
          (gist
-          (gh-tests-with-traces-buffers ((gist-buf "get_gist_sample.txt"))
-            (gh-tests-mock-url ((:record-cls mocker-stub-record
+          (gh-test-with-traces-buffers ((gist-buf "get_gist_sample.txt"))
+            (gh-test-mock-url ((:record-cls mocker-stub-record
                                              :output gist-buf))
                                (oref (gh-gist-new api gist-stub) :data)))))
     (should (object-of-class-p gist 'gh-gist-gist))
-    (gh-gist-tests:test-regular-gist gist)))
+    (gh-gist-test:test-regular-gist gist)))
 
-(provide 'gh-gist-tests)
-;;; gh-gist-tests.el ends here
+(provide 'gh-gist-test)
+;;; gh-gist-test.el ends here

tests/gh-gist-tests.el test/gh-gist-test.eltests/gh-gist-tests.el renamed to test/gh-gist-test.el

@@ -1,4 +1,4 @@
-;;; gh-issues-tests.el --- tests fir gh-issues.el
+;;; gh-issues-test.el --- test fir gh-issues.el
 
 ;; Copyright (C) 2012  Yann Hodique
 
@@ -26,18 +26,18 @@
 
 ;;; Code:
 
-(require 'gh-tests)
+(require 'gh-test)
 (require 'gh-issues)
 
-(defun gh-issues-tests:test-regular-issue (issue)
+(defun gh-issues-test:test-regular-issue (issue)
   (should (equal (oref issue :number) 1347))
   (should (equal (oref issue :state) "open")))
 
-(ert-deftest gh-issues-tests:regular-list ()
-  (let* ((api (gh-tests-mock-api 'gh-issues-api))
+(ert-deftest gh-issues-test:regular-list ()
+  (let* ((api (gh-test-mock-api 'gh-issues-api))
          (issues
-          (gh-tests-with-traces-buffers ((gists-buf "list_issues_sample.txt"))
-            (gh-tests-mock-url ((:record-cls mocker-stub-record
+          (gh-test-with-traces-buffers ((gists-buf "list_issues_sample.txt"))
+            (gh-test-mock-url ((:record-cls mocker-stub-record
                                              :output gists-buf))
                                (oref
                                 (gh-issues-issue-list api "octocat"
@@ -46,7 +46,7 @@
     (should (equal (length issues) 1))
     (let ((issue (car issues)))
       (should (object-of-class-p issue 'gh-issues-issue))
-      (gh-issues-tests:test-regular-issue issue))))
+      (gh-issues-test:test-regular-issue issue))))
 
-(provide 'gh-issues-tests)
-;;; gh-issues-tests.el ends here
+(provide 'gh-issues-test)
+;;; gh-issues-test.el ends here

tests/gh-issues-tests.el test/gh-issues-test.eltests/gh-issues-tests.el renamed to test/gh-issues-test.el

@@ -1,4 +1,4 @@
-;;; gh-orgs-tests.el --- tests for gh-orgs.el
+;;; gh-orgs-test.el --- test for gh-orgs.el
 
 ;; Copyright (C) 2012  Yann Hodique
 
@@ -26,56 +26,56 @@
 
 ;;; Code:
 
-(require 'gh-tests)
+(require 'gh-test)
 (require 'gh-orgs)
 
-(defun gh-orgs-tests:test-regular-org-stub (org)
+(defun gh-orgs-test:test-regular-org-stub (org)
   (should (equal (oref org :id) 1))
   (should (equal (oref org :login) "github"))
   (should (equal "https://github.com/images/error/octocat_happy.gif" (oref org :avatar-url))))
 
-(defun gh-orgs-tests:test-regular-org (org)
-  (gh-orgs-tests:test-regular-org-stub org)
+(defun gh-orgs-test:test-regular-org (org)
+  (gh-orgs-test:test-regular-org-stub org)
   (should (equal (oref org :public-gists) 1))
   (should (equal (oref org :public-repos) 2)))
 
-(ert-deftest gh-orgs-tests:regular-list ()
-  (let* ((api (gh-tests-mock-api 'gh-orgs-api))
+(ert-deftest gh-orgs-test:regular-list ()
+  (let* ((api (gh-test-mock-api 'gh-orgs-api))
          (orgs
-          (gh-tests-with-traces-buffers ((orgs-buf "list_orgs_sample.txt"))
-            (gh-tests-mock-url ((:record-cls mocker-stub-record
+          (gh-test-with-traces-buffers ((orgs-buf "list_orgs_sample.txt"))
+            (gh-test-mock-url ((:record-cls mocker-stub-record
                                              :output orgs-buf))
                                (oref (gh-orgs-list api "dummy") :data)))))
     (should (equal (length orgs) 1))
     (let ((org (car orgs)))
       (should (object-of-class-p org 'gh-orgs-org-stub))
-      (gh-orgs-tests:test-regular-org-stub org))))
+      (gh-orgs-test:test-regular-org-stub org))))
 
-(ert-deftest gh-orgs-tests:regular-get ()
-  (let* ((api (gh-tests-mock-api 'gh-orgs-api))
+(ert-deftest gh-orgs-test:regular-get ()
+  (let* ((api (gh-test-mock-api 'gh-orgs-api))
          (org
-          (gh-tests-with-traces-buffers ((orgs-buf "get_org_sample.txt"))
-            (gh-tests-mock-url ((:record-cls mocker-stub-record
+          (gh-test-with-traces-buffers ((orgs-buf "get_org_sample.txt"))
+            (gh-test-mock-url ((:record-cls mocker-stub-record
                                              :output orgs-buf))
                                (oref (gh-orgs-get api "github") :data)))))
     (should (object-of-class-p org 'gh-orgs-org))
-    (gh-orgs-tests:test-regular-org org)))
+    (gh-orgs-test:test-regular-org org)))
 
-(ert-deftest gh-orgs-tests:regular-update ()
-  (let* ((api (gh-tests-mock-api 'gh-orgs-api))
+(ert-deftest gh-orgs-test:regular-update ()
+  (let* ((api (gh-test-mock-api 'gh-orgs-api))
          (org-stub
           (make-instance 'gh-orgs-org
                          :login "github"
                          :id 1
                          :url "https://api.github.com/orgs/1"
                          :avatar-url "https://github.com/images/error/octocat_happy.gif"))
          (org
-          (gh-tests-with-traces-buffers ((orgs-buf "get_org_sample.txt"))
-            (gh-tests-mock-url ((:record-cls mocker-stub-record
+          (gh-test-with-traces-buffers ((orgs-buf "get_org_sample.txt"))
+            (gh-test-mock-url ((:record-cls mocker-stub-record
                                              :output orgs-buf))
                                (oref (gh-orgs-update api org-stub) :data)))))
     (should (object-of-class-p org 'gh-orgs-org))
-    (gh-orgs-tests:test-regular-org org)))
+    (gh-orgs-test:test-regular-org org)))
 
-(provide 'gh-orgs-tests)
-;;; gh-orgs-tests.el ends here
+(provide 'gh-orgs-test)
+;;; gh-orgs-test.el ends here