Merge branch 'floitsch/45.cache-env' into floitsch/50.config

package.lock

@@ -1,10 +1,13 @@
-sdk: ^2.0.0-alpha.100
+sdk: ^2.0.0-alpha.120
 prefixes:
   fs: pkg-fs
   host: pkg-host
 packages:
   pkg-fs:
-    path: ../pkg-fs
+    url: github.com/toitlang/pkg-fs
+    name: fs
+    version: 1.0.0
+    hash: c816c85022a155f37a4396455da9b27595050de1
     prefixes:
       host: pkg-host
   pkg-host:

package.yaml

@@ -4,7 +4,8 @@ environment:
   sdk: ^2.0.0-alpha.100
 dependencies:
   fs:
-    path: ../pkg-fs
+    url: github.com/toitlang/pkg-fs
+    version: ^1.0.0
   host:
     url: github.com/toitlang/pkg-host
     version: ^1.11.0

src/cache.toit

@@ -46,10 +46,9 @@ class Cache:
   */
   constructor --app-name/string:
     app-name-upper := app-name.to-ascii-upper
-    env := os.env
-    if env.contains "$(app-name-upper)_CACHE_DIR":
-      path := env["$(app-name-upper)_CACHE_DIR"]
-      return Cache --app-name=app-name --path=path
+    env-path := os.env.get "$(app-name-upper)_CACHE_DIR"
+    if env-path:
+      return Cache --app-name=app-name --path=env-path
 
     cache-home := xdg.cache-home
     return Cache --app-name=app-name --path="$cache-home/$(app-name)"

src/cli.toit

@@ -369,7 +369,7 @@ abstract class Option:
     if short-name and not is-alpha-num-string_ short-name:
       throw "Invalid short option name: '$short-name'"
     if split-commas and not multi:
-      throw "--split_commas is only valid for multi options."
+      throw "--split-commas is only valid for multi options."
     if is-hidden and is-required:
       throw "Option can't be hidden and required."
 
@@ -655,7 +655,6 @@ class OptionPatterns extends Option:
       key: str[separator-index + 1..]
     }
 
-
 /**
 A Uuid option.
 */

tests/options_test.toit

@@ -164,7 +164,7 @@ test-flag:
     flag.parse "foo"
 
 test-bad-combos:
-  expect-throw "--split_commas is only valid for multi options.":
+  expect-throw "--split-commas is only valid for multi options.":
     cli.Option "foo" --split-commas
 
   expect-throw "Invalid short option name: '@'":

tests/package.lock

@@ -1,4 +1,4 @@
-sdk: ^2.0.0-alpha.64
+sdk: ^2.0.0-alpha.120
 prefixes:
   cli: ..
   host: pkg-host
@@ -9,7 +9,10 @@ packages:
       fs: pkg-fs
       host: pkg-host
   pkg-fs:
-    path: ../../pkg-fs
+    url: github.com/toitlang/pkg-fs
+    name: fs
+    version: 1.0.0
+    hash: c816c85022a155f37a4396455da9b27595050de1
     prefixes:
       host: pkg-host
   pkg-host: