lib/prize/cli.rb in prize-0.1.3 vs lib/prize/cli.rb in prize-0.2.0

@@ -1,59 +1,53 @@
 require 'thor'
 require 'redis'
 require 'hiredis'
 require 'pry'
+require 'rainbow'
 
 module Prize
   class Cli < ::Thor
 
     default_command :main
 
     desc '', 'Simple Redis CLI client with Pry loaded'
     class_option :url, type: :string, aliases: ['-u'], required: false, desc: 'Server URL, for a TCP connection: `redis://:[password]@[hostname]:[port]/[db]` (password, port and database are optional), for a unix socket connection: `unix://[path to Redis socket]`. This overrides all other options.'
-    class_option :host, type: :string, aliases: ['-h'], required: false, desc: 'Server hostname (default: 127.0.0.1)'
+    class_option :host, type: :string, aliases: ['-H'], required: false, desc: 'Server hostname (default: 127.0.0.1)'
     class_option :port, type: :numeric, aliases: ['-p'], required: false, desc: 'Server port (default: 6379)'
     class_option :path, type: :string, aliases: ['-s', '--socket'], required: false, desc: 'Server socket (overrides hostname and port)'
     class_option :timeout, type: :numeric, required: false, desc: 'Timeout in seconds (default: 5.0)'
     class_option :connect_timeout, type: :numeric, required: false, desc: 'Timeout for initial connect in seconds (default: same as timeout)'
     class_option :password, type: :string, aliases: ['-a'], required: false, desc: 'Password to authenticate against server'
     class_option :db, type: :numeric, aliases: ['-n'], required: false, desc: 'Database number (default: 0)'
     class_option :replica, type: :boolean, required: false, desc: 'Whether to use readonly replica nodes in Redis Cluster or not'
     class_option :cluster, type: :string, required: false, desc: 'List of cluster nodes to contact, format: URL1,URL2,URL3...'
     def main
-      redis = Redis.new(build_options)
-      Pry.config.prompt = build_prompt(redis)
+      @redis = Redis.new(build_options)
+      Pry.config.prompt = Pry::Prompt.new("", "", prompt)
       if File.exists?(File.expand_path('~/.prizerc'))
         Pry.load_file_at_toplevel(File.expand_path('~/.prizerc'))
       end
-      Pry.start(redis)
+      Pry.start(@redis)
     end
 
     no_commands do
       def build_options
         opts = options.to_h.merge(driver: :hiredis)
         opts['cluster'] = opts['cluster'].split(',') if opts['cluster']
         opts
       end
 
-      def build_prompt(redis)
-        opts = redis.instance_variable_get('@client').options
+      def prompt
+        opts = @redis.instance_variable_get('@client').options
         host = opts[:url] || opts[:path] || "#{opts[:host]}:#{opts[:port]}/#{opts[:db]}"
-        prompt_fn = proc do |obj, nest_level, _|
-          p = ""
-          p += if obj == redis
-                "Redis<#{host}>:"
-              else
-                "#{obj}:"
-              end
-          p += "#{nest_level}> "
-        end
-
-        [prompt_fn,
-        proc do |obj, nest_level, other|
-          "*#{prompt_fn.call obj, nest_level, other}"
-        end
-        ]
+        [proc do |obj, nest_level, _|
+           if obj == @redis && nest_level == 0
+             nest_level_prompt = ''
+           else
+             nest_level_prompt = "(#{obj}:#{nest_level})"
+           end
+           "%s#{Rainbow('@').green}%s#{nest_level_prompt} %s " % [Rainbow('PRIZE').red, Rainbow(host).yellow, Rainbow('❯').green]
+         end]
       end
     end
   end
 end