appveyor updates

cormullion · cormullion · commit 937ce6dbab42 · 2019-03-26T14:04:40.000Z
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,16 +1,17 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+  - julia_version: 1.0
+  - julia_version: latest
 
-## uncomment the following lines to allow failures on nightly julia
-## (tests will run but not make your overall status red)
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+# uncomment the following lines to allow failures on nightly julia
+# (tests will run but not make your overall status red)
 matrix:
-  allow_failures:
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+ allow_failures:
+ - julia_version: latest
 
 branches:
   only:
@@ -24,24 +25,12 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# If there's a newer build queued for the same PR, cancel this one
-  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
-        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
-        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
-        throw "There are newer queued builds for this pull request, failing early." }
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"TickTock\"); Pkg.build(\"TickTock\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"TickTock\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
diff --git a/src/TickTock.jl b/src/TickTock.jl
@@ -116,21 +116,25 @@ laptimer() = showtimes(canonical=true)
     alarm(hours, minutes, seconds;
         action = () -> @info("TickTock: time's up"))
 
-Run an alarm, with the option of providing a anonymous function that executes
+Set an alarm, with the option of providing a anonymous function that executes
 when alarm fires.
 
 ```
 using Dates
 
 @async alarm(0, 5, 0, action = ()-> println("TickTock.jl: 5 minutes is up!"))
+
+@async alarm(0, 0, 5, action = () -> run(`say "your alarm is ringing, sir"`), alarmname="tea's up") # uses macOS speech
 ```
 """
 function alarm(hours, minutes, seconds;
-        action=() -> @info("TickTock: alarm: time's up"))
+        action=() -> @info("TickTock: alarm"),
+        alarmname="TickTock alarm")
     tick()
     while true
         sleep(5)
         if peektimer() > hours * 60 * 60 + minutes * 60 + seconds
+            @info alarmname
             action()
             tock()
             break
@@ -152,7 +156,7 @@ using Dates
 
 dt = now() + Dates.Minute(1)
 
-@async alarm(dt, action=()-> println("TickTock.jl: Ready!"))
+@async alarm(dt, action = () -> println("TickTock.jl: Ready!"))
 ```
 
 ```
@@ -162,21 +166,22 @@ dt = now() + Dates.Minute(1)
 TODO alarms don't appear in timer lists...
 """
 function alarm(dt::DateTime;
-        action = () -> @info("TickTock: alarm: time's up"))
+        action = () -> @info("TickTock: alarm"),
+        alarmname = "TickTock alarm")
     p = Dates.Period(dt - now())
     secs = round(p, Dates.Second).value
     m, s = divrem(secs, 60)
     h, m = divrem(m, 60)
-    @info "TickTock: setting alarm for $h hours, $m minutes, $s seconds"
-    alarm(h, m, s, action=action)
+    @info "TickTock: \"$(alarmname)\" alarm for $h hours, $m minutes, $s seconds"
+    alarm(h, m, s, action=action, alarmname=alarmname)
 end
 
 """
 @async alarm(now() + Dates.Second(5), action = () ->  TickTock.alarmnotify("time's up"))
 
 TODO this is macOS only...
 """
-function alarmnotify(subtitle="time's up")
+function alarmnotify(subtitle="TickTock alarm")
     !Sys.isapple() && exit()
     command = """
     display notification with title "TickTock.jl" subtitle \"$(subtitle)\" sound name "frog"
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -9,7 +9,7 @@ sleep(1)
 @async alarm(now() + Dates.Minute(0) + Dates.Second(10),
     action=() ->
         begin
-            println("test alarm set at $(now()) for 10 seconds has fired")
+            println("test alarm has fired")
         end)
 
 alarmmessage() = println("This is an alarm. Do not be alarmed.")
