Merge branch 'allow-multiple-app-slugs' of https://github.com/appharbor/github-services into appharbor-allow-multiple-app-slugs

technoweenie · technoweenie · commit 4d6028b71381 · 2011-12-29T11:13:21.000-07:00
diff --git a/docs/appharbor b/docs/appharbor
@@ -8,8 +8,8 @@ Install Notes
 
   1.  Go to your application's main page on AppHarbor and find the "Create build URL". Example: https://appharbor.com/application/{application_slug}/build?authorization={token}
 
-  2.  "token" is the value of the "authorization" parameter.
+  2.  "Token" is the value of the "authorization" parameter.
 
-  3.  "application_slug" is your application's unique identifier.
+  3.  "Application Slugs" is a list of unique application identifiers delimited by "," (i.e. "foo" or "foo,bar") that pushes should trigger builds on.
 
   4.  If your GitHub repository is private you need to add the "apphb" GitHub user as a collaborator. This enables AppHarbor to download the source code.
diff --git a/services/appharbor.rb b/services/appharbor.rb
@@ -2,12 +2,18 @@ class Service::AppHarbor < Service
   string :application_slug, :token
   
   def receive_push
-    slug = data['application_slug']
+    slugs = data['application_slugs']
     token = data['token']
 
-    raise_config_error 'Missing application slug' if slug.to_s.empty?
+    raise_config_error 'Missing application slug' if slugs.to_s.empty?
     raise_config_error 'Missing token' if token.to_s.empty?
 
+    slugs.split(",").each{|slug| post_appharbor_message(slug, token)}
+  end
+
+private
+
+  def post_appharbor_message(slug, token)
     create_build_url = "https://appharbor.com/application/#{slug}/build?authorization=#{token}"
 
     commit = distinct_commits.last
diff --git a/test/appharbor_test.rb b/test/appharbor_test.rb
@@ -5,28 +5,43 @@ def setup
     @stubs = Faraday::Adapter::Test::Stubs.new
   end
 
-  def test_push
-    application_slug = 'foo'
-    token = 'bar'
+  def test_single_slug_push
+    test_push 'foo', 'bar'
+  end
+
+  def test_multiple_slugs_push
+    test_push 'foo,bar', 'baz'
+  end
 
-    @stubs.post "/application/#{application_slug}/build" do |env|
-      assert_equal token, env[:params]['authorization']
-      assert_equal 'application/json', env[:request_headers]['accept']
+  def service(*args)
+    super Service::AppHarbor, *args
+  end
 
-      branches = JSON.parse(env[:body])['branches']
-      assert_equal 1, branches.size
+private
 
-      branch = branches[payload['ref'].sub(/\Arefs\/heads\//, '')]
-      assert_not_nil branch
-      assert_equal payload['after'], branch['commit_id']
-      assert_equal payload['commits'].select{|c| c['id'] == payload['after']}.first['message'], branch['commit_message']
+  def test_push(application_slugs, token)
+    application_slugs.split(",").each do |slug|
+      @stubs.post "/application/#{slug}/build" do |env|
+        verify_appharbor_payload(token, env)
+      end
     end
 
-    svc = service({'token' => token, 'application_slug' => application_slug}, payload)
+    svc = service({'token' => token, 'application_slugs' => application_slugs}, payload)
     svc.receive_push
+
+    @stubs.verify_stubbed_calls
   end
 
-  def service(*args)
-    super Service::AppHarbor, *args
+  def verify_appharbor_payload(token, env)
+    assert_equal token, env[:params]['authorization']
+    assert_equal 'application/json', env[:request_headers]['accept']
+
+    branches = JSON.parse(env[:body])['branches']
+    assert_equal 1, branches.size
+
+    branch = branches[payload['ref'].sub(/\Arefs\/heads\//, '')]
+    assert_not_nil branch
+    assert_equal payload['after'], branch['commit_id']
+    assert_equal payload['commits'].select{|c| c['id'] == payload['after']}.first['message'], branch['commit_message']
   end
 end
