jenkins_pipeline_builder 0.10.5 → 0.10.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWU1ZGI4Y2VjNTc5MmEyMGMyYTA2YjViMDAzNjJlYWNkYWI1M2RkZA==
+    OGVhNGM1N2I0MzllNGY3NWQwZTE4ODUyYTBlNjg3M2UyZjQyYmMzOQ==
   data.tar.gz: !binary |-
-    MzA4OGQ1MTYwODVlNGQzNzY4N2Q4NjNmMDkxYjY2OWNjMzczMmNjOA==
+    YjJlYTdjNTFhYTdlODVkMWEwNjI3MWE3YmE1MzA4ZjhlM2Y1MTY3Mw==
 SHA512:
   metadata.gz: !binary |-
-    MjUyYzE2YjRmNGQxNzUzOWI3ZmJmN2NlYjVhZjU3Y2JhYjcxNGNmZGFmNDc2
-    NWE2MmJiYzNkNTVhMzI2NzcxZDExNWRjYTdiZTc4M2M1NDI1MmE3ZmJiNmFm
-    MjM3M2I5Y2U0NWJiNjc2OTllNDZkMmMwNDQzMmJiMDgzN2UwNmI=
+    NjU5YzFhZTQ0MmYyZjlmOTBiZGM2OTQ5YmNiZDM1YWUyZWZhNTRjNTZhOWY3
+    NzIzZGI4MTMwZDJhZmE1YjJjNDNmOTY1NmU5OTEzNjE1YmZlMjBiNzNhMjU2
+    YTlkNDU3MjliODdlYzUzODg3OGIwNjQ0NzA2ZGI2NjQyZTdhZmM=
   data.tar.gz: !binary |-
-    MjJlMWRiN2ZjMGRhNDZiODdlYjJiODgzNTY5Zjk2MjEyZjUxZWFjODZkNWEw
-    ZjQ5YjU2NTQwMzJlNzNkY2M0N2E0NDRjMmIwYjUwNjZlMDM5NDQyZDdmMzQw
-    MmQyZDJmMmIyMDVjYTZjYWJhMjVjODMyZjk5MDc1Y2RiMGU1NDg=
+    ZWRmODUwZmFkZDQ1N2ZmZGJkNDU3ZDc1OGM1MTU5OGVlMWNiMGJmNTc3ODg2
+    N2FjNTJlYjllOWZmMjEzM2U5MmEzNzdkMTExYmRhZjI0MGI4NDE5ZmZmM2U5
+    ODU4Y2JlZjI5MWI3YWZlMDdlYTViMWI3ZGJmNThlZWM2NjkzNjA=

data/.rubocop.yml

@@ -29,6 +29,7 @@ Metrics/LineLength:
     - '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/*'
 
 # Configuration parameters: CountComments.

data/lib/jenkins_pipeline_builder.rb

@@ -27,6 +27,7 @@ require 'jenkins_pipeline_builder/version'
 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/generator'

data/lib/jenkins_pipeline_builder/cli/base.rb

@@ -28,7 +28,7 @@ module JenkinsPipelineBuilder
       class_option :username, aliases:  '-u', desc:  'Name of Jenkins user'
       class_option :password, aliases:  '-p', desc:  'Password of Jenkins user'
       class_option :password_base64, aliases:  '-b', desc:  'Base 64 encoded password of Jenkins user'
-      class_option :server_ip, aliases:  '-s', desc:  'Jenkins server IP address'
+      class_option :server, aliases:  '-s', desc:  'Jenkins server IP address or URL'
       class_option :server_port, aliases:  '-o', desc:  'Jenkins port'
       class_option :creds_file, aliases:  '-c', desc:  'Credentials file for communicating with Jenkins server'
       class_option :debug, type: :boolean, aliases: '-d', desc: 'Run in debug mode (no Jenkins changes)', default: false

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -40,9 +40,8 @@ module JenkinsPipelineBuilder
       # @return [JenkinsPipelineBuilder::Generator] A new Client object
       #
       def self.setup(options)
-        if options[:username] && options[:server_ip] && \
-          (options[:password] || options[:password_base64])
-          creds = options
+        if options[:username] && options[:server] && (options[:password] || options[:password_base64])
+          creds = process_cli_creds(options)
         elsif options[:creds_file]
           if options[:creds_file].end_with? 'json'
             creds = JSON.parse(IO.read(File.expand_path(options[:creds_file])))
@@ -58,7 +57,7 @@ module JenkinsPipelineBuilder
         else
           msg = 'Credentials are not set. Please pass them as parameters or'
           msg << ' set them in the default credentials file'
