add option to clean file

Some refactoring were also performed to make the code cleaner along the way.

Author: MichelML

src/jlog/core.clj

@@ -5,6 +5,8 @@
 
 (use '[clojure.java.shell :only [sh]])
 
+(def jlog-file "jlog.txt")
+
 (defn valid-jlog-time?
   "Checks if the argument provided is of format HhMMm (basic support for JIRA time-log)."
   [timelog]
@@ -48,20 +50,27 @@
   (.format (java.text.SimpleDateFormat. "MM/dd/yyyy") (new java.util.Date)))
 
 (defn spit-log
-  "Spits a Jira worklog into a jlog.txt file, containing the date, jira issue key, and message."
+  "Spits a Jira worklog into the worklogs file, containing the date, jira issue key, and message."
   [timelog issue message]
-  (spit (str (get-jar-root) "jlog.txt") 
+  (spit (str (get-jar-root) jlog-file) 
         (str (get-date) " --- " issue " *" (space-hrs&mins timelog) "* --- " message "\n")
         :append true)
   (println "Worklog saved successfully!"))
 
 (defn print-worklogs
-  "Lists/Prints worklogs contained in the jlog.txt file in the console."
+  "Lists/Prints worklogs contained in the worklogs file in the console."
+  []
+  (doseq [i ["\n" "Your Jira Worklogs:\n" (slurp (str (get-jar-root) jlog-file))]] (println i)))
+
+(defn clean-worklog-file 
+  "Clean the worklogs file of all existing worklogs."
   []
-  (doseq [i ["\n" "Your Jira Worklogs:\n" (slurp (str (get-jar-root) "jlog.txt"))]] (println i)))
+  (do 
+    @(future (sh "rm" (str (get-jar-root) jlog-file)))
+    @(future (sh "touch" (str (get-jar-root) jlog-file)))))
 
 (defn jlog
-  "Appends a worklog to a jlog.txt file. This is the jlog main function."
+  "Appends a worklog to the worklogs file. This is the jlog main function."
   [arg1 arg2 message]
   (if (= arg1 "-b")
     (if (valid-jlog-time? arg2)
@@ -71,23 +80,26 @@
       (if (valid-jira-issue? arg2)
         (spit-log arg1 (upper-case arg2) message)
         (throw (Exception. "Invalid Jira issue key format provided.")))
-      (throw (Exception. "Invalid timelog format provided."))))
-  (shutdown-agents))
+      (throw (Exception. "Invalid timelog format provided.")))))
 
 (defn print-help
   "Prints the possible jlog commands to the console."
   []
   (println (str "\nValid commands for jlog are:\n\n"
                 "   jlog -h                                            -     Prints the help menu to the console.\n"
-                "   jlog -l                                            -     Prints worklogs contained in the jlog.txt file to the console.\n"
-                "   jlog -o                                            -     Opens your jlog.txt file.\n"
-                "   jlog -b <timelog> <message in quotes>              -     Writes a worklog to the jlog.txt file, retrieving the issue-key from your branch.\n"
-                "   jlog <timelog> <issue key> <message in quotes>     -     Writes a worklog to the jlog.txt file using the provided information.\n")))
+                "   jlog -l                                            -     Prints worklogs contained in the worklogs file to the console.\n"
+                "   jlog -c                                            -     Clean worklogs file from all existing worklogs.\n"
+                "   jlog -o                                            -     Opens your worklogs file.\n"
+                "   jlog -b <timelog> <message in quotes>              -     Writes a worklog to the worklogs file, retrieving the issue-key from your branch.\n"
+                "   jlog <timelog> <issue key> <message in quotes>     -     Writes a worklog to the worklogs file using the provided information.\n")))
 
 (defn -main [& args]
+  @(future (sh "touch" (str (get-jar-root) jlog-file)))
   (cond 
     (= "-h" (first args)) (print-help)
     (= "-l" (first args)) (print-worklogs)
-    (= "-o" (first args)) ((sh "open" (str (get-jar-root) "jlog.txt")) (shutdown-agents))
+    (= "-c" (first args)) (clean-worklog-file)
+    (= "-o" (first args)) (sh "open" (str (get-jar-root) jlog-file))
     (= (count (take 3 args)) 3) (apply jlog (take 3 args))
-    :else ((println "Syntax error.") (print-help))))
+    :else ((println "Syntax error.") (print-help)))
+  (shutdown-agents))

target/classes/META-INF/maven/jlog/jlog/pom.properties

@@ -1,6 +1,6 @@
 #Leiningen
-#Tue Jun 20 23:28:21 EDT 2017
+#Thu Jun 20 11:14:17 EDT 2019
 version=0.1.0-SNAPSHOT
-revision=38dd03ffe0ad2693062a5020994a3c823916d3e0\n
+revision=0ce5185f96c1bcb421eb86ecba0d9f9b4db27bc8
 groupId=jlog
 artifactId=jlog

target/jlog-0.1.0-SNAPSHOT-standalone.jar

@@ -1 +1 @@
-[{:dependencies {org.clojure/clojure {:vsn "1.8.0", :native-prefix nil}, compliment {:vsn "0.2.0", :native-prefix nil}, org.clojure/tools.trace {:vsn "0.7.8", :native-prefix nil}, cljs-tooling {:vsn "0.1.3", :native-prefix nil}, org.clojure/tools.namespace {:vsn "0.2.5", :native-prefix nil}, org.clojure/java.classpath {:vsn "0.2.0", :native-prefix nil}, org.clojure/tools.nrepl {:vsn "0.2.12", :native-prefix nil}, clojure-complete {:vsn "0.2.4", :native-prefix nil}, cider/cider-nrepl {:vsn "0.8.1", :native-prefix nil}, org.tcrawley/dynapath {:vsn "0.2.3", :native-prefix nil}}, :native-path "target/native"} {:native-path "target/native", :dependencies {org.clojure/clojure {:vsn "1.8.0", :native-prefix nil, :native? false}, compliment {:vsn "0.2.0", :native-prefix nil, :native? false}, org.clojure/tools.trace {:vsn "0.7.8", :native-prefix nil, :native? false}, cljs-tooling {:vsn "0.1.3", :native-prefix nil, :native? false}, org.clojure/tools.namespace {:vsn "0.2.5", :native-prefix nil, :native? false}, org.clojure/java.classpath {:vsn "0.2.0", :native-prefix nil, :native? false}, org.clojure/tools.nrepl {:vsn "0.2.12", :native-prefix nil, :native? false}, clojure-complete {:vsn "0.2.4", :native-prefix nil, :native? false}, cider/cider-nrepl {:vsn "0.8.1", :native-prefix nil, :native? false}, org.tcrawley/dynapath {:vsn "0.2.3", :native-prefix nil, :native? false}}}]
+[{:dependencies {org.clojure/clojure {:vsn "1.8.0", :native-prefix nil}}, :native-path "target/native"} {:native-path "target/native", :dependencies {org.clojure/clojure {:vsn "1.8.0", :native-prefix nil, :native? false}}}]