jenkins_pipeline_builder 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c9eaa60f562aa024ee5a9b44bdb38a5449e9a41
-  data.tar.gz: a3e1a81c570cfa3fefa4d81aa5e03e6182a0073f
+  metadata.gz: a578698f30c71e6c28107103857b4be73e8dfa4f
+  data.tar.gz: 57ea00034bf5cebd16d3ced5a886c027456e2c0a
 SHA512:
-  metadata.gz: e19ef3c9750c89d0aa696a0c252faef6de04177e4c6288fafbd1339cab7a2ceeafd7764055ec25015c81f3afb8edffeeef1d794fe4d8f261c379b10b9d57781a
-  data.tar.gz: 564e2f4f913f581bb9ac35a5dd7d7874f823ad1051500664d2bc2d1d1cabc5313bfa3b3482a7b29da76f4ce8e06c600d3c7760ad19d4450ddbc0f529f42c941a
+  metadata.gz: 7512de621f5099fcfd7b1324fc99f3deab84f6cd52d8add4b6bd9e65f1bf3fcabd02f98157a0afa1372047b84493e3a2d78ba7ecb77008d2228e012501e48805
+  data.tar.gz: 790629f860d9db07c16a8a158ecad15e6b9378c6e8b8e05c69c3a20ea7f28a96b61f7671877da8f0d399dfc51147282503a932f78a1d8d020a5e8763b490f958

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -19,7 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-
 # Promotion specific job attributes
 job_attribute do
   name :promotion_description
@@ -272,19 +271,27 @@ job_attribute do
   jenkins_name 'HipChat Notifications'
   announced false
 
-  xml path: '//properties' do |params|
-    raise 'No HipChat room specified' unless params[:room]
-
-    send('jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty') do
-      room params[:room]
-      # :'start-notify' is legacy and evil, but I don't want anyone complaining
-      startNotification params[:start_notify] || params[:'start-notify'] || false
-      notifySuccess params[:success_notify] || true
-      notifyFailure params[:failure_notify] || true
-      notifyBackToNormal params[:normal_notify] || true
-      notifyAborted params[:aborted_notify] || true
-      notifyNotBuilt params[:notbuilt_notify] || false
-      notifyUnstable params[:unstable_notify] || true
+  version '0' do
+    xml path: '//properties' do |params|
+      raise 'No HipChat room specified' unless params[:room]
+
+      send('jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty') do
+        room params[:room]
+        # :'start-notify' is legacy and evil, but I don't want anyone complaining
+        startNotification params[:start_notify] || params[:'start-notify'] || false
+        notifySuccess params[:success_notify] || true
+        notifyFailure params[:failure_notify] || true
+        notifyBackToNormal params[:normal_notify] || true
+        notifyAborted params[:aborted_notify] || true
+        notifyNotBuilt params[:notbuilt_notify] || false
+        notifyUnstable params[:unstable_notify] || true
+      end
+    end
+  end
+  # The xml laid  down for previous versions of the hipchat notifier require the above xml format
+  # However, version 2.0.0 specifically needs that xml to not be there.
+  version '2.0.0' do
+    xml path: '//properties' do |_params|
     end
   end
 end

data/lib/jenkins_pipeline_builder/extensions/publishers.rb

@@ -18,7 +18,6 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
 publisher do
   name :description_setter
   plugin_id 'description-setter'
@@ -114,68 +113,70 @@ publisher do
       send('jenkins.plugins.hipchat.HipChatNotifier') do
         credentialId params[:credential_id] || ''
         room params[:room] || ''
-        send('notifications') do
-          if startNotification params[:start_notify]
-            send('jenkins.plugins.hipchat.model.NotificationConfig') do
-              notifyEnabled params[:enabled_notify] || false
-              textFormat params[:text_format] || false
-              notificationType params[:notification_type] || 'STARTED'
-              color params[:color] || ''
-              messageTemplate params[:message_template] || ''
+        if params[:notifications]
+          send('notifications') do
+            if params[:notifications][:start_notify]
+              send('jenkins.plugins.hipchat.model.NotificationConfig') do
+                notifyEnabled params[:notifications][:start_notify][:enabled_notify] || false
+                textFormat params[:notifications][:start_notify][:text_format] || false
+                notificationType params[:notifications][:start_notify][:notification_type] || 'STARTED'
+                color params[:notifications][:start_notify][:color] || ''
+                messageTemplate params[:notifications][:start_notify][:message_template] || ''
+              end
             end
