From eb98355c3b829523bb021c1ea1f99ecb426c8493 Mon Sep 17 00:00:00 2001
From: Max Fierke <max@maxfierke.com>
Date: Thu, 20 Jul 2023 20:49:06 -0500
Subject: [PATCH] Update ameba and address new lint warnings

---
 shard.lock                        | 2 +-
 shard.yml                         | 4 ++--
 src/mstrap/cli.cr                 | 6 +++---
 src/mstrap/project.cr             | 8 ++++----
 src/mstrap/runtime.cr             | 2 +-
 src/mstrap/runtimes/go.cr         | 2 +-
 src/mstrap/runtimes/node.cr       | 2 +-
 src/mstrap/steps/projects_step.cr | 2 +-
 src/mstrap/user.cr                | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/shard.lock b/shard.lock
index 44a910d..03b5ea3 100644
--- a/shard.lock
+++ b/shard.lock
@@ -2,7 +2,7 @@ version: 2.0
 shards:
   ameba:
     git: https://github.com/crystal-ameba/ameba.git
-    version: 1.2.0
+    version: 1.4.3
 
   commander:
     git: https://github.com/mrrooijen/commander.git
diff --git a/shard.yml b/shard.yml
index 6fe8947..67ad466 100644
--- a/shard.yml
+++ b/shard.yml
@@ -17,7 +17,7 @@ dependencies:
 development_dependencies:
   ameba:
     github: crystal-ameba/ameba
-    version: ~> 1.2.0
+    version: ~> 1.4.0
   spectator:
     gitlab: arctic-fox/spectator
     version: ~> 0.10.5
@@ -31,6 +31,6 @@ targets:
   mstrap:
     main: src/cli.cr
 
-crystal: '>= 1.0.0'
+crystal: '>= 1.8.0'
 
 license: MIT
diff --git a/src/mstrap/cli.cr b/src/mstrap/cli.cr
index b98aa52..b2ff32c 100644
--- a/src/mstrap/cli.cr
+++ b/src/mstrap/cli.cr
@@ -255,12 +255,12 @@ DESC
         else
           Defs::ConfigDef.new(
             user: Defs::UserDef.new(
-              name: name.not_nil!,
-              email: email.not_nil!,
+              name: name,
+              email: email,
               github: github
             ),
           )
-        end.not_nil!
+        end
     end
 
     private def load_cli_options!(options)
diff --git a/src/mstrap/project.cr b/src/mstrap/project.cr
index b50af39..95ac134 100644
--- a/src/mstrap/project.cr
+++ b/src/mstrap/project.cr
@@ -69,7 +69,7 @@ module MStrap
       @cname = project_def.cname
       @name = project_def.name
       @hostname = project_def.hostname || "#{cname}.localhost"
-      @path = File.join(MStrap::Paths::SRC_DIR, project_def.path_present? ? project_def.path.not_nil! : cname)
+      @path = File.join(MStrap::Paths::SRC_DIR, (project_path = project_def.path) ? project_path : cname)
       @port = (port = project_def.port) ? port.to_i32 : nil
       @repo = project_def.repo
       @repo_upstream = project_def.repo_upstream
@@ -129,10 +129,10 @@ module MStrap
     def clone
       success = cmd("git", "clone", git_uri, path, quiet: true)
 
-      if success && repo_upstream
+      if success && repo_upstream && (upstream_uri = git_upstream_uri)
         Dir.cd(path) do
           success =
-            cmd("git", "remote", "add", "upstream", git_upstream_uri.not_nil!, quiet: true) &&
+            cmd("git", "remote", "add", "upstream", upstream_uri, quiet: true) &&
               cmd("git", "fetch", "upstream", quiet: true)
         end
       end
@@ -221,7 +221,7 @@ module MStrap
       `git rev-parse --abbrev-ref HEAD`.chomp
     end
 
-    private def git_checkpoint
+    private def git_checkpoint(&)
       stash_message = "MSTRAP CHECKPOINT #{Time.utc.to_unix}"
 
       begin
diff --git a/src/mstrap/runtime.cr b/src/mstrap/runtime.cr
index 8c74af3..69e58a3 100644
--- a/src/mstrap/runtime.cr
+++ b/src/mstrap/runtime.cr
@@ -111,7 +111,7 @@ module MStrap
     # version or the version specified by the environment.
     #
     # NOTE: This will not traverse parent directories to find versions files.
-    def with_dir_version(dir)
+    def with_dir_version(dir, &)
       env_version = ENV[version_env_var]?
       begin
         Dir.cd(dir) do
diff --git a/src/mstrap/runtimes/go.cr b/src/mstrap/runtimes/go.cr
index 483e5f0..1b6b6d4 100644
--- a/src/mstrap/runtimes/go.cr
+++ b/src/mstrap/runtimes/go.cr
@@ -42,7 +42,7 @@ module MStrap
         end
       end
 
-      private def disable_go_modules
+      private def disable_go_modules(&)
         current_module_setting = ENV["GO111MODULE"]?
 
         begin
diff --git a/src/mstrap/runtimes/node.cr b/src/mstrap/runtimes/node.cr
index 395cb14..aa97045 100644
--- a/src/mstrap/runtimes/node.cr
+++ b/src/mstrap/runtimes/node.cr
@@ -44,7 +44,7 @@ module MStrap
         end
       end
 
-      private def skip_reshim
+      private def skip_reshim(&)
         ENV["ASDF_SKIP_RESHIM"] = "1"
         yield
       ensure
diff --git a/src/mstrap/steps/projects_step.cr b/src/mstrap/steps/projects_step.cr
index 4e938df..5ea1553 100644
--- a/src/mstrap/steps/projects_step.cr
+++ b/src/mstrap/steps/projects_step.cr
@@ -52,7 +52,7 @@ module MStrap
       private def projects
         @projects ||= profile.projects.map do |project_def|
           MStrap::Project.for(project_def)
-        end.not_nil!
+        end
       end
 
       private def has_web_projects?
diff --git a/src/mstrap/user.cr b/src/mstrap/user.cr
index 8f2e3a8..d66812a 100644
--- a/src/mstrap/user.cr
+++ b/src/mstrap/user.cr
@@ -14,8 +14,8 @@ module MStrap
     getter :github
 
     def initialize(user : Defs::UserDef)
-      @name = user.name.not_nil!
-      @email = user.email.not_nil!
+      @name = user.name || ""
+      @email = user.email || ""
       @github = user.github
     end