Skip to content

Make os.home a def #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lefou merged 9 commits into from
Nov 27, 2023
Merged

Make os.home a def #239

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc241cd
Make os.home a def with an intermediate lazy val _home
MaciejG604 Nov 21, 2023
7522a61
Add test in separate module
lolgab Nov 23, 2023
e6db672
Add test also for Scala Native
lolgab Nov 23, 2023
f6de818
Use private object to avoid bin-compat issue
lolgab Nov 23, 2023
8dd083c
Make test fail if os is already initialized
lolgab Nov 23, 2023
0f072d6
Make value `lazy` to avoid have direct exception
lolgab Nov 23, 2023
fd98bfe
Fix nohometest on windows
lolgab Nov 23, 2023
4f09c73
Added comments to bincompat workaround
lefou Nov 27, 2023
8065f06
Merge branch 'main' into make-os.home-lazy
lefou Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make value lazy to avoid have direct exception
  • Loading branch information
@lolgab
lolgab committed Nov 23, 2023
commit 0f072d68d30b386451d7ff457f5ade63c7f906d7
6 changes: 2 additions & 4 deletions os/nohometest/src/NoHomeTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ object NoHomeTests extends TestSuite {
val tests = Tests {
test("pwd when home is not available") {
System.setProperty("user.home", "?")
val homeException =
intercept[ExceptionInInitializerError] { os.home }
.getCause()
.getMessage()
val homeException = intercept[IllegalArgumentException] { os.home }
.getMessage()
assert(homeException == "requirement failed: ? is not an absolute path")
os.pwd
()
Expand Down
2 changes: 1 addition & 1 deletion os/src-jvm/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package object os {
}

private object _home {
val value = Path(System.getProperty("user.home"))
lazy val value = Path(System.getProperty("user.home"))
}

/**
Expand Down
2 changes: 1 addition & 1 deletion os/src-native/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package object os {
}

private object _home {
val value = Path(System.getProperty("user.home"))
lazy val value = Path(System.getProperty("user.home"))
}

/**
Expand Down