Skip to content
This repository was archived by the owner on May 13, 2020. It is now read-only.

Commit 3a5200b

Browse files
committed
Rename bundle.json to tack.json
1 parent 03802b8 commit 3a5200b

File tree

16 files changed

+39
-39
lines changed

16 files changed

+39
-39
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ actor Main
176176

177177
```bash
178178
stable fetch
179-
# The dependencies listed in `bundle.json` will be fetched
179+
# The dependencies listed in `tack.json` will be fetched
180180
# and/or updated into the local `.deps` directory.
181181
```
182182
```
@@ -193,7 +193,7 @@ Checking connectivity... done.
193193

194194
```bash
195195
stable env ponyc --debug
196-
# The local paths to the dependencies listed in `bundle.json`
196+
# The local paths to the dependencies listed in `tack.json`
197197
# will be included in the `PONYPATH` environment variable,
198198
# available to `use` in the `ponyc` invocation.
199199
# You can run any custom command here - not just `ponyc`.

stable/_bundle_locator.pony

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ primitive _BundleLocator
55
var path = start_path
66
while path.size() > 0 do
77
let candidate = try
8-
FilePath(env.root as AmbientAuth, path)?.join("bundle.json")?
8+
FilePath(env.root as AmbientAuth, path)?.join("tack.json")?
99
else
1010
return None
1111
end

stable/_test.pony

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ class _TestBundleLocator is UnitTest
2323
h.assert_eq[String]("stable/test/testdata/nested/deeply",
2424
_BundleLocator(h.env, bundle("nested/deeply")) as String)
2525

26-
// nested/empty has no bundle.json
26+
// nested/empty has no tack.json
2727
h.assert_eq[String]("stable/test/testdata/nested",
2828
_BundleLocator(h.env, bundle("nested/empty")) as String)
2929

30-
// stable itself has no bundle.json, so this ancestor-checking
31-
// from stable/test/testdata/empty yields no bundle.json
30+
// stable itself has no tack.json, so this ancestor-checking
31+
// from stable/test/testdata/empty yields no tack.json
3232
h.assert_eq[None](None, _BundleLocator(h.env, bundle("empty")) as None)

stable/bundle.pony

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Bundle
1414
path = path'
1515
log = log'
1616

17-
let bundle_path = path.join("bundle.json")?
17+
let bundle_path = path.join("tack.json")?
1818

1919
if not bundle_path.exists() then
2020
if create_on_missing then
@@ -87,5 +87,5 @@ class Bundle
8787
else JsonArray
8888
end
8989
deps_array.data.push(dep_json)
90-
let file = CreateFile(path.join("bundle.json")?) as File
90+
let file = CreateFile(path.join("tack.json")?) as File
9191
file.write(json.string(" ", true))

stable/main.pony

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ actor Main
1717
""
1818
" A simple dependency manager for the Pony language."
1919
""
20-
" Invoke in a working directory containing a bundle.json."
20+
" Invoke in a working directory containing a tack.json."
2121
""
2222
"Commands:"
2323
" help - Print this message"
@@ -41,7 +41,7 @@ actor Main
4141
if create_on_missing then
4242
Bundle(FilePath(env.root as AmbientAuth, cwd)?, log, true)?
4343
else
44-
log("No bundle.json in current working directory or ancestors.")
44+
log("No tack.json in current working directory or ancestors.")
4545
error
4646
end
4747
end

stable/test/integration/test_env.pony

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ actor EnvTests is TestList
1818
class TestEnvNoBundle is UnitTest
1919
new iso create() => None
2020

21-
fun name(): String => "integration.Env(no bundle.json)"
21+
fun name(): String => "integration.Env(no tack.json)"
2222

2323
fun apply(h: TestHelper) =>
2424
h.long_test(2_000_000_000)
@@ -35,7 +35,7 @@ class TestEnvNoBundle is UnitTest
3535

3636
let notifier: ProcessNotify iso = _ExpectClient(h,
3737
None,
38-
["No bundle.json in current working directory or ancestors."],
38+
["No tack.json in current working directory or ancestors."],
3939
0)
4040
_Exec(h, "stable env", tmp.path, consume notifier)
4141