-          puts msg
+          $stderr.puts msg
           exit 1
         end
 
@@ -67,6 +66,21 @@ module JenkinsPipelineBuilder
         generator.debug = options[:debug]
         generator
       end
+
+      def self.process_cli_creds(options)
+        creds = {}.with_indifferent_access.merge options
+        if creds[:server] =~ Resolv::AddressRegex
+          creds[:server_ip] = creds.delete :server
+        elsif creds[:server] =~ URI.regexp
+          creds[:server_url] = creds.delete :server
+        else
+          msg = "server given (#{creds[:server]}) is neither a URL nor an IP."
+          msg << ' Please pass either a valid IP address or valid URI'
+          $stderr.puts msg
+          exit 1
+        end
+        creds
+      end
     end
   end
 end

data/lib/jenkins_pipeline_builder/generator.rb

@@ -119,6 +119,10 @@ module JenkinsPipelineBuilder
       File.open(job_name + '.xml', 'w') { |f| f.write xml }
     end
 
+    def out_dir
+      'out/xml'
+    end
+
     #
     # BEGIN PRIVATE METHODS
     #
@@ -618,9 +622,5 @@ module JenkinsPipelineBuilder
         xml.removedJobAction 'IGNORE'
       end
     end
-
-    def out_dir
-      'out/xml'
-    end
   end
 end

data/lib/jenkins_pipeline_builder/pull_request.rb

@@ -19,66 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-
 module JenkinsPipelineBuilder
-  class PullRequestGenerator
-    attr_reader :purge
-    attr_reader :create
-    attr_reader :jobs
-
-    def initialize(project, jobs, pull_job)
-      @purge = []
-      @create = []
-      @jobs = {}
-
-      pull_requests = check_for_pull pull_job
-      purge_old(pull_requests, project)
-      pull_requests.each do |number|
-        # Manipulate the YAML
-        req = JenkinsPipelineBuilder::PullRequest.new(project, number, jobs, pull_job)
-        @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
-    end
-
-    private
-
-    # 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]
-      # Build the Git URL
-      git_url = "#{args[:git_url]}api/v3/repos/#{args[:git_org]}/#{args[: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
-
-    # Purge old builds
-    def purge_old(pull_requests, project)
-      reqs = pull_requests.clone.map { |req| "#{project[:name]}-PR#{req}" }
-      # Read File
-      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(',') }
-    end
-  end
-
   class PullRequest
     attr_reader :project    # The root project YAML as a hash
     attr_reader :number     # The pull request number
@@ -117,7 +58,7 @@ module JenkinsPipelineBuilder
     # Change the git branch for each job
     def change_git!
       @jobs.each_value do |job|
-        job[:value][:scm_branch] = "origin/pr/#{@number}/head"
+        job[:value][:scm_branch] = 'origin/pr/{{pull_request_number}}/head'
         job[:value][:scm_params] = {} unless job[:value][:scm_params]
         job[:value][:scm_params][:refspec] = 'refs/pull/*:refs/remotes/origin/pr/*'
       end

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -0,0 +1,81 @@
+#
+# 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 PullRequestGenerator
+    attr_reader :purge
+    attr_reader :create
+    attr_reader :jobs
+
+    def initialize(project, jobs, pull_job)
+      @purge = []
+      @create = []
+      @jobs = {}
+
+      pull_requests = check_for_pull pull_job
+      purge_old(pull_requests, project)
+      pull_requests.each do |number|
+        # Manipulate the YAML
+        req = JenkinsPipelineBuilder::PullRequest.new(project, number, jobs, pull_job)
+        @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
+    end
+
+    private
+
+    # 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]
+      # Build the Git URL
+      git_url = "#{args[:git_url]}api/v3/repos/#{args[:git_org]}/#{args[: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
+
+    # Purge old builds
+    def purge_old(pull_requests, project)
+      reqs = pull_requests.clone.map { |req| "#{project[:name]}-PR#{req}" }
+      # Read File
+      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(',') }
+    end
+  end
+end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.10.5'
+  VERSION = '0.10.6'
 end

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

