abt-cli 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce59010855d53bf8b8731a680d7adcd21cef4eb93d421174aee893f27350cb1e
-  data.tar.gz: 8ac30f3ada5fcc7c75f7a9a91110340d579fd79d8c6226dd4f92a24bdf070d88
+  metadata.gz: 6b8172eca54c77feb083acbc9895bf9f221b69efc1c0b8170d87f250b486286a
+  data.tar.gz: e07e6122c3b3c3bc1307769f5d52d01cb6db9126df0fe10bfb217b940a1eaf12
 SHA512:
-  metadata.gz: 0cdbbd886589a06d20281e67a8376b3292cd61e432b7b672c968e2c5730a65707cc60d31d179acdcd7ad2a5eab9ebffe15866e08f5001b1922f291007146038b
-  data.tar.gz: d0e568a9db4e57207f1cd8d72c789fea3c456f282c6cc1b4a46694767317a0b5c4055d90d53903779c20cd7ecf3c5a0803b07ebafb03b9e07d5ed99f3be14a88
+  metadata.gz: 5eee8193b985110d79170134593fa1ac03b50f6be36b43fa99bb99c8bdcf51d531f9e2b10fe5bca919524f388f503a3a46b9d74bf4764226e6f8d94b905d12ca
+  data.tar.gz: 3a3d7f288dbf3faaab041934bcf703afbaa87b989a1e869bae02a084c83834fd02a1a93df78ed06b2bb6a0b29f4167cdae8a972940c6684e9660dd58d06a78ba

data/bin/abt

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../lib/abt.rb'
+require_relative "../lib/abt"
 
 begin
   Abt::Cli.new.perform
 rescue Abt::Cli::Abort => e
-  abort e.message
+  abort(e.message)
 rescue Interrupt
-  abort 'Aborted'
+  abort("Aborted")
 end

data/lib/abt.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'dry-inflector'
-require 'faraday'
-require 'oj'
-require 'open3'
-require 'stringio'
-require 'optparse'
+require "dry-inflector"
+require "faraday"
+require "oj"
+require "open3"
+require "stringio"
+require "optparse"
 
 Dir.glob("#{File.dirname(File.absolute_path(__FILE__))}/abt/*.rb").sort.each do |file|
   require file

data/lib/abt/ari.rb

@@ -14,7 +14,7 @@ module Abt
       str = scheme
       str += ":#{path}" if path
 
-      [str, *flags].join(' ')
+      [str, *flags].join(" ")
     end
   end
 end

data/lib/abt/ari_list.rb

@@ -3,7 +3,7 @@
 module Abt
   class AriList < Array
     def to_s
-      map(&:to_s).join(' -- ')
+      map(&:to_s).join(" -- ")
     end
 
     def -(other)

data/lib/abt/base_command.rb

@@ -5,11 +5,11 @@ module Abt
     extend Forwardable
 
     def self.usage
-      raise NotImplementedError, 'Command classes must implement .usage'
+      raise NotImplementedError, "Command classes must implement .usage"
     end
 
     def self.description
-      raise NotImplementedError, 'Command classes must implement .description'
+      raise NotImplementedError, "Command classes must implement .description"
     end
 
     def self.flags
@@ -27,7 +27,7 @@ module Abt
     end
 
     def perform
-      raise NotImplementedError, 'Command classes must implement #perform'
+      raise NotImplementedError, "Command classes must implement #perform"
     end
 
     private
@@ -41,18 +41,18 @@ module Abt
 
       result
     rescue OptionParser::InvalidOption => e
-      abort e.message
+      abort(e.message)
     end
 
     def flag_parser
       @flag_parser ||= OptionParser.new do |opts|
         opts.banner = <<~TXT
-          #{self.class.description}
+          #{self.class.description.strip}
 
-          Usage: #{self.class.usage}
+          Usage: #{self.class.usage.strip}
         TXT
 
-        opts.on('-h', '--help', 'Display this help')
+        opts.on("-h", "--help", "Display this help")
 
         self.class.flags.each do |(*flag)|
           opts.on(*flag)

data/lib/abt/cli.rb

@@ -1,31 +1,18 @@
 # frozen_string_literal: true
 
