pry-shell 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9a629aa438ee37cbeba5f9f4773b188e8df465c78847509c3892257408fa1d
-  data.tar.gz: '082b79f813e2e9d96fdf459f4d92113d5ec112897ddc4e04bda79c687e832fbb'
+  metadata.gz: 339b96b3477c3abfe68e09e2112a2c4d59a533466d2d800174fe1d255530e84f
+  data.tar.gz: 47cede13047e2c16cc427f75fe9333600620a6a7703f259fb8e0c378a77b183e
 SHA512:
-  metadata.gz: 64daa0a9fc25ade4ed370e3940b60030afa3340856db5a28f7ff3c79c9b7533ce3579a9ed3f72faff4614b620b7c670c6d85814ac993867818f376b978f0dd7b
-  data.tar.gz: 19055e234eefd7d82e7c95dd1bc329e57b423a3bb85e4f88fa0c86e8fee164c73e5784b07fccd272766cb0f0991c2256f810720016ae3452ad1fb714dd0e9f0b
+  metadata.gz: e9e426725066c6653d8a5c14e5ff2df0ecfb56fcfa0368e96ea6ca7b1fccab3ba42be1b07cb67b4e705f26275e59af59c74a52e0fbf74b2bde6aec895fe4cec8
+  data.tar.gz: 46ec623b15d359d3d108c94697a088cb094bf27ae9885be6177f390baad36f5cd09c9be87561002e78ce43f05563c5aeee210bec24fa03cc044628682677f675

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pry-shell (0.2.1)
+    pry-shell (0.3.0)
       pry (~> 0.13.0)
       tty-markdown
       tty-prompt

data/lib/pry/shell.rb

@@ -3,6 +3,7 @@
 require_relative "shell/version"
 require_relative "shell/client"
 require_relative "shell/command"
+require_relative "shell/configuration"
 require_relative "shell/logger"
 require_relative "shell/registry"
 require_relative "shell/server"
@@ -15,6 +16,8 @@ require_relative "shell/io/pager"
 require_relative "shell/ui"
 require_relative "shell/ui/base"
 require_relative "shell/ui/about"
+require_relative "shell/ui/configuration"
+require_relative "shell/ui/configuration/auto_connect"
 require_relative "shell/ui/list"
 require_relative "shell/ui/menu"
 require_relative "shell/ui/session"
@@ -25,12 +28,9 @@ class Pry
     DEFAULT_PORT = "1881"
 
     class << self
-      attr_reader :registry
-
-      def run(host:, port:, auto_connect:)
-        @registry = Registry.new(auto_connect)
-
-        new(host, port, registry).run
+      def run
+        run_server
+        draw_ui
       end
 
       def active_shell_options(thread: Thread.current)
@@ -40,29 +40,24 @@ class Pry
       def active_shell_options=(value)
         Thread.current[:active_shell_options] = value
       end
-    end
 
-    def initialize(host, port, registry)
-      @host = host
-      @port = port
-      @registry = registry
-    end
-
-    def run
-      run_server
-      draw_ui
-    end
+      def configuration
+        @configuration ||= Configuration.new
+      end
 
-    private
+      def registry
+        @registry ||= Registry.new
+      end
 
-    attr_reader :host, :port, :registry
+      private
 
-    def run_server
-      Server.new(host, port, registry).run
-    end
+      def run_server
+        Server.run
+      end
 
-    def draw_ui
-      UI.draw!
+      def draw_ui
+        UI.draw!
+      end
     end
   end
 end

data/lib/pry/shell/cli.rb

@@ -10,35 +10,27 @@ class Pry
         def run
           options.parse!
 
-          Shell.run(**config)
+          Shell.run
 
           join_drb_thread
         end
 
         private
 
-        def config
-          @config ||= {
-            host: DEFAULT_HOST,
-            port: DEFAULT_PORT,
-            auto_connect: false
-          }
-        end
-
         def options # rubocop:disable Metrics/MethodLength
           @parser = OptionParser.new do |o|
             o.banner = "Usage: bundle exec pry-shell [options]"
 
             o.on "-h", "--host HOST", "Host name" do |arg|
-              config[:host] = arg
+              Shell.configuration.host = arg
             end
 
             o.on "-p", "--post PORT", "Port of the shell application" do |arg|
-              config[:port] = arg
+              Shell.configuration.port = arg
             end
 
             o.on "-a", "--auto-connect", "Connect automatically to the first Pry session" do
-              config[:auto_connect] = true
+              Shell.configuration.auto_connect = true
             end
 
             o.on "-v", "--version", "Print version and exit" do

data/lib/pry/shell/configuration.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Pry
+  class Shell
+    class Configuration
+      CONFIG_KEYS = {
+        host: "localhost",
+        port: "1881",
+        auto_connect: false
+      }.freeze
+
+      CONFIG_KEYS.each do |config_key, default_value|
+        attr_writer config_key
+
+        define_method(config_key) do
+          return default_value unless instance_variable_defined?("@#{config_key}")
+
+          instance_variable_get("@#{config_key}")
+        end
+      end
+    end
+  end
+end

data/lib/pry/shell/registry.rb

@@ -7,10 +7,9 @@ class Pry
     class Registry
       include DRb::DRbUndumped
 
