Merge pull request #169 from srid/release-0.4

Release 0.4
srid · May 9, 2020 · e8c4286 · e8c4286
2 parents f4b746d + e116f82
commit e8c4286
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,32 +1,40 @@
 # Change Log for neuron
 
-## 0.3.0.0 (DEV)
+## 0.4.0.0
 
-- New features
-  - [Short links](https://neuron.zettel.page/2014501.html).
+- Notable changes
+  - More convenient links; `<foobar>` instead of `[foobar](z:/)` (#59)
+  - Hierarchical tags, with tag pattern in zquery (#115)
+  - Change default ID generation to use random hash (#151)
+    - Add `date` field to Markdown metadata
+  - Added `neuron query` to query the Zettelkasten and get JSON output (#42)
+- CLI argument parsing revamp
+  - Zettelkasten directory is now provided via the `-d` argument.
+    - Its default, `~/zettelkasten`, is used when not specified.
+    - This directory must exist, otherwise neuron will error out.
+  - The output directory is now moved to `.neuron/output`
+  - `neuron ... rib serve` is now `neuron rib -wS`.
+- CLI changes:
   - Full text search: `neuron search --full-text`
   - #43: Add `neuron search -e` to open the matching zettel in $EDITOR
   - Allow customizing output directory
   - Added `neuron open` to open the locally generated Zettelkasten site.
+  - #107: Add full path to the zettel in `neuron query` JSON
+- Web interface:
   - Custom themes for web interface
+  - Display all backlinks to a zettel (even those not in category tree) (#34)
+  - Simplified link style (#151)
+  - Client-side web search (#90)
+  - Add JSON-LD breadcrumbs (#147)
+  - Add query to display tag tree (#121)
   - Custom alias redirects
-  - #90: Client-side web search
-  - #107: Add full path to the zettel in `neuron query` JSON
-  - #115: Hierarchical tags, with tag pattern in zquery
-- CLI revamp
-  - Zettelkasten directory is now provided via the `-d` argument.
-    - Its default, `~/zettelkasten`, is used when not specified.
-    - This directory must exist, otherwise neuron will error out.
-  - The output directory is now moved to `.neuron/output` under the Zettelkasten directory.
-  - `neuron ... rib serve` is now `neuron rib -wS`.
-- Bug fixes
-  - Fix regression in neuron library use
-  - #130: Handle links inside blockquotes
-- UI
   - Tags are restyled and positioned below
   - Produce compact CSS in HTML head
   - #24: zquery is displayed in HTML view.
   - #100: Tables are styled nicely using Semantic UI
+- Bug fixes
+  - Fix regression in neuron library use
+  - #130: Handle links inside blockquotes
 
 ## 0.2.0.0
 

diff --git a/neuron.cabal b/neuron.cabal
@@ -1,7 +1,7 @@
 cabal-version: 2.4
 name: neuron
 -- This version must be in sync with what's in Default.dhall
-version: 0.3.1.0
+version: 0.4.0.0
 license: BSD-3-Clause
 copyright: 2020 Sridhar Ratnakumar
 maintainer: srid@srid.ca
@@ -39,7 +39,7 @@ common library-common
   import: ghc-common
   default-language: Haskell2010
   build-depends:
-    base,
+    base >=4.12 && < 4.14,
     aeson,
     mtl,
     text,
@@ -75,7 +75,7 @@ common app-common
   hs-source-dirs: src/app src/lib
   default-language: Haskell2010
   build-depends:
-    base,
+    base >=4.12 && < 4.14,
     aeson,
     clay -any,
     mtl,
@@ -109,6 +109,8 @@ common app-common
     shake,
     with-utf8
   if (!flag(ghcid))
+    autogen-modules:
+      Paths_neuron
     other-modules:
       Data.Graph.Labelled
       Data.Graph.Labelled.Algorithm
@@ -157,7 +159,7 @@ test-suite neuron-test
   hs-source-dirs: test
   main-is: Spec.hs
   build-depends:
-    base,
+    base >=4.12 && < 4.14,
     relude,
     hspec,
     QuickCheck,

diff --git a/src-dhall/Config/Default.dhall b/src-dhall/Config/Default.dhall
@@ -13,5 +13,5 @@
 , mathJaxSupport =
     True
 , minVersion =
-    "0.3"
+    "0.4"
 }
diff --git a/test/Neuron/VersionSpec.hs b/test/Neuron/VersionSpec.hs
@@ -17,23 +17,21 @@ spec = do
   describe "Application version" $ do
     it "should have dots" $ do
       neuronVersion `shouldSatisfy` T.isInfixOf "."
-    it "should contain the git rev" $ do
-      pending
   -- TODO: Check minVersion in Default.dhall is same as the one in Paths_neuron
-  describe "Version comparison" $ do
+  describe "must compare" $ do
     let isGreater = shouldSatisfy
         isLesserOrEqual = shouldNotSatisfy
-    it "must compare simple versions" $ do
+    it "simple versions" $ do
       -- If the user requires 0.4, and we are "older than" than that, fail (aka. isGreater)
-      "0.4" `isGreater` olderThan
-      "0.3" `isLesserOrEqual` olderThan -- This is current version
+      "0.5" `isGreater` olderThan
+      "0.4" `isLesserOrEqual` olderThan -- This is current version
       "0.2" `isLesserOrEqual` olderThan
-    it "must compare full versions" $ do
-      "0.4.1.2" `isGreater` olderThan
+    it "full versions" $ do
+      "0.5.1.2" `isGreater` olderThan
       "0.4.3" `isGreater` olderThan
-      "0.3.1.8" `isGreater` olderThan
-      "0.3.1.0" `isLesserOrEqual` olderThan -- This is current version
-      "0.2.1.0" `isLesserOrEqual` olderThan
-    it "must compare within same major version" $ do
-      "0.3.1.8" `isGreater` olderThan
-      "0.3.1.0" `isLesserOrEqual` olderThan -- This is current version
+      "0.4.1.8" `isGreater` olderThan
+      "0.4.0.0" `isLesserOrEqual` olderThan -- This is current version
+      "0.3.1.0" `isLesserOrEqual` olderThan
+    it "within same major version" $ do
+      "0.4.1.8" `isGreater` olderThan
+      "0.4.0.0" `isLesserOrEqual` olderThan -- This is current version
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,5 +13,5 @@ @@
     , mathJaxSupport =
         True
     , minVersion =
-        "0.3"
+        "0.4"
     }