jenkins_pipeline_builder 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40dedb407466d4dbcdca1495e4b10b95dad3d027761eabf815980850f7d55d0c
-  data.tar.gz: 013341f2abbff6d1ec00bf731b20bc615347ea7693afefc459662b2ad4da9c0d
+  metadata.gz: e4d433fdb4421e7ff066fd49444c45abe2d2b29df62228b95b9d0933b0dce7f6
+  data.tar.gz: 2586bd749811dd2848490e146b926e42c7332526282c53ff43c5f706ad49a8fc
 SHA512:
-  metadata.gz: 5c1b776786e820aa08f386c3aa5658f3a6c4fca69f8b2457885fe8751e91f9d83b3e1329c1ba9c0cf23bca314e493de22c569ba48dabc89d043048aa073cde94
-  data.tar.gz: 8dade49ffff55821f81e760d3f37315b3e3355b1a2d804451c810dbdfb978cd9f3e1044f65ec2d7da42eb3064789d747b274a3d4b8776de7248c382c148046e7
+  metadata.gz: 0969f829a1b73b76c1954ea323352f66d346b90b307705016d28d8b1a74987580f4baaea75dc2ba8f5c59b4e7c41039307c2a4b96019cc0a30c8ab51db861940
+  data.tar.gz: 6a02902dc545bdd9e2086503818b0cf9095edbe0964a290140bbe1bd718bb3c0748de2763d5b290f7af05927efafa9299418d1145e843fe1f81f78c9cb5f3302

data/.rubocop.yml

@@ -1,3 +1,8 @@
+AllCops:
+  TargetRubyVersion: 2.1.5
+
+inherit_from: .rubocop_todo.yml
+
 #######
 # WIP These should all go back to defaults at some point
 Metrics/AbcSize:
@@ -33,3 +38,6 @@ Style/VariableName:
 
 Style/SymbolProc:
   IgnoredMethods: new
+
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,59 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-12-13 09:51:35 -0500 using RuboCop version 0.52.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 6
+Lint/UriEscapeUnescape:
+  Exclude:
+    - 'lib/jenkins_pipeline_builder/promotion.rb'
+
+# Offense count: 1
+Lint/Void:
+  Exclude:
+    - 'lib/jenkins_pipeline_builder.rb'
+
+# Offense count: 132
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 420
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect.
+Performance/HashEachMethods:
+  Exclude:
+    - 'lib/jenkins_pipeline_builder/cli/list.rb'
+    - 'lib/jenkins_pipeline_builder/compiler.rb'
+    - 'lib/jenkins_pipeline_builder/extensions.rb'
+    - 'lib/jenkins_pipeline_builder/utils.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/jenkins_pipeline_builder/pull_request_generator.rb'
+
+# Offense count: 1
+Style/MultipleComparison:
+  Exclude:
+    - 'lib/jenkins_pipeline_builder/extensions/publishers.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/jenkins_pipeline_builder/compiler.rb'
+    - 'lib/jenkins_pipeline_builder/module_registry.rb'
+    - 'lib/jenkins_pipeline_builder/remote_dependencies.rb'
+
+Layout/EmptyLinesAroundArguments:
+  Exclude:
+    - 'lib/jenkins_pipeline_builder/extensions/triggers.rb'
+

data/Rakefile

@@ -45,4 +45,4 @@ namespace :doc do
   end
 end
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]

data/jenkins_pipeline_builder.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jenkins_pipeline_builder/version'
@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'jenkins_pipeline_builder'
   spec.version       = JenkinsPipelineBuilder::VERSION
   spec.authors       = ['Igor Moochnick', 'Joseph Henrich']
-  spec.email         = %w(igor.moochnick@gmail.com crimsonknave@gmail.com)
+  spec.email         = %w[igor.moochnick@gmail.com crimsonknave@gmail.com]
   spec.description   = 'This is a simple and easy-to-use Jenkins Pipeline generator with features focused on
 automating Job & Pipeline creation from the YAML files checked-in with your application source code'
   spec.summary       = 'This gem is will boostrap your Jenkins pipelines'
@@ -21,27 +21,27 @@ automating Job & Pipeline creation from the YAML files checked-in with your appl
 
   ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] = 'true'
 