-          end
-          if notifySuccess params[:success_notify]
-            send('jenkins.plugins.hipchat.model.NotificationConfig') do
-              notifyEnabled params[:enabled_notify] || false
-              textFormat params[:text_format] || false
-              notificationType params[:notification_type] || 'SUCCESS'
-              color params[:color] || ''
-              messageTemplate params[:message_template] || ''
+            if params[:notifications][:success_notify]
+              send('jenkins.plugins.hipchat.model.NotificationConfig') do
+                notifyEnabled params[:notifications][:success_notify][:enabled_notify] || false
+                textFormat params[:notifications][:success_notify][:text_format] || false
+                notificationType params[:notifications][:success_notify][:notification_type] || 'SUCCESS'
+                color params[:notifications][:success_notify][:color] || ''
+                messageTemplate params[:notifications][:success_notify][:message_template] || ''
+              end
             end
-          end
-          if notifyFailure params[:failure_notify]
-            send('jenkins.plugins.hipchat.model.NotificationConfig') do
-              notifyEnabled params[:enabled_notify] || false
-              textFormat params[:text_format] || false
-              notificationType params[:notification_type] || 'FAILURE'
-              color params[:color] || ''
-              messageTemplate params[:message_template] || ''
+            if params[:notifications][:failure_notify]
+              send('jenkins.plugins.hipchat.model.NotificationConfig') do
+                notifyEnabled params[:notifications][:failure_notify][:enabled_notify] || false
+                textFormat params[:notifications][:failure_notify][:text_format] || false
+                notificationType params[:notifications][:failure_notify][:notification_type] || 'FAILURE'
+                color params[:notifications][:failure_notify][:color] || ''
+                messageTemplate params[:notifications][:failure_notify][:message_template] || ''
+              end
             end
-          end
-          if notifyBackToNormal params[:normal_notify]
-            send('jenkins.plugins.hipchat.model.NotificationConfig') do
-              notifyEnabled params[:enabled_notify] || false
-              textFormat params[:text_format] || false
-              notificationType params[:notification_type] || 'BACK_TO_NORMAL'
-              color params[:color] || ''
-              messageTemplate params[:message_template] || ''
+            if params[:notifications][:normal_notify]
+              send('jenkins.plugins.hipchat.model.NotificationConfig') do
+                notifyEnabled params[:notifications][:normal_notify][:enabled_notify] || false
+                textFormat params[:notifications][:normal_notify][:text_format] || false
+                notificationType params[:notifications][:normal_notify][:notification_type] || 'BACK_TO_NORMAL'
+                color params[:notifications][:normal_notify][:color] || ''
+                messageTemplate params[:notifications][:normal_notify][:message_template] || ''
+              end
             end
-          end
-          if notifyAborted params[:aborted_notify]
-            send('jenkins.plugins.hipchat.model.NotificationConfig') do
-              notifyEnabled params[:enabled_notify] || false
-              textFormat params[:text_format] || false
-              notificationType params[:notification_type] || 'ABORTED'
-              color params[:color] || ''
-              messageTemplate params[:message_template] || ''
+            if params[:notifications][:aborted_notify]
+              send('jenkins.plugins.hipchat.model.NotificationConfig') do
+                notifyEnabled params[:notifications][:aborted_notify][:enabled_notify] || false
+                textFormat params[:notifications][:aborted_notify][:text_format] || false
+                notificationType params[:notifications][:aborted_notify][:notification_type] || 'ABORTED'
+                color params[:notifications][:aborted_notify][:color] || ''
+                messageTemplate params[:notifications][:aborted_notify][:message_template] || ''
+              end
             end
-          end
-          if notifyNotBuilt params[:notbuilt_notify]
-            send('jenkins.plugins.hipchat.model.NotificationConfig') do
-              notifyEnabled params[:enabled_notify] || false
-              textFormat params[:text_format] || false
-              notificationType params[:notification_type] || 'NOT_BUILT'
-              color params[:color] || ''
-              messageTemplate params[:message_template] || ''
+            if params[:notifications][:notbuilt_notify]
+              send('jenkins.plugins.hipchat.model.NotificationConfig') do
+                notifyEnabled params[:notifications][:notbuilt_notify][:notifications][:notbuilt_notify][:enabled_notify] || false
+                textFormat params[:notifications][:notbuilt_notify][:notifications][:notbuilt_notify][:text_format] || false
+                notificationType params[:notifications][:notbuilt_notify][:notification_type] || 'NOT_BUILT'
+                color params[:notifications][:notbuilt_notify][:color] || ''
+                messageTemplate params[:notifications][:notbuilt_notify][:message_template] || ''
+              end
             end
