jenkins_pipeline_builder 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6388662ca895ddc734a5aba148075f4d1ca06ec
-  data.tar.gz: e22efe806c6c5558996cd4af38629ebba14fff8a
+  metadata.gz: c085dfdc7cec7f2d1df4f4d46ec4d2a53854b0d1
+  data.tar.gz: 11741c96a3ffb283b2c88e6d9e2f90452eac2964
 SHA512:
-  metadata.gz: 79c70051777c8cb7fef36c5666d4b7cc30d1bd8ca76a740dc46face5dcb844c34684f19d7139436dc63ad5157114b96ca9ea07aaf4c27be23aaf584e48c9e92a
-  data.tar.gz: bbea1cdcae6fe68886f7e78461476b90a269448af4ae2166d9fd9692797252a222eae3ac5824e02040df7a1f180cc21459c6317178824264168983bed1b8c855
+  metadata.gz: 964a0077ffefc1a869fb1b1ba1f153e244c5752317270521294e3e058e20fb19866021c191f3c3f737357ce5f104ba0ecaaaed2ea9051fc58e9909e78a147456
+  data.tar.gz: 42f1dd78be906eef930b94e63ede816ddae53b859334e2726ad88a5fc1182001e2c8e56a96d0ea10571a5c13f4d620477891c3c255708601bc1e89962e522d22

data/.ackrc

@@ -0,0 +1,4 @@
+--ignore-dir=docs
+--ignore-dir=doc
+--ignore-dir=out
+--ignore-dir=coverage

data/.gitignore

@@ -0,0 +1,3 @@
+.*.swp
+out
+Gemfile.lock

data/.rspec

@@ -0,0 +1 @@
+--color --tty --format documentation

data/README.md

@@ -104,17 +104,28 @@ Here's a high level overview of what's available:
       room: room name here
       start-notify: true
     builders:
-      - job_builder:
-          child_jobs:
-            - job-name-1
-            - job-name-2
-          mark_phase: SUCCESSFUL
+      - multi_job:
+          phases:
+            "Phase One":
+              jobs:
+                - name: first
+                  exposed_scm: true
+                  current_params: true
+                  config:
+                    predefined_build_parameters:
+                      - "PARENT_WORKSPACE=${WORKSPACE}"
+                - name: second
+              continue_condition: COMPLETED
+            "Phase Two":
+              jobs:
+                - name: third
       - inject_vars_file: build_job_info
       - shell_command: |
           echo 'Doing some work'
           run command1
       - maven3:
           goals: -B clean
+          rootPom: path_to_pom
           mavenName: maven-name # Optional
     wrappers:
       - timestamp: true

data/Rakefile

@@ -66,3 +66,5 @@ namespace :doc do
     `dot jenkins_api_client.dot -Tpng -o jenkins_api_client_class_diagram.png`
   end
 end
+
+task default: :unit_tests

data/lib/jenkins_pipeline_builder/builders.rb

@@ -22,28 +22,31 @@
 
 module JenkinsPipelineBuilder
   class Builders
