jenkins_pipeline_builder 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b24c99f73cecb047e1f58cd328000f81ee3b31c
-  data.tar.gz: 43f6ce844efe1ed19940d3e8d0dfaab50b243d79
+  metadata.gz: 294473072fd747d1bd02d377b9ddfd17c2c46c38
+  data.tar.gz: a7a28bae727b44af5402760d465e5e643e55ba16
 SHA512:
-  metadata.gz: 82bce578c0a059d5cbee047fcd984bbe765174ed58e96601c721b41eb806583e4301959822a6bbe1e729dbdce2636b99d30d9ae00ec877171b1b9b490ecd59c0
-  data.tar.gz: 60bc6c5d94f07227b5750813455267f80c05f2dc7a677bfb972829acd6f32d17e7673eb1b211a3ac849bc085b8d8f6d0682e023a4081e5b74bc2f8fd32848ef5
+  metadata.gz: 2ad2144de19201c8702bfc73c46958a00306c294ce716f0307a6532cc2be0d11b5baeef30d4101ae46a0e4bfff904d92185ac45127f1cebf7769157513d810e4
+  data.tar.gz: c0d8d748642d6a417e3d022d4cbf6c3fbcc6e1093dc433473e0b3791002048b264af90cc29c3aabc5f6c397abee3764fcbb41b2a2adca6cf1e1f955d6b181c24

data/README.md

@@ -256,6 +256,9 @@ Here's a high level overview of what's available:
           recipients: 'test@example.com' # Whitepace-delimited list of recipients
           send_if_unstable: false # Optional, default to true
           send_to_individuals: true # Optional, default to false
+      - sonar_result:
+          branch: 'sonar-results-branch-name'
+          maven_installation_name: 'name'
     triggers:
       - git_push: true
       - scm_polling: 'H/5 * * * *'

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -54,7 +54,11 @@ job_attribute do
     xpath('//scm/recursiveSubmodules').remove if params[:recursive_update]
     xpath('//scm/wipeOutWorkspace').remove if params[:wipe_workspace]
     xpath('//scm/excludedUsers').remove if params[:excluded_users]
-    xpath('//scm/userRemoteConfigs').remove if params[:remote_name] || params[:refspec]
+    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
     xpath('//scm/skipTag').remove if params[:skip_tag]
     xpath('//scm/excludedRegions').remove if params[:excluded_regions]
     xpath('//scm/includedRegions').remove if params[:included_regions]
@@ -66,21 +70,16 @@ job_attribute do
     recursiveSubmodules params[:recursive_update] if params[:recursive_update]
     wipeOutWorkspace params[:wipe_workspace] if params[:wipe_workspace]
     excludedUsers params[:excluded_users] if params[:excluded_users]
-    if params[:remote_name]
+    if params[:remote_name] || params[:refspec]
       userRemoteConfigs do
         send('hudson.plugins.git.UserRemoteConfig') do
-          name params[:remote_name]
+          name params[:remote_name] if params[:remote_name]
+          refspec params[:refspec] if params[:refspec]
+          url params[:remote_url] if params[:remote_url]
         end
       end
     end
     skipTag params[:skip_tag] if params[:skip_tag]
-    if params[:refspec]
-      userRemoteConfigs do
-        send 'hudson.plugins.git.UserRemoteConfig' do
-          refspec params[:refspec]
-        end
-      end
-    end
     excludedRegions params[:excluded_regions] if params[:excluded_regions]
     includedRegions params[:included_regions] if params[:included_regions]
   end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

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

@@ -0,0 +1,72 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe 'job_attributes' do
+  after :each do
+    JenkinsPipelineBuilder.registry.clear_versions
+  end
+
+  before :all do
+    JenkinsPipelineBuilder.credentials = {
+      server_ip: '127.0.0.1',
+      server_port: 8080,
+      username: 'username',
+      password: 'password',
+      log_location: '/dev/null'
+    }
+  end
+
+  after :each do |example|
+    name = example.description.gsub ' ', '_'
+    File.open("./out/xml/job_attribute_#{name}.xml", 'w') { |f| @n_xml.write_xml_to f }
+  end
+
+  context 'scm params' do
+    before :each do
+      allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(
+        list_installed: { 'git' => '20.0' })
+
+      builder = Nokogiri::XML::Builder.new { |xml| xml.scm }
+      @n_xml = builder.doc
+
+      Nokogiri::XML::Builder.with(@n_xml.xpath('//scm').first) do |xml|
+        xml.userRemoteConfigs do
+          xml.send('hudson.plugins.git.UserRemoteConfig') do
+            xml.url 'http://foo.com'
+          end
+        end
+      end
+    end
+
+    it 'writes one block when both refspec and remote_name' do
+      params = { scm_params: { refspec: :bar, remote_name: :foo }, scm_url: 'http://foo.com' }
+
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+      remote_config = @n_xml.root.children.first.children.first
+
+      expect(remote_config.name).to match 'hudson.plugins.git.UserRemoteConfig'
+
+      expect(remote_config.css('name').first).to be_truthy
+      expect(remote_config.css('refspec').first).to be_truthy
+
+      expect(remote_config.css('name').first.content).to eq 'foo'
+      expect(remote_config.css('refspec').first.content).to eq 'bar'
+    end
+
+    it 'using remote_name does not remove the remote url' do
+      params = { scm_params: { remote_name: :foo }, scm_url: 'http://foo.com' }
+
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+      remote_config = @n_xml.root.children.first.children.first
+
+      expect(remote_config.name).to match 'hudson.plugins.git.UserRemoteConfig'
+
+      expect(remote_config.css('name').first).to be_truthy
+      expect(remote_config.css('url').first).to be_truthy
+
+      expect(remote_config.css('name').first.content).to eq 'foo'
+      expect(remote_config.css('url').first.content).to eq 'http://foo.com'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -357,6 +357,7 @@ files:
 - pipeline/project.yaml
 - spec/lib/jenkins_pipeline_builder/compiler_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/builders_spec.rb
+- spec/lib/jenkins_pipeline_builder/extensions/job_attributes_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/publishers_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions_spec.rb
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/PullRequest-10-SampleJob.yaml
@@ -407,6 +408,7 @@ summary: This gem is will boostrap your Jenkins pipelines
 test_files:
 - spec/lib/jenkins_pipeline_builder/compiler_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/builders_spec.rb
+- spec/lib/jenkins_pipeline_builder/extensions/job_attributes_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/publishers_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions_spec.rb
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/PullRequest-10-SampleJob.yaml