Monadoro 0.2.0.0 → 0.2.1.0

raw patch · 8 files changed

+11/−97 lines, 8 filesdep −argparserdep −doctestdep −ncurses

Dependencies removed: argparser, doctest, ncurses, optparse-applicative, process

Files

• Monadoro.cabal +3/−21
• changelog +4/−0
• src/ArgParse.hs +2/−2
• src/Clock.lhs +0/−1
• src/FullScreen.lhs +0/−58
• src/Lib.hs +0/−6
• src/MyHelp.hs +0/−4
• src/Pomodoro.lhs +2/−5

@@ -4,12 +4,12 @@ -- -- see: https://github.com/sol/hpack ----- hash: 924fd821c4ec1f5d5265fc59902a3058d01b0e57e4c3a131948ce2e4ff3533f1+-- hash: 4a9c3a5404214ff07204618846c837fa6d4ee55918feb1d50c7d87b4fa78a688  name:           Monadoro-version:        0.2.0.0+version:        0.2.1.0 synopsis:       A minimalistic CLI Pomodoro timer, based on a library of the same purpose.-description:    Please see the README on GitLab at <https://gitlab.com/kocielnik/monadoro#readme>+description:    README is available at <https://gitlab.com/kocielnik/monadoro#readme> category:       Tools homepage:       https://github.com/gitlab.com/kocielnik#readme bug-reports:    https://github.com/gitlab.com/kocielnik/issues@@ -32,9 +32,6 @@   exposed-modules:       ArgParse       Clock-      FullScreen-      Lib-      MyHelp       Pomodoro       Timer   other-modules:@@ -43,12 +40,7 @@       src   build-depends:       ansi-terminal >=0.8 && <1-    , argparser >=0.3 && <0.4     , base >=4.7 && <5-    , doctest >=0.8-    , ncurses >=0.2-    , optparse-applicative >=0.14-    , process >=1.6 && <2     , time >=1.8 && <2   default-language: Haskell2010 @@ -62,12 +54,7 @@   build-depends:       Monadoro     , ansi-terminal >=0.8 && <1-    , argparser >=0.3 && <0.4     , base >=4.7 && <5-    , doctest >=0.8-    , ncurses >=0.2-    , optparse-applicative >=0.14-    , process >=1.6 && <2     , time >=1.8 && <2   default-language: Haskell2010 @@ -82,11 +69,6 @@   build-depends:       Monadoro     , ansi-terminal >=0.8 && <1-    , argparser >=0.3 && <0.4     , base >=4.7 && <5-    , doctest >=0.8-    , ncurses >=0.2-    , optparse-applicative >=0.14-    , process >=1.6 && <2     , time >=1.8 && <2   default-language: Haskell2010

@@ -1,3 +1,7 @@+monadoro (2.1.0)++	* Prune dependencies.+ monadoro (2.0.0)  	* Add option for a long (4-pomodoro) session.

@@ -20,7 +20,7 @@ parse ["--session"] = worker parse []     = countdown -usage   = putStrLn "Usage: monadoro [-vh] [file ...]"-version = putStrLn "Monadoro 1.1"+usage   = putStrLn "Usage: monadoro [-vh] [--session]"+version = putStrLn "Monadoro 2.1.0" exit    = exitWith ExitSuccess die     = exitWith (ExitFailure 1)

@@ -8,7 +8,6 @@ > module Clock (countdown) where  > import Control.Concurrent  (threadDelay)-> import System.Process      (system, rawSystem) > import System.Console.ANSI (clearLine, >                             clearFromCursorToScreenEnd, >                             setCursorColumn,

@@ -1,58 +0,0 @@-> module FullScreen where->-> import Timer (secToTimestamp)-> import Control.Concurrent (threadDelay)-> import UI.NCurses-> import System.IO (->                   hFlush,->                   stdout)-> import System.Console.ANSI (clearLine,->                             clearFromCursorToScreenEnd,->                             setCursorColumn,->                             hideCursor,->                             showCursor,->                             saveCursor,->                             restoreCursor,->                            )->-> main :: IO ()-> main = ncurses_clock->-> wait_seconds :: Int -> IO()-> wait_seconds 0 = do->     putStr ""-> wait_seconds n = do->     restoreCursor->     putStr $ secToTimestamp $ n - 1->     hFlush stdout->     delay 1->     wait_seconds $ n - 1--> delay :: Int -> IO()-> delay n = del n-> -> del :: Int -> IO()-> del n = do->     threadDelay $ n * 1000 * 1000--> ncurses_clock :: IO ()-> ncurses_clock = runCurses $ do->     setEcho False->     w <- defaultWindow->     updateWindow w $ do->         moveCursor 1 10->         drawString "Hello world!"->         moveCursor 3 10->         drawString "(press q to quit)"->         moveCursor 0 0->     render->     waitFor w (\ev -> ev == EventCharacter 'q' || ev == EventCharacter 'Q')-> -> waitFor :: Window -> (Event -> Bool) -> Curses ()-> waitFor w p = loop where->     loop = do->         ev <- getEvent w Nothing->         case ev of->             Nothing -> loop->             Just ev' -> if p ev' then return () else loop-> 

@@ -1,6 +0,0 @@-module Lib-    ( someFunc-    ) where--someFunc :: IO ()-someFunc = putStrLn "someFunc"

@@ -1,4 +0,0 @@-module MyHelp (show_help) where--show_help :: IO ()-show_help = putStrLn "Welcome to Monadoro - your personal Pomodoro counter!"

@@ -3,18 +3,15 @@ > module Pomodoro (worker) where  > import Control.Concurrent (threadDelay)-> import System.Process (system, rawSystem) > import System.Console.ANSI (clearLine, >                             clearFromCursorToScreenEnd, >                             setCursorColumn, >                             hideCursor, >                             showCursor, >                             saveCursor,->                             restoreCursor,->                            )+>                             restoreCursor) > import System.Environment (getArgs)-> import System.IO (->                   hFlush,+> import System.IO (hFlush, >                   stdout) > import Timer (secToTimestamp) >