abt-cli 0.0.21 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce59010855d53bf8b8731a680d7adcd21cef4eb93d421174aee893f27350cb1e
-  data.tar.gz: 8ac30f3ada5fcc7c75f7a9a91110340d579fd79d8c6226dd4f92a24bdf070d88
+  metadata.gz: ed527a89749355f223b94daa60d63b91c78ae98ab6976c3470ec6ca42cbcff27
+  data.tar.gz: aed24bd58e30bfbbdc574532eb97044cd8e108851c2586ac407c0eb42a2deb28
 SHA512:
-  metadata.gz: 0cdbbd886589a06d20281e67a8376b3292cd61e432b7b672c968e2c5730a65707cc60d31d179acdcd7ad2a5eab9ebffe15866e08f5001b1922f291007146038b
-  data.tar.gz: d0e568a9db4e57207f1cd8d72c789fea3c456f282c6cc1b4a46694767317a0b5c4055d90d53903779c20cd7ecf3c5a0803b07ebafb03b9e07d5ed99f3be14a88
+  metadata.gz: 6d615f241ac406df5f89cc79ad36f19b0554602f6eb3e20e2f01ba0143595ea6e748c727ccedfeecd1a826c46e031acc7160a3b0ee7462027157a357d730de35
+  data.tar.gz: 2b9e500f77e181f4198ac17939fc1753f9a7105682783b005d780ec4da61c8af43aa3e986bba34e1df4f5173bde47bd0e97e042f293edb713a364d2a9c1c71b6

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.strip)
 rescue Interrupt
-  abort 'Aborted'
+  exit 130
 end

data/lib/abt.rb

@@ -1,11 +1,12 @@
 # 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"
+require "yaml"
 
 Dir.glob("#{File.dirname(File.absolute_path(__FILE__))}/abt/*.rb").sort.each do |file|
   require file
@@ -22,4 +23,8 @@ module Abt
     const_name = Helpers.command_to_const(scheme)
     Providers.const_get(const_name) if Providers.const_defined?(const_name)
   end
+
+  def self.directory_config
+    @directory_config ||= Abt::DirectoryConfig.new
+  end
 end

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,50 +1,35 @@
 # 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 Cli # rubocop:disable Metrics/ClassLength
     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
+    attr_reader :command, :remaining_args, :input, :output, :err_output, :prompt
 
-    def initialize(argv: ARGV, input: STDIN, output: STDOUT, err_output: STDERR)
-      (@command, *remaining_args) = argv
+    def initialize(argv: ARGV, input: $stdin, output: $stdout, err_output: $stderr)
+      (@command, *@remaining_args) = argv
       @input = input
       @output = output
       @err_output = err_output
       @prompt = Abt::Cli::Prompt.new(output: err_output)
-      @aris = ArgumentsParser.new(sanitized_piped_args + remaining_args).parse
     end
 
     def perform
       if command.nil?
         warn("No command specified, printing help\n\n")
-        @command = 'help'
+        @command = "help"
       end
 
-      if global_command?
-        process_global_command
-      else
-        process_aris
-      end
+      return process_alias if alias?
+      return process_global_command if global_command?
+
+      process_aris
     end
 
     def print_ari(scheme, path, description = nil)
@@ -73,8 +58,29 @@ module Abt
       raise Exit, message
     end
 
+    def aris
+      @aris ||= ArgumentsParser.new(sanitized_piped_args + remaining_args).parse
+    end
+
     private
 
+    def alias?
+      command[0] == "@"
+    end
+
+    def process_alias
+      matching_alias = Abt.directory_config.dig("aliases", command[1..-1])
+
+      abort("No such alias #{command}") if matching_alias.nil?
+
+      with_args = matching_alias.sub("$@", remaining_args.join(" "))
+      with_program_name = with_args.gsub("$0", $PROGRAM_NAME).strip
+      humanized = with_args.gsub("$0", "abt").strip
+
+      warn(humanized)
+      system(with_program_name)
+    end
+
     def global_command?
       return true if aris.empty?
       return true if aris.first.scheme.nil?
@@ -83,11 +89,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 +107,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 +124,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 +158,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