@@ -0,0 +1,105 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe JenkinsPipelineBuilder::CLI::Helper do
+  context '#setup' do
+    let(:generator) do
+      instance_double(
+        JenkinsPipelineBuilder::Generator,
+        :debug= => true
+      )
+    end
+
+    before(:each) do
+      allow(JenkinsPipelineBuilder).to receive(:generator).and_return(generator)
+    end
+
+    context 'username and password given' do
+      let(:options) do
+        {
+          username: 'username',
+          password: 'password'
+        }
+      end
+
+      let(:expected_options) do
+        {
+          username: 'username',
+          password: 'password'
+        }
+      end
+
+      it 'should handle server arg being an ipv4 address' do
+        expect(JenkinsPipelineBuilder).to receive(:credentials=).with(expected_options)
+        options[:server] = '127.0.0.1'
+        expected_options[:server_ip] = '127.0.0.1'
+        described_class.setup(options)
+      end
+
+      it 'should handle server arg being an ipv6 address' do
+        expect(JenkinsPipelineBuilder).to receive(:credentials=).with(expected_options)
+        options[:server] = '::1'
+        expected_options[:server_ip] = '::1'
+        described_class.setup(options)
+      end
+
+      it 'should handle server arg being a url' do
+        expect(JenkinsPipelineBuilder).to receive(:credentials=).with(expected_options)
+        options[:server] = 'https://localhost.localdomain'
+        expected_options[:server_url] = 'https://localhost.localdomain'
+        described_class.setup(options)
+      end
+
+      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.setup(options) }.to raise_error(SystemExit, 'exit')
+      end
+    end
+
+    context 'credential file given' do
+      let(:creds_file_base) { 'spec/lib/jenkins_pipeline_builder/fixtures/sample_creds' }
+
+      let(:expected_options) do
+        {
+          'username' => 'username',
+          'password' => 'password',
+          'server_url' => 'https://localhost.localdomain',
+          'server_port' => 8080
+        }
+      end
+
+      it 'should handle credentials passed as a yaml file' do
+        options = {
+          creds_file: "#{creds_file_base}.yaml"
+        }
+        expect(JenkinsPipelineBuilder).to receive(:credentials=).with(expected_options)
+        described_class.setup(options)
+      end
+
+      it 'should handle credentials passed as a json file' do
+        options = {
+          creds_file: "#{creds_file_base}.json"
+        }
+        expect(JenkinsPipelineBuilder).to receive(:credentials=).with(expected_options)
+        described_class.setup(options)
+      end
+
+      it 'should handle the debug flag' do
+        options = { debug: true }
+        expected_options = {
+          username: :foo,
+          password: :bar,
+          server_ip: :baz
+        }
+        expect(JenkinsPipelineBuilder).to receive(:credentials=).with(expected_options)
+        described_class.setup(options)
+      end
+
+      it 'should puts and error to stdout and exit if no credentials are passed' do
+        expect(File).to receive(:exist?).and_return(false)
+        expect($stderr).to receive(:puts).with(/Credentials are not set/)
+        expect { described_class.setup({}) }.to raise_error(SystemExit, 'exit')
+      end
+    end
+  end
+end

data/spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.json

@@ -0,0 +1,6 @@
+{
+  "server_url": "https://localhost.localdomain",
+  "server_port": 8080,
+  "username": "username",
+  "password": "password"
+}

data/spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.yaml

@@ -0,0 +1,4 @@
+server_url: https://localhost.localdomain
+server_port: 8080
+username: username
+password: password

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 def cleanup_compiled_xml(job_name)
-  Dir["#{job_name}*.xml"].each do |file|
+  Dir["#{@generator.out_dir}/#{job_name}*.xml"].each do |file|
     File.delete(file)
   end
 end
@@ -133,7 +133,24 @@ describe JenkinsPipelineBuilder::Generator do
     before :each do
       allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(
         list_installed: { 'description' => '20.0', 'git' => '20.0' })
+      @generator.debug = true
     end
+    let(:jobs) do
+      {
+        '{{name}}-10-SampleJob' => {
+          name: '{{name}}-10-SampleJob',
+          type: :job,
+          value: {
+            name: '{{name}}-10-SampleJob',
+            scm_branch: 'origin/pr/{{pull_request_number}}/head',
+            scm_params: {
+              refspec: 'refs/pull/*:refs/remotes/origin/pr/*'
+            }
+          }
+        }
+      }
+    end
+    let(:path) { File.expand_path('../fixtures/generator_tests/pullrequest_pipeline', __FILE__) }
     it 'produces no errors while creating pipeline PullRequest' do
       # Dummy data
       purge = []
@@ -143,29 +160,15 @@ describe JenkinsPipelineBuilder::Generator do
           type: :project,
           value: {
             name: 'PullRequest-PR1',
+            pull_request_number: '1',
             jobs: [
               '{{name}}-10-SampleJob'
             ]
           }
         }
       ]
