Merge pull request #17 from imdrasil/feature/add-crystal-1-support

Add crystal 1.0.0 support
imdrasil · Jun 28, 2021 · 5608ed7 · 5608ed7
2 parents ebabed7 + 8041ead
commit 5608ed7
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+  schedule:
+    - cron: "0 7 * * 1"
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+
+    runs-on: ubuntu-latest
+
+    env:
+      TERM: xterm-256color
+
+    steps:
+      - name: Install Crystal
+        uses: oprypin/install-crystal@v1
+
+      - name: Donwload sources
+        uses: actions/checkout@v2
+
+      - name: Check formatting
+        run: crystal tool format --check
+
+      - name: Install dependencies
+        run: shards install
+
+      - name: Run linter
+        run: ./bin/ameba
+
+      - name: Setup environment
+        run: crystal examples/sam.cr setup
+
+      - name: Run specs
+        run: crystal spec
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Add this to your application's `shard.yml`:
 dependencies:
   sam:
     github: imdrasil/sam.cr
-    version: 0.4.0
+    version: 0.4.1
 ```
 
 After executing `shards install` Sam-file will be added to the root of your project (unless you already have one).

diff --git a/shard.yml b/shard.yml
@@ -1,17 +1,17 @@
 name: sam
-version: 0.4.0
+version: 0.4.1
 
 authors:
   - Roman Kalnytskyi <moranibaca@gmail.com>
 
-crystal: 0.35.1
+crystal: ">= 0.35.1"
 
 license: MIT
 
 development_dependencies:
   ameba:
     github: crystal-ameba/ameba
-    version: "= 0.13.0"
+    version: "= 0.14.3"
 
 scripts:
   postinstall: "false | [ -f ../../sam.cr ]  && true || cp -i examples/sam.template ../../sam.cr 2>/dev/null"
diff --git a/spec/shell_table_spec.cr b/spec/shell_table_spec.cr
@@ -8,14 +8,14 @@ describe Sam::ShellTable do
       namespace = Sam::Namespace.new("name", nil)
       Sam::ShellTable.new([
         Sam::Task.new(
-          -> {},
+          ->{},
           %w[],
           namespace,
           "short_name",
           "but very long description, such long that it requires multiple lines to be written"
         ),
         Sam::Task.new(
-          -> {},
+          ->{},
           %w[],
           namespace,
           "very_long_task_name_such_long_that_it_requires_multiple_lines_to_be_written",

diff --git a/spec/task_spec.cr b/spec/task_spec.cr
@@ -95,21 +95,21 @@ describe Sam::Task do
     it "accepts no arguments" do
       count = 0
       namespace.task("t1") { count += 1 }
-      namespace.task("t2") { |t| t.invoke("t1") }.call(empty_args)
+      namespace.task("t2", &.invoke("t1")).call(empty_args)
       count.should eq(1)
     end
 
     it "accepts tuple at the end" do
       count = 0
       namespace.task("t1") { |_, args| count += args[0].as(Int32) }
-      namespace.task("t2") { |t| t.invoke("t1", 1) }.call(empty_args)
+      namespace.task("t2", &.invoke("t1", 1)).call(empty_args)
       count.should eq(1)
     end
 
     it "accepts hash" do
       count = 0
       namespace.task("t1") { |_, args| count += args["count"].as(Int32) }
-      namespace.task("t2") { |t| t.invoke("t1", {"count" => 2}) }.call(empty_args)
+      namespace.task("t2", &.invoke("t1", {"count" => 2})).call(empty_args)
       count.should eq(2)
     end
 
@@ -123,14 +123,14 @@ describe Sam::Task do
     it "accepts hash and array" do
       count = 0
       namespace.task("t1") { |_, args| count += args["count"].as(Int32) + args[0].as(Int32) }
-      namespace.task("t2") { |t| t.invoke("t1", {"count" => 2}, [1]) }.call(empty_args)
+      namespace.task("t2", &.invoke("t1", {"count" => 2}, [1])).call(empty_args)
       count.should eq(3)
     end
 
     it "ignores invoked tasks" do
       count = 0
       namespace.task("t1") { count += 1 }
-      namespace.task("t2", ["t1"]) { |t| t.invoke("t1") }.call(empty_args)
+      namespace.task("t2", ["t1"], &.invoke("t1")).call(empty_args)
       count.should eq(1)
     end
   end
@@ -139,21 +139,21 @@ describe Sam::Task do
     it "accepts no arguments" do
       count = 0
       namespace.task("t1") { count += 1 }
-      namespace.task("t2") { |t| t.execute("t1") }.call(empty_args)
+      namespace.task("t2", &.execute("t1")).call(empty_args)
       count.should eq(1)
     end
 
     it "accepts tuple at the end" do
       count = 0
       namespace.task("t1") { |_, args| count += args[0].as(Int32) }
-      namespace.task("t2") { |t| t.execute("t1", 1) }.call(empty_args)
+      namespace.task("t2", &.execute("t1", 1)).call(empty_args)
       count.should eq(1)
     end
 
     it "accepts hash" do
       count = 0
       namespace.task("t1") { |_, args| count += args["count"].as(Int32) }
-      namespace.task("t2") { |t| t.execute("t1", {"count" => 2}) }.call(empty_args)
+      namespace.task("t2", &.execute("t1", {"count" => 2})).call(empty_args)
       count.should eq(2)
     end
 
@@ -167,14 +167,14 @@ describe Sam::Task do
     it "accepts hash and array" do
       count = 0
       namespace.task("t1") { |_, args| count += args["count"].as(Int32) + args[0].as(Int32) }
-      namespace.task("t2") { |t| t.execute("t1", {"count" => 2}, [1]) }.call(empty_args)
+      namespace.task("t2", &.execute("t1", {"count" => 2}, [1])).call(empty_args)
       count.should eq(3)
     end
 
     it "ignores invoked tasks" do
       count = 0
       namespace.task("t1") { count += 1 }
-      namespace.task("t2", ["t1"]) { |t| t.execute("t1") }.call(empty_args)
+      namespace.task("t2", ["t1"], &.execute("t1")).call(empty_args)
       count.should eq(2)
     end
   end

diff --git a/src/sam/execution.cr b/src/sam/execution.cr
@@ -1,4 +1,3 @@
-
 require "./exceptions"
 
 module Sam

diff --git a/src/sam/shell_table.cr b/src/sam/shell_table.cr
@@ -53,9 +53,9 @@ module Sam
         [
           [
             tasks.map(&.path.size).max,
-            clean_width * min_content_width_ratio
+            clean_width * min_content_width_ratio,
           ].max,
-          clean_width * max_content_width_ration
+          clean_width * max_content_width_ration,
         ].min.to_i.as(Int32)
     end
 

diff --git a/src/sam/task.cr b/src/sam/task.cr
@@ -33,7 +33,9 @@ module Sam
       @description || ""
     end
 
-    # Launch current task. Prerequisites are invoked first.
+    # Launch current task.
+    #
+    # Prerequisites are invoked before target task.
     def call(args : Args)
       @invoked = true
       case @block.arity
@@ -44,6 +46,7 @@ module Sam
       else
         raise "Wrong task block arity - #{@block.arity} and maximum is 2."
       end
+
       case @block.arity
       when 0
         @block.as(-> Void).call

diff --git a/src/sam/version.cr b/src/sam/version.cr
@@ -1,3 +1,3 @@
 module Sam
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end