jenkins_pipeline_builder 0.10.8 → 0.10.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGYzYTA1YjUyZmViMzkwMTdiODdhZjhlM2YzMmJhYzY1Y2Y0NDlmYg==
+    Y2NjMWU0N2Q4MmNhYzVmNGM5YmY5OTBlYjA1YmE0NmIyY2ZlNDU2ZQ==
   data.tar.gz: !binary |-
-    YjIzZjFkZGY2ZDk3MGIxYzQ2MTFiMzI1MDllY2RiMTkxOGY2NDljNA==
+    YmJmNzUzMDZiOTRmYTZkODY0MTllNDQ2OWM1ZGM4MTYxZGQyYzE3Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZjQ1YjI2YzYxZjgxMzRkNzNlOWEzY2VkZDYzOGUxZGRhY2E2YjgyNTExNTBj
-    YmQ4N2U4ZjA3NWI3NDdkMzU3NzJmZTI3M2RjMDQ1OWY3YjZmYjJjNzM5NzE1
-    NTZhYjNmYmVlOTdkNzY1YzNiNWM3NTlkY2Q3NWY2ZmQ1ZjZkYjE=
+    NmI4ZmY2OWQxNTQ1NDA0NmY2ZGRmNjgyNjg4YjBjZDUwMmI2MDg2MGM4YjI5
+    MTcxMWY4ZmU2Y2RhMTIwZjc3MzI2NTRkNWYyYjZmM2M0ZDgzNGJhNmM0ZmIz
+    M2Q0YmFiMzFmODg3YWNhMjM0YmUwZjBlZTI5ODQ4MDcyNjZjNDQ=
   data.tar.gz: !binary |-
-    ZjI4MTkwNDFhMWYwMDdhMGY4YTBhN2NjZjBkNmE2ODY3MGJhYWIwYjY1MTgx
-    ZDhhNDQ3YTkzMTA2OWYyY2Q1ZTA5OWU5YmQ4MDdjYmM1YzMzY2RmNzJjMzcx
-    Y2U4YTAyYmExNjAwMWFiYTVjYzRiYmI1NGJmMzVjZGVkNzdlYzY=
+    ZGQ1ODhjNzViZWYwMWViYmVkYmQ5MGYxYjY1ZGU1Y2I0NTE3ZGQzY2Q5NzRm
+    OTEwOGZhNTE1YjI1YmI0NDJkZjc3NzJmOWI2OGY1OTlhODFmNjZjZGY5Yzcy
+    ODA4MjVjOWFlNWUyZmY4N2I4YjlkY2Q5NjhmMWE3NzY4MzVhNjY=

data/jenkins_pipeline_builder.gemspec

@@ -42,5 +42,7 @@ 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'
 end

data/lib/jenkins_pipeline_builder/cli/describe.rb

@@ -28,7 +28,6 @@ module JenkinsPipelineBuilder
       klass_name = entry.to_s.classify
       # rubocop:disable Style/AccessModifierIndentation
       klass = Class.new(Thor) do
-
         if entry == :job_attributes
           extensions = JenkinsPipelineBuilder.registry.registry[:job].select { |_, x| x.is_a? ExtensionSet }
         else

data/lib/jenkins_pipeline_builder/extensions.rb

@@ -23,35 +23,20 @@ require 'jenkins_pipeline_builder'
 JenkinsPipelineBuilder.registry.entries.each do |type, path|
   singular_type = type.to_s.singularize
   define_method singular_type do |&block|
-    set = JenkinsPipelineBuilder::ExtensionSet.new
-    set.instance_eval(&block)
-    set.blocks.each do |version, settings|
-      set.add_extension singular_type, version, settings, path
-    end
-    unless set.valid?
-      name = set.name || 'A plugin with no name provided'
-      puts "Encountered errors while registering #{name}"
-      puts set.errors.map { |k, v| "#{k}: #{v}" }.join(', ')
-      return false
-    end
+    set = JenkinsPipelineBuilder::ExtensionSet.new singular_type, path, &block
+    return false unless set.valid?
+
     JenkinsPipelineBuilder.registry.register([:job, type], set)
     versions = set.extensions.map(&:min_version)
     puts "Successfully registered #{set.name} for versions #{versions}" if set.announced
