From cab0217522fb5862e9ea05bd84a68d81b4ec23cb Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Fri, 1 Aug 2014 15:14:27 -0300
Subject: [PATCH] serpro_integration: fix jenkins integration

---
 plugins/serpro_integration/lib/ext/profile.rb                                   |  9 ---------
 plugins/serpro_integration/lib/serpro_integration_plugin/jenkins_integration.rb |  5 ++---
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 plugins/serpro_integration/lib/ext/profile.rb

diff --git a/plugins/serpro_integration/lib/ext/profile.rb b/plugins/serpro_integration/lib/ext/profile.rb
deleted file mode 100644
index 9eb48aa..0000000
--- a/plugins/serpro_integration/lib/ext/profile.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require_dependency 'profile'
-
-class Profile
-  settings_items :allow_sonar_integration, :type => :boolean, :default => false
-  settings_items :allow_gitlab_integration, :type => :boolean, :default => false
-
-  #FIXME make test for default option
-  settings_items :serpro_integration_plugin, :type => Hash, :default => {}
-end
diff --git a/plugins/serpro_integration/lib/serpro_integration_plugin/jenkins_integration.rb b/plugins/serpro_integration/lib/serpro_integration_plugin/jenkins_integration.rb
index 7654ee6..8c54c3a 100644
--- a/plugins/serpro_integration/lib/serpro_integration_plugin/jenkins_integration.rb
+++ b/plugins/serpro_integration/lib/serpro_integration_plugin/jenkins_integration.rb
@@ -10,15 +10,14 @@ class SerproIntegrationPlugin::JenkinsIntegration
   end
 
   def project_url
-    "#{jenkins_host}/#{jenkins_project_name}"
+    "#{@profile.jenkins_host}/#{@profile.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?
+    if @client.job.list(profile.jenkins_project_name).blank?
       @client.job.create(profile.jenkins_project_name, xml_jenkins(repository_path, web_url, git_url))
     end
     #rescue JenkinsApi::Exceptions::ApiException
--
libgit2 0.21.2