jenkins_pipeline_builder 0.11.0 → 0.11.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWM3M2NlYzkyODVkOTJiMDcxNjgyY2U4MDFhZWRkNDkyMDViNGFmZg==
+    ZWQ5ODAzODU5ZTFiZjA1NzkwMDgyMGEyYzFjMDcwNGY5NDQ4MGZlMg==
   data.tar.gz: !binary |-
-    MGQ1MDM2NDQ4OGJjMWExNzRiZGI1ZDEwMzAwODcxNDFkMjAyYTE0Yw==
+    ZjFkOGIxYTJiMjc0NmViZGNiMTU1NTlmZGViN2Y4ODFiZTgyODBlNA==
 SHA512:
   metadata.gz: !binary |-
-    YTQ2ZjU1YzkwOWNlN2RjNTJjNzhhZGEwNmZmNTI5ZWU5ZjE5MzgwN2YzNjAx
-    NDIyNzJhMTI2ODkwMDhhOGE2NGNlYTc4OTgxYmZiODZjZjk3NmRhYTNiMWJh
-    YTRjMTQxMGYyM2U4YTM0N2JmMTg3NGMzMWI4NzdmY2I3ZmVlNWQ=
+    OGZkNzk1ZmE2ODZmZTg4MzhiMTBiZDNlMzNkY2E1OGM4N2QzZDJmNzA0MTRi
+    Zjk5ZGRiNjJkNjhjNzYzNDY1OGY4MmRlMTE5YzliYjBmMjY3OTg4NWViOTE2
+    NmIxN2JiZjY3NmVkMWUzNzFiZjEyMjcyNDU5NmYxMmIyODdmYWM=
   data.tar.gz: !binary |-
-    ZDE3OGY2ZDU3N2VjOTExN2MzNDYyZjEyYjU2MmZmM2I3ZmFkY2QxYzY4OGIw
-    YzY0NDZjZTczNWMzMGQ5NWFiYzY0N2Q4ZjUxYTMwYzY3ZTZjY2U4N2M2ZjNl
-    YmNiNjk2OTI4YmViODEyNWMxMzYxYTIzZjU3Y2I1YWQxMGU1MWE=
+    MzdiMDJkMWMyOTg1ZjI5MGQwYTllZTIxOWMwNTNjNjU4NWI4MjhmMmUxNmQ2
+    MTFmOTdlNDgyYjE0Nzc2M2U5NzE2ODIwMDI3NzgyMjQ2MjBmYWU5MjA1ZGMx
+    NTNiMTA5Y2UwZmQyOTdmMTdjOTg1NmZjYTM4NGJlODBjMTY4MDY=

data/.rubocop.yml

@@ -1,13 +1,11 @@
 #######
 # WIP These should all go back to defaults at some point
-Metrics/CyclomaticComplexity:
-  Max: 9
-Metrics/PerceivedComplexity:
-  Max: 11
+Metrics/AbcSize:
+  Max: 22
 Metrics/MethodLength:
   Max: 20
 Metrics/ClassLength:
-  Max: 175
+  Max: 180
 
 #######
 # Finalized settings
@@ -17,7 +15,6 @@ Metrics/LineLength:
   Exclude:
     - 'spec/lib/jenkins_pipeline_builder/compiler_spec.rb'
     - 'spec/lib/jenkins_pipeline_builder/view_spec.rb'
-    - 'spec/lib/jenkins_pipeline_builder/pull_request_spec.rb'
     - 'spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb'
     - 'lib/jenkins_pipeline_builder/extensions/**/*'
 

data/jenkins_pipeline_builder.gemspec

@@ -15,8 +15,8 @@ automating Job & Pipeline creation from the YAML files checked-in with your appl
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($RS)
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] = 'true'
@@ -42,7 +42,5 @@ automating Job & Pipeline creation from the YAML files checked-in with your appl
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'webmock'
-  # Eventually, we'll fix all the Complexity that ties us to 0.26.1
-  # spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop', '= 0.26.1'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -49,20 +49,14 @@ module JenkinsPipelineBuilder
       end
 
       def self.process_creds(options)
