jenkins_pipeline_builder 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4943ac45edc67e9ca0708021b806c1a27076b3
-  data.tar.gz: ec099fb6d0d07a7fe0b9aa7584bb858e3c45111f
+  metadata.gz: 02c5a6f146ee6cbc2d05531f77ab5e29115586af
+  data.tar.gz: c299f2a21aee7479f12397e19b395314d0a651cc
 SHA512:
-  metadata.gz: 58a24ed1e2bb4d4d24ebf1139397ca7b77b652c07a07f1a69dfdd34756deef0a91907e0f5f1de1ebb7debba9d34a3d17d5fe2b29d7cb670cc92a0866b26e44c8
-  data.tar.gz: 2328c82cfa12db03c25a53f725e15a893408a68fe1062aa5783722621ca29b06b6b8489e78c630396879c91c8322996edec791f5507d85a4f733423a2156ec56
+  metadata.gz: 741140017fddf92b7cb19d4b5aaf8bf8f12d8e851f3665f6bb27571355a452f74c76408bcc7ee0b3037bcd69dcaf9d09bcf43f5c87e4c9fd5167567100ae63c9
+  data.tar.gz: 2f4f027d1cf4ae672c022fba30499a8c45368156ca1e63721280e8c26489eed2f605b06629e1a75bb7062d678b5d084def9897a1c97e5619c302c12a19b22ea6

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -129,11 +129,9 @@ job_attribute do
     ]
 
     before do |params|
-      if params[:remote_name] || params[:refspec]
-        remote_url = xpath('//scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url').first
-        params[:remote_url] = remote_url.content if remote_url
-        xpath('//scm/userRemoteConfigs').remove
-      end
+      remote_url = xpath('//scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url').first
+      params[:remote_url] = remote_url.content if remote_url
+      xpath('//scm/userRemoteConfigs').remove
     end
 
     xml path: '//scm' do |params|

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/lib/jenkins_pipeline_builder/extensions/job_attributes_spec.rb

@@ -68,6 +68,27 @@ describe 'job_attributes' do
         expect(scm_config.css('configVersion').first.content).to eq '2'
       end
 
+      it 'sets the remote url name all the time' do
+        params = { scm_params: {}, scm_url: 'http://foo.com' }
+
+        JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+        scm_config = @n_xml.xpath('//scm').first
+
+        expect(
+          scm_config.xpath('//scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig').first.children.map(&:name)
+        ).to_not include 'refspec'
+        expect(
+          scm_config.xpath('//scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig').first.children.map(&:name)
+        ).to_not include 'name'
+        expect(
+          scm_config.xpath('//scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url').first
+        ).to be_truthy
+        expect(
+          scm_config.xpath('//scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url').first.content
+        ).to eq 'http://foo.com'
+      end
+
       it 'writes a single block if refspec and remote_name are specified' do
         params = { scm_params: { refspec: :bar, remote_name: :foo }, scm_url: 'http://foo.com' }
 
@@ -109,7 +130,7 @@ describe 'job_attributes' do
         expect(scm_config.css('recursiveSubmodules').first).to be_truthy
         expect(scm_config.css('trackingSubmodules').first).to be_truthy
         expect(scm_config.css('localBranch').first).to be_truthy
-        expect(scm_config.css('excludedUser').first).to be_truthy
+        expect(scm_config.css('excludedUsers').first).to be_truthy
         expect(scm_config.css('includedRegions').first).to be_truthy
         expect(scm_config.css('excludedRegions').first).to be_truthy
         expect(scm_config.css('credentialsId').first).to be_truthy
@@ -121,7 +142,7 @@ describe 'job_attributes' do
         expect(scm_config.css('recursiveSubmodules').first.content).to eq 'true'
         expect(scm_config.css('trackingSubmodules').first.content).to eq 'false'
         expect(scm_config.css('localBranch').first.content).to eq 'local'
-        expect(scm_config.css('excludedUser').first.content).to eq 'exclude_me'
+        expect(scm_config.css('excludedUsers').first.content).to eq 'exclude_me'
         expect(scm_config.css('includedRegions').first.content).to eq 'included_region'
         expect(scm_config.css('excludedRegions').first.content).to eq 'excluded_region'
         expect(scm_config.css('credentialsId').first.content).to eq 'creds'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri