Update for Crystal v0.35

busyloop · Jun 12, 2020 · 6c6b1fd · 6c6b1fd
2 parents ea551d1 + 0890e2f
commit 6c6b1fd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/app
     docker:
-      - image: crystallang/crystal:0.33.0
+      - image: crystallang/crystal:0.35.0
     steps:
       - checkout
       - run:

diff --git a/src/rucksack.cr b/src/rucksack.cr
@@ -2,17 +2,23 @@ require "openssl"
 
 class Rucksack
   class NotFound < Exception; end
+
   class FileNotFound < Exception; end
+
   class FileCorrupted < Exception; end
+
   class RucksackHeaderNotFound < Exception; end
+
   class RucksackNotFound < Exception; end
+
   class RucksackEmpty < Exception; end
+
   class RucksackCorrupted < Exception; end
 
   KNAUTSCHZONE = ("\000" * 8192).to_slice
-  EOF_DELIM = "RS".to_slice
-  DATA_FILE = Process.executable_path.not_nil!
-  MODE = ENV.fetch("RUCKSACK_MODE", "0").to_i
+  EOF_DELIM    = "RS".to_slice
+  DATA_FILE    = Process.executable_path.not_nil!
+  MODE         = ENV.fetch("RUCKSACK_MODE", "0").to_i
 
   @@offset : UInt64 = 0
   @@index = {} of String => File
@@ -128,13 +134,13 @@ class Rucksack
       raise NotImplementedError.new("")
     end
 
-    def write(slice : Bytes) : Nil
+    def write(slice : Bytes) : Int64
       @md.update(slice)
-      nil
+      slice.size.to_i64
     end
 
-    def digest
-      @md.digest
+    def final
+      @md.final
     end
   end
 
@@ -162,7 +168,7 @@ class Rucksack
       ::File.open(@path) do |fd|
         IO.copy(fd, c)
       end
-      c.digest
+      c.final
     end
 
     def size : UInt64
@@ -182,7 +188,7 @@ class Rucksack
     def verify!
       c = Checksummer.new
       read(c, true)
-      raise FileCorrupted.new(@path) unless @checksum == c.digest
+      raise FileCorrupted.new(@path) unless @checksum == c.final
       @verified = true
     end
 
@@ -203,8 +209,7 @@ end
 macro rucksack(path)
   {% if path.is_a? StringLiteral && !path.empty? %}
   {{
-system( \
-<<-EOC
+    system(<<-EOC
 cat >#{__DIR__}/.rucksack_packer.cr <<EOF
 require "openssl"
 
@@ -247,7 +252,7 @@ File.open(".rucksack.toc", "a") do |fd|
 end
 EOF
 EOC
-)
+    )
   }}
   {{ run("./.rucksack_packer", path) }}
   {{ system("rm -f #{__DIR__}/.rucksack_packer.cr") }}

diff --git a/test/test.cr b/test/test.cr
@@ -7,15 +7,15 @@ checksums = {} of String => Slice(UInt8)
   File.open({{path}}) do |fd|
     IO.copy(fd, c)
   end
-  checksums[{{path}}] = c.digest
+  checksums[{{path}}] = c.final
 
   rucksack({{path}})
 {% end %}
 
 checksums.each do |file, checksum|
   c = Rucksack::Checksummer.new
   rucksack(file).read(c)
-  if checksum != c.digest
+  if checksum != c.final
     puts
     puts "ERROR: Checksum mismatch #{file}"
     exit 1
@@ -30,7 +30,7 @@ end
 
 c = Rucksack::Checksummer.new
 rucksack("./fixtures/cat3.txt").read(c)
-if checksums["./fixtures/cat3.txt"] != c.digest
+if checksums["./fixtures/cat3.txt"] != c.final
   puts
   puts "ERROR: Meow. :("
   exit 1