From fd9adf0f0c4e1a71e67e8406a1db3e757472a1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 1 Oct 2018 21:25:41 -0300 Subject: Refactor initial code --- lib/bundler/cli.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index da648fa45e..ad2c7c969c 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -292,18 +292,16 @@ module Bundler def show(gem_name = nil) if ARGV[0] == "show" rest = ARGV[1..-1] - alternative = rest.find {|arg| !arg.start_with?("--") } ? "info" : "list" - new_argv = [alternative, *rest] + new_command = rest.find {|arg| !arg.start_with?("--") } ? "info" : "list" - if alternative == "list" && rest.include?("--paths") - new_argv.delete("--paths") - else - new_argv = new_argv.map {|arg| arg == "--paths" ? "--path" : arg } + new_arguments = rest.map do |arg| + next arg if arg != "--paths" + next "--path" if new_command == "info" end old_argv = ARGV.join(" ") - new_argv = new_argv.join(" ") + new_argv = [new_command, *new_arguments.compact].join(" ") Bundler::SharedHelpers.major_deprecation(2, "use `bundle #{new_argv}` instead of `bundle #{old_argv}`") end -- cgit v1.2.1