jenkins_pipeline_builder 0.12.4 → 0.13.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmMyYTNiNzc4YjYyZGM1ZDM3OGFlMzQ5ZjdhNDA2NTM3NzA4YjFjYg==
+    ZGMzZGY0Yzk1MzZiMGYzNzc1ZGZlODIwNmQ3NDRjMWZkYWEzZWVkMw==
   data.tar.gz: !binary |-
-    YTY5ZjBjMTk0NGY5OWYzMjE5MzViMDlkZmE5ZWQ5NWFkZDhjNTUyOQ==
+    OWNkMTcwZDE1NTgxYTU1MWU0MTlhZGNmOTZjNGEwYjE5NTIwNTIzMA==
 SHA512:
   metadata.gz: !binary |-
-    ZThiYmVmYmM1MmUxMTYxYTJhMjc2YTI2MDhiMTI2MDg4NDM5NDIzNDZhMDA4
-    MzdkMmI3ZTIyYWI0NzE0N2ZjNWFjZGViMWUzMjhjMWRlZTc2MzFjZGU1ZTBm
-    YTg4ZDMwZjNlNzFlZDQwZjQ4YzkzMzY2NDRjZjlmOGQ5ODg2MjY=
+    NmE2YTA2MGI3NmU1MjkxMzI0YjkzNjY1NmE2ZGYwOTMwMzY2NDU5Yzg5ZWM3
+    YjJmMjcyY2NhNjkwOWJhZTY0ZTgyODcxNjY0NWExZGU3MmY3ZmU0MDFhMTY3
+    NDUyMjA5MTBlOTg4YTc5YzA2NjM5NjFiNGZhY2ViODgxMzBlODQ=
   data.tar.gz: !binary |-
-    MGNjOGYxYjUxMDRlMGIzMDFhYTY4NTViNzFiOTEyMGUwYTdiOGI0YzY1ZmRj
-    MWM3ODU3YThjZmU3ZDI2NDBjNDRmMjEzZjE3OWMxNWQ3N2NkYzZhODM2YTNl
-    ZmU5YWM4YmMyYmRhZjI3ODY3YWFlMzk5Y2Y4Y2U0YWQyNjYyNmM=
+    NmJiYjMyOGU5MDgyN2Y3MjI4MDEyZDVhNGZkOGEzZjE1YjNlMTE2YzRmNDZl
+    N2M5ZWIyYmFhNzZlZDg3ZjFmOTRkODRmOTFkYmVjYTNmYWEzY2ViMTYxNDVk
+    YzU2ZWJjYzM5N2VmMWY1NDAzYTUyY2ExMTg1ZTQ5OGNmMDI5Mzk=

data/lib/jenkins_pipeline_builder.rb

@@ -28,7 +28,6 @@ require 'jenkins_pipeline_builder/utils'
 require 'jenkins_pipeline_builder/compiler'
 require 'jenkins_pipeline_builder/module_registry'
 require 'jenkins_pipeline_builder/pull_request_generator'
-require 'jenkins_pipeline_builder/pull_request'
 require 'jenkins_pipeline_builder/view'
 require 'jenkins_pipeline_builder/job_collection'
 require 'jenkins_pipeline_builder/job'

data/lib/jenkins_pipeline_builder/generator.rb

@@ -1,6 +1,5 @@
 #
 # Copyright (c) 2014 Constant Contact
-#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
@@ -48,29 +47,22 @@ module JenkinsPipelineBuilder
 
     def bootstrap(path, project_name = nil)
       logger.info "Bootstrapping pipeline from path #{path}"
-      job_collection.load_from_path(path)
-      job_collection.remote_dependencies.cleanup
-
-      if job_collection.projects.any?
-        errors = publish_project(project_name)
-      else
-        errors = publish_jobs(job_collection.standalone_jobs)
-      end
-      print_compile_errors errors
-      errors
+      load_job_collection path
+      publish(project_name || job_collection.projects.first[:name])
     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
