lib/spandx/cli.rb in spandx-0.5.0 vs lib/spandx/cli.rb in spandx-0.6.0

- old
+ new

@@ -1,13 +1,12 @@ # frozen_string_literal: true require 'thor' - require 'spandx' -require 'spandx/command' -require 'spandx/commands/build' -require 'spandx/commands/scan' +require 'spandx/cli/command' +require 'spandx/cli/commands/index' +require 'spandx/cli/commands/scan' module Spandx class CLI < Thor Error = Class.new(StandardError) @@ -15,31 +14,19 @@ def version puts "v#{Spandx::VERSION}" end map %w[--version -v] => :version - desc 'build', 'Build a package index' - method_option :help, aliases: '-h', type: :boolean, - desc: 'Display usage information' - method_option :directory, aliases: '-d', type: :string, - desc: 'Directory to build index in' - def build(*) - if options[:help] - invoke :help, ['build'] - else - require_relative 'commands/build' - Spandx::Commands::Build.new(options).execute - end - end + register Spandx::Cli::Commands::Index, 'index', 'index [SUBCOMMAND]', 'Command description...' desc 'scan LOCKFILE', 'Scan a lockfile and list dependencies/licenses' method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information' def scan(lockfile = nil) if options[:help] invoke :help, ['scan'] else - Spandx::Commands::Scan.new(lockfile, options).execute + Spandx::Cli::Commands::Scan.new(lockfile, options).execute end end end end