jenkins_pipeline_builder 0.11.2 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MThjM2Q2MDE2YmY4OGZmNDc1ODdlYzM3NmViNGQ2NTQyMzcwMGMyYQ==
+    NTI4NWI4YWJjMDk4MzJiNzgzMTAwZWJhYzE0ZDJmYTQzYWFlZDEyYw==
   data.tar.gz: !binary |-
-    ZjJlZjk0MWIwOGVkZWI1NWNlYzUwZjFkNGE0YThlYzhkYzBhNjc0Mw==
+    YmJiMGY3NzU0ODEwY2ZkMzUyZGZjOTQzZTlmZGRkMTRiMzVkMDIxMg==
 SHA512:
   metadata.gz: !binary |-
-    NjdhYzliMzJjZWFiMDkzYTFjNGJlMmU1OTA3NzViOGQ4OTdiOGE4N2Y5YWVj
-    ZTZmYzBiODBjNGQzMzRkMTJhZWEwZGZmZTFlNjQ1ZjE5NjFkMDZiYjVhMmIz
-    YzkyNzBlNmQ0YTY4NTQwMTdmNDA2N2FjYmU1YWI1YjViOGMwOGY=
+    MTVjYmM2M2E4MjZiM2RjNTQ3OTIyZTdlMTgxOTE3MGMzZGQyZmQ4M2VlNTgz
+    YTVmZmQxZGFjZjU0YmZjNDYxM2Q4MWI0ZTlmZmYxZGQ0YTBkOGVkMGEzYzMz
+    YTY4ZjM2OTVmMDI2NWNlMzc4ZTZiNTE0M2JhM2E4ZDY1MGFhYmI=
   data.tar.gz: !binary |-
-    ODRmNDRiMTU0NzhlYzgzYzRlMDc1MDU4OGE5OWFhYTNmNDFiNzE5NjdhNGZj
-    NDE1MTUzMjFmYmI5MWM4NjkyNTIxYTNhMzVjMmMyZDg0MzkxNDc3YmFkNmJi
-    M2ZkMDAxM2Q5YmQ4NTQ2ZjIyZjA5Nzc3OGZmZjc1MTQ3OTFmZjM=
+    ZWM5MzhiOGU2MGY5NWMzZGU4NGVjYTc3NzdhYjlhNzEzZDNjN2Q2YTg3NTVk
+    YzYxYjgwZDJkMzY1YTgxODk0Y2M5ZmVhOGUyZWNmZGE4NzBiMmNlYmE3ZmFk
+    NDIyMzY0NDU1ZTJjNzRhYzVjMTEyMWU2Y2U3MzkxYzlhMjQ1Y2Y=

data/.rubocop.yml

@@ -5,7 +5,7 @@ Metrics/AbcSize:
 Metrics/MethodLength:
   Max: 20
 Metrics/ClassLength:
-  Max: 180
+  Max: 190
 
 #######
 # Finalized settings

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -27,6 +27,7 @@ require 'jenkins_api_client'
 require 'open-uri'
 require 'zlib'
 require 'archive/tar/minitar'
+require 'resolv'
 
 module JenkinsPipelineBuilder
   module CLI

data/lib/jenkins_pipeline_builder/extensions/builders.rb

@@ -296,3 +296,59 @@ builder do
     end
   end
 end
+
+builder do
+  name :checkmarx_scan
+  plugin_id 'checkmarx'
+  description 'Jenkins plugin for checkmarx security audit'
+  jenkins_name 'Trigger a checkmarx security audit of your build'
+  announced false
+  parameters [
+    :serverUrl,
+    :useOwnServerCredentials,
+    :username,
+    :password,
+    :incremental,
+    :isThisBuildIncremental,
+    :projectName,
+    :groupId,
+    :skipSCMTriggers,
+    :waitForResultsEnabled,
+    :vulnerabilityThresholdEnabled,
+    :highThreshold,
+    :mediumThreshold,
+    :lowThreshold,
+    :preset,
+    :presetSpecified,
+    :generatePdfReport,
+    :excludeFolders,
+    :fullScansScheduled,
+    :filterPattern
+  ]
+
+  xml do |params|
+    send('com.checkmarx.jenkins.CxScanBuilder', 'plugin' => 'checkmarx@7.1.8-24') do
+      useOwnServerCredentials params[:useOwnServerCredentials]
+      serverUrl params[:serverUrl]
+      useOwnServerCredentials params[:useOwnServerCredentials]
+      username params[:username]
+      password params[:password]
+      incremental params[:incremental]
+      isThisBuildIncremental params[:isThisBuildIncremental]
+      projectName params[:projectName]
+      groupId params[:groupId]
+      skipSCMTriggers params[:skipSCMTriggers]
+      waitForResultsEnabled params[:waitForResultsEnabled]
+      vulnerabilityThresholdEnabled params[:vulnerabilityThresholdEnabled]
+      highThreshold params[:highThreshold]
+      mediumThreshold params[:mediumThreshold]
+      lowThreshold params[:lowThreshold]
+      generatePdfReport params[:generatePdfReport]
+      excludeFolders params[:excludeFolders]
+      presetSpecified params[:presetSpecified]
+      preset params[:preset]
+      fullScansScheduled params[:fullScansScheduled]
+      filterPattern params[:filterPattern]
+    end
+  end
+end

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -77,8 +77,7 @@ job_attribute do
     # XML preprocessing
     # TODO: Actually figure out how to merge using the builder DSL
     # This delete the things we are going to add later is pretty crappy