+      load_job_collection path
+      defaults = job_collection.defaults[:value]
+      pr_generator = PullRequestGenerator.new defaults
+      pr_generator.delete_closed_prs
+      errors = []
+      pr_generator.open_prs.each do |pr|
+        pr_generator.convert! job_collection, pr
+        error = publish(project_name)
+        errors << error unless error.empty?
       end
-      print_compile_errors errors
       errors.empty?
     end
 
@@ -112,6 +104,21 @@ module JenkinsPipelineBuilder
 
     private
 
+    def load_job_collection(path)
+      job_collection.load_from_path(path)
+      job_collection.remote_dependencies.cleanup
+    end
+
+    def publish(project_name)
+      if job_collection.projects.any?
+        errors = publish_project(project_name)
+      else
+        errors = publish_jobs(job_collection.standalone_jobs)
+      end
+      print_compile_errors errors
+      errors
+    end
+
     def process_project(project)
       project_body = project[:value]
       jobs = prepare_jobs(project_body[:jobs]) if project_body[:jobs]
@@ -139,15 +146,6 @@ module JenkinsPipelineBuilder
       end
     end
 
-    def process_pull_request_project(project)
-      logger.info "Using Project #{project}"
-
-      pull_request_generator = JenkinsPipelineBuilder::PullRequestGenerator.new project, self
-
-      return {} if pull_request_generator.valid?
-      { pull_request_generator.pull_generator[:name] => pull_request_generator.errors }
-    end
-
     def prepare_jobs(jobs)
       jobs.map! do |job|
         job.is_a?(String) ? { job.to_sym => {} } : job
@@ -221,15 +219,8 @@ module JenkinsPipelineBuilder
     end
 
     def publish_project(project_name)
-      errors = {}
-      found = false
-      job_collection.projects.each do |project|
-        next if project[:name] != project_name && !project_name.nil?
-        found = true
-        errors = create_jobs_and_views(project)
-      end
-      fail "Project #{project_name} not found!" unless found
-      errors
+      project = job_collection.projects.find { |p| p[:name] == project_name }
+      create_jobs_and_views(project || fail("Project #{project_name} not found!"))
     end
 
     def publish_jobs(jobs, errors = {})

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -19,149 +19,54 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-
 module JenkinsPipelineBuilder
   class PullRequestGenerator
     class NotFound < StandardError; end
+    attr_accessor :open_prs, :application_name
 
-    attr_reader :purge, :create, :jobs, :project, :generator, :pull_generator, :errors, :pull_requests
-
-    def initialize(project, generator)
-      @project = project
-      @generator = generator
-      @purge = []
-      @create = []
-      @errors = {}
-
-      @pull_generator = find
-      payload = compile_generator
-      return unless payload
-      @jobs = filter_jobs
-
-      # old init
-      @pull_requests = check_for_pull payload
-      find_old_pull_requests
-      generate_pull_requests
-
-      collection.merge! @jobs
-      @errors.merge! create_jobs
-
-      purge_jobs
-    end
-
-    def valid?
-      errors.empty?
+    def initialize(defaults = {})
+      @application_name = defaults[:application_name]
+      @open_prs = active_prs defaults[:github_site], defaults[:git_org], defaults[:git_repo_name]
     end
 
-    private
-
-    def generate_pull_requests
-      @pull_requests.each do |number|
-        req = JenkinsPipelineBuilder::PullRequest.new(project, number, jobs, @pull_generator)
-        @jobs.merge! req.jobs
-        project_new = req.project
-
-        # Overwrite the jobs from the generator to the project
-        project_new[:value][:jobs] = req.jobs.keys
-        @create << project_new
-      end
+    def convert!(job_collection, pr)
+      job_collection.defaults[:value][:application_name] = "#{application_name}-PR#{pr}"
+      job_collection.jobs.each { |j| override j[:value], pr }
     end
 
