[CLI] Use options for config

2 files changed, 39 insertions, 28 deletions

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 05e1851c18..92730355d7 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -436,10 +436,13 @@ module Bundler
       will show the current value, as well as any superceded values and
       where they were specified.
     D
-    method_option "parseable", :type => :boolean, :banner => "Use minimal formatting for more parseable output"
-    def config(*args)
+    method_option :parseable, :type => :boolean, :banner => "Use minimal formatting for more parseable output"
+    method_option :global, :type => :boolean, :banner => "global"
+    method_option :local, :type => :boolean, :banner => "local"
+    method_option :delete, :type => :boolean, :banner => "delete"
+    def config(name = nil, *value)
       require "bundler/cli/config"
-      Config.new(options, args, self).run
+      Config.new(options, name, value, self).run
     end
 
     desc "open GEM", "Opens the source directory of the given bundled gem"
diff --git a/lib/bundler/cli/config.rb b/lib/bundler/cli/config.rb
index 12f71ea8fe..7ec7bf56d5 100644
--- a/lib/bundler/cli/config.rb
+++ b/lib/bundler/cli/config.rb
@@ -2,18 +2,15 @@
 
 module Bundler
   class CLI::Config
-    attr_reader :name, :options, :scope, :thor
-    attr_accessor :args
+    attr_reader :name, :value, :options, :scope, :thor
 
-    def initialize(options, args, thor)
+    def initialize(options, name, value, thor)
       @options = options
-      @args = args
+      @name = name
+      value = Array(value)
+      @value = value.empty? ? nil : value.join(" ")
       @thor = thor
-      @name = peek = args.shift
-      @scope = "global"
-      return unless peek && peek.start_with?("--")
-      @name = args.shift
-      @scope = peek[2..-1]
+      validate_scope!
     end
 
     def run
@@ -22,18 +19,17 @@ module Bundler
         return
       end
 
-      unless valid_scope?(scope)
-        Bundler.ui.error "Invalid scope --#{scope} given. Please use --local or --global."
-        exit 1
-      end
-
-      if scope == "delete"
-        Bundler.settings.set_local(name, nil)
-        Bundler.settings.set_global(name, nil)
+      if options[:delete]
+        if !@explicit_scope || scope != "global"
+          Bundler.settings.set_local(name, nil)
+        end
+        if !@explicit_scope || scope != "local"
+          Bundler.settings.set_global(name, nil)
+        end
         return
       end
 
-      if args.empty?
+      if value.nil?
         if options[:parseable]
           if value = Bundler.settings[name]
             Bundler.ui.info("#{name}=#{value}")
@@ -75,11 +71,11 @@ module Bundler
     end
 
     def new_value
-      pathname = Pathname.new(args.join(" "))
+      pathname = Pathname.new(value)
       if name.start_with?("local.") && pathname.directory?
         pathname.expand_path.to_s
       else
-        args.join(" ")
+        value
       end
     end
 
@@ -88,17 +84,17 @@ module Bundler
       if @options[:parseable]
         "#{name}=#{new_value}" if new_value
       elsif scope == "global"
-        if locations[:local]
+        if !locations[:local].nil?
           "Your application has set #{name} to #{locations[:local].inspect}. " \
             "This will override the global value you are currently setting"
         elsif locations[:env]
           "You have a bundler environment variable for #{name} set to " \
             "#{locations[:env].inspect}. This will take precedence over the global value you are setting"
-        elsif locations[:global] && locations[:global] != args.join(" ")
+        elsif !locations[:global].nil? && locations[:global] != value
           "You are replacing the current global value of #{name}, which is currently " \
             "#{locations[:global].inspect}"
         end
-      elsif scope == "local" && locations[:local] != args.join(" ")
+      elsif scope == "local" && !locations[:local].nil? && locations[:local] != value
         "You are replacing the current local value of #{name}, which is currently " \
           "#{locations[:local].inspect}"
       end
@@ -112,8 +108,20 @@ module Bundler
       end
     end
 
-    def valid_scope?(scope)
-      %w[delete local global].include?(scope)
+    def validate_scope!
+      @explicit_scope = true
+      scopes = %w[global local]
+      scopes.reject! {|s| options[s].nil? }
+      case scopes.size
+      when 0
+        @scope = "global"
+        @explicit_scope = false
+      when 1
+        @scope = scopes.first
+      else
+        raise InvalidOption,
+          "The options #{scopes.join " and "} were specified. Please only use one of the switches at a time."
+      end
     end
   end
 end