-    def self.build_multijob_builder(params, xml)
-      xml.send('com.tikal.jenkins.plugins.multijob.MultiJobBuilder') {
-        xml.phaseName 'Child Jobs'
-        xml.phaseJobs {
-          proc = lambda do |xml, name|
-            xml.send('com.tikal.jenkins.plugins.multijob.PhaseJobsConfig') {
-              xml.jobName name
-              xml.currParams false
-              xml.exposedSCM false
-              xml.configs {
-                xml.send('hudson.plugins.parameterizedtrigger.PredefinedBuildParameters') {
-                  xml.properties 'PARENT_WORKSPACE=${WORKSPACE}'
-                }
+    def self.build_multijob(params, xml)
+      params[:phases].each do |name, content|
+        xml.send('com.tikal.jenkins.plugins.multijob.MultiJobBuilder') {
+          xml.phaseName name
+          xml.phaseJobs {
+            content[:jobs].each do |job|
+              xml.send('com.tikal.jenkins.plugins.multijob.PhaseJobsConfig') {
+                xml.jobName job[:name]
+                xml.currParams job[:current_params] || false
+                xml.exposedSCM job[:exposed_scm] || false
+                if job[:config]
+                  xml.configs {
+                    if job[:config].has_key? :predefined_build_parameters
+                      xml.send('hudson.plugins.parameterizedtrigger.PredefinedBuildParameters') {
+                        xml.properties job[:config][:predefined_build_parameters].join ' '
+                      }
+                    end
+                  }
+                end
               }
-            }
-          end
-          params[:child_jobs].each do |name|
-            proc.call xml, name
-          end
+            end
+          }
+          xml.continuationCondition content[:continue_condition] || 'SUCCESSFUL'
         }
-        xml.continuationCondition params[:mark_phase]
-      }
+      end
     end
 
     def self.build_maven3(params, xml)

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -78,4 +78,4 @@ module JenkinsPipelineBuilder
       return item
     end
   end
-end
+end

data/lib/jenkins_pipeline_builder/generator.rb

@@ -38,6 +38,7 @@ module JenkinsPipelineBuilder
     def initialize(args, client)
       @client        = client
       @logger        = @client.logger
+      #@logger.level = (@debug) ? Logger::DEBUG : Logger::INFO;
       @job_templates = {}
       @job_collection = {}
 
@@ -49,7 +50,7 @@ module JenkinsPipelineBuilder
               parameters: JobBuilder.method(:build_parameters),
               builders: {
                   registry: {
-                      job_builder: Builders.method(:build_multijob_builder),
+                      multi_job: Builders.method(:build_multijob),
                       inject_vars_file: Builders.method(:build_environment_vars_injector),
                       shell_command: Builders.method(:build_shell_command),
                       maven3: Builders.method(:build_maven3)
@@ -95,7 +96,14 @@ module JenkinsPipelineBuilder
     end
 
     attr_accessor :client
-    attr_accessor :debug
+    #attr_accessor :debug
+    def debug=(value)
+      @debug = value
+      @logger.level = (value) ? Logger::DEBUG : Logger::INFO;
+    end
+    def debug
+      @debug
+    end
     # TODO: WTF?
     attr_accessor :no_files
     attr_accessor :job_collection
@@ -109,6 +117,7 @@ module JenkinsPipelineBuilder
     end
 
     def load_collection_from_path(path, recursively = false)
+      path = File.expand_path(path, relative_to=Dir.getwd)
       if File.directory?(path)
         @logger.info "Generating from folder #{path}"
         Dir[File.join(path, '/*.yaml'), File.join(path, '/*.yml')].each do |file|
@@ -183,6 +192,7 @@ module JenkinsPipelineBuilder
       job = get_item(name)
       raise "Failed to locate job by name '#{name}'" if job.nil?
       job_value = job[:value]
+      @logger.debug "Compiling job #{name}"
       compiled_job =  Compiler.compile(job_value, settings)
       return compiled_job
     end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/spec/func_tests/view_spec.rb

@@ -23,16 +23,16 @@ describe JenkinsPipelineBuilder::View do
         def create_and_validate(params)
           name = params[:name]
           @valid_post_responses.should include(
-                                           @generator.view.create(params).to_i
-                                       )
+            @generator.view.create(params).to_i
+          )
           @generator.view.list_children(params[:parent_view], name).include?(name).should be_true
         end
 
         def destroy_and_validate(params)
           name = params[:name]
           @valid_post_responses.should include(
-                                           @generator.view.delete(name, params[:parent_view]).to_i
-                                       )
+            @generator.view.delete(name, params[:parent_view]).to_i
+          )
           @generator.view.list_children(params[:parent_view], name).include?(name).should be_false
         end
 
@@ -43,7 +43,7 @@ describe JenkinsPipelineBuilder::View do
 
         it 'accepts the name of the view and creates the view' do
           params = {
-              :name => 'test_list_view'
+            :name => 'test_list_view'
           }
 
           test_and_validate(params)
@@ -51,15 +51,15 @@ describe JenkinsPipelineBuilder::View do
 
         it 'creates a Nested view with a child' do
           params_parent = {
-              name: 'My Test Parent View',
-              type: 'nestedView'
+            name: 'My Test Parent View',
+            type: 'nestedView'
           }
 
           create_and_validate(params_parent)
 
           params_child = {
-              name: 'Test List View',
-              parent_view: params_parent[:name]
+            name: 'Test List View',
+            parent_view: params_parent[:name]
           }
 
           test_and_validate(params_child)
@@ -69,20 +69,20 @@ describe JenkinsPipelineBuilder::View do
 
         it 'creates a categorized view with columns' do
           params = {
-              name: 'test_category_view',
-              type: 'categorizedView',
-              description: 'Blah blah',
-              regex: 'Job-.*',
-              groupingRules: [{
-                                  groupRegex: 'Step-1.*',
-                                  namingRule: '1. Commit'
-                              },{
-                                  groupRegex: 'Step-2.*',
-                                  namingRule: '2. Acceptance'
-                              },{
-                                  groupRegex: 'Step-3.*',
-                                  namingRule: '3. Release'
-                              }]
+            name: 'test_category_view',
+            type: 'categorizedView',
+            description: 'Blah blah',
+            regex: 'Job-.*',
+            groupingRules: [{
+              groupRegex: 'Step-1.*',
+              namingRule: '1. Commit'
+            },{
+              groupRegex: 'Step-2.*',
+              namingRule: '2. Acceptance'
+            },{
+              groupRegex: 'Step-3.*',
+              namingRule: '3. Release'
+            }]
           }
 
           test_and_validate(params)
@@ -90,4 +90,4 @@ describe JenkinsPipelineBuilder::View do
       end
     end
   end
-end
+end

data/spec/unit_tests/compiler_spec.rb

@@ -16,4 +16,4 @@ describe 'Compiler' do
 
     result.should == hash
   end
-end
+end

data/spec/unit_tests/fixtures/files/Job-Multi-Project.xml

@@ -68,18 +68,34 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <com.tikal.jenkins.plugins.multijob.MultiJobBuilder>
-      <phaseName>Child Jobs</phaseName>
+      <phaseName>Phase One</phaseName>
       <phaseJobs>
         <com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
-          <jobName>Child-Job</jobName>
-          <currParams>false</currParams>
-          <exposedSCM>false</exposedSCM>
+          <jobName>first</jobName>
+          <currParams>true</currParams>
+          <exposedSCM>true</exposedSCM>
           <configs>
             <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
               <properties>PARENT_WORKSPACE=${WORKSPACE}</properties>
             </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
           </configs>
         </com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
+        <com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
+          <jobName>second</jobName>
+          <currParams>false</currParams>
+          <exposedSCM>false</exposedSCM>
+        </com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
+      </phaseJobs>
+      <continuationCondition>COMPLETED</continuationCondition>
+    </com.tikal.jenkins.plugins.multijob.MultiJobBuilder>
+    <com.tikal.jenkins.plugins.multijob.MultiJobBuilder>
+      <phaseName>Phase Two</phaseName>
+      <phaseJobs>
+        <com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
+          <jobName>third</jobName>
+          <currParams>false</currParams>
+          <exposedSCM>false</exposedSCM>
+        </com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
       </phaseJobs>
       <continuationCondition>SUCCESSFUL</continuationCondition>
     </com.tikal.jenkins.plugins.multijob.MultiJobBuilder>

data/spec/unit_tests/fixtures/files/Job-Multi-Project.yaml

@@ -19,10 +19,21 @@
       - git_push: true
       - scm_polling: "H/5 * * * *"
     builders:
-      - job_builder:
-          child_jobs:
-            - Child-Job
-          mark_phase: SUCCESSFUL
+      - multi_job:
+          phases:
+            "Phase One":
+              jobs:
+                - name: first
+                  exposed_scm: true
+                  current_params: true
+                  config:
+                    predefined_build_parameters:
+                      - "PARENT_WORKSPACE=${WORKSPACE}"
+                - name: second
+              continue_condition: COMPLETED
+            "Phase Two":
+              jobs:
+                - name: third
       - inject_vars_file: build_job_info
     publishers:
       - downstream:

data/spec/unit_tests/generator_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
-require 'equivalent-xml'
+require 'unit_tests/spec_helper'
 
 describe 'Test YAML jobs conversion to XML' do
   context 'Loading YAML files' do
@@ -64,4 +63,4 @@ describe 'Test YAML jobs conversion to XML' do
       end
     end
   end
-end
+end

data/spec/unit_tests/spec_helper.rb

@@ -22,6 +22,8 @@ end
 SimpleCov.start 'spec' #if ENV["COVERAGE"]
 
 require File.expand_path('../../../lib/jenkins_pipeline_builder', __FILE__)
+require 'rspec/matchers'
+require 'equivalent-xml'
 
 RSpec.configure do |config|
   config.before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Igor Moochnick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -258,6 +258,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .ackrc
+- .gitignore
+- .rspec
 - .ruby-gemset
 - .ruby-version
 - Gemfile