menu_commander 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e8200b7d878b7b0742030cd8318daeda995112dcc8da82dd13f2fe470c4929
-  data.tar.gz: ef68b5988fe2afa5f7583b7ac6cd9bb11456e0414cdefc08e37121892cf5e986
+  metadata.gz: a48d60fb83fd26d522bc9cc7380d16412f17c965a9434ea3763cfbe9a735e90f
+  data.tar.gz: 7de8761c8ac902d24ca76e9ff2bbbb3f175aeb10cc11ded5f87aedf543610f25
 SHA512:
-  metadata.gz: 6ae47c0c7df06e09fad14319d6f6a0a1286524bf71b0e0daa0d8aff504e09a8246b3f4f099e1ff261e525cfb70a8334e856e41f71830812196513d727725499c
-  data.tar.gz: 98e867c151501a32eacb0db956cff15c532efb5caa2306c70b813e7eb75b8d83f95489872aa8bce95bc4ddc67003b44ec8f6d41af28a1968fda4bc0aa5a9554f
+  metadata.gz: e7c83688bdb202b27b63ce8442d3ae770fd0d5f5c44d8d74e9018963123b12e05e4011ada408ec57eb4f34eb7dbda0860ec93b491d87f4bcab9c7cbbda7d7e8d
+  data.tar.gz: 550ee1aa662f2358805d59d78495d2a76cb918ef4569e4de334528267efd368276f326b85e4acea60e8b2ee2600f9bdedbe73cbff21a80c2433a9ddf9e268d92

data/bin/menu

@@ -7,36 +7,31 @@ router = MenuCommander::CLI.router
 
 begin
   exit router.run ARGV
-
 rescue MenuCommander::Interrupt, Interrupt => e
   message = e.message
   message = 'Interrupted... Goodbye' if message.empty?
   say! "\n#{message}"
   exit 0
-
 rescue MenuCommander::Exit => e
-  say "#{e.message}" if e.message
+  say e.message if e.message
   exit 0
-
 rescue MenuCommander::MenuNotFound => e
-  say! "#{e.message}"
-  if e.paths and e.config
-    message = "Looked for !txtgrn!#{e.config}!txtrst! in"
+  say! e.message
+  if e.paths && e.config
+    message = "Looked for g`#{e.config}` in"
     if e.paths.size == 1
-      message += " !txtgrn!#{e.paths.first}"
+      message += " g`#{e.paths.first}`"
       say! message
     else
       say! message
       e.paths.each do |path|
-        say! "- !txtgrn!#{path}"
+        say! "- g`#{path}`"
       end
     end
   end
   exit 1
-
 rescue => e
   puts e.backtrace.reverse if ENV['DEBUG']
-  say! "!txtred!#{e.class}: #{e.message}"
+  say! "r`#{e.class}: #{e.message}`"
   exit 1
-
-end
+end

data/lib/menu_commander/command.rb

@@ -2,21 +2,21 @@ require 'mister_bin'
 
 module MenuCommander
   class Command < MisterBin::Command
-    help "Menu Commander"
+    help 'Menu Commander'
 
-    usage "menu [CONFIG --loop (--dry|--confirm)]"
-    usage "menu (-h|--help|--version)"
+    usage 'menu [CONFIG --loop (--dry|--confirm)]'
+    usage 'menu (-h|--help|--version)'
 
-    option "-d --dry", "Dry run - do not execute the command at the end, just show it"
-    option "-l --loop", "Reopen the menu after executing the selected command"
-    option "-c --confirm", "Show the command before execution and ask for confirmation"
-    option "--version", "Show version number"
+    option '-d --dry', 'Dry run - do not execute the command at the end, just show it'
+    option '-l --loop', 'Reopen the menu after executing the selected command'
+    option '-c --confirm', 'Show the command before execution and ask for confirmation'
+    option '--version', 'Show version number'
 
-    param "CONFIG", "The name of the menu config file with or without the .yml extension [default: menu]"
+    param 'CONFIG', 'The name of the menu config file with or without the .yml extension [default: menu]'
 
-    example "menu --dry"
-    example "menu production --loop --confirm"
-    example "menu -ld"
+    example 'menu --dry'
+    example 'menu production --loop --confirm'
+    example 'menu -ld'
 
     attr_reader :last_command
 
