[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0888e06 01/28: Use Cask and Coveralls.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 0888e06 01/28: Use Cask and Coveralls. |
Date: |
Tue, 05 May 2015 11:10:14 +0000 |
branch: master
commit 0888e063099ab0126704d893b85710109ccc074a
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Use Cask and Coveralls.
---
.gitignore | 2 +-
.travis.yml | 2 +
Cask | 9 +++++
Makefile | 24 ++++++---------
README.md | 2 +-
scripts/dependencies | 2 -
scripts/download-dependencies.el | 61 --------------------------------------
test/test-helper.el | 3 ++
8 files changed, 26 insertions(+), 79 deletions(-)
diff --git a/.gitignore b/.gitignore
index f090318..d0147ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
*.elc
+.cask/
/benchmark/logs/
-/libraries/
diff --git a/.travis.yml b/.travis.yml
index 2dcc8a6..a732f67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,8 @@ install:
sudo apt-get update -qq &&
sudo apt-get install -qq emacs24 emacs24-el;
fi
+ - curl -fsSL https://raw.github.com/cask/cask/master/go | python
+ - export PATH="/home/travis/.cask/bin:$PATH"
- npm install -g scopifier
script:
diff --git a/Cask b/Cask
new file mode 100644
index 0000000..5bdf0cc
--- /dev/null
+++ b/Cask
@@ -0,0 +1,9 @@
+(source melpa)
+
+(package "context-coloring" "6.2.0" "Syntax highlighting, except not for
syntax.")
+(package-file "context-coloring.el")
+
+(development
+ (depends-on "ert-async")
+ (depends-on "js2-mode")
+ (depends-on "undercover"))
diff --git a/Makefile b/Makefile
index 3a6a0be..87115a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,33 @@
+CASK = cask
EMACS = emacs
-DEPENDENCIES = libraries/ert-async.el libraries/js2-mode.el
+DEPENDENCIES = .cask/
all: uncompile compile test
bench: ${DEPENDENCIES}
- ${EMACS} -Q \
+ ${CASK} exec ${EMACS} -Q \
-L . \
- -L libraries \
-l context-coloring \
- -l benchmark/context-coloring-benchmark \
+ -l benchmark/context-coloring-benchmark.el \
-f context-coloring-benchmark-run
compile: ${DEPENDENCIES}
- ${EMACS} -Q -batch \
+ ${CASK} exec ${EMACS} -Q -batch \
-L . \
- -L libraries \
- -f batch-byte-compile *.el libraries/*.el
+ -f batch-byte-compile *.el
uncompile:
- rm -f *.elc libraries/*.elc
+ rm -f *.elc
clean: uncompile
- rm -f ${DEPENDENCIES}
+ rm -rf ${DEPENDENCIES}
${DEPENDENCIES}:
- ${EMACS} -Q -batch \
- -l scripts/download-dependencies.el \
- -f download-dependencies
+ ${CASK}
test: ${DEPENDENCIES}
- ${EMACS} -Q -batch \
+ ${CASK} exec ${EMACS} -Q -batch \
-L . \
- -L libraries \
-l ert \
-l ert-async \
-l context-coloring \
diff --git a/README.md b/README.md
index 7eeacf7..eab100e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Context Coloring [![Build
Status](https://travis-ci.org/jacksonrayhamilton/context-coloring.png?branch=develop)](https://travis-ci.org/jacksonrayhamilton/context-coloring)
+# Context Coloring [![Build
Status](https://travis-ci.org/jacksonrayhamilton/context-coloring.png?branch=develop)](https://travis-ci.org/jacksonrayhamilton/context-coloring)
[![Coverage
Status](https://coveralls.io/repos/jacksonrayhamilton/context-coloring/badge.svg)](https://coveralls.io/r/jacksonrayhamilton/context-coloring)
<p align="center">
<img alt="Screenshot of JavaScript code highlighted by context."
src="screenshot.png" title="Screenshot">
diff --git a/scripts/dependencies b/scripts/dependencies
deleted file mode 100644
index c2a9107..0000000
--- a/scripts/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-https://raw.githubusercontent.com/mooz/js2-mode/master/js2-mode.el
-https://raw.githubusercontent.com/rejeep/ert-async.el/master/ert-async.el
diff --git a/scripts/download-dependencies.el b/scripts/download-dependencies.el
deleted file mode 100644
index 2ab24e2..0000000
--- a/scripts/download-dependencies.el
+++ /dev/null
@@ -1,61 +0,0 @@
-;;; scripts/download-dependencies.el --- Get files for development. -*-
lexical-binding: t; -*-
-
-;; Copyright (C) 2014-2015 Free Software Foundation, Inc.
-
-;; This file is part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;; Download dependencies for development.
-
-;; Dependencies don't need to be version-controlled. They are also
-;; bleeding-edge, which is good because that is what most MELPA users are
using.
-
-;;; Code:
-
-(defconst download-dependencies-directory
- (file-name-directory (or load-file-name buffer-file-name))
- "This file's directory.")
-
-(defun download-dependencies-resolve-path (path)
- "Resolve a path relative to this file's directory."
- (expand-file-name path download-dependencies-directory))
-
-(defun download-dependencies-strip-headers ()
- "Remove the http headers included in the output of
-`url-retrieve-synchronously'."
- (goto-char 1)
- (kill-paragraph 1) ; The headers are 1 paragraph. I hope.
- (kill-line)) ; A line separates the headers from the file's content.
-
-(defun download-dependencies-get-dependencies ()
- "Read the `dependencies' file as a list of URLs."
- (with-temp-buffer
- (insert-file-contents (download-dependencies-resolve-path
"./dependencies"))
- (split-string (buffer-substring-no-properties (point-min) (point-max)))))
-
-(defun download-dependencies ()
- "Download dependencies for development."
- (let ((files (download-dependencies-get-dependencies)))
- (make-directory (download-dependencies-resolve-path "../libraries") t)
- (dolist (file files)
- (let* ((basename (file-name-nondirectory file))
- (destination (download-dependencies-resolve-path
- (concat "../libraries/" basename))))
- (unless (file-exists-p destination)
- (with-current-buffer (url-retrieve-synchronously file)
- (download-dependencies-strip-headers)
- (write-file destination)))))))
-
-;;; download-dependencies.el ends here
diff --git a/test/test-helper.el b/test/test-helper.el
new file mode 100644
index 0000000..1c97075
--- /dev/null
+++ b/test/test-helper.el
@@ -0,0 +1,3 @@
+(require 'undercover)
+(undercover "context-coloring.el")
+(require 'context-coloring)
- [elpa] master updated (510f0ff -> 8a083d5), Jackson Ray Hamilton, 2015/05/05
- [elpa] master f9a6dce 03/28: Coveralls, Jackson Ray Hamilton, 2015/05/05
- [elpa] master 7a9bd8d 07/28: Add async mode startup test., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 2efebc8 10/28: Don't colorize if there are parse errors., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 30f9b0a 02/28: Update Cask file., Jackson Ray Hamilton, 2015/05/05
- [elpa] master fd5b9e1 05/28: Add tests for versions and disabling., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 85ff3ef 13/28: Trailing whitespace, empty arrays, empty strings., Jackson Ray Hamilton, 2015/05/05
- [elpa] master f11f97f 09/28: Make default colors more like font-lock's., Jackson Ray Hamilton, 2015/05/05
- [elpa] master a7f5970 04/28: Remove unused function., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 9873030 08/28: Use real keywords., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 0888e06 01/28: Use Cask and Coveralls.,
Jackson Ray Hamilton <=
- [elpa] master 202ca74 15/28: Drop `subr-x' dependency., Jackson Ray Hamilton, 2015/05/05
- [elpa] master dd3fe3c 06/28: Fix badges., Jackson Ray Hamilton, 2015/05/05
- [elpa] master fb53884 17/28: Update README., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 52da59c 18/28: Bust cache., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 3f63fab 11/28: Add local coverage configuration., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 158fd83 16/28: Test the trimming function., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 0c20edf 14/28: Add coverage for missing lines., Jackson Ray Hamilton, 2015/05/05
- [elpa] master d116055 12/28: Fix original-maximum-face restoration bug., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 1b6f6fb 21/28: Cleanup README., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 5dd3035 19/28: Refactor trim functions., Jackson Ray Hamilton, 2015/05/05