-        if options[:username] && options[:server] && (options[:password] || options[:password_base64])
-          return process_cli_creds(options)
+        if valid_cli_creds? options
+          process_cli_creds(options)
         elsif options[:creds_file]
-          if options[:creds_file].end_with? 'json'
-            return JSON.parse(IO.read(File.expand_path(options[:creds_file])))
-          else
-            return YAML.load_file(File.expand_path(options[:creds_file]))
-          end
+          process_creds_file options[:creds_file]
         elsif File.exist?("#{ENV['HOME']}/.jenkins_api_client/login.yml")
-          return YAML.load_file(
-            File.expand_path("#{ENV['HOME']}/.jenkins_api_client/login.yml", __FILE__)
-          )
+          YAML.load_file(File.expand_path("#{ENV['HOME']}/.jenkins_api_client/login.yml", __FILE__))
         elsif options[:debug]
-          return { username: :foo, password: :bar, server_ip: :baz }
+          { username: :foo, password: :bar, server_ip: :baz }
         else
           msg = 'Credentials are not set. Please pass them as parameters or'
           msg << ' set them in the default credentials file'
@@ -71,6 +65,18 @@ module JenkinsPipelineBuilder
         end
       end
 
+      def self.valid_cli_creds?(options)
+        options[:username] && options[:server] && (options[:password] || options[:password_base64])
+      end
+
+      def self.process_creds_file(file)
+        if file.end_with? 'json'
+          return JSON.parse(IO.read(File.expand_path(file)))
+        else
+          return YAML.load_file(File.expand_path(file))
+        end
+      end
+
       def self.process_cli_creds(options)
         creds = {}.with_indifferent_access.merge options
         if creds[:server] =~ Resolv::AddressRegex

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -61,7 +61,7 @@ module JenkinsPipelineBuilder
 
     def handle_enable(item, settings)
       return true, item unless item.is_a? Hash
-      if item.key?(:enabled) && item.key?(:parameters) && item.length == 2
+      if enable_block_present? item
         enabled_switch = resolve_value(item[:enabled], settings)
         return [true, {}] if enabled_switch == 'false'
         if enabled_switch != 'true'
@@ -80,6 +80,10 @@ module JenkinsPipelineBuilder
 
     private
 
+    def enable_block_present?(item)
+      item.key?(:enabled) && item.key?(:parameters) && item.length == 2
+    end
+
     def compile_string(item, settings)
       errors = {}
       new_value = resolve_value(item, settings)

data/lib/jenkins_pipeline_builder/extensions.rb

@@ -65,11 +65,7 @@ module JenkinsPipelineBuilder
 
       n_builders = n_xml.xpath(path).first
       n_builders.instance_exec(value, &before) if before
-      Nokogiri::XML::Builder.with(n_builders) do |builder|
-        include_helper value, builder
-        helper.extension = self
-        builder.instance_exec helper, &xml
-      end
+      build_extension_xml n_builders, value
       n_builders.instance_exec(value, &after) if after
       true
     end
@@ -93,6 +89,14 @@ module JenkinsPipelineBuilder
 
     private
 
+    def build_extension_xml(n_builders, value)
+      Nokogiri::XML::Builder.with(n_builders) do |builder|
+        include_helper value, builder
+        helper.extension = self
+        builder.instance_exec helper, &xml
+      end
+    end
+
     def include_helper(params, builder)
       klass = "#{name.to_s.camelize}Helper".safe_constantize
       klass ||= ExtensionHelper

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -238,7 +238,6 @@ job_attribute do
     send('hudson.model.ParametersDefinitionProperty') do
       parameterDefinitions do
         params.each do |param|
-
           send(params.param_type param) do
             name param[:name]
             description param[:description]

data/lib/jenkins_pipeline_builder/extensions/publishers.rb

@@ -108,7 +108,6 @@ publisher do
       end
     end
   end
-
 end
 
 publisher do
@@ -328,7 +327,6 @@ publisher do
   announced false
 
   xml do |params|
-
     send('hudson.plugins.brakeman.BrakemanPublisher', 'plugin' => 'brakeman') do
       healthy params[:healthy] || ''
       unHealthy params[:unhealthy] || ''
