Skip to content

Commit

Permalink
Merge pull request #63 from jesims/JESI-3014
Browse files Browse the repository at this point in the history
  • Loading branch information
André de Jager committed Jan 29, 2020
2 parents 42a4ec2 + d99eea9 commit 4b2f8fa
Show file tree
Hide file tree
Showing 86 changed files with 630 additions and 1,620 deletions.
18 changes: 14 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ version: 2
aliases:
cache:
lein_cache: &LEIN_CACHE
key: lein-{{ checksum "project.clj" }}
key: lein-{{ .Environment.CACHE_VERSION }}-{{ checksum "project.clj" }}
paths:
- ~/.lein
- ~/.m2
- /home/node/.lein
- /home/node/.m2
node_cache: &NODE_CACHE
key: node-{{ checksum "/tmp/.node_version" }}-{{ checksum "package-lock.json" }}
key: node-{{ .Environment.CACHE_VERSION }}-{{ checksum "/tmp/.node_version" }}-{{ checksum "package-lock.json" }}
paths:
- node_modules
containers:
docker: &DEFAULT
- image: jesiio/build-bus:latest
user: node
environment:
JVM_OPTS: -Xmx3200m
DEBUG: 1
Expand All @@ -22,12 +23,15 @@ aliases:
run:
name: Check & Cancel Redundant Build
command: 'cancel-redundant-builds.sh'
submodule: &SUBMODULE
run: git submodule update --init
jobs:
deps:
docker: *DEFAULT
steps:
- *CANCEL_REDUNDANT
- checkout
- *SUBMODULE
- restore_cache:
<<: *LEIN_CACHE
- restore_cache:
Expand All @@ -42,6 +46,7 @@ jobs:
steps:
- *CANCEL_REDUNDANT
- checkout
- *SUBMODULE
- restore_cache:
<<: *LEIN_CACHE
- restore_cache:
Expand All @@ -52,6 +57,7 @@ jobs:
steps:
- *CANCEL_REDUNDANT
- checkout
- *SUBMODULE
- restore_cache:
<<: *LEIN_CACHE
- restore_cache:
Expand All @@ -62,6 +68,7 @@ jobs:
steps:
- *CANCEL_REDUNDANT
- checkout
- *SUBMODULE
- restore_cache:
<<: *LEIN_CACHE
- restore_cache:
Expand All @@ -72,6 +79,7 @@ jobs:
steps:
- *CANCEL_REDUNDANT
- checkout
- *SUBMODULE
- restore_cache:
<<: *LEIN_CACHE
- restore_cache:
Expand All @@ -82,6 +90,7 @@ jobs:
steps:
- *CANCEL_REDUNDANT
- checkout
- *SUBMODULE
- restore_cache:
<<: *LEIN_CACHE
- restore_cache:
Expand All @@ -92,6 +101,7 @@ jobs:
steps:
- *CANCEL_REDUNDANT
- checkout
- *SUBMODULE
- restore_cache:
<<: *LEIN_CACHE
- restore_cache:
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
*-init.clj
*.iml
.clj-kondo/
.cljs_node_repl
.idea/dictionaries/
.idea/libraries/
.idea/workspace.xml
.lein-failures
.nrepl-port
.shadow-cljs/
/out
node_modules/
package.json
pom.xml
project.edn
target/
tests.edn
trace.edn
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "bindle"]
path = bindle
url = git@github.com:jesims/bindle.git
10 changes: 10 additions & 0 deletions .idea/bashsupport_project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/watcherTasks.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# 5.0.0

Changed:

* Moved `pprint-str` and `pprint-str-code` to `io.jesi.backpack.miscellaneous`
* Moved `io.jesi.backpack.spy` to `io.jesi.backpack.test.spy`
* Moved `io.jesi.backpack.test.*` to [customs](https://github.com/jesims/customs) project

Removed:

* Deprecated `io.jesi.backpack.miscellaneous/assoc-changed!`
* Deprecated `io.jesi.customs.macros/is=`
* Deprecated `io.jesi.customs.macros/testing`

Added:

* [Bindle](https://github.com/jesims/bindle) submodule
* [customs](https://github.com/jesims/customs) dependency

# 4.2.1

Fix:
Expand Down
8 changes: 3 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@

**DO** ensure the CI checks pass.

**DO** update the [CHANGELOG](CHANGELOG.md) to reflect changes (include your Github identifier).
**DO** update the [CHANGELOG](CHANGELOG.md) to reflect changes.

**DO** update the [CONTRIBUTORS](CONTRIBUTORS.md) to append your name (if not already present).

**DO** notify the project maintainers about any PR that has become stale. We're human and sometimes miss notifications.

**DO** search [crossclj.info](https://crossclj.info/) when considering new additions to see if something already exists.

**Don't** include more than one feature or fix in a single PR.

**Don't** include changes unrelated to the purpose of the PR.
Expand All @@ -21,12 +19,12 @@
## Testing

All utilities should be written to support both Clojure and ClojureScript with unit tests written in **CLJC** where practical.
Unit tests can then be run by invoking `backpack.sh unit-test` or `backpack.sh unit-test-cljs` respectively.
Unit tests can then be run by invoking `backpack.sh test` or `backpack.sh test-cljs` respectively.

### Theme: Animal Safari

We like to have a theme when testing code that requires data. This projects theme is animal facts (bonus points for Sir David Attenborough quotes).
[View an example](./test/io/jesi/backpack/collection_test.cljc#L35)
[View an example](./test/io/jesi/backpack/collection_test.cljc#L42)

## Helper Utilities

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.1
5.0.0

0 comments on commit 4b2f8fa

Please sign in to comment.