jenkins_pipeline_builder 0.12.0 → 0.12.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTI4NWI4YWJjMDk4MzJiNzgzMTAwZWJhYzE0ZDJmYTQzYWFlZDEyYw==
+    NTE5YjExNDk4YWIyNzM4OWZkYTI2MWEyNWZjODFmODk4YmJhMDA0OA==
   data.tar.gz: !binary |-
-    YmJiMGY3NzU0ODEwY2ZkMzUyZGZjOTQzZTlmZGRkMTRiMzVkMDIxMg==
+    MDVmZWJiZDg0Yzk1ODYxYzU5NDlmMjJkYTRhODM0NTU5YzgyMDBjYw==
 SHA512:
   metadata.gz: !binary |-
-    MTVjYmM2M2E4MjZiM2RjNTQ3OTIyZTdlMTgxOTE3MGMzZGQyZmQ4M2VlNTgz
-    YTVmZmQxZGFjZjU0YmZjNDYxM2Q4MWI0ZTlmZmYxZGQ0YTBkOGVkMGEzYzMz
-    YTY4ZjM2OTVmMDI2NWNlMzc4ZTZiNTE0M2JhM2E4ZDY1MGFhYmI=
+    NDU1MzcyYWQzNjg3ZjFiODcwNWQzNzg4N2U1ZTgyNjBhNjc3MTdlZTk5ZDky
+    MWYxYTM2MjRhMjQ5MDE3Nzc2YWZiYTJmOTAyOWVkYzFiN2I2YzI1OTJlNzMw
+    NDg0NzBhZGU0ZTRjNDgxZTJkZjA0ZjZmNmQ2NDdlYmM2Y2IwZTM=
   data.tar.gz: !binary |-
-    ZWM5MzhiOGU2MGY5NWMzZGU4NGVjYTc3NzdhYjlhNzEzZDNjN2Q2YTg3NTVk
-    YzYxYjgwZDJkMzY1YTgxODk0Y2M5ZmVhOGUyZWNmZGE4NzBiMmNlYmE3ZmFk
-    NDIyMzY0NDU1ZTJjNzRhYzVjMTEyMWU2Y2U3MzkxYzlhMjQ1Y2Y=
+    OTViNzJiYzI5OTk3ZWQ0MzhhMzk4M2I2ZmMwMTMxMWE1NDllODFmZDUxYzY4
+    MGFkMWY0MzM1YmY0ZGQzYzJhYjQxMDRkN2MxY2ViMTk0ZDdiNWU3MDg3MjAx
+    NmNmNDg2Y2E2N2QyZjQ1OTQwODM4ZDFmYTVjOTcyNTIzNDA3NGU=

data/lib/jenkins_pipeline_builder/extensions/builders.rb

@@ -297,6 +297,36 @@ builder do
   end
 end
 
+builder do
+  name :system_groovy
+  plugin_id 'groovy'
+  description 'Lets you run groovy scripts as a build step.'
+  jenkins_name 'System Groovy'
+  announced false
+
+  xml do |params|
+    send('hudson.plugins.groovy.SystemGroovy', 'plugin' => 'groovy@1.24') do
+      if params.key?(:script) && params.key?(:file)
+        fail 'Configuration invalid. Both \'script\' and \'file\' keys can not be specified'
+      end
+      unless params.key?(:script) || params.key?(:file)
+        fail 'Configuration invalid. At least one of \'script\' and \'file\' keys must be specified'
+      end
+
+      scriptSource('class' => 'hudson.plugins.groovy.StringScriptSource') do
+        command params[:script]
+      end if params.key? :script
+
+      scriptSource('class' => 'hudson.plugins.groovy.FileScriptSource') do
+        scriptFile params[:file]
+      end if params.key? :file
+
+      bindings params[:bindings]
+      classpath params[:classpath]
+    end
+  end
+end
+
 builder do
   name :checkmarx_scan
   plugin_id 'checkmarx'

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -36,6 +36,18 @@ job_attribute do
   end
 end
 