@@ -356,7 +354,6 @@ publisher do
       doNotResolveRelativePaths { text(params[:do_not_resolve_relative_paths] || false) }
       outputFile { text(params[:output_file] || 'brakeman-output.tabs') }
     end
-
   end
 end
 
@@ -381,7 +378,6 @@ publisher do
 
   xml do |params|
     send('hudson.plugins.cobertura.CoberturaPublisher', 'plugin' => 'cobertura') do
-
       coberturaReportFile params[:cobertura_report_file]
       onlyStable params[:only_stable] || false
       failUnhealthy params[:fail_unhealthy] || false
@@ -399,7 +395,6 @@ publisher do
       sourceEncoding params[:source_encoding] || 'ASCII'
     end
   end
-
 end
 
 publisher do
@@ -417,7 +412,6 @@ publisher do
 
         configuredTriggers do
           params[:triggers].each do |trigger_params|
-
             trigger_type = trigger_params[:type].to_sym
             defaults = params.trigger_defaults[trigger_type]
 
@@ -507,7 +501,6 @@ publisher do
       validateNumberOfTests params[:validate_number_tests] || false
     end
   end
-
 end
 
 publisher do

data/lib/jenkins_pipeline_builder/extensions/wrappers.rb

@@ -174,7 +174,7 @@ wrapper do
         repositoryKey wrapper[:'release-repo']
         snapshotsRepositoryKey wrapper.fetch(:'snapshot-repo', wrapper[:'release-repo'])
       end
-      deployArtifacts wrapper.fetch(:'deploy', true)
+      deployArtifacts wrapper.fetch(:deploy, true)
       artifactDeploymentPatterns do
         includePatterns
         excludePatterns

data/lib/jenkins_pipeline_builder/generator.rb

@@ -49,33 +49,28 @@ module JenkinsPipelineBuilder
     def bootstrap(path, project_name = nil)
       logger.info "Bootstrapping pipeline from path #{path}"
       job_collection.load_from_path(path)
-      errors = {}
+      job_collection.remote_dependencies.cleanup
+
       if job_collection.projects.any?
         errors = publish_project(project_name)
       else
         errors = publish_jobs(job_collection.standalone_jobs)
       end
-      errors.each do |k, v|
-        logger.error "Encountered errors compiling: #{k}:"
-        logger.error v
-      end
+      print_compile_errors errors
       errors
     end
 
     def pull_request(path, project_name)
       logger.info "Pull Request Generator Running from path #{path}"
       job_collection.load_from_path(path)
+      job_collection.remote_dependencies.cleanup
       logger.info "Project: #{job_collection.projects}"
       errors = {}
       job_collection.projects.each do |project|
         next unless project[:name] == project_name || project_name.nil?
         errors.merge! process_pull_request_project project
-
-      end
-      errors.each do |k, v|
-        logger.error "Encountered errors compiling: #{k}:"
-        logger.error v
       end
+      print_compile_errors errors
       errors.empty?
     end
 
@@ -97,7 +92,7 @@ module JenkinsPipelineBuilder
       fail "Failed to locate job by name '#{name}'" if job.nil?
       job_value = job[:value]
       logger.debug "Compiling job #{name}"
-      compiler = Compiler.new self
+      compiler = JenkinsPipelineBuilder::Compiler.new self
       success, payload = compiler.compile(job_value, settings)
       [success, payload]
     end
@@ -105,15 +100,36 @@ module JenkinsPipelineBuilder
     def resolve_project(project)
       defaults = job_collection.defaults
       settings = defaults.nil? ? {} : defaults[:value] || {}
-      compiler = Compiler.new self
+      compiler = JenkinsPipelineBuilder::Compiler.new self
       project[:settings] = compiler.get_settings_bag(project, settings) unless project[:settings]
-      project_body = project[:value]
 
+      errors = process_project project
+      print_project_errors errors
+      return false, 'Encountered errors exiting' unless errors.empty?
+
+      [true, project]
+    end
+
+    private
+
+    def process_project(project)
+      project_body = project[:value]
       jobs = prepare_jobs(project_body[:jobs]) if project_body[:jobs]
       logger.info project
       process_job_changes(jobs)
       errors = process_jobs(jobs, project)
       errors = process_views(project_body[:views], project, errors) if project_body[:views]