-Dir.glob("#{File.expand_path(__dir__)}/cli/**/*.rb").sort.each do |file|
+Dir.glob("#{File.expand_path(__dir__)}/cli/*.rb").sort.each do |file|
   require file
 end
 
 module Abt
   class Cli
     class Abort < StandardError; end
-    class Exit < StandardError; end
-
-    def self.global_command_names
-      GlobalCommands.constants.sort.map { |constant_name| Helpers.const_to_command(constant_name) }
-    end
-
-    def self.global_command_class(name)
-      name = 'help' if [nil, '-h', '--help'].include?(name)
-      name = 'version' if ['-v', '--version'].include?(name)
-
-      const_name = Helpers.command_to_const(name)
-      return unless GlobalCommands.const_defined?(const_name)
 
-      GlobalCommands.const_get(const_name)
-    end
+    class Exit < StandardError; end
 
     attr_reader :command, :aris, :input, :output, :err_output, :prompt
 
-    def initialize(argv: ARGV, input: STDIN, output: STDOUT, err_output: STDERR)
+    def initialize(argv: ARGV, input: $stdin, output: $stdout, err_output: $stderr)
       (@command, *remaining_args) = argv
       @input = input
       @output = output
@@ -37,7 +24,7 @@ module Abt
     def perform
       if command.nil?
         warn("No command specified, printing help\n\n")
-        @command = 'help'
+        @command = "help"
       end
 
       if global_command?
@@ -83,11 +70,9 @@ module Abt
     end
 
     def process_global_command
-      command_class = self.class.global_command_class(command)
+      command_class = GlobalCommands.command_class(command)
 
-      if command_class.nil?
-        abort "No such global command: #{command}, perhaps you forgot to add an ARI?"
-      end
+      abort("No such global command: #{command}, perhaps you forgot to add an ARI?") if command_class.nil?
 
       begin
         ari = aris.first || Abt::Ari.new
@@ -103,16 +88,14 @@ module Abt
       @sanitized_piped_args ||= begin
         input_string = input.read.strip
 
-        abort 'No input from pipe' if input_string.nil? || input_string.empty?
+        abort("No input from pipe") if input_string.nil? || input_string.empty?
 
         # Exclude comment part of piped input lines
-        lines_without_comments = input_string.lines.map do |line|
-          line.split(' # ').first
-        end
+        lines_without_comments = input_string.lines.map { |line| line.split(" # ").first }
 
         # Allow multiple ARIs on a single piped input line
         # TODO: Force the user to pick a single ARI
-        joined_lines = lines_without_comments.join(' ').strip
+        joined_lines = lines_without_comments.join(" ").strip
         joined_lines.split(/\s+/)
       end
     end
@@ -122,26 +105,30 @@ module Abt
 
       aris.each do |ari|
         if used_schemes.include?(ari.scheme)
-          warn "Dropping command for already used scheme: #{ari}"
+          warn("Dropping command for already used scheme: #{ari}")
           next
         end
 
-        command_class = get_command_class(ari.scheme)
-        next if command_class.nil?
-
-        print_command(command, ari) if output.isatty
-        begin
-          command_class.new(ari: ari, cli: self).perform
-        rescue Exit => e
-          puts e.message
-        end
-
-        used_schemes << ari.scheme
+        used_schemes << ari.scheme if process_ari(ari)
       end
 
       return unless used_schemes.empty? && output.isatty
 
-      abort 'No providers found for command and ARI(s)'
+      abort("No providers found for command and ARI(s)")
+    end
+
+    def process_ari(ari)
+      command_class = get_command_class(ari.scheme)
+      return false if command_class.nil?
+
+      print_command(command, ari) if output.isatty
+      begin
+        command_class.new(ari: ari, cli: self).perform
+      rescue Exit => e
+        puts e.message
+      end
+
+      true
     end
 
     def get_command_class(scheme)
@@ -152,7 +139,7 @@ module Abt
     end
 
     def print_command(name, ari)
-      warn "===== #{name.upcase} #{ari} ====="
+      warn("===== #{name.upcase} #{ari} =====")
     end
   end
 end

data/lib/abt/cli/arguments_parser.rb