-    def purge_jobs
-      purge.each do |purge_job|
-        jobs = JenkinsPipelineBuilder.client.job.list "#{purge_job}.*"
-        jobs.each do |job|
-          JenkinsPipelineBuilder.client.job.delete job
-        end
+    def delete_closed_prs
+      return if JenkinsPipelineBuilder.debug
+      jobs_to_delete = JenkinsPipelineBuilder.client.job.list "#{application_name}-PR.*"
+      open_prs.each do |n|
+        jobs_to_delete.reject! { |j| j.start_with? "#{application_name}-PR#{n}" }
       end
+      jobs_to_delete.each { |j| JenkinsPipelineBuilder.client.job.delete j }
     end
 
-    def create_jobs
-      errors = {}
-      create.each do |pull_project|
-        success, compiled_project = generator.resolve_project(pull_project)
-        compiled_project[:value][:jobs].each do |i|
-          job = i[:result]
-          job = Job.new job
-          success, payload = job.create_or_update
-          errors[job.name] = payload unless success
-        end
-      end
-      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] = collection[job.to_s]
-        else
-          jobs[job.keys.first.to_s] = collection[job.keys.first.to_s]
-        end
-      end
-      fail 'No jobs found for pull request' if jobs.empty?
-      jobs
-    end
-
-    def compile_generator
-      defaults = generator.job_collection.defaults
-      settings = defaults.nil? ? {} : defaults[:value] || {}
-      compiler = Compiler.new generator
-      settings = compiler.get_settings_bag(project, settings)
-      success, payload = generator.resolve_job_by_name(pull_generator[:name], settings)
-      return payload if success
+    private
 
-      @errors[@pull_generator[:name]] = payload
-      false
+    def override(job, pr)
+      git_version = JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version
+      job[:scm_branch] = "origin/pr/#{pr}/head"
+      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
     end
 
-    def find
-      project_jobs = project[:value][:jobs] || []
-      pull_job = nil
-      project_jobs.each do |job|
-        job = job.keys.first if job.is_a? Hash
-        job = collection[job.to_s]
-
-        pull_job = job if job[:value][:job_type] == 'pull_request_generator'
-      end
-      fail NotFound, 'No jobs of type pull_request_generator found' unless pull_job
-      pull_job
-    end
-
-    # Check for Github Pull Requests
-    #
-    # args[:git_url] URL to the github main page ex. https://www.github.com/
-    # args[:git_repo] Name of repo only, not url  ex. jenkins_pipeline_builder
-    # args[:git_org] The Orig user ex. constantcontact
-    # @return = array of pull request numbers
-    def check_for_pull(args)
-      fail 'Please specify all arguments' unless args[:git_url] && args[:git_org] && args[:git_repo]
+    def active_prs(git_url, git_org, git_repo)
+      (git_url && git_org && git_repo) || fail('Please set github_site, git_org and git_repo_name in your project.')
       # Build the Git URL
-      git_url = "#{args[:git_url]}api/v3/repos/#{args[:git_org]}/#{args[:git_repo]}/pulls"
-
+      url = "#{git_url}/api/v3/repos/#{git_org}/#{git_repo}/pulls"
       # Download the JSON Data from the API
-      resp = Net::HTTP.get_response(URI.parse(git_url))
-      pulls = JSON.parse(resp.body)
-      pulls.map { |p| p['number'] }
-    end
-
-    def find_old_pull_requests
-      reqs = pull_requests.clone.map { |req| "#{project[:name]}-PR#{req}" }
-      # Read File
-      # FIXME: Shouldn't this be opening just with read permissions?
-      old_requests = File.new('pull_requests.csv', 'a+').read.split(',')
-
-      # Pop off current pull requests
-      old_requests.delete_if { |req| reqs.include?("#{req}") }
-      @purge = old_requests
-
-      # Write File
-      File.open('pull_requests.csv', 'w+') { |file| file.write reqs.join(',') }
+      begin
+        resp = Net::HTTP.get_response(URI.parse(url))
+        pulls = JSON.parse(resp.body)
+        pulls.map { |p| p['number'] }
+      rescue StandardError
+        raise 'Failed connecting to github!'
+      end
     end
   end
 end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.12.4'
+  VERSION = '0.13.0'
 end

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/PullRequest-40-PullRequestGenerator.yaml

