lib/command/build_image.rb in cpl-0.4.1 vs lib/command/build_image.rb in cpl-0.5.0

@@ -6,31 +6,32 @@
     OPTIONS = [
       app_option(required: true),
       commit_option
     ].freeze
     DESCRIPTION = "Builds and pushes the image to Control Plane"
-    LONG_DESCRIPTION = <<~HEREDOC
+    LONG_DESCRIPTION = <<~DESC
       - Builds and pushes the image to Control Plane
       - Automatically assigns image numbers, e.g., `app:1`, `app:2`, etc.
       - Uses `.controlplane/Dockerfile`
-    HEREDOC
+    DESC
 
     def call
       ensure_docker_running!
 
       dockerfile = config.current[:dockerfile] || "Dockerfile"
       dockerfile = "#{config.app_cpln_dir}/#{dockerfile}"
-      progress.puts "- Building dockerfile: #{dockerfile}"
 
+      progress.puts("Building image from Dockerfile '#{dockerfile}'...\n\n")
+
       cp.image_build(latest_image_next, dockerfile: dockerfile)
     end
 
     private
 
     def ensure_docker_running!
       `docker version > /dev/null 2>&1`
-      return if $?.success? # rubocop:disable Style/SpecialGlobalVars
+      return if $CHILD_STATUS.success?
 
-      Shell.abort("Can't run Docker. Please make sure that it's installed and started, then try again.")
+      raise "Can't run Docker. Please make sure that it's installed and started, then try again."
     end
   end
 end