@@ -41,14 +41,14 @@ module MenuCommander
     end
 
     def verify_sanity
-      raise Exit, VERSION if args['--version'] 
+      raise Exit, VERSION if args['--version']
       raise MenuNotFound.new(paths: menu_paths, config: config) unless menu_file
     end
 
     def run_looped_menu
       loop do
         run_menu
-        say ""
+        say ''
         @menu = nil
         break if ENV['MENU_COMMANDER_ENV'] == 'test'
       end
@@ -59,9 +59,9 @@ module MenuCommander
       @last_command = command
 
       execute = args['--dry'] ? false : true
-      say "$ !txtpur!#{command}".strip if args['--confirm'] or args['--dry']
+      say "$ m`#{command}`".strip if args['--confirm'] || args['--dry']
 
-      execute = prompt.yes?("Execute?") if args['--confirm']
+      execute = prompt.yes?('Execute?') if args['--confirm']
       success = execute ? system(command) : false
 
       echo_footer success, command if menu.options.echo
@@ -71,13 +71,13 @@ module MenuCommander
     def echo_footer(success, command)
       if success
         marker = menu.options.echo_marker_success
-        color = :txtblu
+        color = 'b'
       else
         marker = menu.options.echo_marker_error
-        color = :txtred
+        color = 'r'
       end
 
-      say "!#{color}!#{marker} #{command}".strip
+      say "#{color}`#{marker} #{command}`".strip
     end
 
     def menu_file
@@ -102,7 +102,7 @@ module MenuCommander
 
     def config
       result = args['CONFIG'] || 'menu'
-      result += ".yml" unless result.end_with?('.yml')
+      result += '.yml' unless result.end_with?('.yml')
       result
     end
 

data/lib/menu_commander/exceptions.rb

@@ -2,14 +2,15 @@ module MenuCommander
   class Error < StandardError; end
   class Interrupt < Interrupt; end
   class Exit < SystemExit; end
-  
+
   class MenuNotFound < Error
     # :nocov: - covered by external process
     attr_reader :paths, :config
 
-    def initialize(message=nil, paths: nil, config: nil)
-      message ||= "Could not find menu configuration file"
-      @paths, @config = paths, config
+    def initialize(message = nil, paths: nil, config: nil)
+      message ||= 'Could not find menu configuration file'
+      @paths = paths
+      @config = config
       super message
     end
     # :nocov:
@@ -17,8 +18,8 @@ module MenuCommander
 
   class ExitMenu < Interrupt
     # :nocov:
-    def initialize(message=nil)
-      super (message || "Goodbye")
+    def initialize(message = nil)
+      super (message || 'Goodbye')
     end
     # :nocov:
   end
@@ -30,4 +31,4 @@ module MenuCommander
       @menu = menu
     end
   end
-end
+end

data/lib/menu_commander/menu.rb

@@ -10,7 +10,7 @@ module MenuCommander
       @config = config
     end
 
-    def call(menu=nil)
+    def call(menu = nil)
       menu ||= config['menu']
       response = select menu
       response = combine_commands response if response.is_a? Array
@@ -21,7 +21,6 @@ module MenuCommander
     rescue MenuNavigation => e
       puts "\n\n"
       call e.menu
-
     end
 
     def options
@@ -75,9 +74,9 @@ module MenuCommander
 
     def get_opts_type(opts)
       if !opts
-        :free_text 
-      elsif options.auto_select and opts.is_a? Array and opts.size == 1
-        :static 
+        :free_text
+      elsif options.auto_select && opts.is_a?(Array) && (opts.size == 1)
+        :static
       else
         :menu
       end
@@ -102,13 +101,13 @@ module MenuCommander
       case event.key.name
       when :page_up
         parent_menu = history.pop
-        raise MenuNavigation.new(parent_menu) if parent_menu
+        raise MenuNavigation, parent_menu if parent_menu
 
       when :home
         home_menu = history.first
         if home_menu
           @history = []
-          raise MenuNavigation.new(home_menu)
+          raise MenuNavigation, home_menu
         end
 
       end
@@ -116,50 +115,44 @@ module MenuCommander
 
     def ask(title)
       prompt.ask "> #{title}:"
-
     rescue TTY::Reader::InputInterrupt
       # :nocov:
       raise ExitMenu
       # :nocov:
-
     end
 
     def apply_suffix(choices)
-      choices.map do |key, value|
+      choices.to_h do |key, value|
         key = "#{key}#{options.submenu_marker}" if value.is_a? Hash
         [key, value]
-      end.to_h
+      end
     end
 
     def enable_filter?(choices)
-      if options.filter === true
-        true
-      elsif options.filter === false
-        false
-      elsif options.filter.is_a? Numeric
-        choices.size > options.filter
+      case options.filter
+      when true then true
+      when false then false
+      when Numeric then choices.size > options.filter
       else
         choices.size > options.page_size
       end
     end
 
-    def select(choices, title=nil)
+    def select(choices, title = nil)
       title = title ? "#{options.title_marker} #{title}:" : options.title_marker
-      choices = apply_suffix choices if options.submenu_marker and choices.is_a? Hash
+      choices = apply_suffix choices if options.submenu_marker && choices.is_a?(Hash)
       select! choices, title
     end
 
-    def select!(choices, title)      
-      prompt.select title, choices, 
-        symbols: { marker: options.select_marker }, 
-        per_page: options.page_size, 
-        filter: enable_filter?(choices)
-
+    def select!(choices, title)
+      prompt.select title, choices,
+        symbols:  { marker: options.select_marker },
+        per_page: options.page_size,
+        filter:   enable_filter?(choices)
     rescue TTY::Reader::InputInterrupt
       # :nocov:
       raise ExitMenu
       # :nocov:
-
     end
   end
-end
+end

data/lib/menu_commander/menu_options.rb

@@ -4,22 +4,22 @@ module MenuCommander
 
     def initialize(options)
       options ||= {}
-      options.transform_keys! &:to_sym
+      options.transform_keys!(&:to_sym)
       @options = default_options.merge options
-    end    
+    end
 
     def default_options
       @default_options ||= {
-        auto_select: true,
-        echo: false,
+        auto_select:         true,
+        echo:                false,
         echo_marker_success: '✓',
-        echo_marker_error: '✗',
-        filter: 'auto',
-        header: false,
-        page_size: 10,
-        select_marker: "⯈",
-        submenu_marker: " ⯆",
-        title_marker: "▌", # ➤ ❚ ✚
+        echo_marker_error:   '✗',
+        filter:              'auto',
+        header:              false,
+        page_size:           10,
+        select_marker:       '⯈',
+        submenu_marker:      ' ⯆',
+        title_marker:        '▌', # ➤ ❚ ✚
       }
     end
 
@@ -27,8 +27,8 @@ module MenuCommander
       respond_to?(method) ? options[method] : super
     end
 
-    def respond_to_missing?(method_name, include_private=false)
+    def respond_to_missing?(method_name, include_private = false)
       options.has_key?(method_name) || super
     end
   end
-end
+end

data/lib/menu_commander/version.rb

@@ -1,3 +1,3 @@
 module MenuCommander
-  VERSION = "0.2.6"
-end
+  VERSION = '0.2.7'
+end

data/lib/menu_commander.rb

@@ -1,4 +1,3 @@
-require 'menu_commander/polyfills/hash'
 require 'menu_commander/exceptions'
 require 'menu_commander/menu_options'
 require 'menu_commander/menu'

metadata

@@ -1,71 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: menu_commander
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mister_bin
+  name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: colsole
+  name: extended_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt
+  name: mister_bin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: extended_yaml
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.23'
 description: Easily create menus for any command line tool using simple YAML configuration
 email: db@dannyben.com
 executables:
@@ -81,12 +87,12 @@ files:
 - lib/menu_commander/exceptions.rb
 - lib/menu_commander/menu.rb
 - lib/menu_commander/menu_options.rb
-- lib/menu_commander/polyfills/hash.rb
 - lib/menu_commander/version.rb
 homepage: https://github.com/dannyben/menu_commander
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -95,14 +101,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.4.5
 signing_key: 
 specification_version: 4
 summary: Create menus for any CLI tool

data/lib/menu_commander/polyfills/hash.rb

@@ -1,11 +0,0 @@
-# :nocov:
-
-# Required for Ruby < 2.5
-if !{}.respond_to? :transform_keys!
-  class Hash
-    def transform_keys!
-      keys.each { |key| self[yield(key)] = delete(key) }
-      self
-    end
-  end
-end