@@ -1,11 +1,5 @@
 - job:
     name: '{{name}}-40-PullRequestGenerator'
-    job_type: pull_request_generator
-    git_url: '{{git_url}}'
-    git_repo: '{{git_repo}}'
-    git_org: '{{git_org}}'
-    jobs: 
-      - '{{name}}-10-SampleJob'
     builders:
       - shell_command: |
           generate -v || gem install jenkins_pipeline_builder

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

@@ -1,11 +1,12 @@
 - defaults:
     name: global
+    application_name: 'testapp'
     description: 'Test pipeline for generator_spec.rb'
-    git_url: 'https://github.com'
-    git_org: 'bencentra'
-    git_repo: 'generator_tests'
+    github_site: 'https://github.com'
+    git_org: 'testorg'
+    git_repo_name: 'generator_tests'
 
-- project: 
+- project:
     name: PullRequest
     jobs:
       - '{{name}}-10-SampleJob'

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -135,31 +135,32 @@ describe JenkinsPipelineBuilder::Generator do
     let(:path) { File.expand_path('../fixtures/generator_tests/pullrequest_pipeline', __FILE__) }
     it 'produces no errors while creating pipeline PullRequest' do
       job_name = 'PullRequest'
-      allow_any_instance_of(JenkinsPipelineBuilder::PullRequestGenerator).to receive(:check_for_pull).and_return([1])
-      allow_any_instance_of(JenkinsPipelineBuilder::PullRequestGenerator).to receive(:purge_jobs).and_return(true)
+      pr_generator = double('pr_generator')
+      expect(JenkinsPipelineBuilder::PullRequestGenerator).to receive(:new)
+        .with(hash_including(application_name: 'testapp',
+                             github_site: 'https://github.com',
+                             git_org: 'testorg',
+                             git_repo_name: 'generator_tests'))
+        .and_return(pr_generator)
+      expect(pr_generator).to receive(:delete_closed_prs)
+      expect(pr_generator).to receive(:convert!)
+      expect(pr_generator).to receive(:open_prs).and_return [1]
       success = @generator.pull_request(path, job_name)
       expect(success).to be_truthy
     end
 
     it 'correctly creates jobs when there are multiple pulls open' do
       job_name = 'PullRequest'
-      allow_any_instance_of(JenkinsPipelineBuilder::PullRequestGenerator).to receive(:check_for_pull).and_return([1, 2])
-      job1 = double name: 'job name'
-      job2 = double name: 'job name'
-      expect(JenkinsPipelineBuilder::Job).to receive(:new).once.with(
-        name: 'PullRequest-PR1-10-SampleJob', scm_branch: 'origin/pr/1/head', scm_params: {
-          refspec: 'refs/pull/1/head:refs/remotes/origin/pr/1/head',
-          changelog_to_branch: { remote: 'origin', branch: 'pr/1/head' }
-        }
-      ).and_return job1
-      expect(JenkinsPipelineBuilder::Job).to receive(:new).once.with(
-        name: 'PullRequest-PR2-10-SampleJob', scm_branch: 'origin/pr/2/head', scm_params: {
-          refspec: 'refs/pull/2/head:refs/remotes/origin/pr/2/head',
-          changelog_to_branch: { remote: 'origin', branch: 'pr/2/head' }
-        }
-      ).and_return job2
-      expect(job1).to receive(:create_or_update).and_return true
-      expect(job2).to receive(:create_or_update).and_return true
+      pr_generator = double('pr_generator')
+      expect(JenkinsPipelineBuilder::PullRequestGenerator).to receive(:new)
+        .with(hash_including(application_name: 'testapp',
+                             github_site: 'https://github.com',
+                             git_org: 'testorg',
+                             git_repo_name: 'generator_tests'))
+        .and_return(pr_generator)
+      expect(pr_generator).to receive(:delete_closed_prs)
+      expect(pr_generator).to receive(:convert!).twice
+      expect(pr_generator).to receive(:open_prs).and_return [1, 2]
       expect(@generator.pull_request(path, job_name)).to be_truthy
     end
     # Things to check for

