[Search] Web search should escape queries

lib/cocoapods/command/search.rb

@@ -58,11 +58,11 @@ module Pod
 
       def web_search
         query_parameter = [
-          ('on%3Aosx' if @supported_on_osx),
-          ('on%3Aios' if @supported_on_ios),
+          ('on:osx' if @supported_on_osx),
+          ('on:ios' if @supported_on_ios),
           @query
-        ].compact.flatten.join('%20')
-        url = "http://cocoapods.org/?q=#{query_parameter}"
+        ].compact.flatten.join(' ')
+        url = "http://cocoapods.org/?q=#{CGI.escape(query_parameter).gsub("+", "%20")}"
         UI.puts("Opening #{url}")
         open!(url)
       end

spec/functional/command/search_spec.rb

@@ -59,7 +59,12 @@ module Pod
       extend SpecHelper::TemporaryRepos
 
       it "searches with invalid regex" do
-        Command::Search.any_instance.expects(:open!).with('http://cocoapods.org/?q=NSAttributedString+CCLFormat')
+        Command::Search.any_instance.expects(:open!).with('http://cocoapods.org/?q=NSAttributedString%2BCCLFormat')
+        run_command('search', '--web', 'NSAttributedString+CCLFormat')
+      end
+
+      it "should url encode search queries" do
+        Command::Search.any_instance.expects(:open!).with('http://cocoapods.org/?q=NSAttributedString%2BCCLFormat')
         run_command('search', '--web', 'NSAttributedString+CCLFormat')
       end