[Statistics] moved to Octokit

Gemfile

@@ -17,4 +17,5 @@ group :development do
   gem "vcr"
   gem "webmock"
   gem "awesome_print"
+  gem "pry"
 end

Gemfile.lock

@@ -10,6 +10,7 @@ GEM
     addressable (2.2.7)
     awesome_print (1.0.2)
     bacon (1.1.0)
+    coderay (1.0.5)
     colored (1.2)
     crack (0.3.1)
     escape (0.0.4)
@@ -24,6 +25,7 @@ GEM
     kicker (2.5.0)
       rb-fsevent
     metaclass (0.0.1)
+    method_source (0.7.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.0)
@@ -37,9 +39,14 @@ GEM
       hashie (~> 1.2)
       multi_json (~> 1.0)
     open4 (1.3.0)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
     rack (1.4.1)
     rake (0.9.2.2)
     rb-fsevent (0.9.1)
+    slop (2.4.4)
     vcr (2.0.1)
     webmock (1.8.6)
       addressable (>= 2.2.7)
@@ -58,6 +65,7 @@ DEPENDENCIES
   mocha-on-bacon
   octokit
   open4
+  pry
   rake
   rb-fsevent
   vcr

lib/cocoapods/command/presenter.rb

@@ -54,7 +54,7 @@ module Pod
             separator = "\n      - "
             t << separator + value.join(separator)
           else
-            t << " #{spaces + value}\n"
+            t << " #{spaces + value.to_s}\n"
           end
         end
       end

lib/cocoapods/command/spec.rb

@@ -37,7 +37,7 @@ module Pod
       end
 
       def create
-        if repo_id = @name_or_url[/github.com\/([^\/]*\/[^\/]*).*/, 1]
+        if repo_id = @name_or_url[/github.com\/([^\/\.]*\/[^\/\.]*)\.*/, 1]
           data = github_data_for_template(repo_id)
           puts semantic_versioning_notice(repo_id, data[:name]) if data[:tag] == 'HEAD'
         else

lib/cocoapods/specification/statistics.rb

-require 'net/https'
-require 'uri'
 require 'yaml'
+require 'octokit'
 
 module Pod
   class Specification
@@ -77,34 +76,23 @@ module Pod
 
       def github_stats_if_needed(set)
         return if get_value(set, :gh_date) && get_value(set, :gh_date) > Time.now - cache_expiration
-        spec  = set.specification.part_of_other_pod? ? set.specification.part_of_specification : set.specification
-        url   = spec.source.reject {|k,_| k == :commit || k == :tag }.values.first
-        gh_url, username, reponame = *(url.match(/[:\/]([\w\-]+)\/([\w\-]+)\.git/).to_a)
-
-        return unless gh_url
-        response_body = fetch_stats(username, reponame)
-
-        return unless response_body
-        watchers  = response_body.match(/"watchers"\W*:\W*([0-9]+)/).to_a[1]
-        forks     = response_body.match(/"forks"\W*:\W*([0-9]+)/).to_a[1]
+        spec    = set.specification.part_of_other_pod? ? set.specification.part_of_specification : set.specification
+        url     = spec.source.reject {|k,_| k == :commit || k == :tag }.values.first
+        repo_id = url[/github.com\/([^\/\.]*\/[^\/\.]*)\.*/, 1]
+        return unless repo_id
+
+        begin
+          repo = Octokit.repo(repo_id)
+        rescue
+          return
+        end
 
-        return unless watchers && forks
         cache[set.name] ||= {}
-        set_value(set, :gh_watchers,  watchers)
-        set_value(set, :gh_forks,     forks)
+        set_value(set, :gh_watchers,  repo['watchers'])
+        set_value(set, :gh_forks,     repo['forks'])
         set_value(set, :gh_date,      Time.now)
         save_cache
       end
-
-      def fetch_stats(username, reponame)
-        uri               = URI.parse("https://api.github.com/repos/#{username}/#{reponame}")
-        http              = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl      = true
-        http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
-        request           = Net::HTTP::Get.new(uri.request_uri)
-        response          = http.request(request)
-        response.body if response.is_a?(Net::HTTPSuccess)
-      end
     end
   end
 end

spec/functional/command/presenter_spec.rb

@@ -22,8 +22,8 @@ describe Pod::Command::Presenter do
   end
 
   it "presents the stats of a specification set" do
-    response = '{"repository":{"homepage":"","url":"https://github.com/robbiehanson/CocoaLumberjack","has_downloads":true,"has_issues":true,"language":"Objective-C","master_branch":"master","forks":42,"fork":false,"created_at":"2011/03/30 19:38:39 -0700","has_wiki":true,"description":"A fast & simple, yet powerful & flexible logging framework for Mac and iOS","size":416,"private":false,"name":"CocoaLumberjack","owner":"robbiehanson","open_issues":4,"watchers":318,"pushed_at":"2012/03/26 12:39:36 -0700"}}% '
-    Pod::Specification::Statistics.instance.expects(:fetch_stats).with("robbiehanson", "CocoaLumberjack").returns(response)
+    repo = {"forks"=>42, "watchers"=>318}
+    Octokit.expects(:repo).with("robbiehanson/CocoaLumberjack").returns(repo)
     presenter = Presenter.new(argv('--stats'))
     output = presenter.describe(@set)
     output.should.include? 'Author:   Robbie Hanson'