use the service api for fetch_config and find_admin services

Author: svenfuchs

lib/travis.rb

@@ -54,6 +54,8 @@ module Travis
   autoload :Task,         'travis/task'
   autoload :Testing,      'travis/testing'
 
+  extend Services
+
   class UnknownRepository < StandardError; end
   class GithubApiError < StandardError; end
   class AdminMissing < StandardError; end

lib/travis/model/repository.rb

@@ -94,7 +94,7 @@ def counts_by_owner_names(owner_names)
   end
 
   def admin
-    @admin ||= Travis::Services::Github::FindAdmin.new(self).run # TODO check who's using this
+    @admin ||= Travis.service(:github, :find_admin, repository: self).run # TODO check who's using this
   end
 
   def slug

lib/travis/model/request/states.rb

@@ -38,7 +38,7 @@ def approval
       end
 
       def fetch_config
-        Travis::Services::Github::FetchConfig.new(self).run
+        Travis.service(:github, :fetch_config, request: self).run
       end
 
       def add_build

lib/travis/services/github/fetch_config.rb

@@ -4,16 +4,10 @@ module Travis
   module Services
     module Github
       # encapsulates fetching a .travis.yml from a given commit's config_url
-      class FetchConfig
+      class FetchConfig < Base
         include Logging
         extend Instrumentation
 
-        attr_accessor :request
-
-        def initialize(request)
-          @request = request
-        end
-
         def run
           parse(fetch) || { '.result' => 'not_found' }
         rescue GH::Error => e
@@ -25,6 +19,10 @@ def run
         end
         instrument :run
 
+        def request
+          params[:request]
+        end
+
         def config_url
           request.config_url
         end

lib/travis/services/github/find_admin.rb

@@ -3,7 +3,7 @@
 module Travis
   module Services
     module Github
-      class FindAdmin
+      class FindAdmin < Base
         extend Travis::Instrumentation
         include Travis::Logging
 
@@ -13,18 +13,16 @@ def for_repository(repository)
           end
         end
 
-        attr_reader :repository
-
-        def initialize(repository)
-          @repository = repository
-        end
-
         def run
           admin = candidates.detect { |user| validate(user) }
           admin || raise_admin_missing
         end
         instrument :run
 
+        def repository
+          params[:repository]
+        end
+
         private
 
           def candidates

spec/travis/notification/instrument/services/github/fetch_config_spec.rb

@@ -4,7 +4,7 @@
   include Travis::Testing::Stubs
 
   let(:body)      { { 'content' => ['foo: Foo'].pack('m') } }
-  let(:service)   { Travis::Services::Github::FetchConfig.new(request) }
+  let(:service)   { Travis::Services::Github::FetchConfig.new(nil, request: request) }
   let(:publisher) { Travis::Notification::Publisher::Memory.new }
   let(:event)     { publisher.events[1] }
 

spec/travis/notification/instrument/services/github/find_admin_spec.rb

@@ -5,7 +5,7 @@
 
   let(:publisher) { Travis::Notification::Publisher::Memory.new }
   let(:event)     { publisher.events[1] }
-  let(:service)   { Travis::Services::Github::FindAdmin.new(repository) }
+  let(:service)   { Travis::Services::Github::FindAdmin.new(nil, repository: repository) }
 
   before :each do
     Travis::Notification.publishers.replace([publisher])

spec/travis/services/github/fetch_config_spec.rb

@@ -5,7 +5,7 @@
 
   let(:subject)   { Travis::Services::Github::FetchConfig }
   let(:body)      { { 'content' => ['foo: Foo'].pack('m') } }
-  let(:service)   { subject.new(request) }
+  let(:service)   { subject.new(nil, request: request) }
   let(:result)    { service.run }
   let(:exception) { GH::Error.new }
 

spec/travis/services/github/find_admin_spec.rb

@@ -3,10 +3,8 @@
 describe Travis::Services::Github::FindAdmin do
   include Travis::Testing::Stubs
 
-  let(:subject) { Travis::Services::Github::FindAdmin }
-
   describe 'find' do
-    let(:result) { subject.new(repository).run }
+    let(:result) { described_class.new(nil, repository: repository).run }
 
     before :each do
       User.stubs(:with_permissions).with(:repository_id => repository.id, :admin => true).returns [user]