jenkins_pipeline_builder 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4d433fdb4421e7ff066fd49444c45abe2d2b29df62228b95b9d0933b0dce7f6
-  data.tar.gz: 2586bd749811dd2848490e146b926e42c7332526282c53ff43c5f706ad49a8fc
+  metadata.gz: b2b8dbf5bb5aecf737f7de86141b559cf74704d23ceaa754f4d9c19803401a37
+  data.tar.gz: a412dce1a03b09be9298c5d6381a0fe7c85f4b1f9d7bf2229292de1b845cad86
 SHA512:
-  metadata.gz: 0969f829a1b73b76c1954ea323352f66d346b90b307705016d28d8b1a74987580f4baaea75dc2ba8f5c59b4e7c41039307c2a4b96019cc0a30c8ab51db861940
-  data.tar.gz: 6a02902dc545bdd9e2086503818b0cf9095edbe0964a290140bbe1bd718bb3c0748de2763d5b290f7af05927efafa9299418d1145e843fe1f81f78c9cb5f3302
+  metadata.gz: d4c23fe8ad05dd27dd99a55c771a5b8a423f8b7af3e8069d70f9f6d2f4aa3d72c4a0348b5ffd487a98452190d6ff8c5fd8aad9b5d6d393f1d9ab9cd853cde4c5
+  data.tar.gz: d40e0eb1e3a388975bf324822c334dcc085bf0dc58657b14cef9cbf744e393b383cd882c01fdee438c7e17934a4ca5f5a7563a595912d2a4a239a24baaa7761a

data/lib/jenkins_pipeline_builder/cli/pipeline.rb

@@ -31,7 +31,7 @@ module JenkinsPipelineBuilder
         Helper.setup(parent_options).dump(job_name)
       end
 
-      desc 'bootstrap Path', 'Generates pipeline from folder or a file'
+      desc 'bootstrap Path [ProjectName]', 'Generates pipeline from folder or a file'
       def bootstrap(path, project_name = nil)
         failed = Helper.setup(parent_options).bootstrap(path, project_name)
         exit(0) if failed.empty? # weird ordering, but rubocop decrees
@@ -39,12 +39,13 @@ module JenkinsPipelineBuilder
         exit(1)
       end
 
-      desc 'pull_request Path', 'Generates jenkins jobs based on a git pull request.'
+      option :base_branch_only, type: :boolean
+      desc 'pull_request Path [ProjectName] [--base_branch_only]', 'Generates jenkins jobs based on a git pull request.'
       def pull_request(path, project_name = nil)
-        Helper.setup(parent_options).pull_request(path, project_name)
+        Helper.setup(parent_options).pull_request(path, project_name, options[:base_branch_only])
       end
 
-      desc 'file Path', 'Does the same thing as bootstrap but doesn\'t actually create jobs on the server'
+      desc 'file Path [ProjectName]', 'Does the same thing as bootstrap but doesn\'t actually create jobs on the server'
       def file(path, project_name = nil)
         Helper.setup(parent_options).file(path, project_name)
       end

data/lib/jenkins_pipeline_builder/extensions/build_steps.rb

@@ -54,7 +54,7 @@ build_step do
               end
             end
           else
-            configs(class: 'empty-list'){}
+            configs(class: 'empty-list') {}
           end
 
           projects state[:name]

data/lib/jenkins_pipeline_builder/generator.rb

@@ -56,7 +56,8 @@ module JenkinsPipelineBuilder
       publish(project_name || job_collection.projects.first[:name])
     end
 
-    def pull_request(path, project_name)
+    # rubocop:disable Metrics/AbcSize
+    def pull_request(path, project_name, base_branch_only = false)
       logger.info "Pull Request Generator Running from path #{path}"
       load_job_collection path unless job_collection.loaded?
       defaults = job_collection.defaults[:value]
@@ -64,12 +65,14 @@ module JenkinsPipelineBuilder
       pr_generator.delete_closed_prs
       errors = []
       pr_generator.open_prs.each do |pr|
-        pr_generator.convert! job_collection, pr
+        next if base_branch_only && defaults[:git_branch] != pr[:base]
+        pr_generator.convert! job_collection, pr[:number]
         error = publish(project_name)
         errors << error unless error.empty?
       end
       errors.empty?
     end
+    # rubocop:enable Metrics/AbcSize
 
     def file(path, project_name)
       logger.info "Generating files from path #{path}"

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -29,32 +29,32 @@ module JenkinsPipelineBuilder
       @open_prs = active_prs defaults[:github_site], defaults[:git_org], defaults[:git_repo_name]
     end
 