-    # Alternately don't use/tweak the xml the api client generates
-    # (which is where I assume this is coming from)
+    # Alternately don't use/tweak the xml the jenkins_api_client generates
     before do |params|
       xpath('//scm/localBranch').remove if params[:local_branch]
       xpath('//scm/recursiveSubmodules').remove if params[:recursive_update]
@@ -126,13 +125,20 @@ job_attribute do
       :refspec,
       :remote_name,
       :remote_url,
+      :skip_tag,
       :wipe_workspace
     ]
 
     before do |params|
       remote_url = xpath('//scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url').first
       params[:remote_url] = remote_url.content if remote_url
+
+      # XML preprocessing
+      # TODO: Actually figure out how to merge using the builder DSL
+      # This delete the things we are going to add later is pretty crappy
+      # Alternately don't use/tweak the xml the jenkins_api_client generates
       xpath('//scm/userRemoteConfigs').remove
+      xpath('//scm/skipTag').remove if params[:skip_tag]
     end
 
     xml path: '//scm' do |params|
@@ -147,6 +153,7 @@ job_attribute do
       end
       doGenerateSubmoduleConfigurations false
       submoduleCfg
+      skipTag params[:skip_tag] if params[:skip_tag]
       extensions do
         if params[:changelog_to_branch]
           opts = params[:changelog_to_branch]

data/lib/jenkins_pipeline_builder/extensions/publishers.rb

@@ -305,7 +305,7 @@ publisher do
 
   xml do |params|
     send('hudson.plugins.sonar.SonarPublisher') do
-      jdk '(Inherit From Job)'
+      jdk params[:jdk] || '(Inherit From Job)'
       branch params[:branch] || ''
       language
       mavenOpts

data/lib/jenkins_pipeline_builder/generator.rb

@@ -205,21 +205,31 @@ module JenkinsPipelineBuilder
       end
     end
 
-    def publish_project(project_name, errors = {})
-      job_collection.projects.each do |project|
-        next unless project_name.nil? || project[:name] == project_name
-        success, payload = resolve_project(project)
-        if success
-          logger.info 'successfully resolved project'
-          compiled_project = payload
-        else
-          return { project_name: 'Failed to resolve' }
-        end
+    def create_jobs_and_views(project)
+      success, payload = resolve_project(project)
+      if success
+        logger.info 'successfully resolved project'
+        compiled_project = payload
+      else
+        return { project_name: 'Failed to resolve' }
+      end
 
-        errors = publish_jobs(compiled_project[:value][:jobs]) if compiled_project[:value][:jobs]
-        next unless compiled_project[:value][:views]
-        create_views compiled_project[:value][:views]
+      errors = publish_jobs(compiled_project[:value][:jobs]) if compiled_project[:value][:jobs]
+      return errors unless compiled_project[:value][:views]
+      create_views compiled_project[:value][:views]
+      errors
+    end
+
+    def publish_project(project_name)
+      return {} if project_name.nil?
+      errors = {}
+      found = false
+      job_collection.projects.each do |project|
+        next unless project[:name] == project_name
+        found = true
+        errors = create_jobs_and_views(project)
       end
+      fail "Project #{project_name} not found!" unless found
       errors
     end
 

data/lib/jenkins_pipeline_builder/version.rb

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

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

@@ -205,7 +205,8 @@ describe 'job_attributes' do
             remote_name: :foo,
             refspec: :refspec,
             remote_url: :remote_url,
-            credentials_id: :creds
+            credentials_id: :creds,
+            skip_tag: true
           },
           scm_url: 'http://foo.com'
         }
@@ -238,6 +239,7 @@ describe 'job_attributes' do
         expect(scm_config.css('includedRegions').first.content).to eq 'included_region'
         expect(scm_config.css('excludedRegions').first.content).to eq 'excluded_region'
         expect(scm_config.css('credentialsId').first.content).to eq 'creds'
+        expect(scm_config.css('skipTag').first.content).to eq 'true'
       end
     end
 

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

@@ -69,6 +69,26 @@ describe 'publishers' do
       root_pom = sonar_nodes.select { |node| node.name == 'rootPom' }
       expect(root_pom.first.content).to match 'project_war/pom.xml'
     end
+
+    it 'populates the jdk by with default' do
+      params = { publishers: { sonar_result: {} } }
+
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+      sonar_nodes = @n_xml.root.children.first.children
+      root_pom = sonar_nodes.select { |node| node.name == 'jdk' }
+      expect(root_pom.first.content).to match '(Inherit From Job)'
+    end
+
+    it 'populates the jdk by' do
+      params = { publishers: { sonar_result: { jdk: 'java8' } } }
+
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+      sonar_nodes = @n_xml.root.children.first.children
+      root_pom = sonar_nodes.select { |node| node.name == 'jdk' }
+      expect(root_pom.first.content).to match 'java8'
+    end
   end
 
   context 'description_setter' do

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

@@ -38,7 +38,8 @@ BUILDERS = {
   maven3: ['0'],
   multi_job: ['0'],
   remote_job: ['0'],
-  shell_command: ['0']
+  shell_command: ['0'],
+  checkmarx_scan: ['0']
 }
 TRIGGERS = {
   git_push: ['0'],

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -68,6 +68,10 @@ describe JenkinsPipelineBuilder::Generator do
       File.expand_path("../fixtures/generator_tests/#{fixture}", __FILE__)
     end
 
+    it 'raises an error when a specified project does not exist' do
+      expect { bootstrap(fixture_path('sample_pipeline'), 'Nopers') }.to raise_error
+    end
+
     it 'produces no errors while creating pipeline SamplePipeline with view' do
       errors = bootstrap(fixture_path('sample_pipeline'), 'SamplePipeline')
       expect(errors).to be_empty

metadata

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