jenkins_pipeline_builder 0.13.2 → 0.13.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjllMWFlNjVkNjkzMzFlODlmMDkwNDExNWU5NWVhZjg3YWY2ZmViOQ==
+    MDc1ZDNkY2I3M2NkYTk4OThlMTNlMjA0MDkwN2QwYmU0MzEyMzVjNg==
   data.tar.gz: !binary |-
-    MTlkNTMyODljMzdmY2I5YWIxZjdjZjZkOTNjZTBhZjBkZTE1YjEyOA==
+    ZmM5YTA3NWZkYzRmZWYwMDE1Y2I0ZThhNjM0ZDY4YTAxZmNiYTlkNw==
 SHA512:
   metadata.gz: !binary |-
-    NzFjNGI2ODhkYmNlNDA0OTVlMjA3MDQ3N2I2ZDM1Nzg1MDM3ZDZhYWFkNDAw
-    YThhYWQ2ZTZlMDliOTQ4YTM1YjYxMmE5MzY4MWU4Y2Y4NDY1MTU1MjU0YWU4
-    ZDEzYmI3MzU4NDA5ZGZiMTRkOGZhMThjMzBkYWVhZDE3OGM1NWU=
+    MTBkM2VhYTMzOTNjZTA2NWVkYjgzNjQ4MzE3N2Y4OGIyNjQ1YWZjNmZhMWEw
+    NzA2YmE5OWJlNzUzNzg0OTYxYWJjOGM3ODE1NjczNzFkMzQwZjRhOTI0NTAx
+    ODk2NGFkNTgzMjQ5N2VlYjljZWNmNmE2MWNlMmE3MTgyZTE2MDE=
   data.tar.gz: !binary |-
-    ZWZhNzQ2ZTBiYjMwN2M3ZDUyMWQ3ZWI5NDI0MmNjYTQwOWJjZDJmMDc1ZWQw
-    MDhkOWMyNWY0ODdhZmQyYThhZDllNjgxY2Q2OWI1YzZkMTAwNTEzYWQ5MmU4
-    YjA1Yzg3MTZhYzY0MTgwZDU4ZjRlZjM2ZjYzZTcxODI0ZTY4Yzk=
+    Zjc4M2JlNTkyMDYwMmNkMzhkNmIzYTBkOTVjMmE3MGFiNzc2YmQwMDhhMmJk
+    MTA2Yjc0MzFlMzU1ODczODlkNjgyMzE2NjE5OThhMjc2MDdkYjA3NTZmOTdm
+    ZmNlMzhmY2U4NGEyZmQ4OTQ4NDkxMDdjNGUzMGNhOTAyODlhNTM=

data/lib/jenkins_pipeline_builder/generator.rb

@@ -93,7 +93,7 @@ module JenkinsPipelineBuilder
       defaults = job_collection.defaults
       settings = defaults.nil? ? {} : defaults[:value] || {}
       compiler = JenkinsPipelineBuilder::Compiler.new self
-      project[:settings] = compiler.get_settings_bag(project, settings) unless project[:settings]
+      project[:settings] = compiler.get_settings_bag(project, settings)
 
       errors = process_project project
       print_project_errors errors

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.13.2'
+  VERSION = '0.13.3'
 end

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -163,6 +163,24 @@ describe JenkinsPipelineBuilder::Generator do
       expect(pr_generator).to receive(:open_prs).and_return [1, 2]
       expect(@generator.pull_request(path, job_name)).to be_truthy
     end
+
+    it 'refreshes the project settings everytime' 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(:delete_closed_prs)
+      pr_generator.stub(:convert!) do |job_collection, pr|
+        job_collection.defaults[:value][:application_name] = "testapp-PR#{pr}"
+      end
+      expect(pr_generator).to receive(:open_prs).and_return [1, 2]
+      expect(@generator.pull_request(path, job_name)).to be_truthy
+      expect(@generator.job_collection.projects.first[:settings][:application_name]).to eq 'testapp-PR2'
+    end
     # Things to check for
     # Fail - no PR job type found
     # Encounters failure during build process

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri