Merge pull request #1039 from travis-ci/sf-port-856

move rescueing errors to Dpl::Cli, and suggest provider names on unknown providers (ports #856)

bin/dpl

@@ -6,10 +6,4 @@ $stderr.sync = true
 
 require 'dpl'
 
-begin
-  Dpl::Cli.new.run(ARGV)
-rescue Dpl::Error => e
-  msg = "\e[31m#{e.message}\e[0m"
-  msg = [msg, *e.backtrace].join("\n") if e.backtrace?
-  abort msg
-end
+Dpl::Cli.new.run(ARGV)

dpl.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.require_path  = 'lib'
   s.required_ruby_version = '>= 2.2'
 
-  s.executables = ['dpl']
-  s.files       = Dir['{lib/**/*,[A-Z]*}']
+  s.executables   = ['dpl']
+  s.files         = Dir['{lib/**/*,[A-Z]*}']
 
-  s.add_runtime_dependency 'cl', '~> 1.0.0'
+  s.add_runtime_dependency 'cl', '~> 1.0'
   s.add_development_dependency 'rake', '~> 12.3'
 end

lib/dpl/cli.rb

@@ -2,14 +2,19 @@
 
 module Dpl
   class Cli < Cl
-    def self.new(ctx = nil, cmd = nil)
-      super(ctx || Dpl::Ctx::Bash.new, cmd || 'dpl')
+    def self.new(ctx = nil, name = 'dpl')
+      ctx ||= Dpl::Ctx::Bash.new
+      super
     end
 
     def run(args)
       args = untaint(args)
       args = with_provider_opt(args)
       super
+    rescue UnknownCmd
+      unknown_provider(args.first)
+    rescue Error => e
+      error(e)
     end
 
     # Tainting is being used for automatically obfuscating values for secure
@@ -18,11 +23,32 @@ def untaint(args)
       args.map(&:dup).each(&:untaint)
     end
 
-    # bc with travis-build dpl v1 integration
+    # backwards compatibility for travis-build dpl v1 integration
     def with_provider_opt(args)
       return args unless arg = args.detect { |arg| arg.include?('--provider') }
       args.delete(arg)
       [arg.split('=').last, *args]
     end
+
+    def error(e)
+      msg = "\e[31m#{e.message}\e[0m"
+      msg = [msg, *e.backtrace].join("\n") if e.backtrace?
+      abort msg
+    end
+
+    def unknown_provider(name)
+      msg = "\e[31mUnknown provider: #{name}\e[0m"
+      msg << "\nDid you mean: #{suggestions(name).join(', ')}?" if suggestions(name).any?
+      abort msg
+    end
+
+    def suggestions(name)
+      return [] unless defined?(DidYouMean)
+      DidYouMean::SpellChecker.new(dictionary: providers).correct(name)
+    end
+
+    def providers
+      Cl::Cmd.registry.keys.map(&:to_s)
+    end
   end
 end

lib/dpl/ctx/bash.rb

@@ -14,7 +14,7 @@ class Bash < Cl::Ctx
       def initialize(stdout = $stdout, stderr = $stderr)
         @stdout, @stderr = stdout, stderr
         @folds = 0
-        super('dpl')
+        super('dpl', abort: false)
       end
 
       # Folds any log output from the given block