-      attr_reader :auto_connect, :clients, :current, :mutex
+      attr_reader :clients, :current, :mutex
 
-      def initialize(auto_connect)
-        @auto_connect = auto_connect
+      def initialize
         @clients = {}
         @mutex = Mutex.new
       end
@@ -20,7 +19,7 @@ class Pry
           Logger.debug("New client connected - #{client}")
 
           @clients[id] = client
-          connect_to(client) if auto_connect
+          connect_to(client) if Shell.configuration.auto_connect
         end
       end
 

data/lib/pry/shell/server.rb

@@ -5,24 +5,18 @@ require "drb"
 class Pry
   class Shell
     class Server
-      def initialize(host, port, registry)
-        @host = host
-        @port = port
-        @registry = registry
-      end
-
-      def run
-        Logger.info("Running Drb server on '#{uri}'")
-
-        DRb.start_service(uri, registry)
-      end
+      class << self
+        def run
+          Logger.info("Running Drb server on '#{uri}'")
 
-      private
+          DRb.start_service(uri, Shell.registry)
+        end
 
-      attr_reader :host, :port, :registry
+        private
 
-      def uri
-        "druby://#{host}:#{port}"
+        def uri
+          "druby://#{Shell.configuration.host}:#{Shell.configuration.port}"
+        end
       end
     end
   end

data/lib/pry/shell/ui.rb

@@ -8,6 +8,7 @@ class Pry
       class << self
         def draw!
           UI::Menu.draw!
+          draw!
         rescue StopMainUI
           sleep
           draw!

data/lib/pry/shell/ui/base.rb

@@ -42,7 +42,7 @@ class Pry
           end
 
           def draw_footer
-            return_menu_prompt
+            prompt.keypress("Press any key to return to the menu...")
           end
 
           def header
@@ -60,12 +60,6 @@ class Pry
           def print_markdown(text)
             puts TTY::Markdown.parse(text)
           end
-
-          def return_menu_prompt
-            prompt.keypress("Press any key to return to the menu...")
-
-            Menu.draw!
-          end
         end
       end
     end

data/lib/pry/shell/ui/configuration.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Pry
+  class Shell
+    class UI
+      class Configuration < Base
+        HEADER = "PRY-SHELL Configuration"
+        ITEMS = [
+          { name: "Auto-connect", value: "auto_connect" },
+          { name: "Go back to menu", value: "menu" }
+        ].freeze
+        ACTIONS = {
+          "auto_connect" => -> { AutoConnect.draw! & draw! },
+          "menu" => -> {}
+        }.freeze
+
+        class << self
+          def draw_content
+            selection = prompt.select("Select a configuration item to change it's value", ITEMS)
+
+            ACTIONS[selection].call
+          end
+
+          def draw_footer; end
+        end
+      end
+    end
+  end
+end

data/lib/pry/shell/ui/configuration/auto_connect.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class Pry
+  class Shell
+    class UI
+      class Configuration
+        class AutoConnect < Base
+          class << self
+            def draw!
+              Shell.configuration.auto_connect = show_prompt
+            end
+
+            private
+
+            def show_prompt
+              prompt.select("Accept connections automatically?", cycle: true) do |config|
+                config.default default_value
+
+                config.choice "yes", true
+                config.choice "no", false
+              end
+            end
+
+            def default_value
+              Shell.configuration.auto_connect ? "yes" : "no"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pry/shell/ui/menu.rb

@@ -7,11 +7,13 @@ class Pry
         HEADER = "PRY-SHELL Main Menu"
         ITEMS = [
           { name: "1) Available sessions", value: "list" },
-          { name: "2) About pry-shell", value: "about" },
-          { name: "3) Quit", value: "quit" }
+          { name: "2) Configuration", value: "configuration" },
+          { name: "3) About pry-shell", value: "about" },
+          { name: "4) Quit", value: "quit" }
         ].freeze
         MENU_ACTIONS = {
           "list" => -> { List.draw! },
+          "configuration" => -> { Configuration.draw! },
           "about" => -> { About.draw! },
           "quit" => -> { clear! && exit(0) }
         }.freeze
@@ -23,6 +25,9 @@ class Pry
             switch_to(selection)
           end
 
+          # Override this to remove "press any key" prompt
+          def draw_footer; end
+
           def switch_to(selected_ui)
             MENU_ACTIONS[selected_ui].call
           end

data/lib/pry/shell/version.rb

@@ -2,6 +2,6 @@
 
 class Pry
   class Shell
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-shell
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Mehmet Emin INAC
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -75,6 +75,7 @@ files:
 - lib/pry/shell/cli.rb
 - lib/pry/shell/client.rb
 - lib/pry/shell/command.rb
+- lib/pry/shell/configuration.rb
 - lib/pry/shell/io/base.rb
 - lib/pry/shell/io/editor.rb
 - lib/pry/shell/io/input.rb
@@ -92,6 +93,8 @@ files:
 - lib/pry/shell/ui.rb
 - lib/pry/shell/ui/about.rb
 - lib/pry/shell/ui/base.rb
+- lib/pry/shell/ui/configuration.rb
+- lib/pry/shell/ui/configuration/auto_connect.rb
 - lib/pry/shell/ui/list.rb
 - lib/pry/shell/ui/menu.rb
 - lib/pry/shell/ui/session.rb