Adopted result.

SDGGiesbrecht · May 6, 2019 · 387216a · 387216a
1 parent d41de31
commit 387216a
Show file tree

Hide file tree

Showing 14 changed files with 269 additions and 231 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,43 +13,32 @@
 language: generic
 matrix:
   include:
-    - os: osx
-      env:
-        - JOB="macOS + Swift Package Manager"
-      osx_image: xcode10.2
-      script:
-        - "git config --global protocol.version 1"
-        - "bash \"./Refresh (macOS).command\""
-        - "bash \"./Validate (macOS).command\" •job macos‐swift‐package‐manager"
-    - os: osx
-      env:
-        - JOB="macOS + Xcode"
+    - name: "macOS"
+      os: osx
       osx_image: xcode10.2
       script:
         - "git config --global protocol.version 1"
         - "bash \"./Refresh (macOS).command\""
-        - "bash \"./Validate (macOS).command\" •job macos‐xcode"
-    - os: linux
-      env:
-        - JOB="Linux"
+        - "bash \"./Validate (macOS).command\" •job macos"
+    - name: "Linux"
+      os: linux
       dist: xenial
       script:
         - "export SWIFT_VERSION=5.0"
         - "eval \"$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)\""
         - "bash \"./Refresh (macOS).command\""
         - "bash \"./Validate (macOS).command\" •job linux"
-    - os: linux
-      env:
-        - JOB="Miscellaneous"
+    - name: "Miscellaneous"
+      os: linux
       dist: xenial
       script:
         - "export SWIFT_VERSION=5.0"
         - "eval \"$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)\""
         - "bash \"./Refresh (macOS).command\""
         - "bash \"./Validate (macOS).command\" •job miscellaneous"
-    - os: linux
+    - name: "Deployment"
+      os: linux
       env:
-        - JOB="Deployment"
         - secure: "rHheTc8sUxKAdE0Wfx6FveDJC+dwlHt3ZIJc5csxoPQge4LtqufFte3OBYVNNL+8RbyxfP25xD5nNKNVl8BAwa6uvMgmpRCSRxHRjk/nI+gioeiFocQWBXNb9EcuDjnshMc64XzeGj0gIWCD2H81daDyY9ysrLY7Y/ZREdczsMMDRAwyBuV15iC/d7tiJYy/07Pwg/3Rja8wZJFw/7fYu6x6Wk7aeFnxrb6KUyPiUexgn2PupX+E/0U1C0VAJsUS4r6p7N4spZeloeqlH8bdlrqotpvSS/h8Ui4NWL9Ke5yWyfY4E7l3cDl+I7YlLa7AGiOuOGEFVVMgaRQo/MrtrBYraGcUC+lBt6jmP6nDQb4n1Q0SvFvpFlzVtqOs7Y44oHMfGgINBNjMuGf3SKFG57jFpRJoLGOEb4kS+HkW35pefQlGTlIKKPZvjliBN71yagsRyJQI+dKX5jfSeUtstaNyVBFch8zz70bnC3YZEgAYnGDC283O3r1TmIyyMlpAbejv8dLd/JnpLzAzkVay73lBbtt1Fqqusn2C6k/U2X+/avwj08rW/Ui+2LFWt4D93pqpi00mX9+oxgaBikuncq6G6AxV5H6AZwMiCDTQwQeSASgJCYN5WAqq4F9hbHvHlTJkoulv+nSihsmmdnfHoxTuUwfwrGJki6TJrg1hQqE="
       if: branch = master and (not type = pull_request)
 

diff --git a/Documentation/🇨🇦EN Read Me.md b/Documentation/🇨🇦EN Read Me.md
@@ -127,10 +127,10 @@ Tests are easy to set up:
 
 ```swift
 func testParrot() {
-    do {
-        let output = try parrot.execute(with: ["speak", "•phrase", "Hello, world!"])
+    switch parrot.execute(with: ["speak", "•phrase", "Hello, world!"]) {
+    case .success(let output):
         XCTAssertEqual(output, "Hello, world!")
-    } catch {
+    case .failure:
         XCTFail("The parrot is not co‐operating.")
     }
 }

diff --git a/README.md b/README.md
@@ -127,10 +127,10 @@ Tests are easy to set up:
 
 ```swift
 func testParrot() {
-    do {
-        let output = try parrot.execute(with: ["speak", "•phrase", "Hello, world!"])
+    switch parrot.execute(with: ["speak", "•phrase", "Hello, world!"]) {
+    case .success(let output):
         XCTAssertEqual(output, "Hello, world!")
-    } catch {
+    case .failure:
         XCTFail("The parrot is not co‐operating.")
     }
 }

diff --git a/Refresh (macOS).command b/Refresh (macOS).command
@@ -7,20 +7,20 @@ REPOSITORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "${REPOSITORY}"
 if workspace version > /dev/null 2>&1 ; then
     echo "Using system install of Workspace..."
-    workspace refresh $1 $2 •use‐version 0.19.0
-elif ~/Library/Caches/ca.solideogloria.Workspace/Versions/0.19.0/workspace version > /dev/null 2>&1 ; then
+    workspace refresh $1 $2 •use‐version 0.20.0
+elif ~/Library/Caches/ca.solideogloria.Workspace/Versions/0.20.0/workspace version > /dev/null 2>&1 ; then
     echo "Using cached build of Workspace..."
-    ~/Library/Caches/ca.solideogloria.Workspace/Versions/0.19.0/workspace refresh $1 $2 •use‐version 0.19.0
-elif ~/.cache/ca.solideogloria.Workspace/Versions/0.19.0/workspace version > /dev/null 2>&1 ; then
+    ~/Library/Caches/ca.solideogloria.Workspace/Versions/0.20.0/workspace refresh $1 $2 •use‐version 0.20.0
+elif ~/.cache/ca.solideogloria.Workspace/Versions/0.20.0/workspace version > /dev/null 2>&1 ; then
     echo "Using cached build of Workspace..."
-    ~/.cache/ca.solideogloria.Workspace/Versions/0.19.0/workspace refresh $1 $2 •use‐version 0.19.0
+    ~/.cache/ca.solideogloria.Workspace/Versions/0.20.0/workspace refresh $1 $2 •use‐version 0.20.0
 else
     echo "No cached build detected, fetching Workspace..."
     rm -rf /tmp/Workspace
     git clone https://github.com/SDGGiesbrecht/Workspace /tmp/Workspace
     cd /tmp/Workspace
     swift build --configuration release
     cd "${REPOSITORY}"
-    /tmp/Workspace/.build/release/workspace refresh $1 $2 •use‐version 0.19.0
+    /tmp/Workspace/.build/release/workspace refresh $1 $2 •use‐version 0.20.0
     rm -rf /tmp/Workspace
 fi