prize 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3543934605bf4546fd1d189991fe2858eb28de2c33aef427b79743f59645f541
-  data.tar.gz: 55975f3103e24701e27a76420eefa87f24c0b9d1d093bd130ff6afb233aef90a
+  metadata.gz: db1d922317b07849ebec0c2df67e739f4a10006ad2a6dadfd40cfd460ea3227b
+  data.tar.gz: 806471a10dc86d2319bdb16b61d5d3dd78c6f0f9186fe8084f8b0937223f3508
 SHA512:
-  metadata.gz: 831a82c2e98ecce891cdb1cef9bb05fa375e0fc77fc16c7e7375cf3a006b50111edc6327e5842cc514bb209381fe1393bde9bec04c62f0be9a0e2b06e67a92ce
-  data.tar.gz: bc26873ce4457c95558c1d6c3f5e411a6ca2f9c43c9f28ff1cfb4b5175dbec15e5114e09f56595841def61069dd868148364aa0b3964d48ef2f8e0a4ede2719f
+  metadata.gz: 6033353e9e5e87f02dd53df358f38b950c2640c89a87f97164cad0fddfda01e9ff70e01d451a90819fe0e5284caaff15688173c218ab60858f5219e3eb65f790
+  data.tar.gz: 11527d0515d2a6cdadfca1f2627e85f70236db34593c4cd4ce83c29fc43640521095c6380a56bd3725cc2a54fbe4e1af1ca8fd6af0ceb17f78b608e394eae095

data/Gemfile.lock

@@ -1,35 +1,37 @@
 PATH
   remote: .
   specs:
-    prize (0.1.3)
+    prize (0.2.0)
       activesupport
       hiredis (>= 0.6.0)
-      pry (>= 0.12.0)
+      pry (>= 0.13.1)
+      rainbow (~> 3.0.0)
       redis (>= 4.0.0)
       thor (~> 0.20.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.0)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     hiredis (0.6.3)
-    i18n (1.6.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    method_source (0.9.2)
-    minitest (5.12.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    method_source (1.0.0)
+    minitest (5.14.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.0.0)
     rake (10.5.0)
-    redis (4.1.2)
+    redis (4.2.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -45,18 +47,18 @@ GEM
     rspec-support (3.8.2)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.1.10)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler
   prize!
   rake (~> 10.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.2

data/lib/prize/cli.rb

@@ -2,6 +2,7 @@ require 'thor'
 require 'redis'
 require 'hiredis'
 require 'pry'
+require 'rainbow'
 
 module Prize
   class Cli < ::Thor
@@ -10,7 +11,7 @@ module Prize
 
     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)'
@@ -20,12 +21,12 @@ module Prize
     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
@@ -35,24 +36,17 @@ module Prize
         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

data/lib/prize/version.rb

@@ -1,3 +1,3 @@
 module Prize
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/prize.gemspec

@@ -28,9 +28,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redis', '>= 4.0.0'
   spec.add_dependency 'hiredis', '>= 0.6.0'
   spec.add_dependency 'thor', '~> 0.20.0'
-  spec.add_dependency 'pry', '>= 0.12.0'
+  spec.add_dependency 'pry', '>= 0.13.1'
+  spec.add_dependency 'rainbow', '~> 3.0.0'
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prize
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Liu Xiang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,28 +72,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
+        version: 3.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +164,7 @@ homepage: https://github.com/lululau/prize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Simple Redis CLI client with pry loaded
 test_files: []