+      errors
+    end
+
+    def print_compile_errors(errors)
+      errors.each do |k, v|
+        logger.error "Encountered errors compiling: #{k}:"
+        logger.error v
+      end
+    end
+
+    def print_project_errors(errors)
       errors.each do |k, v|
         puts "Encountered errors processing: #{k}:"
         v.each do |key, error|
@@ -121,13 +137,8 @@ module JenkinsPipelineBuilder
           puts "  #{error.inspect}"
         end
       end
-      return false, 'Encountered errors exiting' unless errors.empty?
-
-      [true, project]
     end
 
-    private
-
     def process_pull_request_project(project)
       logger.info "Using Project #{project}"
 
@@ -187,6 +198,13 @@ module JenkinsPipelineBuilder
       errors
     end
 
+    def create_views(views)
+      views.each do |v|
+        compiled_view = v[:result]
+        view.create(compiled_view)
+      end
+    end
+
     def publish_project(project_name, errors = {})
       job_collection.projects.each do |project|
         next unless project_name.nil? || project[:name] == project_name
@@ -200,10 +218,7 @@ module JenkinsPipelineBuilder
 
         errors = publish_jobs(compiled_project[:value][:jobs]) if compiled_project[:value][:jobs]
         next unless compiled_project[:value][:views]
-        compiled_project[:value][:views].each do |v|
-          compiled_view = v[:result]
-          view.create(compiled_view)
-        end
+        create_views compiled_project[:value][:views]
       end
       errors
     end

data/lib/jenkins_pipeline_builder/job_collection.rb

@@ -61,7 +61,6 @@ module JenkinsPipelineBuilder
       else
         load_file(path, remote)
       end
-      remote_dependencies.cleanup if remote
     end
 
     private

data/lib/jenkins_pipeline_builder/module_registry.rb

@@ -94,19 +94,28 @@ module JenkinsPipelineBuilder
           next
         end
         reg_value = registry[key]
-        if reg_value.is_a? ExtensionSet
-          ext = reg_value.extension
-          logger.debug "Using #{ext.type} #{ext.name} version #{ext.min_version}"
-          success = ext.execute value, n_xml
-          fail 'Encountered errors compiling the xml' unless success
-        elsif value.is_a? Hash
-          traverse_registry reg_value, value, n_xml, true
-        elsif value.is_a? Array
-          value.each do |v|
-            traverse_registry reg_value, v, n_xml, true
-          end
+        execute_registry_value reg_value, value, n_xml
+      end
+    end
+
+    private
+
+    def execute_registry_value(reg_value, value, n_xml)
+      if reg_value.is_a? ExtensionSet
+        execute_extension reg_value.extension, value, n_xml
+      elsif value.is_a? Hash
+        traverse_registry reg_value, value, n_xml, true
+      elsif value.is_a? Array
+        value.each do |v|
+          traverse_registry reg_value, v, n_xml, true
         end
       end
     end
+
+    def execute_extension(ext, value, n_xml)
+      logger.debug "Using #{ext.type} #{ext.name} version #{ext.min_version}"
+      success = ext.execute value, n_xml
+      fail 'Encountered errors compiling the xml' unless success
+    end
   end
 end

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -43,7 +43,7 @@ module JenkinsPipelineBuilder
       find_old_pull_requests
       generate_pull_requests
 
-      @generator.job_collection.collection.merge! @jobs
+      collection.merge! @jobs
       @errors.merge! create_jobs
 
       purge_jobs
@@ -90,14 +90,18 @@ module JenkinsPipelineBuilder
       errors
     end
 
+    def collection
+      generator.job_collection.collection
+    end
+
     def filter_jobs
       jobs = {}
       pull_jobs = pull_generator[:value][:jobs] || []
       pull_jobs.each do |job|
         if job.is_a? String
-          jobs[job.to_s] = generator.job_collection.collection[job.to_s]
+          jobs[job.to_s] = collection[job.to_s]
         else
-          jobs[job.keys.first.to_s] = generator.job_collection.collection[job.keys.first.to_s]
+          jobs[job.keys.first.to_s] = collection[job.keys.first.to_s]
         end
       end
       fail 'No jobs found for pull request' if jobs.empty?