-    def convert!(job_collection, pr)
-      job_collection.defaults[:value][:application_name] = "#{application_name}-PR#{pr}"
-      job_collection.defaults[:value][:pull_request_number] = pr.to_s
-      job_collection.jobs.each { |j| override j[:value], pr }
+    def convert!(job_collection, pr_number)
+      job_collection.defaults[:value][:application_name] = "#{application_name}-PR#{pr_number}"
+      job_collection.defaults[:value][:pull_request_number] = pr_number.to_s
+      job_collection.jobs.each { |j| override j[:value], pr_number }
     end
 
     def delete_closed_prs
       return if JenkinsPipelineBuilder.debug
       jobs_to_delete = JenkinsPipelineBuilder.client.job.list "^#{application_name}-PR(\\d+)-(.*)$"
-      open_prs.each do |n|
-        jobs_to_delete.reject! { |j| j.start_with? "#{application_name}-PR#{n}" }
+      open_prs.each do |pr|
+        jobs_to_delete.reject! { |j| j.start_with? "#{application_name}-PR#{pr[:number]}" }
       end
       jobs_to_delete.each { |j| JenkinsPipelineBuilder.client.job.delete j }
     end
 
     private
 
-    def override(job, pr)
+    def override(job, pr_number)
       git_version = JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version
-      job[:scm_branch] = "origin/pr/#{pr}/head"
+      job[:scm_branch] = "origin/pr/#{pr_number}/head"
       job[:scm_params] ||= {}
-      job[:scm_params][:refspec] = "refs/pull/#{pr}/head:refs/remotes/origin/pr/#{pr}/head"
+      job[:scm_params][:refspec] = "refs/pull/#{pr_number}/head:refs/remotes/origin/pr/#{pr_number}/head"
       job[:scm_params][:changelog_to_branch] ||= {}
       if Gem::Version.new(2.0) < git_version
         job[:scm_params][:changelog_to_branch]
-          .merge!(remote: 'origin', branch: "pr/#{pr}/head")
+          .merge!(remote: 'origin', branch: "pr/#{pr_number}/head")
       end
     end
 
@@ -66,7 +66,7 @@ module JenkinsPipelineBuilder
       begin
         resp = Net::HTTP.get_response(URI.parse(url))
         pulls = JSON.parse(resp.body)
-        pulls.map { |p| p['number'] }
+        pulls.map { |p| { number: p['number'], base: p['base']['ref'] } }
       rescue StandardError
         raise 'Failed connecting to github!'
       end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/spec/lib/jenkins_pipeline_builder/extension_set_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 describe JenkinsPipelineBuilder::ExtensionSet do
-  subject(:set) { JenkinsPipelineBuilder::ExtensionSet.new('foo'){} }
+  subject(:set) { JenkinsPipelineBuilder::ExtensionSet.new('foo') {} }
 
   before :each do
     set.name 'example'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/project.yaml

@@ -5,6 +5,7 @@
     github_site: 'https://github.com'
     git_org: 'testorg'
     git_repo_name: 'generator_tests'
+    git_branch: 'master'
 
 - project:
     name: PullRequest

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -133,6 +133,9 @@ describe JenkinsPipelineBuilder::Generator do
       JenkinsPipelineBuilder.registry.registry[:job][:scm_params].clear_installed_version
     end
 
+    let(:pr_master) { { number: 1, base: 'master' } }
+    let(:pr_not_master) { { number: 2, base: 'not-master' } }
+    let(:open_prs) { [pr_master, pr_not_master] }
     let(:path) { File.expand_path('../fixtures/generator_tests/pullrequest_pipeline', __FILE__) }
     it 'produces no errors while creating pipeline PullRequest' do
       job_name = 'PullRequest'
@@ -145,7 +148,7 @@ describe JenkinsPipelineBuilder::Generator do
         .and_return(pr_generator)
       expect(pr_generator).to receive(:delete_closed_prs)
       expect(pr_generator).to receive(:convert!)
-      expect(pr_generator).to receive(:open_prs).and_return [1]
+      expect(pr_generator).to receive(:open_prs).and_return [pr_master]
       success = @generator.pull_request(path, job_name)
       expect(success).to be_truthy
     end
@@ -161,7 +164,7 @@ describe JenkinsPipelineBuilder::Generator do
         .and_return(pr_generator)
       expect(pr_generator).to receive(:delete_closed_prs)
       expect(pr_generator).to receive(:convert!).twice
-      expect(pr_generator).to receive(:open_prs).and_return [1, 2]
+      expect(pr_generator).to receive(:open_prs).and_return open_prs
       expect(@generator.pull_request(path, job_name)).to be_truthy
     end
 
@@ -175,13 +178,33 @@ describe JenkinsPipelineBuilder::Generator do
                              git_repo_name: 'generator_tests'))
         .and_return(pr_generator)
       expect(pr_generator).to receive(:delete_closed_prs)
