From 0ffaf48730d83674cedfc9874e9adf5e8e71b5c9 Mon Sep 17 00:00:00 2001 From: Duncan McGreggor Date: Thu, 21 May 2015 17:31:11 -0500 Subject: [PATCH 1/8] Updated deps and unit tests to latest. --- rebar.config | 13 ++++--------- .../unit-calrissian-error-monad-tests.lfe | 13 +++++-------- .../unit-calrissian-identity-monad-tests.lfe | 13 +++++-------- .../unit-calrissian-maybe-monad-tests.lfe | 13 +++++-------- .../unit-calrissian-state-transformer-tests.lfe | 13 +++++-------- 5 files changed, 24 insertions(+), 41 deletions(-) rename test/{unit => }/unit-calrissian-error-monad-tests.lfe (74%) rename test/{unit => }/unit-calrissian-identity-monad-tests.lfe (50%) rename test/{unit => }/unit-calrissian-maybe-monad-tests.lfe (75%) rename test/{unit => }/unit-calrissian-state-transformer-tests.lfe (86%) diff --git a/rebar.config b/rebar.config index 46ae791..e2e8465 100644 --- a/rebar.config +++ b/rebar.config @@ -1,16 +1,11 @@ -{erl_opts, [debug_info, {src_dirs, ["test/unit", - "test/integration", - "test/system"]}]}. +{erl_opts, [debug_info, {src_dirs, ["test"]}]}. {lfe_first_files, []}. {deps_dir, ["deps"]}. {eunit_compile_opts, [ - {src_dirs, ["test/unit", - "test/integration", - "test/system", - "src"]} + {src_dirs, ["test"]} ]}. {deps, [ {lfe, ".*", {git, "git://github.com/rvirding/lfe.git", "develop"}}, - {'lfe-utils', ".*", {git, "https://github.com/lfe/lfe-utils.git", "master"}}, - {lfeunit, ".*", {git, "git://github.com/lfe/lfeunit.git", "master"}} + {lutil, ".*", {git, "https://github.com/lfex/lutil.git", "master"}}, + {ltest, ".*", {git, "git://github.com/lfex/ltest.git", "master"}} ]}. diff --git a/test/unit/unit-calrissian-error-monad-tests.lfe b/test/unit-calrissian-error-monad-tests.lfe similarity index 74% rename from test/unit/unit-calrissian-error-monad-tests.lfe rename to test/unit-calrissian-error-monad-tests.lfe index 37003aa..d6125ed 100644 --- a/test/unit/unit-calrissian-error-monad-tests.lfe +++ b/test/unit-calrissian-error-monad-tests.lfe @@ -1,13 +1,10 @@ (defmodule unit-calrissian-error-monad-tests - (export all) - (import - (from lfeunit-util - (check-failed-assert 2) - (check-wrong-assert-exception 2)))) + (behaviour ltest-unit) + (export all)) -(include-lib "deps/lfeunit/include/lfeunit-macros.lfe") -(include-lib "include/monads.lfe") -(include-lib "include/monad-tests.lfe") +(include-lib "ltest/include/ltest-macros.lfe") +(include-lib "calrissian/include/monads.lfe") +(include-lib "calrissian/include/monad-tests.lfe") (test-monad (monad 'error)) diff --git a/test/unit/unit-calrissian-identity-monad-tests.lfe b/test/unit-calrissian-identity-monad-tests.lfe similarity index 50% rename from test/unit/unit-calrissian-identity-monad-tests.lfe rename to test/unit-calrissian-identity-monad-tests.lfe index ea8ccac..87e15a9 100644 --- a/test/unit/unit-calrissian-identity-monad-tests.lfe +++ b/test/unit-calrissian-identity-monad-tests.lfe @@ -1,13 +1,10 @@ (defmodule unit-calrissian-identity-monad-tests - (export all) - (import - (from lfeunit-util - (check-failed-assert 2) - (check-wrong-assert-exception 2)))) + (behaviour ltest-unit) + (export all)) -(include-lib "deps/lfeunit/include/lfeunit-macros.lfe") -(include-lib "include/monads.lfe") -(include-lib "include/monad-tests.lfe") +(include-lib "ltest/include/ltest-macros.lfe") +(include-lib "calrissian/include/monads.lfe") +(include-lib "calrissian/include/monad-tests.lfe") (test-monad (monad 'identity)) diff --git a/test/unit/unit-calrissian-maybe-monad-tests.lfe b/test/unit-calrissian-maybe-monad-tests.lfe similarity index 75% rename from test/unit/unit-calrissian-maybe-monad-tests.lfe rename to test/unit-calrissian-maybe-monad-tests.lfe index e463b49..16de31c 100644 --- a/test/unit/unit-calrissian-maybe-monad-tests.lfe +++ b/test/unit-calrissian-maybe-monad-tests.lfe @@ -1,13 +1,10 @@ (defmodule unit-calrissian-maybe-monad-tests - (export all) - (import - (from lfeunit-util - (check-failed-assert 2) - (check-wrong-assert-exception 2)))) + (behaviour ltest-unit) + (export all)) -(include-lib "deps/lfeunit/include/lfeunit-macros.lfe") -(include-lib "include/monads.lfe") -(include-lib "include/monad-tests.lfe") +(include-lib "ltest/include/ltest-macros.lfe") +(include-lib "calrissian/include/monads.lfe") +(include-lib "calrissian/include/monad-tests.lfe") (test-monad (monad 'maybe)) diff --git a/test/unit/unit-calrissian-state-transformer-tests.lfe b/test/unit-calrissian-state-transformer-tests.lfe similarity index 86% rename from test/unit/unit-calrissian-state-transformer-tests.lfe rename to test/unit-calrissian-state-transformer-tests.lfe index 99e1c8a..02f1718 100644 --- a/test/unit/unit-calrissian-state-transformer-tests.lfe +++ b/test/unit-calrissian-state-transformer-tests.lfe @@ -1,13 +1,10 @@ (defmodule unit-calrissian-state-transformer-tests - (export all) - (import - (from lfeunit-util - (check-failed-assert 2) - (check-wrong-assert-exception 2)))) + (behaviour ltest-unit) + (export all)) -(include-lib "deps/lfeunit/include/lfeunit-macros.lfe") -(include-lib "include/monads.lfe") -(include-lib "include/monad-tests.lfe") +(include-lib "ltest/include/ltest-macros.lfe") +(include-lib "calrissian/include/monads.lfe") +(include-lib "calrissian/include/monad-tests.lfe") (test-monad (transformer 'state 'identity)) From e0dbe6ff15b476fc40f80c5cb38b265df140d681 Mon Sep 17 00:00:00 2001 From: Duncan McGreggor Date: Thu, 21 May 2015 17:39:27 -0500 Subject: [PATCH 2/8] Replaced obselete EXPM data with lfe.config. --- lfe.config | 11 +++++++++++ package.exs | 7 ------- rebar.config | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 lfe.config delete mode 100644 package.exs diff --git a/lfe.config b/lfe.config new file mode 100644 index 0000000..9af290f --- /dev/null +++ b/lfe.config @@ -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"))))))) diff --git a/package.exs b/package.exs deleted file mode 100644 index 027db08..0000000 --- a/package.exs +++ /dev/null @@ -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"]]) diff --git a/rebar.config b/rebar.config index e2e8465..2aa306a 100644 --- a/rebar.config +++ b/rebar.config @@ -7,5 +7,6 @@ {deps, [ {lfe, ".*", {git, "git://github.com/rvirding/lfe.git", "develop"}}, {lutil, ".*", {git, "https://github.com/lfex/lutil.git", "master"}}, - {ltest, ".*", {git, "git://github.com/lfex/ltest.git", "master"}} + {ltest, ".*", {git, "git://github.com/lfex/ltest.git", "master"}}, + {lcfg, ".*", {git, "git://github.com/lfex/lcfg.git", "master"}} ]}. From e5ab919365dc2aa418ca3a2c0d95c26b1808bf55 Mon Sep 17 00:00:00 2001 From: Duncan McGreggor Date: Thu, 21 May 2015 17:41:52 -0500 Subject: [PATCH 3/8] Added version util funcs. --- src/calrissian-util.lfe | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/calrissian-util.lfe b/src/calrissian-util.lfe index 3055123..24a6a53 100644 --- a/src/calrissian-util.lfe +++ b/src/calrissian-util.lfe @@ -1,9 +1,18 @@ (defmodule calrissian-util - (export (module-info 1) + (export (get-version 0) + (get-versions 0) + (module-info 1) (module-info 2) (implements? 2) (exports? 2))) +(defun get-version () + (lutil:get-app-version 'calrissian)) + +(defun get-versions () + (++ (lutil:get-versions) + `(#(calrissian ,(get-version))))) + (defun module-info (((tuple module _args)) ;; Report exported function arities as (arity - 1) to account for From 3952a891848b2abaee8b04710171c7ec7af9433a Mon Sep 17 00:00:00 2001 From: Duncan McGreggor Date: Thu, 21 May 2015 17:42:05 -0500 Subject: [PATCH 4/8] Updated make file and include to latest. --- Makefile | 2 + resources/make/common.mk | 104 ++++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index d6f62d1..0e89e1c 100644 --- a/Makefile +++ b/Makefile @@ -1 +1,3 @@ +PROJECT = calrissian + include resources/make/common.mk diff --git a/resources/make/common.mk b/resources/make/common.mk index e062f14..cbd99d3 100644 --- a/resources/make/common.mk +++ b/resources/make/common.mk @@ -1,98 +1,112 @@ -PROJECT = calrissian +ifeq ($(shell which erl),) +$(error Can't find Erlang executable 'erl') +exit 1 +endif + LIB = $(PROJECT) DEPS = ./deps BIN_DIR = ./bin -EXPM = $(BIN_DIR)/expm - SOURCE_DIR = ./src OUT_DIR = ./ebin TEST_DIR = ./test TEST_OUT_DIR = ./.eunit SCRIPT_PATH=$(DEPS)/lfe/bin:.:./bin:"$(PATH)":/usr/local/bin -ERL_LIBS=$(shell pwd):$(shell $(LFETOOL) info erllibs) -EMPTY = -ifeq ($(shell which lfetool),$EMPTY) - LFETOOL=$(BIN_DIR)/lfetool +ifeq ($(shell which lfetool),) +LFETOOL=$(BIN_DIR)/lfetool else - LFETOOL=lfetool +LFETOOL=lfetool endif +ERL_LIBS=.:..:$(shell pwd):$(shell $(LFETOOL) info erllibs) OS := $(shell uname -s) ifeq ($(OS),Linux) - HOST=$(HOSTNAME) + HOST=$(HOSTNAME) endif ifeq ($(OS),Darwin) - HOST = $(shell scutil --get ComputerName) + HOST = $(shell scutil --get ComputerName) endif $(BIN_DIR): mkdir -p $(BIN_DIR) -$(LFETOOL): $(BIN_DIR) - @[ -f $(LFETOOL) ] || \ - curl -L -o ./lfetool https://raw.github.com/lfe/lfetool/master/lfetool && \ +get-lfetool: $(BIN_DIR) + curl -L -o ./lfetool https://raw.github.com/lfe/lfetool/dev-v1/lfetool && \ chmod 755 ./lfetool && \ mv ./lfetool $(BIN_DIR) get-version: - @PATH=$(SCRIPT_PATH) lfetool info version - -$(EXPM): $(BIN_DIR) - @[ -f $(EXPM) ] || \ - PATH=$(SCRIPT_PATH) lfetool install expm $(BIN_DIR) + @PATH=$(SCRIPT_PATH) $(LFETOOL) info version + @echo "Erlang/OTP, LFE, & library versions:" + @ERL_LIBS=$(ERL_LIBS) PATH=$(SCRIPT_PATH) erl \ + -eval "lfe_io:format(\"~p~n\",['$(PROJECT)-util':'get-versions'()])." \ + -noshell -s erlang halt get-deps: @echo "Getting dependencies ..." - @which rebar.cmd >/dev/null 2>&1 && rebar.cmd get-deps || rebar get-deps - @PATH=$(SCRIPT_PATH) lfetool update deps + @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) download deps clean-ebin: @echo "Cleaning ebin dir ..." @rm -f $(OUT_DIR)/*.beam clean-eunit: - @PATH=$(SCRIPT_PATH) lfetool tests clean + -@PATH=$(SCRIPT_PATH) $(LFETOOL) tests clean compile: get-deps clean-ebin @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 @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: - @PATH=$(SCRIPT_PATH) lfetool tests build +compile-tests: clean-eunit + @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 @which clear >/dev/null 2>&1 && clear || printf "\033c" - @echo "Starting shell ..." - @PATH=$(SCRIPT_PATH) lfetool repl + @echo "Starting an Erlang shell ..." + @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) erl + pc unicode shell-no-deps: compile-no-deps @which clear >/dev/null 2>&1 && clear || printf "\033c" - @echo "Starting shell ..." - @PATH=$(SCRIPT_PATH) lfetool repl + @echo "Starting an Erlang shell ..." + @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) erl + pc unicode clean: clean-ebin clean-eunit @which rebar.cmd >/dev/null 2>&1 && rebar.cmd clean || rebar clean check-unit-only: - @PATH=$(SCRIPT_PATH) lfetool tests unit + @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) tests unit check-integration-only: - @PATH=$(SCRIPT_PATH) lfetool tests integration + @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) tests integration 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: compile-no-deps check-unit-only -check-integration: compile check-integration-only -check-system: compile check-system-only -check-all-with-deps: compile check-unit-only check-integration-only \ - check-system-only -check-all: get-deps compile-no-deps - @PATH=$(SCRIPT_PATH) lfetool tests all +check-unit: clean-eunit compile-no-deps check-unit-only +check-integration: clean-eunit compile check-integration-only +check-system: clean-eunit compile check-system-only +check-all-with-deps: clean-eunit compile check-unit-only \ + check-integration-only check-system-only clean-eunit +check-all: get-deps clean-eunit compile-no-deps + @PATH=$(SCRIPT_PATH) ERL_LIBS=$(ERL_LIBS) $(LFETOOL) tests all check: check-unit-with-deps @@ -106,16 +120,6 @@ push-all: git push upstream --tags install: compile - @echo "Installing calrissian ..." + @echo "Installing lumberjack ..." @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 From 47827b2fe90addec7bf22ebedf1f05f23a134012 Mon Sep 17 00:00:00 2001 From: Duncan McGreggor Date: Thu, 21 May 2015 18:23:23 -0500 Subject: [PATCH 5/8] Updated travis make target. --- resources/make/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/make/common.mk b/resources/make/common.mk index cbd99d3..9a67212 100644 --- a/resources/make/common.mk +++ b/resources/make/common.mk @@ -110,7 +110,7 @@ check-all: get-deps clean-eunit compile-no-deps check: check-unit-with-deps -check-travis: $(LFETOOL) check +check-travis: $(BIN_DIR)/lfetool check push-all: @echo "Pusing code to github ..." From 1a37e663e530889a07fa21b708ffa06fc10d95b0 Mon Sep 17 00:00:00 2001 From: Duncan McGreggor Date: Thu, 21 May 2015 18:27:34 -0500 Subject: [PATCH 6/8] Added another target for Jenkins' use. --- resources/make/common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/make/common.mk b/resources/make/common.mk index 9a67212..e609701 100644 --- a/resources/make/common.mk +++ b/resources/make/common.mk @@ -28,6 +28,9 @@ endif $(BIN_DIR): mkdir -p $(BIN_DIR) +$(BIN_DIR)/lfetool: $(BIN_DIR) + @make get-lfetool + get-lfetool: $(BIN_DIR) curl -L -o ./lfetool https://raw.github.com/lfe/lfetool/dev-v1/lfetool && \ chmod 755 ./lfetool && \ From 1518454010bef170869c0cd855f8a07c183d0e36 Mon Sep 17 00:00:00 2001 From: "Duncan M. McGreggor" Date: Thu, 21 May 2015 20:44:39 -0500 Subject: [PATCH 7/8] Fixed bad copy/paste. --- lfe.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfe.config b/lfe.config index 9af290f..7ffa31d 100644 --- a/lfe.config +++ b/lfe.config @@ -1,7 +1,7 @@ #(project (#(deps (#("lfex/lcfg" "master"))) #(meta ( - #(name logjam) + #(name calrissian) #(description "Monads for LFE") #(version "0.1.0") #(keywords ("LFE" "Lisp" "Library" "Monads")) From 2577cf91f4f9d779cf8bf2cd573466bc357c29d3 Mon Sep 17 00:00:00 2001 From: "Duncan M. McGreggor" Date: Thu, 21 May 2015 20:45:42 -0500 Subject: [PATCH 8/8] Removed old targets. --- resources/make/common.mk | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/make/common.mk b/resources/make/common.mk index e609701..dbbd1e2 100644 --- a/resources/make/common.mk +++ b/resources/make/common.mk @@ -114,15 +114,3 @@ check-all: get-deps clean-eunit compile-no-deps check: check-unit-with-deps check-travis: $(BIN_DIR)/lfetool check - -push-all: - @echo "Pusing code to github ..." - git push --all - git push upstream --all - git push --tags - git push upstream --tags - -install: compile - @echo "Installing lumberjack ..." - @PATH=$(SCRIPT_PATH) lfetool install lfe -