fire-jenkins-builder 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4b8133de7c1b2accf52a98c6a00943c411c644d
-  data.tar.gz: 2e57a5f2bcd607d559fd8aa6230f13d90ff1d13c
+  metadata.gz: 55e1cb69b320fcee23c46712810b44dd27824257
+  data.tar.gz: 2dd1e4f4bf43d5e096cb08968b17cf87954ed982
 SHA512:
-  metadata.gz: 6945e512fe6f5604b7c6e3f26d087dc4c37ccd7c3aedc30e2a2da00deb7962c2fff9cf29109700d77e1eba30259276adfdf504616d8eaf6cf76763d778fde8bf
-  data.tar.gz: d7de91487dcbcafce5c4f95fd7907d600a906059eea26319fc3b3b292ad05cf55f4b0fb80276b76a03042af04e79061ab0209cea24e8f6c1f3ef7b1602727bd3
+  metadata.gz: bcbb90dd04a2cf94790211591d8b4b7143512d34d9e0796f81444989aa59e997eaf3034eaecdb89fcf0122ac4818fb30f5d225b4332fdf3476c3ed3015034db5
+  data.tar.gz: a1082d440914e6829df92e550302003010f5d93199903c8c51f81fe5a13b2fe6f92fac877fbd8daa10d636b2cbf5252cea9a19a04b7a5ac8639a42b8a8887e08

data/.fire-jenkins.yml

@@ -23,9 +23,17 @@ job_name_prefix: ZGiOS_
 # jenkins 上的分组，对应 view
 job_view: 掌柜iOS
 
+# branch 可以从 CI 变量中拿到，不需要设置
+# branch: feature/jenkins-executer
+
+# 下面配置可选
+# 如果没有设置，则采用模版值
+# remote_url: git@git.2dfire-inc.com:ios/restapp.git
+# credentials_id: xxx
+
 # jenkins 用户名密码
 username: qingmu
-password: 1
+password: xxxx
 
 # 各业务线采用不同的模版，配置这里
 # 模版工程名称（需要唯一）

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fire-jenkins-builder (0.1.2)
+    fire-jenkins-builder (0.1.3)
       jenkins_api_client
       nokogiri
 
@@ -18,13 +18,13 @@ GEM
     json (2.1.0)
     mini_portile2 (2.3.0)
     mixlib-shellout (2.4.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     rake (10.5.0)
     socksify (1.7.1)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.0)
+    thor (0.20.3)
     unicode-display_width (1.4.0)
 
 PLATFORMS

data/README.md

@@ -54,6 +54,14 @@ job_name_prefix: ZGiOS_
 # jenkins 上的分组，对应 view
 job_view: 掌柜iOS
 
+# branch 可以从 CI 变量中拿到，不需要设置
+# branch: feature/jenkins-executer
+
+# 下面配置可选
+# 如果没有设置，则采用模版值
+# remote_url: git@git.2dfire-inc.com:ios/restapp.git
+# credentials_id: xxx
+
 # jenkins 用户名密码
 username: qingmu
 password: xxx
@@ -78,7 +86,7 @@ stages:
 ...
 jenkins_build:
 	before_script:
-		- gem install fire-jenkins-builder -v 0.1.1 --no-ri --no-rdoc --conservative
+		- gem install fire-jenkins-builder -v 0.1.3 --no-ri --no-rdoc --conservative
   stage: build
   only:
     variables:

data/bin/jb

@@ -15,28 +15,29 @@ OptionParser.new do |opts|
 	opts.banner = "jb is a tool to build jenkins job on gitlab CI."
 
 	opts.on('-p PATH', '--path PATH', 'config file path.') do |value|
-		options[:path] = value
+		options['path'] = value
 	end
-	
-	opts.on('-b BRANCH', '--branch BRANCH', 'jenkins branch sprcifier.') do |value|
-		options[:branch] = value
+
+	opts.on('-r REMOTE_URL', '--remote-url REMOTE_URL', 'remote url specifier.') do |value|
+		options['remote_url'] = value
+	end
+
+	opts.on('-b BRANCH', '--branch BRANCH', 'jenkins branch specifier.') do |value|
+		options['branch'] = value
 	end
 
 	opts.on('-l LOG_LEVEL', '--log_level LOGGER_LEVEL', 'log level of jb.') do |value|
-		options[:log_level] = value
+		options['log_level'] = value
 	end
 end.parse!
 
-config_path = options[:path]
+config_path = options['path']
 
-raise "必须指定配置文件路径，模版见 git homepage" if config_path.nil? || !File.exist?(config_path)
+raise "必须指定配置文件路径，模版见 README	" if config_path.nil? || !File.exist?(config_path)
 
 config = YAML.load_file(config_path)
 
-config.merge!({
-	'branch' => options[:branch],
-	'log_level' => options[:log_level]
-})
+config.merge!(options)
 
 builder = Fire::Jenkins::Builder::Base.new(config)
 builder.build

data/lib/fire/jenkins/builder/version.rb

@@ -1,7 +1,7 @@
 module Fire
   module Jenkins
     module Builder
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end
   end
 end

data/lib/fire/jenkins/builder.rb

@@ -11,7 +11,7 @@ module Fire
 				attr_reader :config
 				attr_reader :client
 
-				REQUIRED_KEYS = %w[server_url server_port username password template_job_name job_view branch].freeze
+				REQUIRED_KEYS = %w[server_url server_port username password template_job_name job_view branch remote_url].freeze
 
 				def initialize(config)
 					@client = JenkinsApi::Client.new(
@@ -74,6 +74,18 @@ module Fire
 					branch_spec_node = doc.search("//hudson.plugins.git.BranchSpec")
 					branch_node = branch_spec_node.children.find { |c| c.name == 'name' }
 					branch_node.content = config['branch']
+
+					if config['remote_url']
+						user_remote_config_node = doc.search("//hudson.plugins.git.UserRemoteConfig")
+						url_node = user_remote_config_node.children.find { |c| c.name == 'url' }
+						url_node.content = config['remote_url']
+					end
+
+					if config['credentials_id']
+						credentials_id_node = user_remote_config_node.children.find { |c| c.name == 'credentialsId' }
+						credentials_id_node.content = config['credentials_id']
+					end
+
 					doc.to_xml
 				end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fire-jenkins-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri