jenkins_pipeline_builder 0.10.15 → 0.10.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTQzMTY2NWY5YWIwYjk4Y2JjNGI5MzU3YWQ3NTk1MDNlZTJkN2ViYg==
+    MGExN2ExOTMzNjdkYzNlMTE2NzQ3Y2QyNjA1ODQ1MjEzNDllZjhmNw==
   data.tar.gz: !binary |-
-    ZDk5MDZjMTEzMWQ3M2UzMWRhYjRhMDAzZmQzNjZjZmU0NmZlNzZkZg==
+    ZDUzNmFkYTUxNjViYTcwZDAxYzBlYTEzZTAyZDIyNTE1MjFjNmVmOQ==
 SHA512:
   metadata.gz: !binary |-
-    OGJjMDZmZTQzN2QyYmIzOWIzZTJmMjU0MDNlYmRhNWFjOGQyMjZiZmQ1ZGE0
-    ZjNhMDdjZTU4NDkzNmI0MmVhMzM2MWFhYzkxMTcxOWZjZWViODRhMzM2MTUx
-    NmQwNTUyZjZlYTdjMWE1NGE3MDQzMjcxZGY0M2YzNmE3ZTY2NjM=
+    MmI3YzUzODJjYjIwZjkzNjI4ZjRmMzEwOGU2NDdhNjZjMGI4M2M4MzI3YmQ5
+    OWExYWZlYjNlYTJiMTRhYTY4MjQyNzZlOTZkN2JiYjg1NjE5YzIzYjYxYTRi
+    YTk1NzM2MTA0MzMwYzJiYzljYWFmNzU0ZjM3YjM1M2E1ZDViNTU=
   data.tar.gz: !binary |-
-    NjhhOTAyNjg0ZmVlOWQxNzM3NDAyNDJmMzVkZTcxN2MzYWM4NTBlYWVjMmQz
-    ZGZjYjY2MWYyYzA5MmI0OTIzZTljZmZjNmY2ODgwMGM3ODg3Yjg1ZjE1NjUw
-    NDY1NmYwMTZjYzFjZWQ1ZTliNjc5NWRiZDQ2MjJhNzAwNzJlMmY=
+    MWQ2YzA5YjdmYmNkODgyOWMwZjRmZGY5NWU5MzEyMmU3ZjcwMTFjNjEzZjUy
+    MWU1OWEzY2YzYTQ0MjlkYzUwMTMwNDA4YzEyYzAxOGIzMDQ5ZGU1MTA5N2Fl
+    MTJjMGNhMTlkZDU0NzljZmRiY2ZlY2Q5ZjEwNzgyMzQxNmY2NGQ=

data/lib/jenkins_pipeline_builder/pull_request.rb

@@ -70,11 +70,10 @@ module JenkinsPipelineBuilder
       @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]
+      return unless pull_generator[:value][: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]
+      key = pull_generator[:value][:inject_pr_into].to_sym
+      project[:value][key] = "{{#{key}}}-PR#{@number}" if project[:value]
     end
 
     # Apply any specified changes to each job

data/lib/jenkins_pipeline_builder/version.rb

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

data/spec/lib/jenkins_pipeline_builder/pull_request_spec.rb

@@ -95,7 +95,6 @@ describe JenkinsPipelineBuilder::PullRequest do
       {
         name: 'pull_req_test',
         type: :project,
-        inject_pr_into: :app_name,
         app_name: 'my_app',
         value: {
           name: 'pull_req_test',
@@ -113,6 +112,7 @@ describe JenkinsPipelineBuilder::PullRequest do
         git_repo: 'jenkins_pipeline_builder',
         git_org: 'constantcontact',
         value: {
+          inject_pr_into: :app_name,
           jobs: ['{{app_name}}-10', '{{app_name}}-11']
         },
         builders: [
@@ -143,8 +143,7 @@ describe JenkinsPipelineBuilder::PullRequest do
     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'
+      expect(pull.project[:value][:app_name]).to eq '{{app_name}}-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.15
+  version: 0.10.16
 platform: ruby
 authors:
 - Igor Moochnick