jenkins_pipeline_builder 0.10.14 → 0.10.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGIzMDU1ZWQ5YmQyOWU5YmYzYTI4NzFhYzVkYmU5ZjBhMjVlMGNhZA==
+    ZTQzMTY2NWY5YWIwYjk4Y2JjNGI5MzU3YWQ3NTk1MDNlZTJkN2ViYg==
   data.tar.gz: !binary |-
-    YzQ4MzNhNGRiNzRmYTc4N2M0MGNkYjdmMjY4MjlkYWIwODI5NGQzNQ==
+    ZDk5MDZjMTEzMWQ3M2UzMWRhYjRhMDAzZmQzNjZjZmU0NmZlNzZkZg==
 SHA512:
   metadata.gz: !binary |-
-    M2YzZmUyZjZmNmJiMzBkYTI1MDRjYjM0NjczNTQ2NTUyMjc5YTIyMjhmYzA1
-    OWU4MTQ5NWJkMjc5M2EyOGVkZjMwY2E3YzY4YzgwNzQ4YzNmNDg0MTdjMDRl
-    MjY3ZTdlYWVlMWMwZTU2YzY4ZWU0YjkwMzBlMDgxZWU5YmY4NTY=
+    OGJjMDZmZTQzN2QyYmIzOWIzZTJmMjU0MDNlYmRhNWFjOGQyMjZiZmQ1ZGE0
+    ZjNhMDdjZTU4NDkzNmI0MmVhMzM2MWFhYzkxMTcxOWZjZWViODRhMzM2MTUx
+    NmQwNTUyZjZlYTdjMWE1NGE3MDQzMjcxZGY0M2YzNmE3ZTY2NjM=
   data.tar.gz: !binary |-
-    MTQ0NGVmMTFhNjA5ZGE0NGM5OGQzMGExM2UzNGJhNzQ1NTJhMzQ1OWIxZjVk
-    YmRiODgwYjI1ZDEwZDA0YjdlMjMxYzMxYTVkYzM5NWYwMTgyYTU4OTJmN2My
-    NjU2Njk2ZTk2OTBmYjlkZmRiZGFhODc2NjQ5NjRlZWVjZjczZWM=
+    NjhhOTAyNjg0ZmVlOWQxNzM3NDAyNDJmMzVkZTcxN2MzYWM4NTBlYWVjMmQz
+    ZGZjYjY2MWYyYzA5MmI0OTIzZTljZmZjNmY2ODgwMGM3ODg3Yjg1ZjE1NjUw
+    NDY1NmYwMTZjYzFjZWQ1ZTliNjc5NWRiZDQ2MjJhNzAwNzJlMmY=

data/lib/jenkins_pipeline_builder/pull_request.rb

@@ -69,6 +69,12 @@ module JenkinsPipelineBuilder
     def change_name!
       @project[:name] = "#{@project[:name]}-PR#{@number}" if @project[:name]
       @project[:value][:name] = "#{@project[:value][:name]}-PR#{@number}" if @project[:value][:name]
+
+      return unless project[:inject_pr_into]
+
+      key = project[:inject_pr_into].to_sym
+      project[key] = "#{project[key]}-PR#{@number}" if project[key]
+      project[:value][key] = "#{project[:value][key]}-PR#{@number}" if @project[:value][key]
     end
 
     # Apply any specified changes to each job

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -22,6 +22,8 @@
 
 module JenkinsPipelineBuilder
   class PullRequestGenerator
+    class NotFound < StandardError; end
+
     attr_reader :purge, :create, :jobs, :project, :generator, :pull_generator, :errors, :pull_requests
 
     def initialize(project, generator)
@@ -123,7 +125,7 @@ module JenkinsPipelineBuilder
 
         pull_job = job if job[:value][:job_type] == 'pull_request_generator'
       end
-      fail 'No jobs of type pull_request_generator found' unless pull_job
+      fail NotFound, 'No jobs of type pull_request_generator found' unless pull_job
       pull_job
     end
 

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.10.14'
+  VERSION = '0.10.15'
 end

data/spec/lib/jenkins_pipeline_builder/pull_request_spec.rb

@@ -9,9 +9,54 @@ describe JenkinsPipelineBuilder::PullRequest do
     JenkinsPipelineBuilder.registry.registry[:job][:scm_params].clear_installed_version
   end
   let(:pull_request_class) { JenkinsPipelineBuilder::PullRequest }