+    true
   end
 end
 
 def job_attribute(&block)
-  set = JenkinsPipelineBuilder::ExtensionSet.new
-  set.instance_eval(&block)
-  set.blocks.each do |version, settings|
-    set.add_extension :job_attribute, version, settings
-  end
-  unless set.valid?
-    name = set.name || 'A plugin with no name provided'
-    puts "Encountered errors while registering #{name}"
-    puts set.errors.map { |k, v| "#{k}: #{v}" }.join(', ')
-    return false
-  end
+  set = JenkinsPipelineBuilder::ExtensionSet.new :job_attribute, &block
+  return false unless set.valid?
+
   JenkinsPipelineBuilder.registry.register([:job], set)
   versions = set.extensions.map(&:min_version)
   puts "Successfully registered #{set.name} for versions #{versions}" if set.announced
@@ -76,10 +61,16 @@ module JenkinsPipelineBuilder
 
     attr_accessor :blocks, :extensions, :settings
 
-    def initialize
+    def initialize(type, path = nil, &block)
       @blocks = {}
       @settings = {}
       @extensions = []
+
+      instance_eval(&block)
+
+      blocks.each do |version, settings|
+        add_extension type, version, settings, path
+      end
     end
 
     def installed_version=(version)
@@ -103,7 +94,6 @@ module JenkinsPipelineBuilder
       return @version if @version
       reg = JenkinsPipelineBuilder.registry
       version = reg.versions[settings[:plugin_id]]
-      puts reg.versions.inspect if version.nil?
       fail "Plugin #{settings[:name]} is not installed (plugin_id: #{settings[:plugin_id]})" if version.nil?
       self.installed_version = version
       @version
@@ -113,11 +103,12 @@ module JenkinsPipelineBuilder
       # TODO: Support multiple xml sections for the native to jenkins plugins
       return extensions.first if settings[:plugin_id] == 'builtin'
 
-      ordered_version_list.each do |version|
-        return versions[version] if version <= installed_version
-      end
+      extension = versions[highest_allowed_version]
 
-      fail "Can't find version of #{name} lte #{installed_version}, versions available are #{versions.keys.map(&:to_s)}"
+      unless extension
+        fail "Can't find version of #{name} lte #{installed_version}, available versions: #{versions.keys.map(&:to_s)}"
+      end
+      extension
     end
 
     def merge(other_set)
@@ -130,7 +121,7 @@ module JenkinsPipelineBuilder
       mismatch.each do |error|
         puts error
       end
-      fail 'Values did not match, cannot merge exception sets' if mismatch.any?
+      fail 'Values did not match, cannot merge extension sets' if mismatch.any?
 
       blocks.merge other_set.blocks
     end
@@ -152,11 +143,7 @@ module JenkinsPipelineBuilder
         fail "no block found for version #{version}" unless blocks.key version
         return blocks[version][:block]
       end
-      if blocks[version]
-        blocks[version].merge!(xml: block, path: path)
-      else
-        blocks[version] = { xml: block, path: path }
-      end
+      store_xml version, block, path
     end
 
     def version(ver, &block)
@@ -179,7 +166,13 @@ module JenkinsPipelineBuilder
     end
 
     def valid?
-      errors.empty?
+      valid = errors.empty?
+      unless valid
+        name ||= 'A plugin with no name provided'
+        puts "Encountered errors while registering #{name}"
+        puts errors.map { |k, v| "#{k}: #{v}" }.join(', ')
+      end
+      valid
     end
 
     def errors
@@ -194,6 +187,20 @@ module JenkinsPipelineBuilder
 
     private
 
