Merge pull request #1893 from CocoaPods/web_search_regex

Web search regex

lib/cocoapods/command/search.rb

@@ -36,9 +36,13 @@ module Pod
         super
         help! "A search query is required." unless @query
 
-        /#{@query.join(' ').strip}/
-      rescue RegexpError
-        help! "A valid regular expression is required."
+        unless @web
+          begin
+            /#{@query.join(' ').strip}/
+          rescue RegexpError
+            help! "A valid regular expression is required."
+          end
+        end
       end
 
       def run
@@ -54,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

@@ -50,7 +50,7 @@ module Pod
       output.should.include? 'BananaLib'
     end
 
-    it "shows a friendly message when searching with invalid regex" do
+    it "shows a friendly message when locally searching with invalid regex" do
       lambda { run_command('search', '+') }.should.raise CLAide::Help
     end
 
@@ -58,6 +58,16 @@ module Pod
 
       extend SpecHelper::TemporaryRepos
 
+      it "searches with invalid regex" do
+        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
+
       it "searches the web via the open! command" do
         Command::Search.any_instance.expects(:open!).with('http://cocoapods.org/?q=bananalib')
         run_command('search', '--web', 'bananalib')