[SCM] ci-tooling packaging branch, master, updated. 6f34349da3484c5684afb8bc7a0bc92a1706b0d6

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=6f34349

The following commit has been merged in the master branch:
commit 6f34349da3484c5684afb8bc7a0bc92a1706b0d6
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Dec 17 02:46:21 2014 +0100

    Make sure we can pass custom configs via the ctor
---
 lib/jenkins.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jenkins.rb b/lib/jenkins.rb
index 428a7db..6fb14eb 100644
--- a/lib/jenkins.rb
+++ b/lib/jenkins.rb
@@ -7,7 +7,7 @@ end
 require 'rubygems'
 require 'jenkins_api_client'
 
-def new_jenkins
+def new_jenkins(args = {})
     config_file = "#{ENV['HOME']}/.config/pangea-jenkins.json"
     config_data = {}
     if File.exist?(config_file)
@@ -16,5 +16,6 @@ def new_jenkins
     config_data[:server_ip] ||= 'kci.pangea.pub'
     config_data[:server_port] ||= '80'
     config_data[:log_level] ||= Logger::FATAL
+    config_data.merge(args)
     return JenkinsApi::Client.new(config_data)
 end

-- 
ci-tooling packaging