Exit jrnl if no text entered into editor

features/core.feature

@@ -20,6 +20,12 @@ Feature: Basic reading and writing to a journal
         When we run "jrnl -n 1"
         Then the output should contain "2013-07-23 09:00 A cold and stormy day."
 
+    # Note that the expected output is actually "[Nothing saved to file]" but due to mocking limitations, we expect no output here.
+    Scenario: Writing an empty entry from the editor
+        Given we use the config "editor.yaml"
+        When we open the editor and enter ""
+        Then we should see the message "[Nothing saved to file]"
+
     Scenario: Filtering for dates
         Given we use the config "basic.yaml"
         When we run "jrnl -on 2013-06-10 --short"

features/data/configs/editor.yaml

@@ -0,0 +1,12 @@
+default_hour: 9
+default_minute: 0
+editor: "vim"
+encrypt: false
+highlight: true
+journals:
+  default: features/journals/simple.journal
+linewrap: 80
+tagsymbols: "@"
+template: false
+timeformat: "%Y-%m-%d %H:%M"
+indent_character: "|"

features/steps/core.py

@@ -29,6 +29,7 @@ def get_password(self, servicename, username):
     def delete_password(self, servicename, username, password):
         self.keys[servicename][username] = None
 
+
 # set the keyring for keyring lib
 keyring.set_keyring(TestKeyring())
 
@@ -66,6 +67,25 @@ def set_config(context, config_file):
             cf.write("version: {}".format(__version__))
 
 
+@when('we open the editor and enter')
+@when('we open the editor and enter "{text}"')
+def open_editor_and_enter(context, text=""):
+    text = (text or context.text)
+    print("open_editor_and_enter called")
+    def _mock_editor_function(command):
+        print("_mock_editor_function called")
+        tmpfile = command[-1]
+        print("TMPFILE:", tmpfile)
+        with open(tmpfile, "w+") as f:
+            f.write(text)
+
+        print("File contents:", open(tmpfile, "r").read())
+        return tmpfile
+
+    with patch('subprocess.call', side_effect=_mock_editor_function):
+        run(context, "jrnl")
+
+
 def _mock_getpass(inputs):
     def prompt_return(prompt="Password: "):
         print(prompt)
@@ -182,6 +202,11 @@ def check_json_output_path(context, path, value):
     assert struct == value, struct
 
 
+@then('the output should be empty')
+def check_empty_output(context):
+    assert context.stdout_capture is None
+
+
 @then('the output should be')
 @then('the output should be "{text}"')
 def check_output(context, text=None):

jrnl/cli.py

@@ -206,7 +206,7 @@ def run(manual_args=None):
         if raw:
             args.text = [raw]
         else:
-            mode_compose = False
+            sys.exit()
 
     # This is where we finally open the journal!
     try:

jrnl/util.py

@@ -118,6 +118,8 @@ def get_text_from_editor(config, template=""):
     os.remove(tmpfile)
     if not raw:
         print('[Nothing saved to file]', file=sys.stderr)
+    else:
+        print("RAW: '" + raw + "'")
     return raw