Merge pull request #2 from dbalan/change_new

Change new command structure

.circleci/config.yml

@@ -7,8 +7,16 @@ jobs:
       - checkout
       - run: DEBIAN_FRONTEND=noninteractive apt-get update
       - run: DEBIAN_FRONTEND=noninteractive apt-get install -y xz-utils make
+      - restore_cache:
+          keys:
+            - stack-dir
       - run: stack upgrade
       - run: stack setup
       - run: stack build
       - run: stack test
+      - save_cache:
+          key: stack-dir
+          paths:
+            - ".stack-work"
+            - "/root/.stack"
 

README.md

@@ -46,8 +46,7 @@ Available commands:
 1. Example session
 
 ```
-$ idid new 
-what did you do? some stuff
+$ idid new some stuff
 $ idid what lastweek
 2018-04-08
 ========
@@ -57,7 +56,10 @@ $ idid what lastweek
 ========
 1. some stuff
 ```
+
 ## Hacking!
 Pull requests welcome!
 
 
+## Versioning
+Uses semantic versioning.

app/Main.hs

@@ -4,10 +4,10 @@ module Main where
 
 import Cli
 import Data as D
-import System.IO
+
+import Data.List
 import Data.Time
 import System.Directory
-import System.FilePath
 
 main :: IO ()
 main = do
@@ -22,24 +22,18 @@ run (Args (CommonOpts fp) cmd) = do
   runWithFp expPt cmd
 
 runWithFp :: String -> Command -> IO ()
-runWithFp fp CommandNew = newCmd fp
+runWithFp fp (CommandNew msg) = newCmd (intercalate " " msg) fp
 runWithFp fp (CommandWhat prd) = whatCmd prd fp
 
 getExpandedPath :: FilePath -> IO FilePath
 getExpandedPath ('~':'/':xs) = (++ "/" ++ xs) <$> getHomeDirectory
 getExpandedPath x = return x
 
-newCmd fp = do
-  msg <- readMsg
-  entry <- D.entryNow msg
+newCmd :: String -> FilePath -> IO ()
+newCmd m fp = do
+  entry <- D.entryNow m
   appendFile fp $ D.toFile entry
 
-readMsg :: IO String
-readMsg = do
-  hSetBuffering stdout NoBuffering
-  putStr "what did you do? "
-  getLine
-
 periodToDiff :: UTCTime -> Period -> UTCTime
 periodToDiff cur pd = addUTCTime (-1 * periodToNominalDiffTime pd) cur
 

package.yaml

@@ -1,5 +1,5 @@
 name:                idid
-version:             0.1.0.0
+version:             2.0.0
 github:              "dbalan/idid"
 license:             BSD3
 author:              "Dhananjay Balan"

src/Cli.hs

@@ -15,10 +15,8 @@ import Data.Time
 data Args = Args CommonOpts Command
   deriving Show
 
-data Command = CommandNew
-             | CommandWhat {
-                 period :: Period
-                 }
+data Command = CommandNew { message :: [String] }
+             | CommandWhat { period :: Period }
                deriving (Show)
 
 data CommonOpts = CommonOpts { filePath :: String }
@@ -69,7 +67,7 @@ parseOpts = CommonOpts
                 <> help "file to store data")
 
 parseNewCommand :: Parser Command
-parseNewCommand = pure (CommandNew)
+parseNewCommand = CommandNew <$> (many $ argument str (metavar "MSG.."))
 
 parseWhatCommand :: Parser Command
 parseWhatCommand = CommandWhat <$> periodParser
@@ -98,4 +96,3 @@ periodToNominalDiffTime p
   | p == Day = 24*60*60
   | p == Week = 7 * periodToNominalDiffTime Day
   | p == Month = 4 * periodToNominalDiffTime Week
-