data/spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb

@@ -1,99 +1,132 @@
 require File.expand_path('../spec_helper', __FILE__)
-require 'webmock/rspec'
+require 'json'
 
 describe JenkinsPipelineBuilder::PullRequestGenerator do
-  let(:pull_request_generator) { JenkinsPipelineBuilder::PullRequestGenerator }
-  let(:project) do
+  let(:application_name) { 'testapp' }
+  let(:github_site) { 'https://github.com' }
+  let(:git_org) { 'git_org' }
+  let(:git_repo_name) { 'git_repo' }
+  let(:prs) { (1..10).map { |n| "#{application_name}-PR#{n}" } }
+  let(:closed_prs) { (1..6).map { |n| "#{application_name}-PR#{n}" } }
+  let(:open_prs_json) { (7..10).map { |n| { number: n } }.to_json }
+  let(:url) { "#{github_site}/api/v3/repos/#{git_org}/#{git_repo_name}/pulls" }
+  let(:params) do
     {
-      name: 'pull_req_test',
-      type: :project,
-      value: {
-        name: 'pull_req_test',
-        jobs: [
-          {
-            name: '{{name}}-00',
-            type: :job,
-            job_type: 'pull_request_generator',
-            git_url: 'https://www.github.com/',
-            git_repo: 'jenkins_pipeline_builder',
-            git_org: 'constantcontact',
-            jobs: [
-              '{{name}}-10',
-              '{{name}}-11'
-            ],
-            builders: [{ shell_command: 'generate -v || gem install jenkins_pipeline_builder\ngenerate pipeline -c config/{{login_config}} pull_request pipeline/ {{name}}\n' }]
-          },
-          '{{name}}-10',
-          '{{name}}-11']
-      }
+      github_site: github_site,
+      git_org: git_org,
+      git_repo_name: git_repo_name,
+      application_name: application_name
     }
   end
-  let(:jobs) do
-    {
-      '{{name}}-10' => {
-        name: '{{name}}-10',
-        type: :'job-template',
-        value: {
-          name: '{{name}}-10',
-          description: '{{description}}',
-          publishers: [{ downstream: { project: '{{job@{{name}}-11}}' } }]
-        }
-      },
-      '{{name}}-11' => {
-        name: '{{name}}-11',
-        type: :'job-template',
-        value: {
-          name: '{{name}}-11',
-          description: '{{description}}' }
-      }
-    }
+  let(:job_collection) do
+    double('job_collection',
+           defaults: { value: { application_name: application_name } },
+           jobs: [{ value: { scm_branch: 'master', scm_params: { random: 'foo' } } }])
   end
-  let(:create_jobs) do
-    [
-      {
-        name: 'pull_req_test-PR5',
-        type: :project,
-        value: {
-          name: 'pull_req_test-PR5',
-          jobs: ['{{name}}-10',
-                 '{{name}}-11'],
-          pull_request_number: '5' }
-      },
-      {
-        name: 'pull_req_test-PR6',
-        type: :project,
-        value: {
-          name: 'pull_req_test-PR6',
-          jobs: ['{{name}}-10',
-                 '{{name}}-11'],
-          pull_request_number: '6'
-        }
-      }
-    ]
+  subject { JenkinsPipelineBuilder::PullRequestGenerator.new params }
+
+  context '#initialize' do
+    it 'fails when one of the params is not set' do
+      expect do
+        JenkinsPipelineBuilder::PullRequestGenerator.new(application_name: 'name')
+      end.to raise_error('Please set github_site, git_org and git_repo_name in your project.')
+    end
+    it 'fails when github is not reponding properly' do
+      stub_request(:get, url)
+        .with(headers: { 'Accept' => '*/*',
+                         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                         'Host' => 'github.com',
+                         'User-Agent' => 'Ruby' })
+        .to_raise 'error'
+      expect { subject }.to raise_error('Failed connecting to github!')
+    end
   end