-      allow(pr_generator).to receive(:convert!) do |job_collection, pr|
-        job_collection.defaults[:value][:application_name] = "testapp-PR#{pr}"
+      allow(pr_generator).to receive(:convert!) do |job_collection, pr_number|
+        job_collection.defaults[:value][:application_name] = "testapp-PR#{pr_number}"
       end
-      expect(pr_generator).to receive(:open_prs).and_return [1, 2]
+      expect(pr_generator).to receive(:open_prs).and_return open_prs
       expect(@generator.pull_request(path, job_name)).to be_truthy
       expect(@generator.job_collection.projects.first[:settings][:application_name]).to eq 'testapp-PR2'
     end
+
+    it 'correctly creates jobs only for the base branch' do
+      job_name = 'PullRequest'
+      pr_generator = double('pr_generator')
+      expect(JenkinsPipelineBuilder::PullRequestGenerator).to receive(:new)
+        .with(hash_including(
+                application_name: 'testapp',
+                github_site: 'https://github.com',
+                git_org: 'testorg',
+                git_repo_name: 'generator_tests'
+        )).and_return(pr_generator)
+
+      expect(pr_generator).to receive(:open_prs).and_return open_prs
+      expect(pr_generator).to receive(:delete_closed_prs)
+      expect(pr_generator).to receive(:convert!)
+        .with(instance_of(JenkinsPipelineBuilder::JobCollection), pr_master[:number])
+        .once
+
+      expect(@generator.pull_request(path, job_name, true)).to be_truthy
+    end
     # Things to check for
     # Fail - no PR job type found
     # Encounters failure during build process

data/spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb

@@ -8,7 +8,7 @@ describe JenkinsPipelineBuilder::PullRequestGenerator do
   let(:git_repo_name) { 'git_repo' }
   let(:prs) { (1..10).map { |n| "#{application_name}-PR#{n}" } }
   let(:closed_prs) { (1..6).map { |n| "#{application_name}-PR#{n}" } }
-  let(:open_prs_json) { (7..10).map { |n| { number: n } }.to_json }
+  let(:open_prs_json) { (7..10).map { |n| { number: n, base: { ref: 'master' } } }.to_json }
   let(:url) { "#{github_site}/api/v3/repos/#{git_org}/#{git_repo_name}/pulls" }
   let(:params) do
     {
@@ -91,41 +91,41 @@ describe JenkinsPipelineBuilder::PullRequestGenerator do
         .to_return(status: 200, body: open_prs_json, headers: {})
     end
 
+    let(:pr_number) { 8 }
+
     it 'converts the job application name' do
       collection = job_collection.clone
-      subject.convert! collection, 8
-      expect(collection.defaults[:value][:application_name]).to eq "#{application_name}-PR8"
+      subject.convert! collection, pr_number
+      expect(collection.defaults[:value][:application_name]).to eq "#{application_name}-PR#{pr_number}"
     end
 
     it 'provides the PR number to the job settings' do
       collection = job_collection.clone
-      subject.convert! collection, 8
-      expect(collection.defaults[:value][:pull_request_number]).to eq '8'
+      subject.convert! collection, pr_number
+      expect(collection.defaults[:value][:pull_request_number]).to eq pr_number.to_s
     end
 
     it 'overrides the git params' do
-      pr = 8
       collection = job_collection.clone
-      subject.convert! collection, pr
+      subject.convert! collection, pr_number
       expect(collection.jobs.first[:value]).to eq(
-        scm_branch: "origin/pr/#{pr}/head",
+        scm_branch: "origin/pr/#{pr_number}/head",
         scm_params: {
-          refspec: "refs/pull/#{pr}/head:refs/remotes/origin/pr/#{pr}/head",
-          changelog_to_branch: { remote: 'origin', branch: "pr/#{pr}/head" },
+          refspec: "refs/pull/#{pr_number}/head:refs/remotes/origin/pr/#{pr_number}/head",
+          changelog_to_branch: { remote: 'origin', branch: "pr/#{pr_number}/head" },
           random: 'foo'
         }
       )
     end
 
     it 'does not override extra params' do
-      pr = 8
       collection = job_collection.clone
-      subject.convert! collection, pr
+      subject.convert! collection, pr_number
       expect(collection.jobs.first[:value]).to eq(
-        scm_branch: "origin/pr/#{pr}/head",
+        scm_branch: "origin/pr/#{pr_number}/head",
         scm_params: {
-          refspec: "refs/pull/#{pr}/head:refs/remotes/origin/pr/#{pr}/head",
-          changelog_to_branch: { remote: 'origin', branch: "pr/#{pr}/head" },
+          refspec: "refs/pull/#{pr_number}/head:refs/remotes/origin/pr/#{pr_number}/head",
+          changelog_to_branch: { remote: 'origin', branch: "pr/#{pr_number}/head" },
           random: 'foo'
         }
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -485,7 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: This gem is will boostrap your Jenkins pipelines