@@ -59,13 +59,13 @@ class TestEnvEmptyBundleInSameDir is UnitTest
5959

6060
let f =
6161
try
62-
Directory(tmp)?.create_file("bundle.json")?
62+
Directory(tmp)?.create_file("tack.json")?
6363
else
64-
h.fail("failed to create bundle.json in temporary directory")
64+
h.fail("failed to create tack.json in temporary directory")
6565
h.complete(false)
6666
return
6767
end
68-
h.assert_true(f.write("{\"deps\":[]}\n"), "prepare bundle.json")
68+
h.assert_true(f.write("{\"deps\":[]}\n"), "prepare tack.json")
6969

7070
let notifier: ProcessNotify iso = _ExpectClient(h,
7171
["PONYPATH=\n"], // empty
@@ -93,9 +93,9 @@ class TestEnvBundleInSameDir is UnitTest
9393

9494
let f =
9595
try
96-
Directory(tmp)?.create_file("bundle.json")?
96+
Directory(tmp)?.create_file("tack.json")?
9797
else
98-
h.fail("failed to create bundle.json in temporary directory")
98+
h.fail("failed to create tack.json in temporary directory")
9999
h.complete(false)
100100
return
101101
end
@@ -104,7 +104,7 @@ class TestEnvBundleInSameDir is UnitTest
104104
{\"type\": \"local-git\", \"local-path\":\"../local-git/b\"},
105105
{\"type\": \"github\", \"repo\":\"github/c\"},
106106
{\"type\": \"gitlab\", \"repo\":\"gitlab/d\"}
107-
]}\n"), "prepare bundle.json")
107+
]}\n"), "prepare tack.json")
108108

109109
let expected =
110110
try
@@ -144,15 +144,15 @@ class TestEnvBundleInSameDirWithCall is UnitTest
144144

145145
let f =
146146
try
147-
Directory(tmp)?.create_file("bundle.json")?
147+
Directory(tmp)?.create_file("tack.json")?
148148
else
149-
h.fail("failed to create bundle.json in temporary directory")
149+
h.fail("failed to create tack.json in temporary directory")
150150
h.complete(false)
151151
return
152152
end
153153
h.assert_true(f.write("{\"deps\":[
154154
{\"type\": \"local\", \"local-path\":\"../local/a\"}
155-
]}\n"), "prepare bundle.json")
155+
]}\n"), "prepare tack.json")
156156

157157
let notifier: ProcessNotify iso = _ExpectClient(h,
158158
["../local/a"],
@@ -163,7 +163,7 @@ class TestEnvBundleInSameDirWithCall is UnitTest
163163
class TestEnvBundleInParentDir is UnitTest
164164
new iso create() => None
165165

166-
fun name(): String => "integration.Env(bundle.json in parent dir)"
166+
fun name(): String => "integration.Env(tack.json in parent dir)"
167167

168168
fun apply(h: TestHelper) =>
169169
h.long_test(2_000_000_000)
@@ -182,15 +182,15 @@ class TestEnvBundleInParentDir is UnitTest
182182
try
183183
h.assert_true(Directory(tmp)?.mkdir("nested"), "create nested directory")
184184
let n = tmp.join("nested")?
185-
(Directory(tmp)?.create_file("bundle.json")?, n)
185+
(Directory(tmp)?.create_file("tack.json")?, n)
186186
else
187-
h.fail("failed to create bundle.json in nested temporary directory")
187+
h.fail("failed to create tack.json in nested temporary directory")
188188
h.complete(false)
189189
return
190190
end
191191
h.assert_true(f.write("{\"deps\":[
192192
{\"type\": \"local\", \"local-path\":\"../local/a\"}
193-
]}\n"), "prepare bundle.json")
193+
]}\n"), "prepare tack.json")
194194