-      jobs = {
-        '{{name}}-10-SampleJob' => {
-          name: '{{name}}-10-SampleJob',
-          type: :job,
-          value: {
-            name: '{{name}}-10-SampleJob',
-            scm_branch: 'origin/pr/2/head',
-            scm_params: {
-              refspec: 'refs/pull/*:refs/remotes/origin/pr/*'
-            }
-          }
-        }
-      }
       # Run the test
-      @generator.debug = true
       job_name = 'PullRequest'
-      path = File.expand_path('../fixtures/generator_tests/pullrequest_pipeline', __FILE__)
       expect(JenkinsPipelineBuilder::PullRequestGenerator).to receive(:new).once.and_return(
         double(purge: purge, create: create, jobs: jobs)
       )
@@ -173,6 +176,39 @@ describe JenkinsPipelineBuilder::Generator do
       expect(success).to be_truthy
       cleanup_compiled_xml(job_name)
     end
+
+    it 'correclty creates jobs when there are multiple pulls open' do
+      purge = []
+      create = %w(1 2).map do |n|
+        {
+          name: "PullRequest-PR#{n}",
+          type: :project,
+          value: {
+            pull_request_number: n,
+            name: "PullRequest-PR#{n}",
+            jobs: [
+              '{{name}}-10-SampleJob'
+            ]
+          }
+        }
+      end
+      job_name = 'PullRequest'
+      expect(JenkinsPipelineBuilder::PullRequestGenerator).to receive(:new).once.and_return(
+        double(purge: purge, create: create, jobs: jobs)
+      )
+      expect(@generator).to receive(:compile_job_to_xml).once.with(
+        name: 'PullRequest-PR1-10-SampleJob', scm_branch: 'origin/pr/1/head', scm_params: {
+          refspec: 'refs/pull/*:refs/remotes/origin/pr/*'
+        }
+      )
+      expect(@generator).to receive(:compile_job_to_xml).once.with(
+        name: 'PullRequest-PR2-10-SampleJob', scm_branch: 'origin/pr/2/head', scm_params: {
+          refspec: 'refs/pull/*:refs/remotes/origin/pr/*'
+        }
+      )
+      expect(@generator.pull_request(path, job_name)).to be_truthy
+      cleanup_compiled_xml(job_name)
+    end
     # Things to check for
     # Fail - no PR job type found
     # Encounters failure during build process