@@ -121,7 +125,7 @@ module JenkinsPipelineBuilder
       pull_job = nil
       project_jobs.each do |job|
         job = job.keys.first if job.is_a? Hash
-        job = generator.job_collection.collection[job.to_s]
+        job = collection[job.to_s]
 
         pull_job = job if job[:value][:job_type] == 'pull_request_generator'
       end

data/lib/jenkins_pipeline_builder/remote_dependencies.rb

@@ -18,11 +18,7 @@ module JenkinsPipelineBuilder
       end
     end
 
-    # TODO: Look into remote jobs not working according to sinan
-
     def load(dependencies)
-      ### Load remote YAML
-      # Download Tar.gz
       dependencies.each do |source|
         source = source[:source]
         url = source[:url]
@@ -37,13 +33,7 @@ module JenkinsPipelineBuilder
         end
 
         path = File.expand_path(file, Dir.getwd)
-        # Load templates recursively
-        unless source[:templates]
-          logger.info 'No specific template specified'
-          # Try to load the folder or the pipeline folder
-          path = File.join(path, 'pipeline') if Dir.entries(path).include? 'pipeline'
-          return job_collection.load_from_path(path, true)
-        end
+        return load_default_path path unless source[:templates]
 
         load_templates(path, source[:templates])
       end
@@ -51,29 +41,50 @@ module JenkinsPipelineBuilder
 
     private
 
+    def load_default_path(path)
+      logger.info 'No specific template specified'
+      path = File.join(path, 'pipeline') if Dir.entries(path).include? 'pipeline'
+      job_collection.load_from_path(path, true)
+    end
+
     def load_template(path, template)
       # If we specify what folder the yaml is in, load that
+      path = template_path path, template
+
+      if File.directory?(path)
+        logger.info "Loading from #{path}"
+        job_collection.load_from_path(path, true)
+        true
+      else
+        false
+      end
+    end
+
+    def highest_template_version(path)
+      folders = Dir.entries(path)
+      highest = folders.max
+      highest = highest  unless highest == 0
+      highest
+    end
+
+    def use_newest_version?(template, path)
+      (template[:version].nil? || template[:version] == 'newest') && File.directory?(path)
+    end
+
+    def template_path(path, template)
       if template[:folder]
         path = File.join(path, template[:folder])
       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 (template[:version].nil? || template[:version] == 'newest') && File.directory?(path)
-          folders = Dir.entries(path)
-          highest = folders.max
-          template[:version] = highest unless highest == 0
+        if use_newest_version? template, path
+          template[:version] = highest_template_version path
         end
         path = File.join(path, template[:version]) unless template[:version].nil?
         path = File.join(path, 'pipeline')
       end
 
-      if File.directory?(path)
-        logger.info "Loading from #{path}"
-        job_collection.load_from_path(path, true)
-        true
-      else
-        false
-      end
+      path
     end
 
     def download_yaml(url, file, remote_opts = {})

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/lib/jenkins_pipeline_builder/view.rb

@@ -96,6 +96,14 @@ module JenkinsPipelineBuilder
     end
 
     def post_params(params)
+      payload = post_payload params
+      payload.merge!('filterQueue' => 'on') if params[:filter_queue]
+      payload.merge!('filterExecutors' => 'on') if params[:filter_executors]
+      payload.merge!('useincluderegex' => 'on', 'includeRegex' => params[:regex]) if params[:regex]
+      payload
+    end
+
+    def post_payload(params)
       statuses = { 'enabled_jobs_only' => '1', 'disabled_jobs_only' => '2' }
 
       json = {
@@ -106,36 +114,27 @@ module JenkinsPipelineBuilder
         'columns' => get_columns(params[:type])
       }
       json.merge!('groupingRules' => params[:groupingRules]) if params[:groupingRules]
