Merge branches 'rails3_AI3033-serpro_integration' and 'rails3_stable' into rails3_stable

Leandro Santos
2 parents fdd9382e e1f5af1a
Showing 3 changed files with 18 additions and 1 deletions Show diff stats
plugins/serpro_integration/lib/ext/community.rb
plugins/serpro_integration/lib/serpro_integration_plugin/gitlab_integration.rb
plugins/serpro_integration/lib/serpro_integration_plugin/jenkins_integration.rb
@@ -25,7 +25,9 @@ class Community
       if allow_jenkins_integration
         jenkins_integration = SerproIntegrationPlugin::JenkinsIntegration.new(jenkins_host, jenkins_private_token, jenkins_user)
         jenkins_integration.create_jenkis_project(self, gitlab_project.path_with_namespace, gitlab_project.web_url, gitlab_project.http_url_to_repo)
+        gitlab_integration.create_jenkins_hook(jenkins_integration.project_url)
       end
+      
     end
   end
@@ -4,12 +4,15 @@ class SerproIntegrationPlugin::GitlabIntegration
   def initialize(host, private_token)
     @client = Gitlab.client(:endpoint => host, :private_token => private_token)
+    @group = nil
+    @project = nil
   end
   def create_group(group_name)
     #FIXME find group by name
     group = @client.groups.select {|group| group.name == group_name}.first
     group ||= @client.create_group(group_name, group_name)
+    @group = group
   end
   def create_project(project_name, group)
@@ -31,7 +34,7 @@ class SerproIntegrationPlugin::GitlabIntegration
       #Create Web Hook for Jenkins' integration
       #Gitlab.add_project_hook(project.id, "#{self.jenkins[:url]}/gitlab/build_now")
     end
-    project
+    @project = project
   end
   def create_user(email, group)
@@ -59,4 +62,9 @@ class SerproIntegrationPlugin::GitlabIntegration
     project = create_project(profile.gitlab_project_name, group)
   end
+
+  def create_jenkins_hook(jenkins_project_url)
+    @client.add_project_hook(@project.id, "#{jenkins_project_url}/gitlab/build_now")
+  end
+
 end
@@ -5,10 +5,17 @@ class SerproIntegrationPlugin::JenkinsIntegration
   def initialize(host, private_token, user)
     @client = JenkinsApi::Client.new(:server_url => host, :password => private_token, :username => user)
+    @profile = nil
+
+  end
+
+  def project_url
+    "#{jenkins_host}/#{jenkins_project_name}"
   end
   #FIXME make jenkins integration works
   def create_jenkis_project(profile, repository_path, web_url, git_url)
+    @profile = profile
     #begin
     project_name = repository_path.split('/').last
     if @client.job.list(project_name).blank?