195195
let notifier: ProcessNotify iso = _ExpectClient(h,
196196
["PONYPATH=" + Path.join(tmp.path, "../local/a")],
@@ -201,7 +201,7 @@ class TestEnvBundleInParentDir is UnitTest
201201
class TestEnvBadBundleInNestedAndValidBundleInParentDir is UnitTest
202202
new iso create() => None
203203

204-
fun name(): String => "integration.Env(invalid bundle.json in nested dir)"
204+
fun name(): String => "integration.Env(invalid tack.json in nested dir)"
205205

206206
fun apply(h: TestHelper) =>
207207
h.long_test(2_000_000_000)
@@ -220,21 +220,21 @@ class TestEnvBadBundleInNestedAndValidBundleInParentDir is UnitTest
220220
try
221221
h.assert_true(Directory(tmp)?.mkdir("nested"), "create nested directory")
222222
let n = tmp.join("nested")?
223-
(Directory(n)?.create_file("bundle.json")?,
224-
Directory(tmp)?.create_file("bundle.json")?,
223+
(Directory(n)?.create_file("tack.json")?,
224+
Directory(tmp)?.create_file("tack.json")?,
225225
n)
226226
else
227-
h.fail("failed to create bundle.json example data files")
227+
h.fail("failed to create tack.json example data files")
228228
h.complete(false)
229229
return
230230
end
231231
h.assert_true(good_bundle.write("{\"deps\":[
232232
{\"type\": \"local\", \"local-path\":\"../local/a\"}
233-
]}\n"), "prepare good bundle.json")
234-
h.assert_true(bad_bundle.write("{}"), "prepare bad bundle.json")
233+
]}\n"), "prepare good tack.json")
234+
h.assert_true(bad_bundle.write("{}"), "prepare bad tack.json")
235235

236-
// This verifies that the parent-dir bundle.json isn't picked up if the
237-
// nested-dir bundle.json is invalid.
236+
// This verifies that the parent-dir tack.json isn't picked up if the
237+
// nested-dir tack.json is invalid.
238238
let notifier: ProcessNotify iso = _ExpectClient(h,
239239
["PONYPATH=$"],
240240
["JSON error at: " + bad_bundle.path.path + ": missing \"deps\" array"],

stable/test/test_bundle.pony

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ class TestBundle is UnitTest
1111

1212
fun apply(h: TestHelper) ? =>
1313
h.assert_error(_BundleCreate(h.env, "notfound")?, "nonexistant directory")
14-
h.assert_error(_BundleCreate(h.env, bundle("empty"))?, "no bundle.json")
15-
h.assert_error(_BundleCreate(h.env, bundle("bad/empty"))?, "empty bundle.json")
16-
h.assert_error(_BundleCreate(h.env, bundle("bad/wrong_format"))?, "wrong bundle.json")
14+
h.assert_error(_BundleCreate(h.env, bundle("empty"))?, "no tack.json")
15+
h.assert_error(_BundleCreate(h.env, bundle("bad/empty"))?, "empty tack.json")
16+
h.assert_error(_BundleCreate(h.env, bundle("bad/wrong_format"))?, "wrong tack.json")
1717

1818
h.assert_no_error(_BundleCreate(h.env, bundle("empty-deps"))?, "empty deps")
1919
h.assert_no_error(_BundleCreate(h.env, bundle("github"))?, "github dep")
@@ -26,14 +26,14 @@ class TestBundle is UnitTest
2626

2727
h.assert_no_error(_BundleCreate(h.env, bundle("empty"), true)?, "create in directory with no bunde.json")
2828

29-
let file = FilePath(h.env.root as AmbientAuth, bundle("empty/bundle.json"))?
30-
h.assert_true(file.exists(), "empty bundle.json created")
29+
let file = FilePath(h.env.root as AmbientAuth, bundle("empty/tack.json"))?
30+
h.assert_true(file.exists(), "empty tack.json created")
3131
let f = OpenFile(file) as File
3232
let content: String = f.read_string(f.size())
3333
h.assert_eq[String]("{\"deps\":[]}\n", content)
3434

3535
fun tear_down(h: TestHelper) =>
36-
let created_bundle = bundle("empty/bundle.json")
36+
let created_bundle = bundle("empty/tack.json")
3737
try
3838
FilePath(h.env.root as AmbientAuth, created_bundle)?.remove()
3939
else

0 commit comments

Comments
 (0)