Merge 87ea446 into 52908b5

CocoaPods · Apr 8, 2014 · 25e8ffd · 25e8ffd
2 parents 52908b5 + 87ea446
commit 25e8ffd
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 2 deletions.
diff --git a/lib/cocoapods-core/github.rb b/lib/cocoapods-core/github.rb
@@ -103,7 +103,7 @@ def self.normalized_repo_id(url_or_id)
     # @return [Nil] if the given url is not a valid github repo url.
     #
     def self.repo_id_from_url(url)
-      url[%r{github.com/([^/\.]*/[^/\.]*)\.*}, 1]
+      url[%r{github.com/([^/]*/[^/]*)\.*}, 1]
     end
 
     # Performs a get request with the given URL.

diff --git a/spec/fixtures/vcr_cassettes/GitHub.yml b/spec/fixtures/vcr_cassettes/GitHub.yml
diff --git a/spec/github_spec.rb b/spec/github_spec.rb
@@ -18,6 +18,13 @@ module Pod
         end
       end
 
+      it 'returns the information of a repo with dots in the name' do
+        VCR.use_cassette('GitHub', :record => :new_episodes) do
+          repo = GitHub.repo('https://github.com/contentful/contentful.objc')
+          repo['name'].should == 'contentful.objc'
+        end
+      end
+
       it 'returns the tags of a repo' do
         VCR.use_cassette('GitHub', :record => :new_episodes) do
           tags = GitHub.tags('https://github.com/CocoaPods/CocoaPods')