Merge branch 'master' into 2.0-dayone-fixes

features/data/configs/multiple.yaml

@@ -9,6 +9,9 @@ journals:
   ideas: features/journals/nothing.journal
   simple: features/journals/simple.journal
   work: features/journals/work.journal
+  new_encrypted:
+    encrypt: true
+    journal: features/journals/new_encrypted.journal
 linewrap: 80
 password: ''
 tagsymbols: '@'

features/data/journals/simple_jrnl-1-9-5.journal

@@ -1,3 +1,13 @@
 2010-06-10 15:00 A life without chocolate is like a bad analogy.
 
 2013-06-10 15:40 He said "[this] is the best time to be alive".
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent malesuada
+quis est ac dignissim. Aliquam dignissim rutrum pretium. Phasellus pellentesque
+augue et venenatis facilisis.
+
+[2019-08-03 12:55] Some chat log or something
+
+Suspendisse potenti. Sed dignissim sed nisl eu consequat. Aenean ante ex,
+elementum ut interdum et, mattis eget lacus. In commodo nulla nec tellus
+placerat, sed ultricies metus bibendum. Duis eget venenatis erat. In at dolor
+dui.

features/encryption.feature

@@ -29,14 +29,3 @@
             When we run "jrnl simple -n 1"
             Then we should not see the message "Password"
             and the output should contain "2013-06-10 15:40 Life is good"
-
-        Scenario: Upgrading a journal encrypted with jrnl 1.x
-            Given we use the config "encrypted_old.json"
-            When we run "jrnl -n 1" and enter 
-                """
-                Y
-                bad doggie no biscuit
-                bad doggie no biscuit
-                """
-            Then we should see the message "Password"
-            and the output should contain "2013-06-10 15:40 Life is good"

features/exporting.feature

@@ -42,11 +42,9 @@ Feature: Exporting a Journal
         When we run "jrnl --export markdown"
         Then the output should be
         """
-        2015
-        ====
+        # 2015
 
-        April
-        -----
+        ## April
 
         ### 2015-04-14 13:23 Heading Test
 

features/multiple_journals.feature

@@ -39,3 +39,8 @@ Feature: Multiple journals
         Given we use the config "bug343.yaml"
         When we run "jrnl a long day in the office"
         Then we should see the message "No default journal configured"
+
+   Scenario: Don't crash if no file exists for a configured encrypted journal
+        Given we use the config "multiple.yaml"
+        When we run "jrnl new_encrypted Adding first entry" and enter "these three eyes"
+	Then we should see the message "Journal 'new_encrypted' created"

features/tagging.feature

@@ -50,3 +50,35 @@ Feature: Tagging
             @foo                 : 1
             @bar                 : 1
             """
+
+    Scenario:  Excluding a tag should filter it
+        Given we use the config "basic.yaml"
+        When we run "jrnl today: @foo came over, we went to a bar"
+        When we run "jrnl I have decided I did not enjoy that @bar"
+        When we run "jrnl --tags -not @bar"
+        Then the output should be
+            """
+            @foo                 : 1
+            """
+
+    Scenario:  Excluding a tag should filter an entry, even if an unfiltered tag is in that entry
+        Given we use the config "basic.yaml"
+        When we run "jrnl today: I do @not think this will show up @thought"
+        When we run "jrnl today: I think this will show up @thought"
+        When we run "jrnl --tags -not @not"
+        Then the output should be
+            """
+            @thought             : 1
+            """
+
+    Scenario:  Excluding multiple tags should filter them
+        Given we use the config "basic.yaml"
+        When we run "jrnl today: I do @not think this will show up @thought"
+        When we run "jrnl today: I think this will show up @thought"
+        When we run "jrnl today: This should @never show up @thought"
+        When we run "jrnl today: What a nice day for filtering @thought"
+        When we run "jrnl --tags -not @not @never"
+        Then the output should be
+            """
+            @thought             : 2
+            """

features/upgrade.feature

@@ -0,0 +1,23 @@
+Feature: Upgrading Journals from 1.x.x to 2.x.x
+
+    Scenario: Upgrade and parse journals with square brackets
+        Given we use the config "upgrade_from_195.json"
+        When we run "jrnl -9" and enter "Y"
+        Then the output should contain
+            """
+            2010-06-10 15:00 A life without chocolate is like a bad analogy.
+
+            2013-06-10 15:40 He said "[this] is the best time to be alive".
+            """
+        Then the journal should have 2 entries
+
+    Scenario: Upgrading a journal encrypted with jrnl 1.x
+        Given we use the config "encrypted_old.json"
+        When we run "jrnl -n 1" and enter 
+            """
+            Y
+            bad doggie no biscuit
+            bad doggie no biscuit
+            """
+        Then we should see the message "Password"
+        and the output should contain "2013-06-10 15:40 Life is good"