@@ -13,15 +13,11 @@ module Abt
         result = AriList.new
         rest = arguments.dup
 
-        # If the arguments start with "-" it means that we are parsing flags for a global command
-        if rest.any? && rest.first[0] == '-'
-          flags = take_flags(rest)
-
-          return [Ari.new(flags: flags)]
-        end
+        # If the first arg is a flag, it's for a global command
+        result << Ari.new(flags: take_flags(rest)) if flag?(rest.first)
 
         until rest.empty?
-          (scheme, path) = rest.shift.split(':')
+          (scheme, path) = rest.shift.split(":")
           flags = take_flags(rest)
 
           result << Ari.new(scheme: scheme, path: path, flags: flags)
@@ -44,11 +40,11 @@ module Abt
       end
 
       def flag?(part)
-        part && part[0] == '-'
+        part && part[0] == "-"
       end
 
       def delimiter?(part)
-        part == '--'
+        part == "--"
       end
     end
   end

data/lib/abt/cli/global_commands.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+Dir.glob("#{File.expand_path(__dir__)}/global_commands/*.rb").sort.each { |file| require file }
+
+module Abt
+  class Cli
+    module GlobalCommands
+      def self.command_names
+        constants.sort.map { |constant_name| Helpers.const_to_command(constant_name) }
+      end
+
+      def self.command_class(name)
+        name = "help" if [nil, "-h", "--help"].include?(name)
+        name = "version" if ["-v", "--version"].include?(name)
+
+        const_name = Helpers.command_to_const(name)
+        return unless const_defined?(const_name)
+
+        const_get(const_name)
+      end
+    end
+  end
+end

data/lib/abt/cli/global_commands/commands.rb

@@ -5,11 +5,11 @@ module Abt
     module GlobalCommands
       class Commands < Abt::BaseCommand
         def self.usage
-          'abt commands'
+          "abt commands"
         end
 
         def self.description
-          'List all abt commands'
+          "List all abt commands"
         end
 
         attr_reader :cli

data/lib/abt/cli/global_commands/examples.rb

@@ -5,11 +5,11 @@ module Abt
     module GlobalCommands
       class Examples < Abt::BaseCommand
         def self.usage
-          'abt examples'
+          "abt examples"
         end
 
         def self.description
-          'Print command examples'
+          "Print command examples"
         end
 
         attr_reader :cli

data/lib/abt/cli/global_commands/help.rb

@@ -5,11 +5,11 @@ module Abt
     module GlobalCommands
       class Help < Abt::BaseCommand
         def self.usage
-          'abt help'
+          "abt help"
         end
 
         def self.description
-          'Print abt usage text'
+          "Print abt usage text"
         end
 
         attr_reader :cli

data/lib/abt/cli/global_commands/readme.rb

@@ -5,11 +5,11 @@ module Abt
     module GlobalCommands
       class Readme < Abt::BaseCommand
         def self.usage
-          'abt readme'
+          "abt readme"
         end
 
         def self.description
-          'Print markdown readme'
+          "Print markdown readme"
         end
 
         attr_reader :cli

data/lib/abt/cli/global_commands/share.rb

@@ -5,29 +5,29 @@ module Abt
     module GlobalCommands
       class Share < Abt::BaseCommand
         def self.usage
-          'abt share'
+          "abt share"
         end
 
         def self.description
-          'Prints all project configuration as a single line of ARIs'
+          "Prints all project configuration as a single line of ARIs"
         end
 
         attr_reader :cli
 
         def perform
-          warn 'Printing project configuration'
+          warn("Printing project configuration")
           puts share_string
         end
 
         def share_string
           @share_string ||= begin
-            aris = Abt.schemes.join(' ')
+            aris = Abt.schemes.join(" ")
 
             input = StringIO.new(aris)
             output = StringIO.new
-            Abt::Cli.new(argv: ['share'], output: output, input: input).perform
+            Abt::Cli.new(argv: ["share"], output: output, input: input).perform
 
-            output.string.strip.gsub(/\s+/, ' ')
+            output.string.strip.gsub(/\s+/, " ")
           end
         end
       end

data/lib/abt/cli/global_commands/version.rb