-  spec.add_dependency 'nokogiri', '~> 1.6.0'
+  spec.add_dependency 'activesupport', '~> 4.2.6'
   spec.add_dependency 'jenkins_api_client', '~> 1.0.0'
+  spec.add_dependency 'minitar'
   spec.add_dependency 'mixlib-shellout', '= 2.2.7' # maintaining backwards compatibility with ruby 2.1.5
+  spec.add_dependency 'nokogiri', '~> 1.6.0'
   spec.add_dependency 'thor', '>= 0.18.0'
-  spec.add_dependency 'activesupport', '~> 4.2.6'
-  spec.add_dependency 'minitar'
 
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'bump'
-  spec.add_development_dependency 'json'
-  spec.add_development_dependency 'gem-release'
   spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'simplecov-rcov'
-  spec.add_development_dependency 'kwalify'
   spec.add_development_dependency 'equivalent-xml'
-  spec.add_development_dependency 'yard-thor'
-  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'json'
+  spec.add_development_dependency 'kwalify'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'webmock', '~> 1.0'
-  spec.add_development_dependency 'rubocop', '= 0.40.0'
+  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'yard-thor'
 end

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -38,7 +38,7 @@ module JenkinsPipelineBuilder
         attr_accessor :jenkins_api_creds
       end
 
-      DEFAULT_FILE_FORMATS = %w(rb json yml yaml).freeze
+      DEFAULT_FILE_FORMATS = %w[rb json yml yaml].freeze
 
       # Sets up the credentials and initializes the Jenkins Pipeline Builder
       #
@@ -68,7 +68,7 @@ module JenkinsPipelineBuilder
         else
           msg = 'Credentials are not set. Please pass them as parameters or'
           msg << ' set them in the default credentials file'
-          $stderr.puts msg
+          warn msg
           exit 1
         end
       end
@@ -87,12 +87,12 @@ module JenkinsPipelineBuilder
         self.jenkins_api_creds = {}.with_indifferent_access.merge options
         if jenkins_api_creds[:server] =~ Resolv::AddressRegex
           jenkins_api_creds[:server_ip] = jenkins_api_creds.delete :server
-        elsif jenkins_api_creds[:server] =~ URI.regexp
+        elsif jenkins_api_creds[:server] =~ URI::DEFAULT_PARSER.make_regexp
           jenkins_api_creds[:server_url] = jenkins_api_creds.delete :server
         else
           msg = "server given (#{jenkins_api_creds[:server]}) is neither a URL nor an IP."
           msg << ' Please pass either a valid IP address or valid URI'
-          $stderr.puts msg
+          warn msg
           exit 1
         end
       end

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -47,7 +47,7 @@ module JenkinsPipelineBuilder
     def compile_job(item, settings = {})
       new_item = compile(item, settings)
       [true, new_item]
-    rescue => e
+    rescue StandardError => e
       return [false, [e.message]]
     end
 
@@ -70,9 +70,7 @@ module JenkinsPipelineBuilder
       if enable_block_present? item
         enabled_switch = resolve_value(item[:enabled], settings)
         return {} if enabled_switch == 'false'
-        if enabled_switch != 'true'
-          raise "Invalid value for #{item[:enabled]}: #{enabled_switch}"
-        end
+        raise "Invalid value for #{item[:enabled]}: #{enabled_switch}" if enabled_switch != 'true'
         if item[:parameters].is_a? Hash
           item = item.merge item[:parameters]
           item.delete :parameters
@@ -92,7 +90,7 @@ module JenkinsPipelineBuilder
 
     def compile_string(item, settings)
       resolve_value(item, settings)
-    rescue => e
+    rescue StandardError => e
       raise "Failed to resolve #{item} because: #{e.message}"
     end
 

data/lib/jenkins_pipeline_builder/extension_set.rb

@@ -1,12 +1,12 @@
 module JenkinsPipelineBuilder
   class ExtensionSet