-  let(:project) { { name: 'pull_req_test', type: :project, value: { name: 'pull_req_test', jobs: ['{{name}}-00', '{{name}}-10', '{{name}}-11'] } } }
-  let(:pull_request) { { name: '{{name}}-00', type: :job, name: '{{name}}-00', job_type: 'pull_request_generator', git_url: 'https://www.github.com/', git_repo: 'jenkins_pipeline_builder', git_org: 'constantcontact', value: { jobs: ['{{name}}-10', '{{name}}-11'] }, builders: [{ shell_command: 'generate -v || gem install jenkins_pipeline_builder\ngenerate pipeline -c config/{{login_config}} pull_request pipeline/ {{name}}\n' }] } }
-  let(:jobs) { { '{{name}}-10' => { name: '{{name}}-10', type: :'job-template', value: { name: '{{name}}-10', description: '{{description}}', publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }] }  }, '{{name}}-11' => { name: '{{name}}-11', type: :'job-template', value: { name: '{{name}}-11', description: '{{description}}' } } } }
+  let(:project) do
+    {
+      name: 'pull_req_test',
+      type: :project,
+      value: {
+        name: 'pull_req_test',
+        jobs: ['{{name}}-00', '{{name}}-10', '{{name}}-11']
+      }
+    }
+  end
+  let(:pull_request) do
+    {
+      name: '{{name}}-00',
+      type: :job,
+      name: '{{name}}-00',
+      job_type: 'pull_request_generator',
+      git_url: 'https://www.github.com/',
+      git_repo: 'jenkins_pipeline_builder',
+      git_org: 'constantcontact',
+      value: {
+        jobs: ['{{name}}-10', '{{name}}-11']
+      },
+      builders: [
+        { shell_command: 'generate -v || gem install jenkins_pipeline_builder\ngenerate pipeline -c config/{{login_config}} pull_request pipeline/ {{name}}\n' }
+      ]
+    }
+  end
+  let(:jobs) do
+    {
+      '{{name}}-10' => {
+        name: '{{name}}-10',
+        type: :'job-template',
+        value: {
+          name: '{{name}}-10',
+          description: '{{description}}',
+          publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }]
+        }
+      },
+      '{{name}}-11' => {
+        name: '{{name}}-11',
+        type: :'job-template',
+        value: {
+          name: '{{name}}-11',
+          description: '{{description}}'
+        }
+      }
+    }
+  end
   describe '#initialize' do
     it 'process pull_request' do
       pull = pull_request_class.new(project, 2, jobs, pull_request)
@@ -44,4 +89,62 @@ describe JenkinsPipelineBuilder::PullRequest do
       expect(pull.jobs).to eq(post_jobs)
     end
   end
+
+  context 'when the job does not have {{name}} in it' do
+    let(:project) do
+      {
+        name: 'pull_req_test',
+        type: :project,
+        inject_pr_into: :app_name,
+        app_name: 'my_app',
+        value: {
+          name: 'pull_req_test',
+          app_name: 'my_app',
+          jobs: ['{{app_name}}-00', '{{app_name}}-10', '{{app_name}}-11']
+        }
+      }
+    end
+    let(:pull_request) do
+      {
+        name: '{{name}}-00',
+        type: :pull_request_generator,
+        job_type: 'pull_request_generator',
+        git_url: 'https://www.github.com/',
+        git_repo: 'jenkins_pipeline_builder',
+        git_org: 'constantcontact',
+        value: {
+          jobs: ['{{app_name}}-10', '{{app_name}}-11']
+        },
+        builders: [
+          { shell_command: 'generate -v || gem install jenkins_pipeline_builder\ngenerate pipeline -c config/{{login_config}} pull_request pipeline/ {{name}}\n' }
+        ]
+      }
+    end
+    let(:jobs) do
+      {
+        '{{app_name}}-10' => {
+          name: '{{app_name}}-10',
+          type: :'job-template',
+          value: {
+            name: '{{app_name}}-10',
+            description: '{{description}}',
+            publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }]
+          }
+        },
+        '{{app_name}}-11' => {
+          name: '{{app_name}}-11',
+          type: :'job-template',
+          value: {
+            name: '{{app_name}}-11',
+            description: '{{description}}'
+          }
+        }
+      }
+    end
+    it 'injects the pr number into the job name when told to' do
+      pull = pull_request_class.new project, 2, jobs, pull_request
+      expect(pull.project[:app_name]).to eq 'my_app-PR2'
+      expect(pull.project[:value][:app_name]).to eq 'my_app-PR2'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.10.14
+  version: 0.10.15
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri