cleaned out yet some of the 'new generation' stuff from the documenatation

4 files changed, 4 insertions, 43 deletions

diff --git a/README.md b/README.md
index eb96911..7094da0 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,6 @@ There is another project out there, "Command-line Interface for Google Calendar"
 
 There is a "competing" project at https://github.com/geier/khal - you may want to check it out - it's more mature but probably more complex.  It's using a "vsyncdir" backend - if I've understood it correctly, that involves building a local copy of the calendar.  The philosophy behind `calendar-cli` is slightly different, `calendar-cli` is supposed to be a simple cli-based caldav+ical client.  No synchronization, no local storage, just client-side operations.
 
-New vs old interface
---------------------
-
-DO YOU HAVE OPINIONS ON WHAT COLOR TO PAINT THE BIKE SHED WITH?  VISIT https://github.com/tobixen/calendar-cli/issues/88 NOW!
-
-calendar-cli.py is the old interface, it will hang around and be supported for some time to come.  cal.py is the new interface, but until version 1.0 is ready, there will still be functionality in calendar-cli that isn't mirrored to cal.py.
-
 Usage examples
 --------------
 
@@ -101,18 +94,9 @@ Supported in v0.12:
 * An iso time stamp, followed with the duration, using either + or space as separator.  Duration is a number postfixed by s for seconds, m for minutes, h for hours, d for days, w for weeks and y for years (i.e. 2013-09-10T13:37+30d)
 * ISO dates.  For full day events, make sure to specify the duration in days.
 
-All of these would eventually be supported in future versions if it's not too difficult to achieve:
-
-* Two ISO timestamps separated by a dash (-)
-* "tomorrow" instead of an ISO date
-* weekday instead of an ISO date (this seems supported already by dateutil.parser.parse)
-* clock time without the date; event will be assumed to start within 24 hours.
-
-Alternatively, endtime or duration can be given through options (not supported as of 0.12)
-
 ### Getting out customized information through --todo-template and --event-template
 
-This is a string containing variables enclosed in curly braces, like "uid: {uid}".  Full documentation of the available variables will be given in version 1.0.
+This is a string containing variables enclosed in curly braces, like "uid: {uid}".
 
 Particularly the uid can be useful, as one may want to use the uid for things like deleting events and postponing tasks.
 
diff --git a/tests/_setup_alias b/tests/_setup_alias
index 0f2c6de..223467e 100644
--- a/tests/_setup_alias
+++ b/tests/_setup_alias
@@ -13,18 +13,8 @@ error() {
 [ -z "$calendar_cli" ] && [ -x ../calendar-cli.py ] && calendar_cli=../calendar-cli.py
 [ -z "$calendar_cli" ] && error "couldn't find ./calendar_cli.py nor ../calendar_cli.py"
 
-[ -z "$kal" ] && [ -x ./cal.py ] && kal=./cal.py
-[ -z "$kal" ] && [ -x ../cal.py ] && kal=../cal.py
-[ -z "$kal" ] && error "couldn't find ./cal.py nor ../cal.py"
-
 calendar_cli() {
     echo "    $calendar_cli $@"
     output=$($calendar_cli "$@" | tee $outfile)
     [ -z "$output" ] || [ -z "$QUIET" ] || echo $output
 }
-
-kal() {
-    echo "    $kal $@"
-    output=$($kal "$@"  | tee $outfile)
-    [ -z "$output" ] || [ -z "$QUIET" ] || echo $output
-}
diff --git a/tests/test_calendar-cli.sh b/tests/test_calendar-cli.sh
index 1010bae..b33e435 100755
--- a/tests/test_calendar-cli.sh
+++ b/tests/test_calendar-cli.sh
@@ -3,7 +3,7 @@
 storage=$(mktemp -d)
 
 echo "This script will attempt to set up a Radicale server and a Xandikos server and run the test code towards those two servers"
-echo "The test code itself is found in tests.sh and tests_kal.sh"
+echo "The test code itself is found in tests.sh"
 
 export RUNTESTSNOPAUSE="foo"
 
@@ -16,7 +16,7 @@ radicale_pid=$(jobs -l | perl -ne '/^\[\d+\]\+\s+(\d+)\s+Running/ && print $1')
 if [ -n "$radicale_pid" ]
 then
     echo "## Radicale now running on pid $radicale_pid"
-    calendar_cli="../calendar-cli.py --caldav-url=http://localhost:5232/ --caldav-pass=password1 --caldav-user=testuser --calendar-url=/testuser/calendar-cli-test-calendar"
+    calendar_cli="../bin/calendar-cli.py --caldav-url=http://localhost:5232/ --caldav-pass=password1 --caldav-user=testuser --calendar-url=/testuser/calendar-cli-test-calendar"
     echo "## Creating a calendar"
     $calendar_cli calendar create calendar-cli-test-calendar
     
@@ -56,7 +56,7 @@ fi
 if [ -n "$xandikos_pid" ]
 then
     echo "## Xandikos now running on pid $xandikos_pid"
-    calendar_cli="../calendar-cli --caldav-url=http://localhost:8080/ --caldav-user=user"
+    calendar_cli="../bin/calendar-cli --caldav-url=http://localhost:8080/ --caldav-user=user"
     export calendar_cli
     ./tests.sh
     kill $xandikos_pid
diff --git a/tests/tests.sh b/tests/tests.sh
index 7d1e277..f1c0a26 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -94,19 +94,6 @@ echo "$output" | grep -q "20101010" || error "could not find the date"
 echo "$output" | grep -q "20101010T" && error "a supposed whole day event was found to be with the time of day"
 echo "OK: found the event"
 
-## saving the ics data
-tmpfile=$(mktemp)
-cat $outfile > $tmpfile
-
-echo "## cleanup, delete it"
-calendar_cli calendar delete --event-uid=$uid
-
-rm $tmpfile
-calendar_cli  --icalendar calendar agenda --from-time=2010-10-13 --agenda-days=1
-echo "$output" | grep -q "whole day" || error "could not find the event"
-echo "$output" | grep -q "20101010" || error "could not find the date"
-echo "$output" | grep -q "20101010T" && error "a supposed whole day event was found to be with the time of day"
-echo "OK: found the event"
 echo "## cleanup, delete it"
 calendar_cli calendar delete --event-uid=$uid