-      payload = {
+
+      {
         'name' => params[:name],
         'mode' => get_mode(params[:type]),
         'description' => params[:description],
         'statusFilter' => statuses.fetch(params[:status_filter], ''),
         'json' => json.to_json
       }
-      payload.merge!('filterQueue' => 'on') if params[:filter_queue]
-      payload.merge!('filterExecutors' => 'on') if params[:filter_executors]
-      payload.merge!('useincluderegex' => 'on', 'includeRegex' => params[:regex]) if params[:regex]
-      payload
     end
 
     def get_mode(type)
-      case type
-      when 'listview'
-        'hudson.model.ListView'
-      when 'myview'
-        'hudson.model.MyView'
-      when 'nestedView'
-        'hudson.plugins.nested_view.NestedView'
-      when 'categorizedView'
-        'org.jenkinsci.plugins.categorizedview.CategorizedJobsView'
-      when 'dashboardView'
-        'hudson.plugins.view.dashboard.Dashboard'
-      when 'multijobView'
-        'com.tikal.jenkins.plugins.multijob.views.MultiJobView'
-      else
-        fail "Type #{type} is not supported by Jenkins."
-      end
+      types = {
+        'listview' => 'hudson.model.ListView',
+        'myview' => 'hudson.model.MyView',
+        'nestedView' => 'hudson.plugins.nested_view.NestedView',
+        'categorizedView' => 'org.jenkinsci.plugins.categorizedview.CategorizedJobsView',
+        'dashboardView' => 'hudson.plugins.view.dashboard.Dashboard',
+        'multijobView' => 'com.tikal.jenkins.plugins.multijob.views.MultiJobView'
+      }
+      fail "Type #{type} is not supported by Jenkins." unless types.keys.include? type
+      types[type]
     end
 
     # Creates a new empty view of the given type

data/spec/lib/jenkins_pipeline_builder/compiler_spec.rb

@@ -139,7 +139,7 @@ describe JenkinsPipelineBuilder::Compiler do
     it 'fails when value not found' do
       item = { enabled: '{{use_fail}}', parameters: { rootPom: 'path_to_pomasd' } }
       settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true }
-      success, _ = compiler.handle_enable(item, settings)
+      success, _item = compiler.handle_enable(item, settings)
       expect(success).to be false
     end
 

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/project.yaml

@@ -0,0 +1,15 @@
+- defaults:
+    name: global
+    description: 'Test pipeline for generator_spec.rb'
+
+- dependencies: 
+    - source: 
+        url: 'spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/jobs.tar.gz'
+        templates:
+          - name: test_temp
+
+- project:
+    name: TemplatePipeline_nested
+    jobs:
+      - '{{name}}-10'
+      - '{{name}}-11'

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -61,8 +61,7 @@ describe JenkinsPipelineBuilder::Generator do
 
     def bootstrap(fixture_path, job_name)
       JenkinsPipelineBuilder.debug!
-      errors = @generator.bootstrap(fixture_path, job_name)
-      errors
+      @generator.bootstrap(fixture_path, job_name)
     end
 
     def fixture_path(fixture)
@@ -84,6 +83,11 @@ describe JenkinsPipelineBuilder::Generator do
       expect(errors).to be_empty
     end
 
+    it 'produces no errors while creating pipeline TemplatePipeline_nested' do
+      errors = bootstrap(fixture_path('template_pipeline_nested'), 'TemplatePipeline_nested')
+      expect(errors).to be_empty
+    end
+
     it 'loads extensions in remote dependencies' do
       errors = bootstrap(fixture_path('template_pipeline'), 'TemplatePipeline')
       expect(errors).to be_empty

data/spec/lib/jenkins_pipeline_builder/job_spec.rb

@@ -135,7 +135,7 @@ describe JenkinsPipelineBuilder::Job do
     it 'fails on an unknown type' do
       job = described_class.new job_type: 'unknonw', name: 'asdf'
 
-      success, _ = job.to_xml
+      success, _payload = job.to_xml
       expect(success).to be false
     end
   end

data/spec/lib/jenkins_pipeline_builder/pull_request_spec.rb

@@ -8,7 +8,6 @@ describe JenkinsPipelineBuilder::PullRequest do
   after :each do
     JenkinsPipelineBuilder.registry.registry[:job][:scm_params].clear_installed_version
   end
-  let(:pull_request_class) { JenkinsPipelineBuilder::PullRequest }
   let(:project) do
     {
       name: 'pull_req_test',
@@ -19,6 +18,7 @@ describe JenkinsPipelineBuilder::PullRequest do
       }
     }
   end
+  let(:value) { { jobs: ['{{name}}-10', '{{name}}-11'] } }
   let(:pull_request) do
     {
       name: '{{name}}-00',
@@ -28,15 +28,45 @@ describe JenkinsPipelineBuilder::PullRequest do
       git_url: 'https://www.github.com/',
       git_repo: 'jenkins_pipeline_builder',
       git_org: 'constantcontact',
-      value: {
-        jobs: ['{{name}}-10', '{{name}}-11']
-      },
+      value: value,
       builders: [
-        { shell_command: 'generate -v || gem install jenkins_pipeline_builder\ngenerate pipeline -c config/{{login_config}} pull_request pipeline/ {{name}}\n' }
+        { shell_command: 'echo "shell command"' }
       ]
     }
   end
+  let(:job1) { '{{name}}-10' }
+  let(:job2) { '{{name}}-11' }
   let(:jobs) do
+    {
+      job1 => {
+        name: job1,
+        type: :'job-template',
+        value: {
+          name: job1,
+          description: '{{description}}',
+          publishers: [{ downstream: { project: "{{job@#{job2}}}" } }]
+        }
+      },
+      job2 => {
+        name: job2,
+        type: :'job-template',
+        value: {
+          name: job2,
+          description: '{{description}}'
+        }
+      }
+    }
+  end
+  let(:post_scm_params) do
+    {
+      changelog_to_branch: {
+        remote: 'origin',
+        branch: 'pr/{{pull_request_number}}/head'
+      },
+      refspec: 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head'
+    }
+  end
+  let(:post_jobs) do
     {
       '{{name}}-10' => {
         name: '{{name}}-10',
@@ -44,7 +74,9 @@ describe JenkinsPipelineBuilder::PullRequest do
         value: {
           name: '{{name}}-10',
           description: '{{description}}',
-          publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }]
+          publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }],
+          scm_branch: 'origin/pr/{{pull_request_number}}/head',
+          scm_params: post_scm_params
         }
       },
       '{{name}}-11' => {
@@ -52,16 +84,25 @@ describe JenkinsPipelineBuilder::PullRequest do
         type: :'job-template',
         value: {
           name: '{{name}}-11',
-          description: '{{description}}'
+          description: '{{description}}',
+          scm_branch: 'origin/pr/{{pull_request_number}}/head',
+          scm_params: post_scm_params
         }
       }
     }
   end
   describe '#initialize' do
     it 'process pull_request' do
-      pull = pull_request_class.new(project, 2, jobs, pull_request)
-      post_jobs = { '{{name}}-10' => { name: '{{name}}-10', type: :'job-template', value: { name: '{{name}}-10', description: '{{description}}', publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }], scm_branch: 'origin/pr/{{pull_request_number}}/head', scm_params: { changelog_to_branch: { remote: 'origin', branch: 'pr/{{pull_request_number}}/head' }, refspec: 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head' } } }, '{{name}}-11' => { name: '{{name}}-11', type: :'job-template', value: { name: '{{name}}-11', description: '{{description}}', scm_branch: 'origin/pr/{{pull_request_number}}/head', scm_params: { changelog_to_branch: { remote: 'origin', branch: 'pr/{{pull_request_number}}/head' },  refspec: 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head' } } } }
-      post_project = { name: 'pull_req_test-PR2', type: :project, value: { name: 'pull_req_test-PR2', jobs: ['{{name}}-00', '{{name}}-10', '{{name}}-11'], pull_request_number: '2' } }
+      pull = described_class.new(project, 2, jobs, pull_request)
+      post_project = {
+        name: 'pull_req_test-PR2',
+        type: :project,
+        value: {
+          name: 'pull_req_test-PR2',
+          jobs: ['{{name}}-00', '{{name}}-10', '{{name}}-11'],
+          pull_request_number: '2'
+        }
+      }
 
       expect(pull.project).to eq(post_project)
       expect(pull.jobs).to eq(post_jobs)
@@ -69,12 +110,15 @@ describe JenkinsPipelineBuilder::PullRequest do
   end
 
   describe '#git_version_0' do