-  let(:generator) { JenkinsPipelineBuilder::Generator.new }
-  before do
-    # Request to get current pull requests from github
-    stub_request(:any, 'https://www.github.com/api/v3/repos/constantcontact/jenkins_pipeline_builder/pulls').to_return(body: '[{"number": 5,"state": "open","title": "Update README again" },{"number": 6,"state": "open",  "title": "Update README again2"}]')
-    stub_request(:any, 'http://username:password@127.0.0.1:8080/api/json').to_return(body: '{"assignedLabels":[{}],"mode":"NORMAL","nodeDescription":"the master Jenkins node","nodeName":"","numExecutors":2,"description":null,"jobs":[{"name":"PurgeTest-PR1","url":"http://localhost:8080/job/PurgeTest-PR1/","color":"notbuilt" },{"name":"PurgeTest-PR3","url":"http://localhost:8080/job/PurgeTest-PR3/","color":"notbuilt" },{"name":"PurgeTest-PR4","url":"http://localhost:8080/job/PurgeTest-PR4/","color":"notbuilt"}],"overallLoad":{},"primaryView":{"name":"All","url":"http://localhost:8080/" },"quietingDown":false,"slaveAgentPort":0,"unlabeledLoad":{},"useCrumbs":false,"useSecurity":true,"views":[{"name":"All","url":"http://localhost:8080/"}]}')
+
+  context '#delete_closed_prs' do
+    it 'deletes closed prs' do
+      stub_request(:get, url)
+        .with(headers: { 'Accept' => '*/*',
+                         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                         'Host' => 'github.com',
+                         'User-Agent' => 'Ruby' })
+        .to_return(status: 200, body: open_prs_json, headers: {})
+      job = double('job')
+      expect(job).to receive(:list).with("#{application_name}-PR.*").and_return prs
+      client = double('client', job: job)
+      expect(JenkinsPipelineBuilder).to receive(:debug).and_return false
+      allow(JenkinsPipelineBuilder).to receive(:client).and_return client
+      closed_prs.each { |pr| expect(job).to receive(:delete).with(pr) }
+      subject.delete_closed_prs
+    end
+
+    it 'does not fail when there are no closed prs' do
+      stub_request(:get, url)
+        .with(headers: { 'Accept' => '*/*',
+                         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                         'Host' => 'github.com',
+                         'User-Agent' => 'Ruby' })
+        .to_return(status: 200, body: open_prs_json, headers: {})
+      job = double('job')
+      expect(job).to receive(:list).with("#{application_name}-PR.*").and_return prs - closed_prs
+      client = double('client', job: job)
+      expect(JenkinsPipelineBuilder).to receive(:debug).and_return false
+      allow(JenkinsPipelineBuilder).to receive(:client).and_return client
+      expect(job).not_to receive(:delete)
+      subject.delete_closed_prs
+    end
   end
-  describe '#initialize' do
-    after(:all) do
-      FileUtils.rm_r 'pull_requests.csv'
+
+  context '#convert!' do
+    it 'converts the job application name' do
+      stub_request(:get, url)
+        .with(headers: { 'Accept' => '*/*',
+                         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                         'Host' => 'github.com',
+                         'User-Agent' => 'Ruby' })
+        .to_return(status: 200, body: open_prs_json, headers: {})
+      collection = job_collection.clone
+      subject.convert! collection, 8
+      expect(collection.defaults[:value][:application_name]).to eq "#{application_name}-PR8"
     end
 
-    it 'can work without a csv' do
-      pending 'rework this'
-      pull = pull_request_generator.new(project, generator)
-      generator.job_collection.collection = jobs
-      expect(pull.purge.count).to eq(0)
-      expect(pull.create).to eq(create_jobs)
+    it 'overrides the git params' do
+      stub_request(:get, url)
+        .with(headers: { 'Accept' => '*/*',
+                         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                         'Host' => 'github.com',
+                         'User-Agent' => 'Ruby' })
+        .to_return(status: 200, body: open_prs_json, headers: {})
+      pr = 8
+      collection = job_collection.clone
+      subject.convert! collection, pr
+      expect(collection.jobs.first[:value]).to eq(
+        scm_branch: "origin/pr/#{pr}/head",
+        scm_params: {
+          refspec: "refs/pull/#{pr}/head:refs/remotes/origin/pr/#{pr}/head",
+          changelog_to_branch: { remote: 'origin', branch: "pr/#{pr}/head" },
+          random: 'foo'
+        }
+      )
     end