data/spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../spec_helper', __FILE__)
+require 'webmock/rspec'
+
+describe JenkinsPipelineBuilder::PullRequestGenerator do
+  let(:pull_request_generator) { JenkinsPipelineBuilder::PullRequestGenerator }
+  let(:project) { { name: 'pull_req_test', type: :project, value: { name: 'pull_req_test', jobs: ['{{name}}-00', '{{name}}-10', '{{name}}-11'] } } }
+  let(:jobs) { { '{{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(:create_jobs) { [{ 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' } }] }
+  let(:pull_request) { { name: '{{name}}-00', type: :job, name: '{{name}}-00', 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' }] } }
+  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/"}]}')
+  end
+  describe '#initialize' do
+    after(:all) do
+      FileUtils.rm_r 'pull_requests.csv'
+    end
+    it 'can work without a csv' do
+      pull = pull_request_generator.new(project, jobs, pull_request)
+      expect(pull.purge.count).to eq(0)
+      expect(pull.create).to eq(create_jobs)
+    end
+    it 'can work with a csv' do
+      pull = pull_request_generator.new(project, jobs, pull_request)
+      expect(pull.purge.count).to eq(0)
+      expect(pull.create).to eq(create_jobs)
+    end
+  end
+end

data/spec/lib/jenkins_pipeline_builder/pull_request_spec.rb

@@ -1,34 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'webmock/rspec'
 
-describe JenkinsPipelineBuilder::PullRequestGenerator do
-  let(:pull_request_generator) { JenkinsPipelineBuilder::PullRequestGenerator }
-  let(:project) { { name: 'pull_req_test', type: :project, value: { name: 'pull_req_test', jobs: ['{{name}}-00', '{{name}}-10', '{{name}}-11'] } } }
-  let(:jobs) { { '{{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(:create_jobs) { [{ 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' } }] }
-  let(:pull_request) { { name: '{{name}}-00', type: :job, name: '{{name}}-00', 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' }] } }
-  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/"}]}')
-  end
-  describe '#initialize' do
-    after(:all) do
-      FileUtils.rm_r 'pull_requests.csv'
-    end
-    it 'can work without a csv' do
-      pull = pull_request_generator.new(project, jobs, pull_request)
-      expect(pull.purge.count).to eq(0)
-      expect(pull.create).to eq(create_jobs)
-    end
-    it 'can work with a csv' do
-      pull = pull_request_generator.new(project, jobs, pull_request)
-      expect(pull.purge.count).to eq(0)
-      expect(pull.create).to eq(create_jobs)
-    end
-  end
-end
-
 describe JenkinsPipelineBuilder::PullRequest do
   let(:pull_request_class) { JenkinsPipelineBuilder::PullRequest }
   let(:project) { { name: 'pull_req_test', type: :project, value: { name: 'pull_req_test', jobs: ['{{name}}-00', '{{name}}-10', '{{name}}-11'] } } }
@@ -37,7 +9,7 @@ describe JenkinsPipelineBuilder::PullRequest do
   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/2/head', scm_params: { refspec: 'refs/pull/*:refs/remotes/origin/pr/*' } } }, '{{name}}-11' => { name: '{{name}}-11', type: :'job-template', value: { name: '{{name}}-11', description: '{{description}}', scm_branch: 'origin/pr/2/head', scm_params: { refspec: 'refs/pull/*:refs/remotes/origin/pr/*' } } } }
+      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/*:refs/remotes/origin/pr/*' } } }, '{{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/*:refs/remotes/origin/pr/*' } } } }
       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)
@@ -51,7 +23,7 @@ describe JenkinsPipelineBuilder::PullRequest do
     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/2/head', scm_params: { refspec: 'refs/pull/*:refs/remotes/origin/pr/*' } } }, '{{name}}-11' => { name: '{{name}}-11', type: :'job-template', value: { name: '{{name}}-11', description: '{{description}}', scm_branch: 'origin/pr/2/head', scm_params: { refspec: 'refs/pull/*:refs/remotes/origin/pr/*' } } } }
+      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/*:refs/remotes/origin/pr/*' } } }, '{{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/*:refs/remotes/origin/pr/*' } } } }
       expect(pull.jobs).to eq(post_jobs)
     end
   end
@@ -62,7 +34,7 @@ describe JenkinsPipelineBuilder::PullRequest do
     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/2/head', scm_params: { refspec: 'refs/pull/*:refs/remotes/origin/pr/*', changelog_to_branch: { remote: 'origin', branch: 'pr-{{pull_request_number}}' } } } }, '{{name}}-11' => { name: '{{name}}-11', type: :'job-template', value: { name: '{{name}}-11', description: '{{description}}', scm_branch: 'origin/pr/2/head', scm_params: { refspec: 'refs/pull/*:refs/remotes/origin/pr/*', changelog_to_branch: { remote: 'origin', branch: 'pr-{{pull_request_number}}' } } } } }
+      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/*:refs/remotes/origin/pr/*', changelog_to_branch: { remote: 'origin', branch: 'pr-{{pull_request_number}}' } } } }, '{{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/*:refs/remotes/origin/pr/*', changelog_to_branch: { remote: 'origin', branch: 'pr-{{pull_request_number}}' } } } } }
       expect(pull.jobs).to eq(post_jobs)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -359,6 +359,7 @@ files:
 - lib/jenkins_pipeline_builder/generator.rb
 - lib/jenkins_pipeline_builder/module_registry.rb
 - lib/jenkins_pipeline_builder/pull_request.rb
+- lib/jenkins_pipeline_builder/pull_request_generator.rb
 - lib/jenkins_pipeline_builder/utils.rb
 - lib/jenkins_pipeline_builder/version.rb
 - lib/jenkins_pipeline_builder/view.rb
@@ -366,6 +367,7 @@ files:
 - out/xml/.keep
 - pipeline/Jenkins-Pipeline-Builder.yaml
 - pipeline/project.yaml
+- spec/lib/jenkins_pipeline_builder/cli/helper_spec.rb
 - spec/lib/jenkins_pipeline_builder/compiler_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/builders_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/job_attributes_spec.rb
@@ -395,11 +397,14 @@ files:
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_json_files/view.json
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/project.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/view.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.json
+- spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/duplicate_view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/parent_view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/regular_view.yaml
 - spec/lib/jenkins_pipeline_builder/generator_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
@@ -430,6 +435,7 @@ signing_key:
 specification_version: 4
 summary: This gem is will boostrap your Jenkins pipelines
 test_files:
+- spec/lib/jenkins_pipeline_builder/cli/helper_spec.rb
 - spec/lib/jenkins_pipeline_builder/compiler_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/builders_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/job_attributes_spec.rb
@@ -459,11 +465,14 @@ test_files:
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_json_files/view.json
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/project.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/view.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.json
+- spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/duplicate_view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/parent_view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/regular_view.yaml
 - spec/lib/jenkins_pipeline_builder/generator_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