+    let(:post_scm_params) do
+      { refspec: 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head' }
+    end
+
     before :each do
       JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version = '0'
     end
     it 'process pull_request' do
-      pull = pull_request_class.new(project, 2, jobs, pull_request)
-      post_jobs = { '{{name}}-10' => { name: '{{name}}-10', type: :'job-template', value: { name: '{{name}}-10', description: '{{description}}', publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }], scm_branch: 'origin/pr/{{pull_request_number}}/head', scm_params: { refspec: 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head' } } }, '{{name}}-11' => { name: '{{name}}-11', type: :'job-template', value: { name: '{{name}}-11', description: '{{description}}', scm_branch: 'origin/pr/{{pull_request_number}}/head', scm_params: { refspec: 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head' } } } }
+      pull = described_class.new(project, 2, jobs, pull_request)
       expect(pull.jobs).to eq(post_jobs)
     end
   end
@@ -84,8 +128,7 @@ describe JenkinsPipelineBuilder::PullRequest do
       JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version = '2.0'
     end
     it 'process pull_request' do
-      pull = pull_request_class.new(project, 2, jobs, pull_request)
-      post_jobs = { '{{name}}-10' => { name: '{{name}}-10', type: :'job-template', value: { name: '{{name}}-10', description: '{{description}}', publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }], scm_branch: 'origin/pr/{{pull_request_number}}/head', scm_params: { refspec: 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head', changelog_to_branch: { remote: 'origin', branch: 'pr/{{pull_request_number}}/head' } } } }, '{{name}}-11' => { name: '{{name}}-11', type: :'job-template', value: { name: '{{name}}-11', description: '{{description}}', scm_branch: 'origin/pr/{{pull_request_number}}/head', scm_params: { refspec: 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head', changelog_to_branch: { remote: 'origin', branch: 'pr/{{pull_request_number}}/head' } } } } }
+      pull = described_class.new(project, 2, jobs, pull_request)
       expect(pull.jobs).to eq(post_jobs)
     end
   end
@@ -103,46 +146,16 @@ describe JenkinsPipelineBuilder::PullRequest do
         }
       }
     end
-    let(:pull_request) do
-      {
-        name: '{{name}}-00',
-        type: :pull_request_generator,
-        job_type: 'pull_request_generator',
-        git_url: 'https://www.github.com/',
-        git_repo: 'jenkins_pipeline_builder',
-        git_org: 'constantcontact',
-        value: {
-          inject_pr_into: :app_name,
-          jobs: ['{{app_name}}-10', '{{app_name}}-11']
-        },
-        builders: [
-          { shell_command: 'generate -v || gem install jenkins_pipeline_builder\ngenerate pipeline -c config/{{login_config}} pull_request pipeline/ {{name}}\n' }
-        ]
-      }
-    end
-    let(:jobs) do
+    let(:value) do
       {
-        '{{app_name}}-10' => {
-          name: '{{app_name}}-10',
-          type: :'job-template',
-          value: {
-            name: '{{app_name}}-10',
-            description: '{{description}}',
-            publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }]
-          }
-        },
-        '{{app_name}}-11' => {
-          name: '{{app_name}}-11',
-          type: :'job-template',
-          value: {
-            name: '{{app_name}}-11',
-            description: '{{description}}'
-          }
-        }
+        inject_pr_into: :app_name,
+        jobs: ['{{app_name}}-10', '{{app_name}}-11']
       }
     end
+    let(:job1) { '{{app_name}}-10' }
+    let(:job2) { '{{app_name}}-11' }
     it 'injects the pr number into the job name when told to' do
-      pull = pull_request_class.new project, 2, jobs, pull_request
+      pull = described_class.new project, 2, jobs, pull_request
       expect(pull.project[:value][:app_name]).to eq '{{app_name}}-PR2'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -295,16 +295,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: '0'
 description: ! 'This is a simple and easy-to-use Jenkins Pipeline generator with features
   focused on
 
@@ -406,6 +406,8 @@ files:
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/sample_pipeline/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/jobs.tar.gz
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/jobs.tar.gz
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/project.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/project.json
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_job.xml
@@ -482,6 +484,8 @@ test_files:
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/sample_pipeline/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/jobs.tar.gz
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/jobs.tar.gz
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/project.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/project.json
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_job.xml