jenkins_pipeline_builder 0.10.6 → 0.10.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGVhNGM1N2I0MzllNGY3NWQwZTE4ODUyYTBlNjg3M2UyZjQyYmMzOQ==
+    OWYzMTYyMGFlYjRiMmQ4ZjFlYzZiOWNiNjkwOTE4NzI4ZWIxN2NmOA==
   data.tar.gz: !binary |-
-    YjJlYTdjNTFhYTdlODVkMWEwNjI3MWE3YmE1MzA4ZjhlM2Y1MTY3Mw==
+    ODY2NmNmNmM4NzQxNjljNDIxNGNkMGU5MzRlYjMyZmI0ZDVkZWMyMg==
 SHA512:
   metadata.gz: !binary |-
-    NjU5YzFhZTQ0MmYyZjlmOTBiZGM2OTQ5YmNiZDM1YWUyZWZhNTRjNTZhOWY3
-    NzIzZGI4MTMwZDJhZmE1YjJjNDNmOTY1NmU5OTEzNjE1YmZlMjBiNzNhMjU2
-    YTlkNDU3MjliODdlYzUzODg3OGIwNjQ0NzA2ZGI2NjQyZTdhZmM=
+    MTg4YWY5NTkxMzc5OTkzMmM0OGMxYzFkMmIzMjRjZjEzNDE3YjM4ZjgxM2Qx
+    YTllYzk0MWYxNjVkMDFkMDk1OGNiNjhhOGNjYTk0MmVkNmVkZWQ0NGFlZjQy
+    NWM4MDQ0NDI2YWU3NDVmNDk3NzVkNmQ5NWZkMDhmNDUwYzhlNjY=
   data.tar.gz: !binary |-
-    ZWRmODUwZmFkZDQ1N2ZmZGJkNDU3ZDc1OGM1MTU5OGVlMWNiMGJmNTc3ODg2
-    N2FjNTJlYjllOWZmMjEzM2U5MmEzNzdkMTExYmRhZjI0MGI4NDE5ZmZmM2U5
-    ODU4Y2JlZjI5MWI3YWZlMDdlYTViMWI3ZGJmNThlZWM2NjkzNjA=
+    NjUzYzYwMDhkMDE3N2U0OWM1ZjQ0NjIxOGVjN2Q0OWYzZTI3OGRhMmYyMzg4
+    NTVjOGZhYWM1Njk1MTU3NWJkOGM0NjYxMzJkNjZjNzZkMDY3MzUwNzk4OGFk
+    NDU0ODE3NWJmM2M2MmE3NGExNjYxMjg5ZjQwYjFlMWIwNDE1OWE=

data/lib/jenkins_pipeline_builder/extensions/wrappers.rb

@@ -90,9 +90,15 @@ wrapper do
   jenkins_name 'Inject passwords to the build as environment variables'
   announced false
 
-  xml do |passwords|
+  xml do |wrapper|
     EnvInjectPasswordWrapper do
-      injectGlobalPasswords false
+      if wrapper.is_a? Array
+        passwords = wrapper
+      else
+        injectGlobalPasswords wrapper[:inject_global_passwords]
+        passwords = wrapper[:passwords]
+      end
+      break unless passwords
       passwordEntries do
         passwords.each do |password|
           EnvInjectPasswordEntry do

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.10.6'
+  VERSION = '0.10.7'
 end

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

@@ -75,6 +75,36 @@ describe 'wrappers' do
     end
   end
 
+  context 'inject_passwords' do
+    before :each do
+      JenkinsPipelineBuilder.registry.registry[:job][:wrappers][:inject_passwords].installed_version = '0.0'
+    end
+
+    it 'generates correct xml with the old way' do
+      wrapper = { wrappers: { inject_passwords: [{ name: 'x', value: 'y' }] } }
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', wrapper, @n_xml)
+      path = '//buildWrappers/EnvInjectPasswordWrapper/passwordEntries/EnvInjectPasswordEntry[last()]/name'
+      node = @n_xml.root.xpath(path)
+      expect(node.first.content).to eq('x')
+    end
+
+    it 'generates correct xml with the new way' do
+      wrapper = { wrappers: { inject_passwords: { passwords: [{ name: 'x', value: 'y' }] } } }
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', wrapper, @n_xml)
+      path = '//buildWrappers/EnvInjectPasswordWrapper/passwordEntries/EnvInjectPasswordEntry[last()]/name'
+      node = @n_xml.root.xpath(path)
+      expect(node.first.content).to eq('x')
+    end
+
+    it 'generates correct xml without passwords' do
+      wrapper = { wrappers: { inject_passwords: { inject_global_passwords: true } } }
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', wrapper, @n_xml)
+      path = '//buildWrappers/EnvInjectPasswordWrapper/injectGlobalPasswords'
+      node = @n_xml.root.xpath(path)
+      expect(node.first.content).to be_truthy
+    end
+  end
+
   context 'nodejs' do
     before :each do
       JenkinsPipelineBuilder.registry.registry[:job][:wrappers][:nodejs].installed_version = '0.0'

metadata

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