Avoid extra spaces from nil/false switches in Options.to_switches

Author: segiddins

lib/thor/parser/options.rb

@@ -18,11 +18,11 @@ def self.to_switches(options)
         when Hash
           "--#{key} #{value.map { |k, v| "#{k}:#{v}" }.join(' ')}"
         when nil, false
-          ""
+          nil
         else
           "--#{key} #{value.inspect}"
         end
-      end.join(" ")
+      end.compact.join(" ")
     end
 
     # Takes a hash of Thor::Option and a hash with defaults.

spec/parser/options_spec.rb

@@ -35,6 +35,10 @@ def remaining
       expect(Thor::Options.to_switches(:color => false)).to eq("")
     end
 
+    it "avoids extra spaces" do
+      expect(Thor::Options.to_switches(:color => false, :foo => nil)).to eq("")
+    end
+
     it "writes --name value for anything else" do
       expect(Thor::Options.to_switches(:format => "specdoc")).to eq('--format "specdoc"')
     end