+    def highest_allowed_version
+      ordered_version_list.each do |version|
+        return version if version <= installed_version
+      end
+    end
+
+    def store_xml(version, block, path)
+      if blocks[version]
+        blocks[version].merge!(xml: block, path: path)
+      else
+        blocks[version] = { xml: block, path: path }
+      end
+    end
+
     def versions
       @versions ||= extensions.each_with_object({}) do |ext, hash|
         hash[Gem::Version.new(ext.min_version)] = ext

data/lib/jenkins_pipeline_builder/extensions/builders.rb

@@ -117,7 +117,6 @@ builder do
     send('hudson.plugins.parameterizedtrigger.TriggerBuilder', 'plugin' => 'parameterized-trigger') do
       configs do
         send('hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig') do
-
           configs do
             params[:data] = [{ params: '' }] unless params[:data]
             params[:data].each do |config|

data/lib/jenkins_pipeline_builder/extensions/publishers.rb

@@ -220,7 +220,6 @@ publisher do
       excludes params[:excludes] if params[:excludes]
       latestOnly params[:latest_only] || false
       allowEmptyArchive params[:allow_empty] || false
-
     end
   end
 end

data/lib/jenkins_pipeline_builder/generator.rb

@@ -129,6 +129,14 @@ module JenkinsPipelineBuilder
 
     private
 
+    def create_or_update_job(job_name, xml)
+      if client.job.exists?(job_name)
+        client.job.update(job_name, xml)
+      else
+        client.job.create(job_name, xml)
+      end
+    end
+
     # Converts standalone jobs to the format that they have when loaded as part of a project.
     # This addresses an issue where #pubish_jobs assumes that each job will be wrapped
     # with in a hash a referenced under a key called :result, which is what happens when
@@ -189,7 +197,7 @@ module JenkinsPipelineBuilder
     end
 
     def compile_pull_request_generator(pull_job, project)
-      defaults = get_item('global')
+      defaults = find_defaults
       settings = defaults.nil? ? {} : defaults[:value] || {}
       settings = Compiler.get_settings_bag(project, settings)
       resolve_job_by_name(pull_job, settings)
@@ -514,11 +522,7 @@ module JenkinsPipelineBuilder
         return
       end
 
-      if client.job.exists?(job_name)
-        client.job.update(job_name, xml)
-      else
-        client.job.create(job_name, xml)
-      end
+      create_or_update_job job_name, xml
     end
 
     def compile_job_to_xml(job)

data/lib/jenkins_pipeline_builder/pull_request.rb

@@ -46,8 +46,7 @@ module JenkinsPipelineBuilder
       git_version = JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version
       if git_version >= Gem::Version.new(2.0)
         @jobs.each_value do |j|
-          j[:value][:scm_params] ||= {}
-          j[:value][:scm_params][:changelog_to_branch] = { remote: 'origin', branch: 'pr-{{pull_request_number}}' }
+          override_git_2_params j
         end
       end
       update_jobs!
@@ -55,6 +54,11 @@ module JenkinsPipelineBuilder
       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}}' }
+    end
+
     # Change the git branch for each job
     def change_git!
       @jobs.each_value do |job|

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.10.8'
+  VERSION = '0.10.9'
 end

data/spec/lib/jenkins_pipeline_builder/compiler_spec.rb

@@ -50,7 +50,6 @@ describe JenkinsPipelineBuilder::Compiler do
   end
 
   describe '#enable_blocks' do
-
     it 'generates correct new jobs with true' do
       item = { enabled: '{{use1}}', 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 }

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

@@ -25,6 +25,28 @@ describe 'builders' do
     File.open("./out/xml/builder_#{name}.xml", 'w') { |f| @n_xml.write_xml_to f }
   end
 