-    it 'can work with a csv' do
-      pending 'rework this'
-      pull = pull_request_generator.new(project, generator)
-      expect(pull.purge.count).to eq(0)
-      expect(pull.create).to eq(create_jobs)
+
+    it 'does not override extra params' do
+      stub_request(:get, url)
+        .with(headers: { 'Accept' => '*/*',
+                         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                         'Host' => 'github.com',
+                         'User-Agent' => 'Ruby' })
+        .to_return(status: 200, body: open_prs_json, headers: {})
+      pr = 8
+      collection = job_collection.clone
+      subject.convert! collection, pr
+      expect(collection.jobs.first[:value]).to eq(
+        scm_branch: "origin/pr/#{pr}/head",
+        scm_params: {
+          refspec: "refs/pull/#{pr}/head:refs/remotes/origin/pr/#{pr}/head",
+          changelog_to_branch: { remote: 'origin', branch: "pr/#{pr}/head" },
+          random: 'foo'
+        }
+      )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.13.0
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -370,7 +370,6 @@ files:
 - lib/jenkins_pipeline_builder/job_collection.rb
 - lib/jenkins_pipeline_builder/module_registry.rb
 - lib/jenkins_pipeline_builder/project.rb
-- lib/jenkins_pipeline_builder/pull_request.rb
 - lib/jenkins_pipeline_builder/pull_request_generator.rb
 - lib/jenkins_pipeline_builder/remote_dependencies.rb
 - lib/jenkins_pipeline_builder/utils.rb
@@ -427,7 +426,6 @@ files:
 - spec/lib/jenkins_pipeline_builder/job_spec.rb
 - spec/lib/jenkins_pipeline_builder/module_registry_spec.rb
 - spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb
-- spec/lib/jenkins_pipeline_builder/pull_request_spec.rb
 - spec/lib/jenkins_pipeline_builder/spec_helper.rb
 - spec/lib/jenkins_pipeline_builder/utils_spec.rb
 - spec/lib/jenkins_pipeline_builder/view_spec.rb
@@ -505,7 +503,6 @@ test_files:
 - spec/lib/jenkins_pipeline_builder/job_spec.rb
 - spec/lib/jenkins_pipeline_builder/module_registry_spec.rb
 - spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb
-- spec/lib/jenkins_pipeline_builder/pull_request_spec.rb
 - spec/lib/jenkins_pipeline_builder/spec_helper.rb
 - spec/lib/jenkins_pipeline_builder/utils_spec.rb
 - spec/lib/jenkins_pipeline_builder/view_spec.rb

data/lib/jenkins_pipeline_builder/pull_request.rb