-          end
-          if notifyUnstable params[:unstable_notify]
-            send('jenkins.plugins.hipchat.model.NotificationConfig') do
-              notifyEnabled params[:enabled_notify] || false
-              textFormat params[:text_format] || false
-              notificationType params[:notification_type] || 'UNSTABLE'
-              color params[:color] || ''
-              messageTemplate params[:message_template] || ''
+            if params[:notifications][:unstable_notify]
+              send('jenkins.plugins.hipchat.model.NotificationConfig') do
+                notifyEnabled params[:notifications][:unstable_notify][:enabled_notify] || false
+                textFormat params[:notifications][:unstable_notify][:text_format] || false
+                notificationType params[:notifications][:unstable_notify][:notification_type] || 'UNSTABLE'
+                color params[:notifications][:unstable_notify][:color] || ''
+                messageTemplate params[:notifications][:unstable_notify][:message_template] || ''
+              end
             end
           end
         end

data/lib/jenkins_pipeline_builder/module_registry.rb

@@ -62,7 +62,6 @@ module JenkinsPipelineBuilder
       root = prefix.inject(@registry, :[])
       root[name] = {} unless root[name]
       # TODO: Set installed version here
-
       if root[name][set.name]
         root[name][set.name].merge set
       else

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

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

@@ -188,25 +188,55 @@ describe 'publishers' do
         publisher = @n_xml.root.children.first
         expect(publisher.name).to match 'jenkins.plugins.hipchat.HipChatNotifier'
         children = publisher.children.map(&:name)
+        expect(children).not_to include 'notifySuccess'
         expect(children).to include 'credentialId'
         expect(children).to include 'room'
-        expect(children).to include 'notifications'
         expect(children).to include 'startJobMessage'
         expect(children).to include 'completeJobMessage'
       end
 
       it 'instantiates notification parameters' do
-        params = { publishers: { hipchat: {} } }
+        params = { publishers: { hipchat: { notifications: {
+          start_notify: {
+            enabled_notify: true,
+            text_format: false,
+            notification_type: 'STARTED',
+            color: 'GREEN',
+            message_template: ''
+          },
+          failure_notify: {
+            enabled_notify: true,
+            text_format: true,
+            notification_type: 'FAILURE',
+            color: 'RED',
+            message_template: ''
+          }
+        } } } }
         JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
 
         publisher = @n_xml.root.children.first
         expect(publisher.name).to match 'jenkins.plugins.hipchat.HipChatNotifier'
-        children = publisher.children.children.children.map(&:name)
-        expect(children).to include 'notifyEnabled'
-        expect(children).to include 'textFormat'
-        expect(children).to include 'notificationType'
-        expect(children).to include 'color'
-        expect(children).to include 'messageTemplate'
+
+        start_notify_config = @n_xml.root.children.children[2].children[0]
+        puts start_notify_config
+        failure_notify_config = @n_xml.root.children.children[2].children[1]
+        start_notify_children = start_notify_config.children.map(&:name)
+        start_color = start_notify_config.children[3].children.map(&:text)
+        failure_color = failure_notify_config.children[3].children.map(&:text)
+        expect(start_notify_children).to include 'notifyEnabled'
+        expect(start_notify_children).to include 'textFormat'
+        expect(start_notify_children).to include 'notificationType'
+        expect(start_notify_children).to include 'color'
+        expect(start_notify_children).to include 'messageTemplate'
+        expect(start_color).to include 'GREEN'
+
+        failure_notify_children = failure_notify_config.children.map(&:name)
+        expect(failure_notify_children).to include 'notifyEnabled'
+        expect(failure_notify_children).to include 'textFormat'
+        expect(failure_notify_children).to include 'notificationType'
+        expect(failure_notify_children).to include 'color'
+        expect(failure_color).to include 'RED'
+        expect(failure_notify_children).to include 'messageTemplate'
       end
     end
 
@@ -217,7 +247,22 @@ describe 'publishers' do
         )
       end
       it 'generates a configuration' do
-        params = { publishers: { hipchat: {} } }
+        params = { publishers: { hipchat: { notifications: {
+          start_notify: {
+            enabled_notify: true,
+            text_format: false,
+            notification_type: 'STARTED',
+            color: 'GREEN',
+            message_template: ''
+          },
+          failure_notify: {
+            enabled_notify: true,
+            text_format: true,
+            notification_type: 'FAILURE',
+            color: 'RED',
+            message_template: ''
+          }
+        } } } }
         hipchat = JenkinsPipelineBuilder.registry.registry[:job][:publishers][:hipchat]
         expect(hipchat.extension.min_version).to eq '0.1.9'
 

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

@@ -65,7 +65,7 @@ JOB_ATTRIBUTES = {
   jdk: ['0'],
   disabled: ['0'],
   discard_old: ['0'],
-  hipchat: ['0'],
+  hipchat: ['0', '2.0.0'],
   inject_env_vars_pre_scm: ['0'],
   parameters: ['0'],
   shared_workspace: ['0'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -484,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: This gem is will boostrap your Jenkins pipelines