+  context 'generic' do
+    it 'can register a builder' do
+      result = builder do
+        name :test_generic
+        plugin_id :foo
+        xml do
+          foo :bar
+        end
+      end
+      JenkinsPipelineBuilder.registry.registry[:job][:builders].delete :test_generic
+      expect(result).to be true
+    end
+
+    it 'fails to register an invalid builder' do
+      result = builder do
+        name :test_generic
+      end
+      JenkinsPipelineBuilder.registry.registry[:job][:builders].delete :test_generic
+      expect(result).to be false
+    end
+  end
+
   context 'multi_job builder' do
     before :each do
       allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(

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

@@ -40,7 +40,6 @@ describe 'job_attributes' do
 
   context 'scm params' do
     before :each do
-
       builder = Nokogiri::XML::Builder.new { |xml| xml.scm }
       @n_xml = builder.doc
 

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

@@ -69,7 +69,6 @@ describe 'publishers' do
       root_pom = sonar_nodes.select { |node| node.name == 'rootPom' }
       expect(root_pom.first.content).to match 'project_war/pom.xml'
     end
-
   end
 
   context 'description_setter' do

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

@@ -55,9 +55,6 @@ describe 'wrappers' do
       JenkinsPipelineBuilder.registry.traverse_registry_path('job', { wrappers: { xvfb: {} } }, @n_xml)
 
       node = @n_xml.root.xpath('//buildWrappers/org.jenkinsci.plugins.xvfb.XvfbBuildWrapper')
-      puts node.inspect
-      t = node.css('timeout')
-      puts t.inspect
       expect(node.first).to_not be_nil
     end
   end
@@ -119,5 +116,4 @@ describe 'wrappers' do
       expect(node.first.content).to match 'Node-0.10.24'
     end
   end
-
 end

data/spec/lib/jenkins_pipeline_builder/extensions_spec.rb

@@ -119,6 +119,7 @@ describe JenkinsPipelineBuilder::Extension do
         expect(extension.errors).to be_empty
         expect(extension.valid?).to be true
       end
+
       it 'returns false if errors is not empty' do
         expect(extension.errors).to_not be_empty
         expect(extension.valid?).to be false
@@ -128,7 +129,7 @@ describe JenkinsPipelineBuilder::Extension do
 end
 
 describe JenkinsPipelineBuilder::ExtensionSet do
-  subject(:set) { JenkinsPipelineBuilder::ExtensionSet.new }
+  subject(:set) { JenkinsPipelineBuilder::ExtensionSet.new('foo') {} }
 
   before :each do
     set.name 'example'
@@ -219,9 +220,7 @@ describe JenkinsPipelineBuilder::ExtensionSet do
       # set.installed_version = '2.0-beta-1'
       # set.installed_version = '2.0+build.93'
       # set.installed_version = '2.0.8'
-
       expect(set.extension.min_version).to eq '1.9'
-
     end
   end
 end

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -258,7 +258,7 @@ describe JenkinsPipelineBuilder::Generator do
         end
       end
       stub_request(:get, 'http://username:password@127.0.0.1:8080/job/test_job/config.xml')
-         .to_return(status:  200, body:  "#{body}", headers:  {})
+        .to_return(status:  200, body:  "#{body}", headers:  {})
       @generator.dump(job_name)
       expect(File.exist?("#{job_name}.xml")).to be true
       File.delete("#{job_name}.xml")

data/spec/lib/jenkins_pipeline_builder/module_registry_spec.rb

@@ -6,7 +6,6 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
   end
   describe '#register' do
     it 'should return item by a specified path' do
-
       registry = JenkinsPipelineBuilder::ModuleRegistry.new
       set = double
       allow(set).to receive(:name).and_return :foo
@@ -126,7 +125,6 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
     end
   end
   describe '#initialize' do
-
   end
 
   describe '#version' do
@@ -147,23 +145,18 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
   end
 
   describe '#entries' do
-
   end
 
   describe '#get' do
-
   end
 
   describe '#get_by_path_collection' do
-
   end
 
   describe '#traverse_registry_path' do
-
   end
 
   describe '#traverse_registry' do
-
   end
 
   describe '#execute_extension' do
@@ -203,7 +196,6 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
       end
       expect(JenkinsPipelineBuilder.registry.registry[:job][:wrappers]).to have_key :test_name
       @ext = JenkinsPipelineBuilder.registry.registry[:job][:wrappers][:test_name].extension
-
     end
 
     after :each do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.10.9
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri