Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mzuther committed Jul 13, 2020
2 parents 07b6524 + 7086ef1 commit a37bd41
Show file tree
Hide file tree
Showing 6 changed files with 345 additions and 120 deletions.
44 changes: 35 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,66 @@ file. This change log follows the conventions of



## [1.2.0] - 2020-07-13
### Added

- add command line help and version display

- add Leiningen debug profile

- add a first unit test

### Changed

- improve console logging

- return process object from "shell-exec"

- place guards around IO operations

- re-factor code

## Fixed

- fix reflection warning



## [1.1.0] - 2020-06-23
### Added

* let users define tasks and do not limit the number of tasks
- let users define tasks and do not limit the number of tasks

* add complete documentation
- add complete documentation

* display an error message if the settings file cannot be opened or is
- display an error message if the settings file cannot be opened or is
broken

### Changed

* completely change the structure of the settings file
- completely change the structure of the settings file

* do not skip the first state update when MoccaFaux is started
- do not skip the first state update when MoccaFaux is started

* drop the default settings
- drop the default settings

* rename the sample settings file
- rename the sample settings file

## Fixed

* kill the scheduler and end MoccaFaux if an exception is thrown
- kill the scheduler and end MoccaFaux if an exception is thrown



## [1.0.0] - 2020-06-20
### Changed

* This is the first release.
- This is the first release.


[keepachangelog.com]: http://keepachangelog.com/
[Unreleased]: https://github.com/mzuther/moccafaux/tree/develop

[1.0.0]: https://github.com/mzuther/moccafaux/commits/v1.0.0
[1.1.0]: https://github.com/mzuther/moccafaux/commits/v1.1.0
[1.2.0]: https://github.com/mzuther/moccafaux/commits/v1.2.0
4 changes: 2 additions & 2 deletions config-SAMPLE.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"sleep": {
"enable": {
"message": "allow computer to save energy",
"command": "xautolock -time 15 -locker 'systemctl suspend' -detectsleep",
"command": "xautolock -time 10 -locker 'systemctl suspend' -detectsleep",
"fork": true
},
"disable": {
Expand All @@ -20,7 +20,7 @@
"dpms": {
"enable": {
"message": "allow screen to save energy",
"command": "xset dpms 300 600 900",
"command": "xset dpms 0 300 600",
"fork": false
},
"disable": {
Expand Down
17 changes: 14 additions & 3 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
(defproject de.mzuther/moccafaux.core "1.1.0"
(defproject de.mzuther/moccafaux.core "1.2.0"
:description "Adapt power management to changes in the environment."
:url "https://github.com/mzuther/moccafaux"
:license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"}
:url "https://www.eclipse.org/legal/epl-2.0/"}

:dependencies [[org.clojure/clojure "1.10.1"]
[org.clojure/data.json "1.0.0"]
[org.clojure/tools.cli "1.0.194"]
[com.rpl/specter "1.1.3"]
[jarohen/chime "0.3.2"]
[popen "0.3.1"]
Expand All @@ -15,4 +16,14 @@
:target-path "target/%s"
:uberjar-name "moccafaux.jar"

:profiles {:uberjar {:aot :all}})
:profiles {:debug {:debug true
;; :injections [(newline)
;; (doseq [s (into {} (System/getProperties))]
;; (prn s))
;; (newline)
;; (flush)]
:global-vars {*warn-on-reflection* true
*assert* true}}
:uberjar {:aot :all
:global-vars {*warn-on-reflection* true
*assert* false}}})
Loading

0 comments on commit a37bd41

Please sign in to comment.