@@ -5,11 +5,11 @@ module Abt
     module GlobalCommands
       class Version < Abt::BaseCommand
         def self.usage
-          'abt version'
+          "abt version"
         end
 
         def self.description
-          'Print abt version'
+          "Print abt version"
         end
 
         attr_reader :cli

data/lib/abt/cli/prompt.rb

@@ -10,7 +10,7 @@ module Abt
       end
 
       def text(question)
-        output.print "#{question}: "
+        output.print("#{question.strip}: ")
         read_user_input
       end
 
@@ -18,25 +18,24 @@ module Abt
         output.puts text
 
         loop do
-          output.print '(y / n): '
+          output.print("(y / n): ")
 
           case read_user_input
-          when 'y', 'Y' then return true
-          when 'n', 'N' then return false
+          when "y", "Y" then return true
+          when "n", "N" then return false
           else
-            output.puts 'Invalid choice'
-            next
+            output.puts "Invalid choice"
           end
         end
       end
 
-      def choice(text, options, nil_option = false)
-        output.puts "#{text}:"
+      def choice(text, options, nil_option: false)
+        output.puts "#{text.strip}:"
 
         if options.length.zero?
-          raise Abort, 'No available options' unless nil_option
+          raise Abort, "No available options" unless nil_option
 
-          output.puts 'No available options'
+          output.puts "No available options"
           return nil
         end
 
@@ -44,6 +43,15 @@ module Abt
         select_options(options, nil_option)
       end
 
+      def search(text, options)
+        output.puts text
+
+        loop do
+          choice = get_search_result(options)
+          break choice unless choice.nil?
+        end
+      end
+
       private
 
       def print_options(options)
@@ -69,11 +77,11 @@ module Abt
       end
 
       def read_option_number(options_length, nil_option)
-        str = '('
-        str += options_length > 1 ? "1-#{options_length}" : '1'
+        str = "("
+        str += options_length > 1 ? "1-#{options_length}" : "1"
         str += nil_option_string(nil_option)
-        str += '): '
-        output.print str
+        str += "): "
+        output.print(str)
 
         input = read_user_input
 
@@ -81,7 +89,7 @@ module Abt
 
         option_number = input.to_i
         if option_number <= 0 || option_number > options_length
-          output.puts 'Invalid selection'
+          output.puts "Invalid selection"
           return nil
         end
 
@@ -89,19 +97,19 @@ module Abt
       end
 
       def nil_option_string(nil_option)
-        return '' unless nil_option
+        return "" unless nil_option
 
         ", #{nil_option_character(nil_option)}: #{nil_option_description(nil_option)}"
       end
 
       def nil_option_character(nil_option)
-        return 'q' if nil_option == true
+        return "q" if nil_option == true
 
         nil_option[0]
       end
 
       def nil_option_description(nil_option)
-        return 'back' if nil_option == true
+        return "back" if nil_option == true
         return nil_option if nil_option.is_a?(String)
 
         nil_option[1]
@@ -111,11 +119,34 @@ module Abt
         open(tty_path, &:gets).strip # rubocop:disable Security/Open
       end
 
+      def get_search_result(options)
+        matches = matches_for_string(text("Enter search"), options)
+        if matches.empty?
+          output.puts("No matches")
+          return
+        end
+
+        output.puts("Showing the 10 first matches") if matches.size > 10
+        choice("Select a match", matches[0...10], nil_option: true)
+      end
+
+      def matches_for_string(string, options)
+        search_string = sanitize_string(string)
+
+        options.select do |option|
+          sanitize_string(option["name"]).include?(search_string)
+        end
+      end
+
+      def sanitize_string(string)
+        string.downcase.gsub(/[^\w]/, "")
+      end
+
       def tty_path
         @tty_path ||= begin
-          candidates = ['/dev/tty', 'CON:'] # Unix: '/dev/tty', Windows: 'CON:'
+          candidates = ["/dev/tty", "CON:"] # Unix: '/dev/tty', Windows: 'CON:'
           selected = candidates.find { |candidate| File.exist?(candidate) }
-          raise Abort, 'Unable to prompt for user input' if selected.nil?
+          raise Abort, "Unable to prompt for user input" if selected.nil?
 
           selected
         end