Fix CI, bump ameba, fix Crystal version range

.github/workflows/linters.yml

@@ -27,7 +27,13 @@ jobs:
           restore-keys: ${{ runner.os }}-shards-
 
       - name: Install shards
-        run: shards update
+        run: shards install
+
+      - name: Set up bin dir
+        run: mkdir -p bin
+
+      - name: Build ameba
+        run: crystal build -o bin/ameba lib/ameba/bin/ameba.cr
 
       - name: Run linter
         run: bin/ameba

.github/workflows/tests.yml

@@ -37,7 +37,7 @@ jobs:
           restore-keys: ${{ runner.os }}-shards-
 
       - name: Install shards
-        run: shards update
+        run: shards install
 
       - name: Run tests
         run: crystal spec --verbose

README.md

@@ -305,6 +305,18 @@ Format the code:
 crystal tool format
 ```
 
+Build ameba:
+
+```
+crystal build -o bin/ameba lib/ameba/bin/ameba.cr
+```
+
+Run ameba:
+
+```
+bin/ameba
+```
+
 ### Guidelines
 
 - Keep the public interface small. Anything that doesn't have to be public, should explicitly be marked as protected or

shard.lock

@@ -2,13 +2,13 @@ version: 2.0
 shards:
   ameba:
     git: https://github.com/crystal-ameba/ameba.git
-    version: 1.5.0
+    version: 1.7.0
 
   db:
     git: https://github.com/crystal-lang/crystal-db.git
     version: 0.14.0
 
   redis:
     git: https://github.com/jgaskins/redis.git
-    version: 0.15.1
+    version: 0.15.3
 

shard.yml

@@ -5,7 +5,7 @@ authors:
   - Florin Lipan <florinlipan@gmail.com>
   - Rodrigo Pinto <contato@rodrigopinto.me>
 
-crystal: "1.0.0, < 2.0.0"
+crystal: ">= 1.0.0, < 2.0.0"
 
 dependencies:
   redis:
@@ -15,4 +15,4 @@ dependencies:
 development_dependencies:
   ameba:
     github: crystal-ameba/ameba
-    version: ~> 1.5.0
+    version: ~> 1.7.0

src/defense/memory_store.cr

@@ -23,7 +23,7 @@ module Defense
       @data.has_key?(key) && @data[key]["expires_at"] > Time.utc.to_unix_ms
     end
 
-    def read(unprefixed_key : String) : Int64 | Nil
+    def read(unprefixed_key : String) : Int64?
       if exists?(unprefixed_key)
         @data[prefix_key(unprefixed_key)]["count"]
       end

src/defense/redis_store.cr

@@ -18,17 +18,17 @@ module Defense
     def increment(unprefixed_key : String, expires_in : Int32) : Int64
       key = prefix_key(unprefixed_key)
 
-      @redis.multi do |r|
-        r.incr(key)
-        r.expire(key, expires_in)
+      @redis.multi do |red|
+        red.incr(key)
+        red.expire(key, expires_in)
       end.as(Array).first.as(Int64)
     end
 
     def exists?(unprefixed_key : String) : Bool
       @redis.exists(prefix_key(unprefixed_key)) == 1
     end
 
-    def read(unprefixed_key : String) : Int64 | Nil
+    def read(unprefixed_key : String) : Int64?
       @redis.get(prefix_key(unprefixed_key)).try(&.to_i64)
     end
 

src/defense/store.cr

@@ -2,7 +2,7 @@ module Defense
   abstract class Store
     abstract def exists?(unprefixed_key : String) : Bool
     abstract def increment(unprefixed_key : String, expires_in : Int32) : Int64
-    abstract def read(unprefixed_key : String) : Int64 | Nil
+    abstract def read(unprefixed_key : String) : Int64?
     abstract def reset
 
     def prefix