@@ -1,92 +0,0 @@
-#
-# Copyright (c) 2014 Constant Contact
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# 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.
-#
-module JenkinsPipelineBuilder
-  class PullRequest
-    attr_reader :project    # The root project YAML as a hash
-    attr_reader :number     # The pull request number
-    attr_reader :jobs       # The jobs in the pull request as an array of hashes
-    attr_reader :pull_generator # The generator job YAML as a hash
-
-    def initialize(project, number, jobs, pull_generator)
-      @project = Marshal.load(Marshal.dump(project))
-      @number = number
-      @jobs = Marshal.load(Marshal.dump(jobs))
-      @pull_generator = Marshal.load(Marshal.dump(pull_generator))
-      @project[:value][:pull_request_number] = "#{@number}"
-
-      run!
-    end
-
-    private
-
-    def run!
-      git_version = JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version
-      if git_version >= Gem::Version.new(2.0)
-        @jobs.each_value do |j|
-          override_git_2_params j
-        end
-      end
-      update_jobs!
-      change_git!
-      change_name!
-    end
-
-    def override_git_2_params(job)
-      job[:value][:scm_params] ||= {}
-      job[:value][:scm_params][:changelog_to_branch] = { remote: 'origin', branch: 'pr/{{pull_request_number}}/head' }
-    end
-
-    # Change the git branch for each job
-    def change_git!
-      @jobs.each_value do |job|
-        job[:value][:scm_branch] = 'origin/pr/{{pull_request_number}}/head'
-        job[:value][:scm_params] = {} unless job[:value][:scm_params]
-        refspec = 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head'
-        job[:value][:scm_params][:refspec] = refspec
-      end
-    end
-
-    # Change the name of the pull request project
-    def change_name!
-      @project[:name] = "#{@project[:name]}-PR#{@number}" if @project[:name]
-      @project[:value][:name] = "#{@project[:value][:name]}-PR#{@number}" if @project[:value][:name]
-
-      return unless pull_generator[:value][:inject_pr_into]
-
-      key = pull_generator[:value][:inject_pr_into].to_sym
-      project[:value][key] = "{{#{key}}}-PR#{@number}" if project[:value]
-    end
-
-    # Apply any specified changes to each job
-    def update_jobs!
-      @jobs.each_value do |job|
-        name = job[:name]
-        changes = nil
-        @pull_generator[:value][:jobs].each do |gen|
-          changes = gen[name.to_sym] if gen.is_a?(Hash) && gen.keys[0] == name.to_sym
-        end
-        # Apply changes
-        Utils.hash_merge!(job[:value], changes) unless changes.nil?
-      end
-    end
-  end
-end

data/spec/lib/jenkins_pipeline_builder/pull_request_spec.rb

@@ -1,161 +0,0 @@
-require File.expand_path('../spec_helper', __FILE__)
-require 'webmock/rspec'
-
-describe JenkinsPipelineBuilder::PullRequest do
-  before :each do
-    JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version = '1000.0'
-  end
-  after :each do
-    JenkinsPipelineBuilder.registry.registry[:job][:scm_params].clear_installed_version
-  end
-  let(:project) do
-    {
-      name: 'pull_req_test',
-      type: :project,
-      value: {
-        name: 'pull_req_test',
-        jobs: ['{{name}}-00', '{{name}}-10', '{{name}}-11']
-      }
-    }
-  end
-  let(:value) { { jobs: ['{{name}}-10', '{{name}}-11'] } }
-  let(:pull_request) do
-    {
-      name: '{{name}}-00',
-      type: :job,
-      job_type: 'pull_request_generator',
-      git_url: 'https://www.github.com/',
-      git_repo: 'jenkins_pipeline_builder',
-      git_org: 'constantcontact',
-      value: value,
-      builders: [
-        { 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',
-        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: post_scm_params
-        }
-      },
-      '{{name}}-11' => {
-        name: '{{name}}-11',
-        type: :'job-template',
-        value: {
-          name: '{{name}}-11',
-          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 = 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)
-    end
-  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 = described_class.new(project, 2, jobs, pull_request)
-      expect(pull.jobs).to eq(post_jobs)
-    end
-  end
-
-  describe '#git_version_2' do
-    before :each do
-      JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version = '2.0'
-    end
-    it 'process pull_request' do
-      pull = described_class.new(project, 2, jobs, pull_request)
-      expect(pull.jobs).to eq(post_jobs)
-    end
-  end
-
-  context 'when the job does not have {{name}} in it' do
-    let(:project) do
-      {
-        name: 'pull_req_test',
-        type: :project,
-        app_name: 'my_app',
-        value: {
-          name: 'pull_req_test',
-          app_name: 'my_app',
-          jobs: ['{{app_name}}-00', '{{app_name}}-10', '{{app_name}}-11']
-        }
-      }
-    end
-    let(:value) do
-      {
-        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 = described_class.new project, 2, jobs, pull_request
-      expect(pull.project[:value][:app_name]).to eq '{{app_name}}-PR2'
-    end
-  end
-end