summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrome <>2019-10-09 15:08:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-10-09 15:08:00 (GMT)
commitcae1e88ee876cab72c7cc4f1e44aa8dc6d70b61f (patch)
tree42d5a640b25b7e59259fdaf80282d8d9af7109c9
parentfe79914efd02bae105f9de52c764613f20508099 (diff)
version 0.1.1.6HEAD0.1.1.6master
-rw-r--r--CHANGELOG.md11
-rw-r--r--Crypto/Enigma/Display.hs2
-rw-r--r--README.md6
-rw-r--r--cli/enigma.hs11
-rw-r--r--crypto-enigma.cabal12
5 files changed, 21 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2392439..c440272 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,19 @@ See also:
* [closed milestones]; and
* [issues].
-### (0.1.1.6)
+### (0.1.1.7)
Current [development version]
+### [0.1.1.6]
+
+Latest [release version], including
+* minor bug fixes and tidying, including improved error reporting; and
+* compatability with GHC 8.8.1.
+
### [0.1.1.5]
-Latest [release version], including version CLI option and improved CLI error reporting.
+Add version CLI option and improved CLI error reporting.
### [0.1.1.4]
@@ -164,6 +170,7 @@ Stable enough for use, but not reviewed.
[development version]: https://github.com/orome/crypto-enigma-hs/tree/develop
[new CLI]: https://github.com/orome/crypto-enigma-hs/tree/new/cli
+[0.1.1.6]: https://github.com/orome/crypto-enigma-hs/releases/tag/0.1.1.6
[0.1.1.5]: https://github.com/orome/crypto-enigma-hs/releases/tag/0.1.1.5
[0.1.1.4]: https://github.com/orome/crypto-enigma-hs/releases/tag/0.1.1.4
[0.1.1.3]: https://github.com/orome/crypto-enigma-hs/releases/tag/0.1.1.3
diff --git a/Crypto/Enigma/Display.hs b/Crypto/Enigma/Display.hs
index d883782..0a316ab 100644
--- a/Crypto/Enigma/Display.hs
+++ b/Crypto/Enigma/Display.hs
@@ -589,7 +589,7 @@ Show the conventionally formatted encoding of a 'Message' by an (initial) Enigma
>>> putStr $ displayEnigmaEncoding cfg "FOLGENDES IST SOFORT BEKANNTZUGEBEN"
RBBF PMHP HGCZ XTDY GAHG UFXG EWKB LKGJ
-}
--- TBD: Add new arguments for formatting (and use in cli)
+-- TBD: Add new arguments for formatting, and use in cli (#33) <<<
displayEnigmaEncoding :: EnigmaConfig -> Message -> String
displayEnigmaEncoding ec str = postproc $ enigmaEncoding ec (message str)
where
diff --git a/README.md b/README.md
index d43f4e7..48b394e 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Currently support is only provided for those [machine models] in most widespread
[I], [M3], and [M4].
This is adapted, as an exercise in learning Haskell, from an earlier learning project written in Mathematica. It is my
-first Haskell program. A [Python version] with substantially the same API, plus a command line interface, is also
+first Haskell program. A [Python version] with substantially the same API and command line interface, is also
available.
### Functionality: package API
@@ -64,10 +64,10 @@ Haskell installations, provides almost all the functionality of the API.
Encode messages:
$ enigma encode "B-I-III-I EMO UX.MO.AY 13.04.11" "TESTINGXTESTINGUD"
- OZQKPFLPYZRPYTFVU
+ OZQK PFLP YZRP YTFV U
$ enigma encode "B-I-III-I EMO UX.MO.AY 13.04.11" "OZQKPFLPYZRPYTFVU"
- TESTINGXTESTINGUD
+ TEST INGX TEST INGU D
Show configuration details (explained in more detail in the command line help):
diff --git a/cli/enigma.hs b/cli/enigma.hs
index a07df03..4c0881e 100644
--- a/cli/enigma.hs
+++ b/cli/enigma.hs
@@ -276,8 +276,7 @@ topFoot = "Examples:\n" ++ topExamples ++ "\nThis command line interface is part
topExamples = unlines [
" $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"TESTINGXTESTINGUD\"",
- " $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"TESTINGXTESTINGUD\" -f",
- " $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"TESTING! testing?\" -f",
+ " $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"TESTING! testing?\"",
" $ enigma show \"B-I-III-I EMO UX.MO.AY 13.04.11\" -l 'X'",
" $ enigma show \"B-I-III-I EMO UX.MO.AY 13.04.11\" -l 'X' -H '()'",
" $ enigma show \"B-I-III-I EMO UX.MO.AY 13.04.11\" -l 'X' -H '()' -f internal",
@@ -295,17 +294,11 @@ topExamples = unlines [
encodeCmdExamples = init $ unlines [
" Encode a message:",
" $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"TESTINGXTESTINGUD\"",
- " OZQKPFLPYZRPYTFVU",
- " $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"OZQKPFLPYZRPYTFVU\"",
- " TESTINGXTESTINGUD",
- "",
- " Encode a message and break the output into blocks of 4:",
- " $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"TESTINGXTESTINGUD\" -f",
" OZQK PFLP YZRP YTFV U",
"",
" Standard Naval subistitutions for non-letter characters are performed",
" before encoding:",
- " $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"TESTING! testing?\" -f",
+ " $ enigma encode \"B-I-III-I EMO UX.MO.AY 13.04.11\" \"TESTING! testing?\"",
" OZQK PFLP YZRP YTFV U"]
showCmdExamples = init $ unlines [
diff --git a/crypto-enigma.cabal b/crypto-enigma.cabal
index 1d9b170..ff76293 100644
--- a/crypto-enigma.cabal
+++ b/crypto-enigma.cabal
@@ -3,7 +3,7 @@ name: crypto-enigma
-- PVP summary: +-+------- breaking API changes
-- | | +----- non-breaking API additions
-- | | | +--- code changes with no API change
-version: 0.1.1.5
+version: 0.1.1.6
synopsis: An Enigma machine simulator with display.
description: The crypto-enigma package is an Enigma machine simulator
with rich display and machine state details.
@@ -45,7 +45,7 @@ source-repository this
type: git
location: git://github.com/orome/crypto-enigma-hs.git
branch: hackage
- tag: 0.1.1.5
+ tag: 0.1.1.6
library
-- default-extensions: Safe
@@ -53,7 +53,7 @@ library
Crypto.Enigma.Display
other-modules: Crypto.Enigma.Utils
-- other-extensions:
- build-depends: base >=4.8.1.0 && <=4.12.0.0,
+ build-depends: base >=4.8.1.0 && <=4.13.0.0,
containers >=0.5.5.1,
split >=0.2.2,
text >=1.2.2.0
@@ -67,7 +67,7 @@ executable enigma
Crypto.Enigma.Display,
Crypto.Enigma.Utils,
Paths_crypto_enigma
- build-depends: base >=4.8.1.0 && <=4.12.0.0,
+ build-depends: base >=4.8.1.0 && <=4.13.0.0,
containers >=0.5.5.1,
split >=0.2.2,
text >=1.2.2.0,
@@ -80,7 +80,7 @@ test-suite crypto-enigma-check
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Check.hs
- build-depends: base >=4.8.1.0 && <=4.12.0.0,
+ build-depends: base >=4.8.1.0 && <=4.13.0.0,
QuickCheck >=2.8,
crypto-enigma
-- ghc-options: -threaded -rtsopts -with-rtsopts=-N
@@ -90,7 +90,7 @@ test-suite crypto-enigma-test
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Test.hs
- build-depends: base >=4.8.1.0 && <=4.12.0.0,
+ build-depends: base >=4.8.1.0 && <=4.13.0.0,
HUnit >=1.2.5.2,
crypto-enigma
-- ghc-options: -threaded -rtsopts -with-rtsopts=-N