+job_attribute do
+  name :jdk
+  plugin_id 'builtin'
+  description 'This is the jdk used in the job.'
+  jenkins_name 'JDK'
+  announced false
+
+  xml path: '//project' do |jdk|
+    jdk "#{jdk}"
+  end
+end
+
 job_attribute do
   name :disabled
   plugin_id 'builtin'

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

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

@@ -137,4 +137,74 @@ describe 'builders' do
       end
     end
   end
+
+  context 'system_groovy' do
+    error = ''
+    before :each do
+      error = ''
+      allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(
+        list_installed: { 'groovy' => '1.24' })
+
+      begin
+        JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+      rescue RuntimeError => boom
+        puts "Caught error #{boom}"
+        error = boom.to_s
+      end
+      builder = @n_xml.root.children.first
+      expect(builder.name).to match 'hudson.plugins.groovy.SystemGroovy'
+    end
+
+    context 'script given as string' do
+      let(:params) { { builders: { system_groovy: { script: 'print "Hello world"' } } } }
+
+      it 'generates a configuration' do
+        node = @n_xml.xpath '//hudson.plugins.groovy.SystemGroovy/scriptSource/command'
+        expect(node.children.first.content).to eq 'print "Hello world"'
+      end
+    end
+
+    context 'script given as file' do
+      let(:params) { { builders: { system_groovy: { file: 'myScript.groovy' } } } }
+
+      it 'generates a configuration' do
+        node = @n_xml.xpath '//hudson.plugins.groovy.SystemGroovy/scriptSource/scriptFile'
+        expect(node.children.first.content).to eq 'myScript.groovy'
+      end
+    end
+
+    context 'bindings' do
+      let(:params) { { builders: { system_groovy: { file: 'myScript.groovy', bindings: 'myVar=foo' } } } }
+
+      it 'generates a configuration' do
+        node = @n_xml.xpath '//hudson.plugins.groovy.SystemGroovy/bindings'
+        expect(node.children.first.content).to eq 'myVar=foo'
+      end
+    end
+
+    context 'classpath' do
+      let(:params) { { builders: { system_groovy: { file: 'myScript.groovy', classpath: '/tmp/myJar.jar' } } } }
+
+      it 'generates a configuration' do
+        node = @n_xml.xpath '//hudson.plugins.groovy.SystemGroovy/classpath'
+        expect(node.children.first.content).to eq '/tmp/myJar.jar'
+      end
+    end
+
+    context 'both script and file specified' do
+      let(:params) { { builders: { system_groovy: { file: 'myScript.groovy', script: 'print "Hello world"' } } } }
+
+      it 'fails' do
+        expect(error).to eq 'Configuration invalid. Both \'script\' and \'file\' keys can not be specified'
+      end
+    end
+
+    context 'neither script and file specified' do
+      let(:params) { { builders: { system_groovy: {} } } }
+
+      it 'fails' do
+        expect(error).to eq 'Configuration invalid. At least one of \'script\' and \'file\' keys must be specified'
+      end
+    end
+  end
 end

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

@@ -123,6 +123,20 @@ describe 'job_attributes' do
     end
   end
 
+  context 'jdk' do
+    it 'sets jdk' do
+      params = { jdk: 'JDK-8u45' }
+
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.project
+      end
+      @n_xml = builder.doc
+
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+      expect(@n_xml.root.css('jdk').first.content).to eq 'JDK-8u45'
+    end
+  end
+
   context 'scm params' do
     before :each do
       builder = Nokogiri::XML::Builder.new { |xml| xml.scm }

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

@@ -39,7 +39,8 @@ BUILDERS = {
   multi_job: ['0'],
   remote_job: ['0'],
   shell_command: ['0'],
-  checkmarx_scan: ['0']
+  checkmarx_scan: ['0'],
+  system_groovy: ['0']
 }
 TRIGGERS = {
   git_push: ['0'],
@@ -50,6 +51,7 @@ TRIGGERS = {
 JOB_ATTRIBUTES = {
   concurrent_build: ['0'],
   description: ['0'],
+  jdk: ['0'],
   disabled: ['0'],
   discard_old: ['0'],
   hipchat: ['0'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri