diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..faf65757ed --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: java +jdk: oraclejdk11 + +before_install: + - chmod +x gradlew diff --git a/README.md b/README.md index 79a5af1bf1..9674f32dbb 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,4 @@ Duke Increment | Tutorial * If you have feedback or bug reports, please post in [se-edu/duke issue tracker](https://github.com/se-edu/duke/issues). * We welcome pull requests too. -test +test1 diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..04b7ff3e97 --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'java' + id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +group 'seedu.duke' +version '0.1.0' + +repositories { + mavenCentral() +} + +shadowJar { + archiveBaseName = "mid-v1.1" + archiveVersion = "1.1" + archiveClassifier = null + archiveAppendix = null +} + +checkstyle { + toolVersion = '8.23' +} + +application { + // Change this to your main class. + mainClassName = "duke/Duke" +} + +run { + standardInput = System.in +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0' +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000000..b1a57ba6c0 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/tasks.txt b/data/tasks.txt new file mode 100644 index 0000000000..ed30e11312 --- /dev/null +++ b/data/tasks.txt @@ -0,0 +1,4 @@ +T|0|read book +D|0|return book |tmr +E|0|meeting |2019-09-09 +[P][✘] pain (from: TODO to: TODO diff --git a/docs/AboutUs.md b/docs/AboutUs.md new file mode 100644 index 0000000000..f0e1210895 --- /dev/null +++ b/docs/AboutUs.md @@ -0,0 +1,60 @@ +# About Us + +Duke - Level 3 was developed by the [se-edu](https://se-edu.github.io/docs/Team.html) team. +*{The dummy content given below serves as a placeholder to be used by future forks of the project.}* + +We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg/). + + + +## Project Team + +### Hafidz Bin Hussain + +[photo here] + +[[github](https://github.com/9hafidz6)] [profolio] + +Role: Team Lead + +Responsibilities: + +### Sara Djambazovska + +[photo here] + +[[github](https://github.com/saradj/)] [profolio] + +Role: Developer + +Responsibilities: + +### Jiahan Yu + +[photo here] + +[[github](https://github.com/saradj/)] [profolio] + +Role: Developer + +Responsibilities: + +### Goh Zhen Hao Joey + +[photo here] + +[[github](https://github.com/x3chillax)] [profolio] + +Role: Developer + +Responsibilities: + +### Lincoln Lim + +[photo here] + +[[github](https://github.com/CEGLincoln)] [profolio] + +Role: Developer + +Responsibilities: \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..87b738cbd0 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..4b7e1f3d38 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..af6708ff22 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..6d57edc706 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..d1e92fe5db --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'duke' diff --git a/src/main/java/duke/parser/Parser.java b/src/main/java/duke/parser/Parser.java index 98687b35dd..1ead23e1f2 100644 --- a/src/main/java/duke/parser/Parser.java +++ b/src/main/java/duke/parser/Parser.java @@ -4,6 +4,7 @@ import duke.command.*; import duke.exception.DukeException; import duke.task.Deadline; +import duke.task.DoWithinPeriodTasks; import duke.task.Event; import duke.task.Todo; @@ -44,18 +45,18 @@ public static Command parse(String fullCommand) throws DukeException { return new DoneCommand(taskNb - 1); } else throw new DukeException("Need a task number after done!"); case "todo": - if ((splitted.length == 1) || splitted[1].isBlank()) + if ((splitted.length == 1) || splitted[1].isEmpty()) throw new DukeException("The description of a todo cannot be empty."); return new AddCommand(new Todo(splitted[1])); case "deadline": - if ((splitted.length == 1) || splitted[1].isBlank()) + if ((splitted.length == 1) || splitted[1].isEmpty()) throw new DukeException("The description of a deadline cannot be empty."); String[] getBy = splitted[1].split("/by ", 2); if (getBy.length < 2) throw new DukeException("The description of a deadline must contain /by date!"); return new AddCommand(new Deadline(getBy[0], getBy[1])); case "event": - if ((splitted.length == 1) || splitted[1].isBlank()) + if ((splitted.length == 1) || splitted[1].isEmpty()) throw new DukeException("The description of an event cannot be empty, and it must contain /at"); String[] getAt = splitted[1].split("/at ", 2); if (getAt.length < 2) @@ -70,6 +71,7 @@ public static Command parse(String fullCommand) throws DukeException { int taskNb = Integer.parseInt(splitted[1]); return new DeleteCommand(taskNb - 1); } else throw new DukeException("Need a task number after done!"); + case "snooze": if ((splitted.length == 1) || splitted[1].isBlank()) throw new DukeException("The description of a snooze cannot be empty."); @@ -78,6 +80,23 @@ public static Command parse(String fullCommand) throws DukeException { throw new DukeException("The description of a snooze must contain /until date!"); return new Snooze(getUntil[0], getUntil[1]); + + case "period": + if ((splitted.length == 1) || splitted[1].isEmpty()) + throw new DukeException("The description of a period cannot be empty."); + String[] getPart = splitted[1].split("/from ", 2); + if (getPart.length < 2) + throw new DukeException("The description of a period must contain /from date!"); + String[] part = getPart[1].split("/to ", 2); + if (part.length < 2) + throw new DukeException("NO"); + try { + return new AddCommand(new DoWithinPeriodTasks(getPart[0], part[0], part[1])); + } + catch(Exception e){ + throw new DukeException("NO"); + } + default: throw new DukeException("I'm sorry, but I don't know what that means :-("); } diff --git a/src/main/java/duke/task/DoWithinPeriodTasks.java b/src/main/java/duke/task/DoWithinPeriodTasks.java new file mode 100644 index 0000000000..a7099212ca --- /dev/null +++ b/src/main/java/duke/task/DoWithinPeriodTasks.java @@ -0,0 +1,25 @@ +package duke.task; + +import java.util.Date; + +public class DoWithinPeriodTasks extends Task{ + + private Date from; + private Date to; + + public DoWithinPeriodTasks(String d, String f, String t) { + //CONSTRUCTOR + super(d); + from = super.getDate(f); + to = super.getDate(t); + } + + public String printInFile(){ + return this.toString(); + } + + @Override + public String toString(){ + return "[P]" + super.toString() + "(from: " + "TODO" + " to: " + "TODO"; + } +} diff --git a/src/test/java/DukeTest.java b/src/test/java/DukeTest.java index 99e0e46a44..83d4bada25 100644 --- a/src/test/java/DukeTest.java +++ b/src/test/java/DukeTest.java @@ -1,4 +1,9 @@ +import duke.Duke; +import duke.command.AddCommand; +import duke.command.Command; +import duke.command.ExitCommand; import duke.exception.DukeException; +import duke.parser.Parser; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; @@ -12,7 +17,7 @@ public void dummyTest(){ @Test public void testExitCommand() throws DukeException { Duke duke= new Duke("data/tasks.txt"); - Command c=Parser.parse("bye"); + Command c= Parser.parse("bye"); assertTrue(c instanceof ExitCommand); } @Test