github/calrissian
1
0
Fork 0
mirror of https://github.com/correl/calrissian.git synced 2024-11-23 19:19:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'update-deps' into formatting

Browse source
This commit is contained in:
Duncan McGreggor 2015-05-21 17:59:30 -05:00
commit 25fbba197e
10 changed files with 102 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1 +1,3 @@
PROJECT = calrissian
include resources/make/common.mk include resources/make/common.mk

11
lfe.config Normal file
View file

@ -0,0 +1,11 @@
#(project
(#(deps (#("lfex/lcfg" "master")))
#(meta (
#(name logjam)
#(description "Monads for LFE")
#(version "0.1.0")
#(keywords ("LFE" "Lisp" "Library" "Monads"))
#(maintainers (
(#(name "Correl Roush") #(email "correl@gmail.com"))))
#(repos (
#(github "correl/calrissian")))))))

7
package.exs
View file

@ -1,7 +0,0 @@
Expm.Package.new(
name: "calrissian",
description: "Monads for LFE",
version: "0.1.0",
keywords: ["LFE", "Lisp", "Library", "Monads"],
maintainers: [[name: "Correl Roush", email: "correl@gmail.com"]],
repositories: [[github: "correl/calrissian"]])

14
rebar.config
View file

@ -1,16 +1,12 @@
{erl_opts, [debug_info, {src_dirs, ["test/unit", {erl_opts, [debug_info, {src_dirs, ["test"]}]}.
"test/integration",
"test/system"]}]}.
{lfe_first_files, []}. {lfe_first_files, []}.
{deps_dir, ["deps"]}. {deps_dir, ["deps"]}.
{eunit_compile_opts, [ {eunit_compile_opts, [
{src_dirs, ["test/unit", {src_dirs, ["test"]}
"test/integration",
"test/system",
"src"]}
]}. ]}.
{deps, [ {deps, [
{lfe, ".*", {git, "git://github.com/rvirding/lfe.git", "develop"}}, {lfe, ".*", {git, "git://github.com/rvirding/lfe.git", "develop"}},
{'lfe-utils', ".*", {git, "https://github.com/lfe/lfe-utils.git", "master"}}, {lutil, ".*", {git, "https://github.com/lfex/lutil.git", "master"}},
{lfeunit, ".*", {git, "git://github.com/lfe/lfeunit.git", "master"}} {ltest, ".*", {git, "git://github.com/lfex/ltest.git", "master"}},
{lcfg, ".*", {git, "git://github.com/lfex/lcfg.git", "master"}}
]}. ]}.

96
resources/make/common.mk
View file

@ -1,21 +1,22 @@
PROJECT = calrissian ifeq ($(shell which erl),)
$(error Can't find Erlang executable 'erl')
exit 1
endif
LIB = $(PROJECT) LIB = $(PROJECT)
DEPS = ./deps DEPS = ./deps
BIN_DIR = ./bin BIN_DIR = ./bin
EXPM = $(BIN_DIR)/expm
SOURCE_DIR = ./src SOURCE_DIR = ./src
OUT_DIR = ./ebin OUT_DIR = ./ebin
TEST_DIR = ./test TEST_DIR = ./test
TEST_OUT_DIR = ./.eunit TEST_OUT_DIR = ./.eunit
SCRIPT_PATH=$(DEPS)/lfe/bin:.:./bin:"$(PATH)":/usr/local/bin SCRIPT_PATH=$(DEPS)/lfe/bin:.:./bin:"$(PATH)":/usr/local/bin
ERL_LIBS=$(shell pwd):$(shell $(LFETOOL) info erllibs) ifeq ($(shell which lfetool),)
EMPTY =
ifeq ($(shell which lfetool),$EMPTY)
LFETOOL=$(BIN_DIR)/lfetool LFETOOL=$(BIN_DIR)/lfetool
else else
LFETOOL=lfetool LFETOOL=lfetool
endif endif
ERL_LIBS=.:..:$(shell pwd):$(shell $(LFETOOL) info erllibs)
OS := $(shell uname -s) OS := $(shell uname -s)
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
HOST=$(HOSTNAME) HOST=$(HOSTNAME)
@ -27,72 +28,85 @@ endif
$(BIN_DIR): $(BIN_DIR):
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
$(LFETOOL): $(BIN_DIR) get-lfetool: $(BIN_DIR)
@[ -f $(LFETOOL) ] || \ curl -L -o ./lfetool https://raw.github.com/lfe/lfetool/dev-v1/lfetool && \
curl -L -o ./lfetool https://raw.github.com/lfe/lfetool/master/lfetool && \
chmod 755 ./lfetool && \ chmod 755 ./lfetool && \
mv ./lfetool $(BIN_DIR) mv ./lfetool $(BIN_DIR)
get-version: get-version:
@PATH=$(SCRIPT_PATH) lfetool info version @PATH=$(SCRIPT_PATH) $(LFETOOL) info version
@echo "Erlang/OTP, LFE, & library versions:"
$(EXPM): $(BIN_DIR) @ERL_LIBS=$(ERL_LIBS) PATH=$(SCRIPT_PATH) erl \
@[ -f $(EXPM) ] || \ -eval "lfe_io:format(\"~p~n\",['$(PROJECT)-util':'get-versions'()])." \
PATH=$(SCRIPT_PATH) lfetool install expm $(BIN_DIR) -noshell -s erlang halt
get-deps: get-deps:
@echo "Getting dependencies ..." @echo "Getting dependencies ..."
@which rebar.cmd >/dev/null 2>&1 && rebar.cmd get-deps || rebar get-deps @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) download deps
@PATH=$(SCRIPT_PATH) lfetool update deps
clean-ebin: clean-ebin:
@echo "Cleaning ebin dir ..." @echo "Cleaning ebin dir ..."
@rm -f $(OUT_DIR)/*.beam @rm -f $(OUT_DIR)/*.beam
clean-eunit: clean-eunit:
@PATH=$(SCRIPT_PATH) lfetool tests clean -@PATH=$(SCRIPT_PATH) $(LFETOOL) tests clean
compile: get-deps clean-ebin compile: get-deps clean-ebin
@echo "Compiling project code and dependencies ..." @echo "Compiling project code and dependencies ..."
@which rebar.cmd >/dev/null 2>&1 && rebar.cmd compile || rebar compile @which rebar.cmd >/dev/null 2>&1 && \
PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) rebar.cmd compile || \
PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) rebar compile
compile-no-deps: clean-ebin compile-no-deps: clean-ebin
@echo "Compiling only project code ..." @echo "Compiling only project code ..."
@which rebar.cmd >/dev/null 2>&1 && rebar.cmd compile skip_deps=true || rebar compile skip_deps=true @which rebar.cmd >/dev/null 2>&1 && \
PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) \
rebar.cmd compile skip_deps=true || \
PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) rebar compile skip_deps=true
compile-tests: compile-tests: clean-eunit
@PATH=$(SCRIPT_PATH) lfetool tests build @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) tests build
repl: compile
@which clear >/dev/null 2>&1 && clear || printf "\033c"
@echo "Starting an LFE REPL ..."
@PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) repl lfe +pc unicode
repl-no-deps: compile-no-deps
@which clear >/dev/null 2>&1 && clear || printf "\033c"
@echo "Starting an LFE REPL ..."
@PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) repl lfe +pc unicode
shell: compile shell: compile
@which clear >/dev/null 2>&1 && clear || printf "\033c" @which clear >/dev/null 2>&1 && clear || printf "\033c"
@echo "Starting shell ..." @echo "Starting an Erlang shell ..."
@PATH=$(SCRIPT_PATH) lfetool repl @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) erl + pc unicode
shell-no-deps: compile-no-deps shell-no-deps: compile-no-deps
@which clear >/dev/null 2>&1 && clear || printf "\033c" @which clear >/dev/null 2>&1 && clear || printf "\033c"
@echo "Starting shell ..." @echo "Starting an Erlang shell ..."
@PATH=$(SCRIPT_PATH) lfetool repl @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) erl + pc unicode
clean: clean-ebin clean-eunit clean: clean-ebin clean-eunit
@which rebar.cmd >/dev/null 2>&1 && rebar.cmd clean || rebar clean @which rebar.cmd >/dev/null 2>&1 && rebar.cmd clean || rebar clean
check-unit-only: check-unit-only:
@PATH=$(SCRIPT_PATH) lfetool tests unit @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) tests unit
check-integration-only: check-integration-only:
@PATH=$(SCRIPT_PATH) lfetool tests integration @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) tests integration
check-system-only: check-system-only:
@PATH=$(SCRIPT_PATH) lfetool tests system @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) tests system
check-unit-with-deps: get-deps compile compile-tests check-unit-only check-unit-with-deps: get-deps compile compile-tests check-unit-only
check-unit: compile-no-deps check-unit-only check-unit: clean-eunit compile-no-deps check-unit-only
check-integration: compile check-integration-only check-integration: clean-eunit compile check-integration-only
check-system: compile check-system-only check-system: clean-eunit compile check-system-only
check-all-with-deps: compile check-unit-only check-integration-only \ check-all-with-deps: clean-eunit compile check-unit-only \
check-system-only check-integration-only check-system-only clean-eunit
check-all: get-deps compile-no-deps check-all: get-deps clean-eunit compile-no-deps
@PATH=$(SCRIPT_PATH) lfetool tests all @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) tests all
check: check-unit-with-deps check: check-unit-with-deps
@ -106,16 +120,6 @@ push-all:
git push upstream --tags git push upstream --tags
install: compile install: compile
@echo "Installing calrissian ..." @echo "Installing lumberjack ..."
@PATH=$(SCRIPT_PATH) lfetool install lfe @PATH=$(SCRIPT_PATH) lfetool install lfe
upload: $(EXPM) get-version
@echo "Preparing to upload calrissian ..."
@echo
@echo "Package file:"
@echo
@cat package.exs
@echo
@echo "Continue with upload? "
@read
$(EXPM) publish

11
src/calrissian-util.lfe
View file

@ -1,9 +1,18 @@
(defmodule calrissian-util (defmodule calrissian-util
(export (module-info 1) (export (get-version 0)
(get-versions 0)
(module-info 1)
(module-info 2) (module-info 2)
(implements? 2) (implements? 2)
(exports? 2))) (exports? 2)))
(defun get-version ()
(lutil:get-app-version 'calrissian))
(defun get-versions ()
(++ (lutil:get-versions)
`(#(calrissian ,(get-version)))))
(defun module-info (defun module-info
(((tuple module _args)) (((tuple module _args))
;; Report exported function arities as (arity - 1) to account for ;; Report exported function arities as (arity - 1) to account for

13
test/unit/unit-calrissian-error-monad-tests.lfe → test/unit-calrissian-error-monad-tests.lfe
View file

@ -1,13 +1,10 @@
(defmodule unit-calrissian-error-monad-tests (defmodule unit-calrissian-error-monad-tests
(export all) (behaviour ltest-unit)
(import (export all))
(from lfeunit-util
(check-failed-assert 2)
(check-wrong-assert-exception 2))))
(include-lib "deps/lfeunit/include/lfeunit-macros.lfe") (include-lib "ltest/include/ltest-macros.lfe")
(include-lib "include/monads.lfe") (include-lib "calrissian/include/monads.lfe")
(include-lib "include/monad-tests.lfe") (include-lib "calrissian/include/monad-tests.lfe")
(test-monad (monad 'error)) (test-monad (monad 'error))

13
test/unit/unit-calrissian-identity-monad-tests.lfe → test/unit-calrissian-identity-monad-tests.lfe
View file

@ -1,13 +1,10 @@
(defmodule unit-calrissian-identity-monad-tests (defmodule unit-calrissian-identity-monad-tests
(export all) (behaviour ltest-unit)
(import (export all))
(from lfeunit-util
(check-failed-assert 2)
(check-wrong-assert-exception 2))))
(include-lib "deps/lfeunit/include/lfeunit-macros.lfe") (include-lib "ltest/include/ltest-macros.lfe")
(include-lib "include/monads.lfe") (include-lib "calrissian/include/monads.lfe")
(include-lib "include/monad-tests.lfe") (include-lib "calrissian/include/monad-tests.lfe")
(test-monad (monad 'identity)) (test-monad (monad 'identity))

13
test/unit/unit-calrissian-maybe-monad-tests.lfe → test/unit-calrissian-maybe-monad-tests.lfe
View file

@ -1,13 +1,10 @@
(defmodule unit-calrissian-maybe-monad-tests (defmodule unit-calrissian-maybe-monad-tests
(export all) (behaviour ltest-unit)
(import (export all))
(from lfeunit-util
(check-failed-assert 2)
(check-wrong-assert-exception 2))))
(include-lib "deps/lfeunit/include/lfeunit-macros.lfe") (include-lib "ltest/include/ltest-macros.lfe")
(include-lib "include/monads.lfe") (include-lib "calrissian/include/monads.lfe")
(include-lib "include/monad-tests.lfe") (include-lib "calrissian/include/monad-tests.lfe")
(test-monad (monad 'maybe)) (test-monad (monad 'maybe))

13
test/unit/unit-calrissian-state-transformer-tests.lfe → test/unit-calrissian-state-transformer-tests.lfe
View file

@ -1,13 +1,10 @@
(defmodule unit-calrissian-state-transformer-tests (defmodule unit-calrissian-state-transformer-tests
(export all) (behaviour ltest-unit)
(import (export all))
(from lfeunit-util
(check-failed-assert 2)
(check-wrong-assert-exception 2))))
(include-lib "deps/lfeunit/include/lfeunit-macros.lfe") (include-lib "ltest/include/ltest-macros.lfe")
(include-lib "include/monads.lfe") (include-lib "calrissian/include/monads.lfe")
(include-lib "include/monad-tests.lfe") (include-lib "calrissian/include/monad-tests.lfe")
(test-monad (transformer 'state 'identity)) (test-monad (transformer 'state 'identity))