jenkins_pipeline_builder 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a4d0e3df2e5d318482850e9ab14e70a6c19af6a
-  data.tar.gz: b895a30acb5eb9789b93d16de42d2d80a55513d5
+  metadata.gz: 27bfce0d8e1ed49ce1f7d1712159c7085aab313e
+  data.tar.gz: d441dec1b686f09b8fc0a31f8f29c429ff2c33b4
 SHA512:
-  metadata.gz: c9d07ce44d5cf40658132e1d1036d104112793918227ca1612159a1ebeffcf6ea1149ed85bec3713a61ac0ce291a28ae399ef20cc587bf71441f89d9a9489c96
-  data.tar.gz: b9cf45141f6908305fd143202a8330dc2a1a6c6665e53916a3b24252c5d105db7005b96136e440b95ab279ecc5a5ab2dd86162e333d1eb5f71f69d4eabcee94b
+  metadata.gz: 73cf874e69635ebcb6e463d190bca2672c9f05dfbde153167abb70e4e333d55cc4aa122ae7c3518e36998d444162c548d41231440a85d4cf35609958d77224da
+  data.tar.gz: 572698d42843aa3a019ac5a3642f87282450e3c9bc0d69d146b17de3d21a9e2aca784b096b1073d38f255f75ea876bd9f2c2da1771f7e8473d454f29123f1863

data/README.md

@@ -87,7 +87,7 @@ Here's a high level overview of what's available:
 ```yaml
 - job:
     name: nameStr # Name of your Job
-    job_type: free_style # Optional  [free_style|multi_project]
+    job_type: free_style # Optional  [free_style|multi_project|job_dsl|build_flow|pull_request_generator]
     concurrent_build: true or false
     discard_old: # Discard old builds after:
       days: 1 # Optional, number of days after which the build is deleted

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -78,7 +78,14 @@ job_attribute do
     xpath('//scm/skipTag').remove if params[:skip_tag]
     xpath('//scm/excludedRegions').remove if params[:excluded_regions]
     xpath('//scm/includedRegions').remove if params[:included_regions]
+  end
 
+  before version: '2.0' 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
   end
 
   xml path: '//scm' do |params|
@@ -99,6 +106,46 @@ job_attribute do
     excludedRegions params[:excluded_regions] if params[:excluded_regions]
     includedRegions params[:included_regions] if params[:included_regions]
   end
+
+  xml version: '2.0', path: '//scm' do |params|
+    configVersion 2
+    userRemoteConfigs do
+      send('hudson.plugins.git.UserRemoteConfig') do
+        name params[:remote_name] if params[:remote_name]
+        refspec params[:refspec] if params[:refspec]
+        url params[:remote_url] if params[:remote_url]
+        credentialsId params[:credentials_id] if params[:credentials_id]
+      end
+    end
+    doGenerateSubmoduleConfigurations false
+    submoduleCfg
+    extensions do
+      send('hudson.plugins.git.extensions.impl.WipeWorkspace') if params[:wipe_workspace]
+      if params[:local_branch]
+        send('hudson.plugins.git.extensions.impl.LocalWorkspace') do
+          localBranch params[:local_branch]
+        end
+      end
+      if params[:recursive_update]
+        send('hudson.plugins.git.extensions.impl.SubmoduleOption') do
+          disableSubmodules false
+          recursiveSubmodules true
+          trackingSubmodules false
+        end
+      end
+      if params[:excluded_users]
+        send('hudson.plugins.git.extensions.impl.UserExclusion') do
+          excludedUser params[:excluded_users]
+        end
+      end
+      if params[:included_regions] || params[:excluded_regions]
+        send('hudson.plugins.git.extensions.impl.PathRestrictions') do
+          includedRegions params[:included_regions] if params[:included_regions]
+          excludedRegions params[:excluded_regions] if params[:excluded_regions]
+        end
+      end
+    end
+  end
 end
 
 job_attribute do

data/lib/jenkins_pipeline_builder/extensions/publishers.rb

@@ -102,6 +102,15 @@ publisher do
       configVersion params[:configVersion] || 2
       pushMerge params[:'push-merge'] || false
       pushOnlyIfSuccess params[:'push-only-if-success'] || false
+      if params[:tag_name]
+        tagsToPush do
+          send 'hudson.plugins.git.GitPublisher_-TagToPush' do
+            targetRepoName params[:target_repo]
+            tagName params[:tag_name]
+            createTag params[:create_tag] || false
+          end
+        end
+      end
       branchesToPush do
         send('hudson.plugins.git.GitPublisher_-BranchToPush') do
           targetRepoName params[:targetRepoName] || 'origin'

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

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

@@ -40,8 +40,6 @@ describe 'job_attributes' do
 
   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
@@ -54,37 +52,108 @@ describe 'job_attributes' do
         end
       end
     end
+    context '>= 2.0' do
+      before :each do
+        JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version = '2.0'
+      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' }
+      it 'sets the config version' do
+        params = { scm_params: { refspec: :bar, remote_name: :foo }, scm_url: 'http://foo.com' }
 
-      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+        JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+        scm_config = @n_xml.xpath('//scm').first
+
+        expect(scm_config.css('configVersion').first).to be_truthy
+        expect(scm_config.css('configVersion').first.content).to eq '2'
+      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' }
 
-      remote_config = @n_xml.root.children.first.children.first
+        JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
 
-      expect(remote_config.name).to match 'hudson.plugins.git.UserRemoteConfig'
+        remote_config = @n_xml.xpath('//scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig').first
 
-      expect(remote_config.css('name').first).to be_truthy
-      expect(remote_config.css('refspec').first).to be_truthy
+        expect(remote_config.name).to match 'hudson.plugins.git.UserRemoteConfig'
 
-      expect(remote_config.css('name').first.content).to eq 'foo'
-      expect(remote_config.css('refspec').first.content).to eq 'bar'
+        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 'sets all the options' do
+        params = {
+          scm_params: {
+            local_branch: :local,
+            recursive_update: true,
+            excluded_users: :exclude_me,
+            included_regions: :included_region,
+            excluded_regions: :excluded_region
+          },
+          scm_url: 'http://foo.com'
+        }
+
+        JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+        scm_config = @n_xml.xpath('//scm').first
+
+        expect(scm_config.css('disableSubmodules').first).to be_truthy
+        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('includedRegions').first).to be_truthy
+        expect(scm_config.css('excludedRegions').first).to be_truthy
+
+        expect(scm_config.css('disableSubmodules').first.content).to eq 'false'
+        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('includedRegions').first.content).to eq 'included_region'
+        expect(scm_config.css('excludedRegions').first.content).to eq 'excluded_region'
+      end
     end
 
-    it 'using remote_name does not remove the remote url' do
-      params = { scm_params: { remote_name: :foo }, scm_url: 'http://foo.com' }
+    context '<2.0' do
+      before :each do
+        JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version = '1.0'
+      end
 
-      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+      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
 
-      remote_config = @n_xml.root.children.first.children.first
+        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)
 
-      expect(remote_config.name).to match 'hudson.plugins.git.UserRemoteConfig'
+        remote_config = @n_xml.root.children.first.children.first
 
-      expect(remote_config.css('name').first).to be_truthy
-      expect(remote_config.css('url').first).to be_truthy
+        expect(remote_config.name).to match 'hudson.plugins.git.UserRemoteConfig'
 
-      expect(remote_config.css('name').first.content).to eq 'foo'
-      expect(remote_config.css('url').first.content).to eq 'http://foo.com'
+        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
 end

metadata

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