dash-bees 0.18 → 0.19

data/CHANGELOG

@@ -1,3 +1,5 @@
+2010-09-20 v0.19 Fixed sometimes missing identity for Github
+
 2010-09-16 v0.18 Now bees, have separate update and webhook methods
 
 Update method separated from webhook method.

data/lib/dash-fu/bee.rb

@@ -10,7 +10,7 @@ module DashFu
   # The README covers it all.
   module Bee
 
-    VERSION = "0.18"
+    VERSION = "0.19"
 
     class << self
       attr_accessor :logger

data/lib/dash-fu/bees/github.rb

@@ -5,7 +5,7 @@ module DashFu::Bee
 
     def setup(source, params)
       repo = params["repo"].strip
-      source["source.name"] = "Github: #{repo}"
+      source["source.name"] = "GitHub: #{repo}"
       source["metric.columns"] = [{ id: "commits", label: "Commits" }, { id: "watchers", label: "Watchers" }, { id: "forks", label: "Forks" }]
       source["metric.totals"] = true
       source["repo"] = repo
@@ -59,7 +59,8 @@ module DashFu::Bee
               merged.reverse.each do |commits|
                 first = commits.first
                 committer = first["committer"]
-                person = { fullname: committer["name"], identities: %W{github.com:#{committer["login"]}}, email: committer["email"] }
+                identity = "github.com:#{committer["login"]}" unless committer["login"].blank?
+                person = { fullname: committer["name"], identities: Array.wrap(identity), email: committer["email"] }
                 messages = commits.map { |commit| %{<blockquote><a href="#{commit["url"]}">#{commit["id"][0,7]}</a> #{h commit["message"].strip.split(/[\n\r]/).first[0,50]}</blockquote>} }
                 html = %{pushed to #{h source["branch"]} at <a href="http://github.com/#{source["repo"]}">#{h source["repo"]}</a>:\n#{messages.join("\n")}}
                 callback.activity! uid: first["id"], html: html, url: first["url"], tags: %w{push},
@@ -74,7 +75,7 @@ module DashFu::Bee
           when 404, 400
             callback.error! "Could not find the branch #{source["branch"]}"
           else
-            callback.error! "Github: #{response.code} #{response.message}"
+            callback.error! "GitHub: #{response.code} #{response.message}"
           end
         end
       end

data/lib/dash-fu/bees/github.yml

@@ -1,5 +1,5 @@
 en:
-  description: "Tracks Github commits, watchers and forks"
+  description: "Tracks GitHub commits, watchers and forks"
   inputs: |-
     <label>User/repository <input type="text" name="source[repo]" size="30"></label>
     <label>Branch <input type="text" name="source[branch]" size="30" value="master"></label>

data/lib/dash-fu/bees/github_issues.rb

@@ -19,6 +19,7 @@ module DashFu::Bee
     end
 
     def update(source, callback)
+      github = { fullname: "GitHub", identities: %w{site:github.com}, photo_url: "http://github.com/images/error/octocat_happy.gif" }
       session "github.com", 443 do |http|
         auth = { username: "#{source["username"]}/token", password: source["api_token"] }
         http.get_json "/api/v2/json/issues/list/#{source["repo"]}/open" do |status, json|
@@ -35,7 +36,7 @@ opened <a href="#{url}">issue #{issue["number"]}</a> on #{source["repo"]}:
 <blockquote>#{h issue["title"]}</blockquote>
                 HTML
                 callback.activity! uid: sha, url: url, html: html, tags: %w{issue opened},
-                                   timestamp: Time.parse(issue["created_at"]).utc
+                                   person: github, timestamp: Time.parse(issue["created_at"]).utc
                 open_ids << issue["number"]
               end
               source["open_ids"] = open_ids.to_a
@@ -63,7 +64,7 @@ closed <a href="#{url}">issue #{issue["number"]}</a> on #{source["repo"]}:
 <blockquote>#{h issue["title"]}</blockquote>
                 HTML
                 callback.activity! uid: sha, url: url, html: html, tags: %w{issue closed},
-                                   timestamp: Time.parse(issue["closed_at"]).utc
+                                   person: github, timestamp: Time.parse(issue["closed_at"]).utc
                 closed_ids << issue["number"]
               end
               source["closed_ids"] = closed_ids.to_a
@@ -74,7 +75,7 @@ closed <a href="#{url}">issue #{issue["number"]}</a> on #{source["repo"]}:
     end
 
     def meta(source)
-      [ { title: "On Github", url: "http://github.com/#{source["repo"]}/issues" } ]
+      [ { title: "On GitHub", url: "http://github.com/#{source["repo"]}/issues" } ]
     end
 
   protected

data/lib/dash-fu/bees/github_issues.yml

@@ -1,5 +1,5 @@
 en:
-  description: "Tracks open/closed Github issues"
+  description: "Tracks open/closed GitHub issues"
   inputs: |-
     <label>User/repository <input type="text" name="source[repo]" size="30"></label>
     <p>For private repositories:</p>

data/test/cassettes/github.yml

@@ -120,7 +120,12 @@
           "id": "ff156a9fdd2ac534b62b55b8acac2fd092d6543a",
           "committed_date": "2010-08-06T00:15:01-07:00",
           "message": "Separate activity",
-          "committer": { "name": "Assaf Arkin", "login": "assaf", "email": "assaf@labnotes.org" } }
+          "committer": { "name": "Assaf Arkin", "login": "assaf", "email": "assaf@labnotes.org" } },
+        { "url": "http://github.com/assaf/vanity/commit/00154a9fdd2ac534b62b55b8acac2fd092d6543a",
+          "id": "00154a9fdd2ac534b62b55b8acac2fd092d6543a",
+          "committed_date": "2010-08-06T00:15:01-07:00",
+          "message": "No login",
+          "committer": { "name": "Mysterious D", "login": "", "email": "mysterious@example.org" } }
         ]
       }
 

data/test/github_issues_test.rb

@@ -120,6 +120,22 @@ opened <a href="http://github.com/assaf/vanity/issues#issue/21">issue 21</a> on
       should "be valid" do
         assert subject.valid?
       end
+
+      context "person" do
+        subject { source.activities.first.person }
+
+        should "be GitHub" do
+          assert_equal "GitHub", subject.fullname
+        end
+
+        should "have site as identity" do
+          assert_contains subject.identities, "site:github.com"
+        end
+
+        should "use octocat as photo" do
+          assert_equal "http://github.com/images/error/octocat_happy.gif", subject.photo_url
+        end
+      end
     end
 
     context "activity for closed issue" do
@@ -153,6 +169,22 @@ closed <a href="http://github.com/assaf/vanity/issues#issue/18">issue 18</a> on
       should "be valid" do
         assert subject.valid?
       end
+
+      context "person" do
+        subject { source.activities.first.person }
+
+        should "be GitHub" do
+          assert_equal "GitHub", subject.fullname
+        end
+
+        should "have site as identity" do
+          assert_contains subject.identities, "site:github.com"
+        end
+
+        should "use octocat as photo" do
+          assert_equal "http://github.com/images/error/octocat_happy.gif", subject.photo_url
+        end
+      end
     end
 
 
@@ -188,7 +220,7 @@ closed <a href="http://github.com/assaf/vanity/issues#issue/18">issue 18</a> on
     subject { source.meta }
 
     should "link to repository" do
-      assert_contains subject, title: "On Github", url: "http://github.com/assaf/vanity/issues"
+      assert_contains subject, title: "On GitHub", url: "http://github.com/assaf/vanity/issues"
     end
   end
 end

data/test/github_test.rb

@@ -13,7 +13,7 @@ test DashFu::Bee::Github do
       subject { source.metric }
 
       should "use repository name" do
-        assert_equal "Github: assaf/vanity", subject.name
+        assert_equal "GitHub: assaf/vanity", subject.name
       end
 
       should "measure totals" do
@@ -142,6 +142,15 @@ test DashFu::Bee::Github do
         should "capture identity" do
           assert_contains subject.identities, "github.com:assaf"
         end
+
+        should "not trip on empty login" do
+          commits = interactions.select { |i| i.uri =~ /commits\/list/ }
+          stub_request(:get, commits.first.uri).to_return :body=>commits.last.response.body
+          source.update
+          source.activities.each do |activity|
+            assert activity.person.identities.all? { |id| !id.split(":")[1].blank? }
+          end
+        end
       end
 
       context "commit message" do
@@ -173,7 +182,7 @@ test DashFu::Bee::Github do
 
       context "sequential commits" do
         setup do
-          puts source.activities.clear
+          source.activities.clear
           interaction = interactions.select { |i| i.uri =~ /commits\/list/ }.last
           stub_request(:get, interaction.uri).to_return :body=>interaction.response.body
           source.update
@@ -181,7 +190,7 @@ test DashFu::Bee::Github do
         subject { (Nokogiri::HTML(source.activity.html)/"blockquote") }
 
         should "show as multiple activities" do
-          assert_equal 3, source.activities.count # 4 commits -> 3 activities
+          assert_equal 4, source.activities.count # 4 commits -> 3 activities
         end
 
         should "merge related commits into single activity" do
@@ -217,7 +226,7 @@ test DashFu::Bee::Github do
       end
 
       should "capture new number of commits" do
-        assert_equal 39, source.metric.values[:commits]
+        assert_equal 40, source.metric.values[:commits]
       end
     end
 

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 18
-  version: "0.18"
+  - 19
+  version: "0.19"
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 -07:00
+date: 2010-09-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,7 +129,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- DashFu::Bee 0.18
+- DashFu::Bee 0.19
 - --main
 - README.rdoc
 - --webcvs