Adapt to new IO. (#12)

.github/workflows/ci.yml

@@ -27,9 +27,9 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         # The versions should contain (at least) the lowest requirement
         #    and a version that is more up to date.
-        toit-version: [ v2.0.0-alpha.128, latest ]
+        toit-version: [ v2.0.0-alpha.144, latest ]
         include:
-          - toit-version: v2.0.0-alpha.128
+          - toit-version: v2.0.0-alpha.144
             version-name: old
           - toit-version: latest
             version-name: new

package.lock

@@ -1 +1 @@
-sdk: ^2.0.0-alpha.121
+sdk: ^2.0.0-alpha.144

package.yaml

@@ -1,4 +1,4 @@
 name: ar
 description: Toit package for reading and writing 'ar' (archive) files.
 environment:
-  sdk: ^2.0.0-alpha.121
+  sdk: ^2.0.0-alpha.144

src/ar.toit

@@ -3,8 +3,8 @@
 // found in the package's LICENSE file.
 
 import bytes
-import writer show Writer
-import reader show Reader BufferedReader
+import io
+import reader show Reader
 
 AR-HEADER_ ::= "!<arch>\x0A"
 
@@ -41,10 +41,19 @@ An 'ar' archiver.
 Writes the given files into the writer in the 'ar' file format.
 */
 class ArWriter:
-  writer_ ::= ?
+  writer_/io.Writer ::= ?
 
+  /**
+  Takes an $io.Writer as argument.
+
+  For compatibility reasons, also accepts an "old-style" writer. This is
+    deprecated and will be removed in the future.
+  */
   constructor writer:
-    writer_ = Writer writer
+    if writer is io.Writer:
+      writer_ = writer
+    else:
+      writer_ = io.Writer.adapt writer
     write-ar-header_
 
   /**
@@ -151,15 +160,18 @@ class ArFileOffsets:
   constructor .name .from .to:
 
 class ArReader:
-  reader_ / BufferedReader
+  reader_ / io.Reader
   offset_ / int := 0
 
   constructor reader/Reader:
-    reader_ = BufferedReader reader
+    if reader is io.Reader:
+      reader_ = reader as io.Reader
+    else:
+      reader_ = io.Reader.adapt reader
     skip-header_
 
   constructor.from-bytes buffer/ByteArray:
-    return ArReader (bytes.Reader buffer)
+    return ArReader (io.Reader buffer)
 
   /// Returns the next file in the archive.
   /// Returns null if none is left.
@@ -246,7 +258,7 @@ class ArReader:
   is-padded_ size/int: return size & 1 == 1
 
   read-name_ -> string?:
-    if not reader_.can-ensure 1: return null
+    if not reader_.try-ensure-buffered 1: return null
     name / string := reader-read-string_ FILE-NAME-SIZE_
     name = name.trim --right
     if name.ends-with "/": name = name.trim --right "/"

tests/ar_test.toit

@@ -4,11 +4,10 @@
 
 import expect show *
 import ar show *
-import bytes
 import host.directory
 import host.file
 import host.pipe
-import writer show Writer
+import io
 import system
 
 TESTS ::= [
@@ -32,7 +31,7 @@ TESTS ::= [
 ]
 
 write-ar file-mapping/Map --add-with-ar-file/bool=false:
-  writer := bytes.Buffer
+  writer := io.Buffer
   ar-writer := ArWriter writer
   file-mapping.do: |name content|
     if add-with-ar-file:
@@ -47,7 +46,7 @@ run-test file-mapping/Map tmp-dir [generate-ar]:
 
   seen := {}
   count := 0
-  ar-reader := ArReader (bytes.Reader ba)
+  ar-reader := ArReader (io.Reader ba)
   ar-reader.do: |file/ArFile|
     count++
     seen.add file.name
@@ -70,7 +69,7 @@ run-test file-mapping/Map tmp-dir [generate-ar]:
   expect-equals seen.size count
   expect-equals file-mapping.size count
 
-  ar-reader = ArReader (bytes.Reader ba)
+  ar-reader = ArReader (io.Reader ba)
   // We should find all files if we advance from top to bottom.
   last-name := null
   file-mapping.do: |name content|
@@ -86,7 +85,7 @@ run-test file-mapping/Map tmp-dir [generate-ar]:
     actual := ba.copy file-offsets.from file-offsets.to
     expect-equals content actual
 
-  ar-reader = ArReader (bytes.Reader ba)
+  ar-reader = ArReader (io.Reader ba)
   ar-file := ar-reader.find "not there"
   expect-null ar-file
   if last-name:
@@ -111,7 +110,7 @@ run-test file-mapping/Map tmp-dir [generate-ar]:
 
   test-path := "$tmp-dir/test.a"
   stream := file.Stream.for-write test-path
-  (Writer stream).write ba
+  stream.out.write ba
   stream.close
   file-mapping.do: |name expected-content|
     actual := extract test-path name
@@ -121,7 +120,8 @@ extract archive-file contained-file -> ByteArray:
   // 'p' prints the $contained_file onto stdout.
   from := pipe.from "ar" "p" archive-file contained-file
   result := ByteArray 0
-  while next := from.read:
+  reader := from.in
+  while next := reader.read:
     result += next
   from.close
   return result

tests/package.lock

@@ -1,4 +1,4 @@
-sdk: ^2.0.0-alpha.128
+sdk: ^2.0.0-alpha.144
 prefixes:
   ar: ..
   host: pkg-host
@@ -8,5 +8,5 @@ packages:
   pkg-host:
     url: github.com/toitlang/pkg-host
     name: host
-    version: 1.14.1
-    hash: da453fb59f7ef3d37f39e4b438495f7c16614733
+    version: 1.15.0
+    hash: 2588faa0c7553eca9a85cb6f829f3df41d9466f2

tests/package.yaml

@@ -3,4 +3,4 @@ dependencies:
     path: ..
   host:
     url: github.com/toitlang/pkg-host
-    version: ^1.14.1
+    version: ^1.15.0