-    SET_METHODS = [
-      :name,
-      :plugin_id,
-      :jenkins_name,
-      :description,
-      :announced,
-      :type
+    SET_METHODS = %i[
+      name
+      plugin_id
+      jenkins_name
+      description
+      announced
+      type
     ].freeze
 
     SET_METHODS.each do |method_name|
@@ -113,7 +113,7 @@ module JenkinsPipelineBuilder
       yield block
     end
 
-    [:after, :before].each do |method_name|
+    %i[after before].each do |method_name|
       define_method method_name do |version: '0', &block|
         if @min_version
           version = @min_version

data/lib/jenkins_pipeline_builder/extensions.rb

@@ -59,10 +59,12 @@ module JenkinsPipelineBuilder
     def execute(value, n_xml)
       errors = check_parameters value
       raise ArgumentError, errors.join("\n") if errors.any?
-      raise ArgumentError, %(Extension #{name} has no valid path
-      Check ModuleRegistry#entries and the definition of the extension
-      Note: job_attributes have no implicit path and must be set in the builder
-      ).squeeze(' ') unless path
+      unless path
+        raise ArgumentError, %(Extension #{name} has no valid path
+        Check ModuleRegistry#entries and the definition of the extension
+        Note: job_attributes have no implicit path and must be set in the builder
+        ).squeeze(' ')
+      end
 
       n_builders = n_xml.xpath(path).first
       n_builders.instance_exec(value, &before) if before

data/lib/jenkins_pipeline_builder/extensions/build_steps.rb

@@ -54,27 +54,29 @@ build_step do
               end
             end
           else
-            configs(class: 'empty-list') {}
+            configs(class: 'empty-list'){}
           end
 
           projects state[:name]
           condition 'ALWAYS'
           triggerWithNoParameters false
 
-          block do
-            buildStepFailureThreshold do
-              state.generate_for_threshold(self,
-                                           state.resolve_block_condition(:build_step_failure_threshold) || :failure)
-            end
-            unstableThreshold do
-              state.generate_for_threshold(self,
-                                           state.resolve_block_condition(:unstable_threshold) || :unstable)
-            end
-            failureThreshold do
-              state.generate_for_threshold(self,
-                                           state.resolve_block_condition(:failure_threshold) || :failure)
+          if state.block_condition?
+            block do
+              buildStepFailureThreshold do
+                state.generate_for_threshold(self,
+                                             state.resolve_block_condition(:build_step_failure_threshold) || :failure)
+              end
+              unstableThreshold do
+                state.generate_for_threshold(self,
+                                             state.resolve_block_condition(:unstable_threshold) || :unstable)
+              end
+              failureThreshold do
+                state.generate_for_threshold(self,
+                                             state.resolve_block_condition(:failure_threshold) || :failure)
+              end
             end
-          end if state.block_condition?
+          end
 
           buildAllNodesWithLabel false
         end

data/lib/jenkins_pipeline_builder/extensions/builders.rb

@@ -117,11 +117,11 @@ builder do
   description 'Jenkins plugin for building Maven 2/3 jobs via a special project type.'
   jenkins_name 'Invoke Maven 3'
   announced false
-  parameters [
-    :mavenName,
-    :rootPom,
-    :goals,
-    :options
+  parameters %i[
+    mavenName
+    rootPom
+    goals
+    options
   ]
 
   xml do |helper|
@@ -170,13 +170,13 @@ builder do
   description 'This plugin lets you trigger new builds when your build has completed, with various ways of specifying parameters for the new build.'
   jenkins_name 'Trigger/call builds on other projects'
   announced false
-  parameters [
-    :data,
-    :project,
-    :trigger_with_no_parameters,
-    :fail,
-    :mark_fail,
-    :mark_unstable
+  parameters %i[
+    data
+    project
+    trigger_with_no_parameters
+    fail
+    mark_fail
+    mark_unstable
   ]
 
   xml do |helper|
@@ -359,13 +359,17 @@ builder do
         raise '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
+      if params.key? :script
+        scriptSource('class' => 'hudson.plugins.groovy.StringScriptSource') do
+          command params[:script]
+        end
+      end
 
-      scriptSource('class' => 'hudson.plugins.groovy.FileScriptSource') do
-        scriptFile params[:file]
-      end if params.key? :file
+      if params.key? :file
+        scriptSource('class' => 'hudson.plugins.groovy.FileScriptSource') do
+          scriptFile params[:file]
+        end
+      end
 
       bindings params[:bindings]
       classpath params[:classpath]
@@ -394,27 +398,27 @@ builder do
   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
+  parameters %i[
+    serverUrl
+    useOwnServerCredentials
+    username
+    password
+    incremental
+    isThisBuildIncremental
+    projectName
+    groupId
+    skipSCMTriggers
+    waitForResultsEnabled
+    vulnerabilityThresholdEnabled
+    highThreshold
+    mediumThreshold
+    lowThreshold
+    preset
+    presetSpecified
+    generatePdfReport
+    excludeFolders
+    fullScansScheduled
+    filterPattern
   ]
 
   xml do |params|
@@ -450,13 +454,13 @@ builder do
   description 'The plugin allows you to trigger SonarQube analysis from Jenkins using a Post-build action to trigger the analysis with MavenQuickly benefit from Sonar, the open source platform for Continuous Inspection of code quality.'
   jenkins_name 'SonarQube Plugin'
   announced false
-  parameters [
-    :sonarInstallation,
-    :taskToRun,
-    :jdk,
-    :pathToProjectProperties,
-    :projectProperties,
-    :jvmOptions
+  parameters %i[
+    sonarInstallation
+    taskToRun
+    jdk
+    pathToProjectProperties
+    projectProperties
+    jvmOptions
   ]
 
   xml do |params|

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -130,17 +130,17 @@ job_attribute do
   announced false
 
   version '0' do
-    parameters [
-      :remote_name,
-      :refspec,
-      :local_branch,
-      :recursive_update,
-      :wipe_workspace,
-      :excluded_users,
-      :skip_tag,
-      :remote_url,
-      :excluded_regions,
-      :included_regions
+    parameters %i[
+      remote_name
+      refspec
+      local_branch
+      recursive_update
+      wipe_workspace
+      excluded_users
+      skip_tag
+      remote_url
+      excluded_regions
+      included_regions
     ]
 
     # XML preprocessing
@@ -183,19 +183,19 @@ job_attribute do
   end
 
   version '2.0' do
-    parameters [
-      :changelog_to_branch,
-      :credentials_id,
-      :excluded_regions,
-      :excluded_users,
-      :included_regions,
-      :local_branch,
-      :recursive_update,
-      :refspec,
-      :remote_name,
-      :remote_url,
-      :skip_tag,
-      :wipe_workspace
+    parameters %i[
+      changelog_to_branch
+      credentials_id
+      excluded_regions
+      excluded_users
+      included_regions
+      local_branch
+      recursive_update
+      refspec
+      remote_name
+      remote_url
+      skip_tag
+      wipe_workspace
     ]
 
     before do |params|
@@ -408,7 +408,7 @@ job_attribute do
   announced false
 
   xml path: '//concurrentBuild' do |params|
-    (params == true) ? 'true' : 'false'
+    params == true ? 'true' : 'false'
   end
 end
 

data/lib/jenkins_pipeline_builder/extensions/promotion_conditions.rb

@@ -30,10 +30,10 @@ end
 promotion_condition do
   name :parameterized_self_promotion
   plugin_id 'promoted-builds'
-  parameters [
-    :parameter_name,
-    :parameter_value,
-    :even_if_unstable
+  parameters %i[
+    parameter_name
+    parameter_value
+    even_if_unstable
   ]
 
   xml do |params|
@@ -50,9 +50,9 @@ end
 promotion_condition do
   name :downstream_pass
   plugin_id 'promoted-builds'
-  parameters [
-    :jobs,
-    :even_if_unstable
+  parameters %i[
+    jobs
+    even_if_unstable
   ]
 
   xml do |params|

data/lib/jenkins_pipeline_builder/extensions/publishers.rb

@@ -294,11 +294,9 @@ publisher do
       groovyScript params[:groovy_script]
       behavior params[:behavior] || '0'
       runFormMatrixParent 'false'
-      if params[:additional_classpaths]
-        params[:additional_classpaths].each do |path|
-          send('org.jvnet.hudson.plugins.groovypostbuild.GroovyScriptPath') do
-            path path[:path] || '/'
-          end
+      params[:additional_classpaths] && params[:additional_classpaths].each do |path|
+        send('org.jvnet.hudson.plugins.groovypostbuild.GroovyScriptPath') do
+          path path[:path] || '/'
         end
       end
     end
@@ -543,16 +541,14 @@ publisher do
   xml do |params|
     send('htmlpublisher.HtmlPublisher', 'plugin' => 'htmlpublisher') do
       send('reportTargets') do
-        unless params[:report_targets].nil?
-          params[:report_targets].each do |target|
-            send('htmlpublisher.HtmlPublisherTarget') do
-              reportName target[:report_title] || 'HTML Report'
-              reportDir target[:report_dir] || ''
-              reportFiles target[:index_pages] || 'index.html'
-              keepAll target[:keep_past] || false
-              allowMissing target[:allow_missing] || false
-              wrapperName 'htmlpublisher-wrapper.html'
-            end
+        params[:report_targets] && params[:report_targets].each do |target|
+          send('htmlpublisher.HtmlPublisherTarget') do
+            reportName target[:report_title] || 'HTML Report'
+            reportDir target[:report_dir] || ''
+            reportFiles target[:index_pages] || 'index.html'
+            keepAll target[:keep_past] || false
+            allowMissing target[:allow_missing] || false
+            wrapperName 'htmlpublisher-wrapper.html'
           end
         end
       end
@@ -592,15 +588,13 @@ publisher do
   xml do |params|
     send('xunit', 'plugin' => 'xunit') do
       send('types') do
-        unless params[:types].nil?
-          params[:types].each do |type|
-            send(type[:type]) do
-              pattern type[:pattern]
-              skipNoTestFiles type[:skip_no_test_files] || false
-              failIfNotNew type[:fail_if_not_new] || true
-              deleteOutputFiles type[:delete_output_files] || true
-              stopProcessingIfError type[:stop_processing_error] || true
-            end
+        params[:types] && params[:types].each do |type|
+          send(type[:type]) do
+            pattern type[:pattern]
+            skipNoTestFiles type[:skip_no_test_files] || false
+            failIfNotNew type[:fail_if_not_new] || true
+            deleteOutputFiles type[:delete_output_files] || true
+            stopProcessingIfError type[:stop_processing_error] || true
           end
         end
       end
@@ -682,3 +676,21 @@ publisher do
     end
   end
 end
+
+publisher do
+  name :github_pr_coverage_status_reporter
+  plugin_id 'github-pr-coverage-status'
+  description 'Code coverage icon for GitHub pull requests'
+  jenkins_name 'GitHub Pull Request Coverage Status'
+  announced false
+
+  xml do |action|
+    if action == 'compare'
+      send('com.github.terma.jenkins.githubprcoveragestatus.CompareCoverageAction')
+    elsif action == 'master'
+      send('com.github.terma.jenkins.githubprcoveragestatus.MasterCoverageAction')
+    else
+      raise 'Invalid plugin configuration. github_pr_coverage_status_reporter value must be "compare" or "master"'
+    end
+  end
+end

data/lib/jenkins_pipeline_builder/extensions/wrappers.rb

@@ -26,7 +26,7 @@ wrapper do
   announced false
   jenkins_name 'Color ANSI Console Output'
   description 'This plugin adds support for ANSI escape sequences, including color, to Console Output.'
-  parameters false
+
   xml do |_|
     send('hudson.plugins.ansicolor.AnsiColorBuildWrapper') do
       colorMapName 'xterm'

data/lib/jenkins_pipeline_builder/generator.rb

@@ -131,7 +131,7 @@ module JenkinsPipelineBuilder
       errors = {}
       project_body = project[:value]
 
-      %i(jobs views promotions).each do |key|
+      %i[jobs views promotions].each do |key|
         next unless project_body[key]
 
         Utils.symbolize_with_empty_hash!(project_body[key])
@@ -193,9 +193,7 @@ module JenkinsPipelineBuilder
 
       errors = publish_jobs(compiled_project[:value][:jobs])
 
-      if compiled_project[:value][:views]
-        publish_views(compiled_project[:value][:views])
-      end
+      publish_views(compiled_project[:value][:views]) if compiled_project[:value][:views]
 
       if compiled_project[:value][:promotions]
         publish_promotions(compiled_project[:value][:promotions], compiled_project[:value][:jobs])
@@ -212,9 +210,10 @@ module JenkinsPipelineBuilder
       # Converts a list of jobs that might have a list of promoted_builds to
       # A hash of promoted_builds names => associated job names
       promotion_job_pairs = jobs.each_with_object({}) do |j, acc|
+        next unless j[:result][:promoted_builds]
         j[:result][:promoted_builds].each do |promotion_name|
           acc[promotion_name] = j[:result][:name]
-        end if j[:result][:promoted_builds]
+        end
       end
 
       promotions.each do |promotion|

data/lib/jenkins_pipeline_builder/job.rb

@@ -39,7 +39,7 @@ module JenkinsPipelineBuilder
 
     private
 
-    [:free_style, :pull_request_generator].each do |method_name|
+    %i[free_style pull_request_generator].each do |method_name|
       define_method "update_#{method_name}" do
         @xml
       end
@@ -50,7 +50,7 @@ module JenkinsPipelineBuilder
     end
 
     def job_methods
-      %w(job_dsl multi_project build_flow free_style pull_request_generator)
+      %w[job_dsl multi_project build_flow free_style pull_request_generator]
     end
 
     def local_output(xml)

data/lib/jenkins_pipeline_builder/job_collection.rb

@@ -89,10 +89,12 @@ module JenkinsPipelineBuilder
         return
       end
 
-      raise TypeError, %(Expected Hash received #{value.class}.
-        Verify that the pipeline section is made up of a single {key: Hash/Object} pair
-        See the definition for:
-        \t#{section}).squeeze(' ') unless value.is_a? Hash
+      unless value.is_a? Hash
+        raise TypeError, %(Expected Hash received #{value.class}.
+          Verify that the pipeline section is made up of a single {key: Hash/Object} pair
+          See the definition for:
+          \t#{section}).squeeze(' ')
+      end
 
       name = value[:name]
       process_collection! name, key, value, remote

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -52,8 +52,10 @@ module JenkinsPipelineBuilder
       job[:scm_params] ||= {}
       job[:scm_params][:refspec] = "refs/pull/#{pr}/head:refs/remotes/origin/pr/#{pr}/head"
       job[:scm_params][:changelog_to_branch] ||= {}
-      job[:scm_params][:changelog_to_branch]
-        .merge!(remote: 'origin', branch: "pr/#{pr}/head") if Gem::Version.new(2.0) < git_version
+      if Gem::Version.new(2.0) < git_version
+        job[:scm_params][:changelog_to_branch]
+          .merge!(remote: 'origin', branch: "pr/#{pr}/head")
+      end
     end
 
     def active_prs(git_url, git_org, git_repo)

data/lib/jenkins_pipeline_builder/remote_dependencies.rb

@@ -77,9 +77,7 @@ module JenkinsPipelineBuilder
       else
         path = File.join(path, template[:name]) unless template[:name] == 'default'
         # If we are looking for the newest version or no version was set
-        if use_newest_version? template, path
-          template[:version] = highest_template_version path
-        end
+        template[:version] = highest_template_version path if use_newest_version? template, path
         path = File.join(path, template[:version]) unless template[:version].nil?
         path = File.join(path, 'pipeline')
       end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/spec/lib/jenkins_pipeline_builder/cli/helper_spec.rb

@@ -43,7 +43,7 @@ describe JenkinsPipelineBuilder::CLI::Helper do
 
       it 'should puts an error to stdout and exit if server is invalid' do
         options[:server] = 'not_valid_at_all'
-        expect($stderr).to receive(:puts).with(/server given \(not_valid_at_all\)/)
+        expect(described_class).to receive(:warn).with(/server given \(not_valid_at_all\)/)
         expect { described_class.setup(options) }.to raise_error(SystemExit, 'exit')
       end
     end
@@ -99,7 +99,7 @@ describe JenkinsPipelineBuilder::CLI::Helper do
 
       it 'should puts and error to stdout and exit if no credentials are passed' do
         allow(File).to receive(:exist?).and_return(false)
-        expect($stderr).to receive(:puts).with(/Credentials are not set/)
+        expect(described_class).to receive(:warn).with(/Credentials are not set/)
         expect { described_class.setup({}) }.to raise_error(SystemExit, 'exit')
       end
     end
@@ -123,10 +123,10 @@ describe JenkinsPipelineBuilder::CLI::Helper do
         it "loads a default file ending in .#{suffix}" do
           file_suffixes.each do |ending|
             expect(File).to receive(:exist?).with("#{default_creds_base}.#{ending}")
-              .and_return ending == suffix
+                                            .and_return ending == suffix
           end
           expect(File).to receive(:expand_path).with("#{default_creds_base}.#{suffix}")
-            .and_return "#{creds_file_base}.#{suffix}"
+                                               .and_return "#{creds_file_base}.#{suffix}"
 
           described_class.setup({})
         end
@@ -140,7 +140,7 @@ describe JenkinsPipelineBuilder::CLI::Helper do
           # Stub the existence of the used and extraneous 'found' files
           file_suffixes.each do |suffix|
             expect(File).to receive(:exist?).with("#{default_creds_base}.#{suffix}")
-              .and_return suffix == used_suffix || suffix == found_suffix
+                                            .and_return suffix == used_suffix || suffix == found_suffix
           end
           expect(JenkinsPipelineBuilder.logger).to receive(:warn)
             .with(/'#{default_creds_base}\.#{used_suffix}' but '#{default_creds_base}\.#{found_suffix}' found\./)

data/spec/lib/jenkins_pipeline_builder/extension_set_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 describe JenkinsPipelineBuilder::ExtensionSet do
-  subject(:set) { JenkinsPipelineBuilder::ExtensionSet.new('foo') {} }
+  subject(:set) { JenkinsPipelineBuilder::ExtensionSet.new('foo'){} }
 
   before :each do
     set.name 'example'

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

@@ -87,7 +87,7 @@ describe 'job_attributes' do
 
     context 'choice parameter' do
       let(:params) do
-        { parameters: [{ type: 'choice', values: [:foo, :bar], name: :foo, description: :desc, default: :default }] }
+        { parameters: [{ type: 'choice', values: %i[foo bar], name: :foo, description: :desc, default: :default }] }
       end
 
       it 'generates correct config' do

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

@@ -25,6 +25,7 @@ PUBLISHERS = {
   email_ext: ['0'],
   email_notifications: ['0'],
   git: ['0'],
+  github_pr_coverage_status_reporter: ['0'],
   groovy_postbuild: ['0'],
   hipchat: ['0', '0.1.9', '2.0.0'],
   html_publisher: ['0'],

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

@@ -39,6 +39,10 @@ describe 'wrappers' do
     end
 
     it 'fails parameters are passed' do
+      # This test is pending because the ansicolor wrapper has a property `parameters false` which is intended to
+      # indicate that the plugin does not take any parameters. This does not work as expected, however, after
+      # updating code to meet updated Rubocop standards
+      pending
       params = { wrappers: { ansicolor: { config: false } } }
       expect do
         JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -252,7 +252,7 @@ describe JenkinsPipelineBuilder::Generator do
   describe '#projects' do
     it 'returns a list of projects' do
       path = File.expand_path('../fixtures/generator_tests/multi_project', __FILE__)
-      expect(@generator.projects(path)).to eq %w(SamplePipeline1 SamplePipeline2 SamplePipeline3)
+      expect(@generator.projects(path)).to eq %w[SamplePipeline1 SamplePipeline2 SamplePipeline3]
     end
   end
 

data/spec/lib/jenkins_pipeline_builder/module_registry_spec.rb

@@ -97,7 +97,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
     end
 
     it 'calls the xml block when executing the item' do
-      @ext.xml -> (_) { raise XmlException, 'foo' }
+      @ext.xml ->(_) { raise XmlException, 'foo' }
 
       expect do
         JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
@@ -105,7 +105,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
     end
 
     it 'calls the before block' do
-      @ext.before -> (_) { raise BeforeException, 'foo' }
+      @ext.before ->(_) { raise BeforeException, 'foo' }
 
       expect do
         JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
@@ -113,7 +113,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
     end
 
     it 'calls the after block' do
-      @ext.after -> (_) { raise AfterException, 'foo' }
+      @ext.after ->(_) { raise AfterException, 'foo' }
 
       expect do
         JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 4.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client
   requirement: !ruby/object:Gem::Requirement
@@ -40,63 +40,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: minitar
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,21 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bump
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -166,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -180,7 +166,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: kwalify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,7 +180,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -208,7 +194,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kwalify
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -222,21 +208,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: yard-thor
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -250,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -264,7 +250,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -278,7 +264,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -306,19 +292,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard-thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   This is a simple and easy-to-use Jenkins Pipeline generator with features focused on
   automating Job & Pipeline creation from the YAML files checked-in with your application source code
@@ -334,6 +334,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".simplecov"