jenkins_pipeline_builder 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c085dfdc7cec7f2d1df4f4d46ec4d2a53854b0d1
-  data.tar.gz: 11741c96a3ffb283b2c88e6d9e2f90452eac2964
+  metadata.gz: 1ea8f087d4b224af599c56541ff63949b52d753c
+  data.tar.gz: a48aaa32057bb025ff671ecde36ba4a63934d6dc
 SHA512:
-  metadata.gz: 964a0077ffefc1a869fb1b1ba1f153e244c5752317270521294e3e058e20fb19866021c191f3c3f737357ce5f104ba0ecaaaed2ea9051fc58e9909e78a147456
-  data.tar.gz: 42f1dd78be906eef930b94e63ede816ddae53b859334e2726ad88a5fc1182001e2c8e56a96d0ea10571a5c13f4d620477891c3c255708601bc1e89962e522d22
+  metadata.gz: 2625db8daaf9376596495cfc9df690833476fd82e9764f703a636b8457782e23fef998bcdc8c64f3e0e8055b34f7ea331384fce2aac6285e3e64c15981b5d9c8
+  data.tar.gz: 34e0e2d66b774240172c5dde403e0fb571ec3b542ca3215af2baa2e081672ef407e0b8cb150040233af0b36c123371a9c98446ebedd49543ec0aeccb60562bb6

data/jenkins_pipeline_builder.gemspec

@@ -24,6 +24,7 @@ automating Job & Pipeline creation from the YAML files checked-in with your appl
   spec.add_dependency 'nokogiri', '~> 1.5.0'
   spec.add_dependency 'jenkins_api_client', '~> 0.14.1'
   spec.add_dependency 'thor', '>= 0.18.0'
+  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/jenkins_pipeline_builder.rb

@@ -37,3 +37,4 @@ require 'jenkins_pipeline_builder/cli/helper'
 require 'jenkins_pipeline_builder/cli/view'
 require 'jenkins_pipeline_builder/cli/pipeline'
 require 'jenkins_pipeline_builder/cli/base'
+require 'active_support/core_ext'

data/lib/jenkins_pipeline_builder/builders.rb

@@ -36,7 +36,7 @@ module JenkinsPipelineBuilder
                   xml.configs {
                     if job[:config].has_key? :predefined_build_parameters
                       xml.send('hudson.plugins.parameterizedtrigger.PredefinedBuildParameters') {
-                        xml.properties job[:config][:predefined_build_parameters].join ' '
+                        xml.properties job[:config][:predefined_build_parameters].join "\n"
                       }
                     end
                   }

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -66,4 +66,4 @@ module JenkinsPipelineBuilder
       end
     end
   end
-end
+end

data/lib/jenkins_pipeline_builder/cli/pipeline.rb

@@ -37,4 +37,4 @@ module JenkinsPipelineBuilder
       end
     end
   end
-end
+end

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -23,10 +23,11 @@
 module JenkinsPipelineBuilder
   class Compiler
     def self.resolve_value(value, settings)
+      settings = settings.with_indifferent_access
       value_s = value.to_s.clone
-      vars = value_s.scan(/{{([^}]+)}}/).flatten
+      vars = value_s.scan(/{{([^{}]+)}}/).flatten
       vars.select! do |var|
-        var_val = settings[var.to_sym]
+        var_val = settings[var]
         value_s.gsub!("{{#{var.to_s}}}", var_val) unless var_val.nil?
         var_val.nil?
       end
@@ -51,31 +52,63 @@ module JenkinsPipelineBuilder
     end
 
     def self.compile(item, settings = {})
+      errors = {}
       case item
         when String
           new_value = resolve_value(item, settings)
-          puts "Failed to resolve #{item}" if new_value.nil?
-          return new_value
+          if new_value.nil?
+            errors[item] =  "Failed to resolve #{item}"
+          end
+          unless errors.empty?
+            return false, errors
+          end
+          return true, new_value
         when Hash
           result = {}
           item.each do |key, value|
-            new_value = compile(value, settings)
-            puts "Failed to resolve #{value}" if new_value.nil?
-            return nil if new_value.nil?
-            result[key] = new_value
+            if value.nil?
+              errors[key] = "key: #{key} has a nil value, this is likely a yaml syntax error. Skipping children and siblings"
+              break
+            end
+            success, payload = compile(value, settings)
+            unless success
+              errors.merge!(payload)
+              next
+            end
+            if payload.nil?
+              errors[key] = "Failed to resolve:\n===>key: #{key}\n\n===>value: #{value}\n\n===>of: #{item}"
+              next
+            end
+            result[key] = payload
           end
-          return result
+          unless errors.empty?
+            return false, errors
+          end
+          return true, result
         when Array
           result = []
           item.each do |value|
-            new_value = compile(value, settings)
-            puts "Failed to resolve #{value}" if new_value.nil?
-            return nil if new_value.nil?
-            result << new_value
+            if value.nil?
+              errors[item] = "found a nil value when processing following array:\n #{item.inspect}"
+              break
+            end
+            success, payload = compile(value, settings)
+            unless success
+              errors.merge!(payload)
+              next
+            end
+            if payload.nil?
+              errors[value] = "Failed to resolve:\n===>item #{value}\n\n===>of list: #{item}"
+              next
+            end
+            result << payload
+          end
+          unless errors.empty?
+            return false, errors
           end
-          return result
+          return true, result
       end
-      return item
+      return true, item
     end
   end
 end

data/lib/jenkins_pipeline_builder/generator.rb

@@ -65,7 +65,8 @@ module JenkinsPipelineBuilder
                       description_setter: Publishers.method(:description_setter),
                       downstream: Publishers.method(:push_to_projects),
                       junit_result: Publishers.method(:publish_junit),
-                      coverage_result: Publishers.method(:publish_rcov)
+                      coverage_result: Publishers.method(:publish_rcov),
+                      post_build_script: Publishers.method(:post_build_script)
                   },
                   method:
                     lambda { |registry, params, n_xml| @module_registry.run_registry_on_path('//publishers', registry, params, n_xml) }
@@ -96,7 +97,6 @@ module JenkinsPipelineBuilder
     end
 
     attr_accessor :client
-    #attr_accessor :debug
     def debug=(value)
       @debug = value
       @logger.level = (value) ? Logger::DEBUG : Logger::INFO;
@@ -166,11 +166,17 @@ module JenkinsPipelineBuilder
       jobs.map! do |job|
         job.kind_of?(String) ? { job.to_sym => {} } : job
       end
+      errors = {}
       @logger.info project
       jobs.each do |job|
         job_id = job.keys.first
         settings = project[:settings].clone.merge(job[job_id])
-        job[:result] = resolve_job_by_name(job_id, settings)
+        success, payload = resolve_job_by_name(job_id, settings)
+        if success
+          job[:result] = payload
+        else
+          errors[job_id] = payload
+        end
       end
 
       # Process views
@@ -182,10 +188,24 @@ module JenkinsPipelineBuilder
         view_id = view.keys.first
         settings = project[:settings].clone.merge(view[view_id])
         # TODO: rename resolve_job_by_name properly
-        view[:result] = resolve_job_by_name(view_id, settings)
+        success, payload = resolve_job_by_name(view_id, settings)
+        if success
+          view[:result] = payload
+        else
+          errors[view_id] = payload
+        end
       end
 
-      project
+      errors.each do |k,v|
+        puts "Encountered errors processing: #{k}:"
+        v.each do |key, error|
+          puts "  key: #{key} had the following error:"
+          puts "  #{error.inspect}"
+        end
+      end
+      return false, "Encountered errors exiting" unless errors.empty?
+
+      return true, project
     end
 
     def resolve_job_by_name(name, settings = {})
@@ -193,8 +213,9 @@ module JenkinsPipelineBuilder
       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
+
+      success, payload = Compiler.compile(job_value, settings)
+      return success, payload
     end
 
     def projects
@@ -217,23 +238,40 @@ module JenkinsPipelineBuilder
       @logger.info "Bootstrapping pipeline from path #{path}"
       load_collection_from_path(path)
 
+      errors = {}
       # Publish all the jobs if the projects are not found
       if projects.count == 0
         jobs.each do |i|
           job = i[:value]
-          xml = compile_job_to_xml(job)
-          create_or_update(job, xml)
+          success, payload = compile_job_to_xml(job)
+          if success
+            create_or_update(job, payload)
+          else
+            errors[job[:name]] = payload
+          end
         end
       else
         projects.each do |project|
-          compiled_project = resolve_project(project)
-          #pp compiled_project
+          success, payload = resolve_project(project)
+          if success
+            puts 'successfully resolved project'
+            compiled_project = payload
+          else
+            puts payload
+            return false
+          end
 
           if compiled_project[:value][:jobs]
             compiled_project[:value][:jobs].each do |i|
+              puts "Processing #{i}"
               job = i[:result]
-              xml = compile_job_to_xml(job)
-              create_or_update(job, xml)
+              fail "Result is empty for #{i}" if job.nil?
+              success, payload = compile_job_to_xml(job)
+              if success
+                create_or_update(job, payload)
+              else
+                errors[job[:name]] = payload
+              end
             end
           end
 
@@ -245,6 +283,10 @@ module JenkinsPipelineBuilder
           end
         end
       end
+      errors.each do |k,v|
+        @logger.error "Encountered errors compiling: #{k}:"
+        @logger.error v
+      end
     end
 
     def dump(job_name)
@@ -278,20 +320,20 @@ module JenkinsPipelineBuilder
       case job[:job_type]
         when 'job_dsl'
           xml = compile_freestyle_job_to_xml(job)
-          update_job_dsl(job, xml)
+          payload = update_job_dsl(job, xml)
         when 'multi_project'
           xml = compile_freestyle_job_to_xml(job)
-          adjust_multi_project xml
+          payload = adjust_multi_project xml
         when 'build_flow'
           xml = compile_freestyle_job_to_xml(job)
-          add_job_dsl(job, xml)
+          payload = add_job_dsl(job, xml)
         when 'free_style'
-          compile_freestyle_job_to_xml job
+          payload = compile_freestyle_job_to_xml job
         else
-          @logger.info 'Unknown job type'
-          ''
+          return false, "Job type: #{job[:job_type]} is not one of job_dsl, multi_project, build_flow or free_style"
       end
 
+      return true, payload
     end
 
     def adjust_multi_project(xml)

data/lib/jenkins_pipeline_builder/publishers.rb

@@ -53,8 +53,8 @@ module JenkinsPipelineBuilder
               end
             }
             xml.projects params[:project]
-            xml.condition 'SUCCESS'
-            xml.triggerWithNoParameters false
+            xml.condition params[:condition] || 'SUCCESS'
+            xml.triggerWithNoParameters params[:trigger_with_no_parameters] || false
           }
         }
       }
@@ -109,5 +109,20 @@ module JenkinsPipelineBuilder
         }
       }
     end
+
+    def self.post_build_script(params, xml)
+      xml.send('org.jenkinsci.plugins.postbuildscript.PostBuildScript') {
+        xml.buildSteps {
+          if params[:shell_command]
+            xml.send('hudson.tasks.Shell') {
+              xml.command params[:shell_command]
+            }
+          end
+        }
+        xml.scriptOnlyIfSuccess params[:on_success]
+        xml.scriptOnlyIfFailure params[:on_failure]
+        xml.executeOn params[:execute_on] || 'BOTH'
+      }
+    end
   end
-end
+end

data/lib/jenkins_pipeline_builder/version.rb

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

data/lib/jenkins_pipeline_builder/wrappers.rb

@@ -57,10 +57,11 @@ module JenkinsPipelineBuilder
       }
     end
 
-    def self.inject_env_vars(wrapper, xml)
+    def self.inject_env_vars(params, xml)
       xml.EnvInjectBuildWrapper {
         xml.info {
-          xml.propertiesContent wrapper
+          xml.propertiesFilePath params[:file] if params[:file]
+          xml.propertiesContent params[:content] if params[:content]
           xml.loadFilesFromMaster false
         }
       }
@@ -130,4 +131,4 @@ module JenkinsPipelineBuilder
       }
     end
   end
-end
+end

data/spec/unit_tests/compiler_spec.rb

@@ -12,8 +12,9 @@ describe 'Compiler' do
         z: false
     }
 
-    result = JenkinsPipelineBuilder::Compiler.compile(hash)
+    success, result = JenkinsPipelineBuilder::Compiler.compile(hash)
 
+    expect(success).to be_true
     result.should == hash
   end
 end

data/spec/unit_tests/fixtures/files/Job-Build-Maven.xml

@@ -126,4 +126,4 @@
       <filterExcludedArtifactsFromBuild>false</filterExcludedArtifactsFromBuild>
     </org.jfrog.hudson.maven3.ArtifactoryMaven3Configurator>
   </buildWrappers>
-</project>
+</project>

data/spec/unit_tests/fixtures/files/Job-Gem-Build.yaml

@@ -17,8 +17,9 @@
           release-repo: gems-local
           publish: 'pkg/*.gem'
           publish-build-info: true
-      - inject_env_var: >
-          VAR1 = value_1
+      - inject_env_var:
+          content: |
+            VAR1 = value_1
       - inject_passwords:
         - name: OS_PASSWORD
           value: some_encrypted_password

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

@@ -76,7 +76,8 @@
           <exposedSCM>true</exposedSCM>
           <configs>
             <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>PARENT_WORKSPACE=${WORKSPACE}</properties>
+              <properties>GIT_COMMIT=123
+                PARENT_WORKSPACE=${WORKSPACE}</properties>
             </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
           </configs>
         </com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>

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

@@ -28,6 +28,7 @@
                   current_params: true
                   config:
                     predefined_build_parameters:
+                      - 'GIT_COMMIT=123'
                       - "PARENT_WORKSPACE=${WORKSPACE}"
                 - name: second
               continue_condition: COMPLETED

data/spec/unit_tests/fixtures/files/downstream.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders/>
+  <publishers>
+    <hudson.plugins.parameterizedtrigger.BuildTrigger>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>param1 param2</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameters>
+              <propertiesFile>props.file</propertiesFile>
+              <failTriggerOnMissing>false</failTriggerOnMissing>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameters>
+          </configs>
+          <projects>downstream</projects>
+          <condition>FAILURE</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.BuildTrigger>
+  </publishers>
+  <buildWrappers/>
+</project>

data/spec/unit_tests/fixtures/files/downstream.yaml

@@ -0,0 +1,13 @@
+---
+- job:
+    name: downstream
+    publishers:
+      - downstream:
+          project: downstream
+          data:
+            - params: |
+                param1
+                param2
+            - file: props.file
+          condition: FAILURE
+          trigger_with_no_parameters: false

data/spec/unit_tests/fixtures/files/post_build_script.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders/>
+  <publishers>
+    <org.jenkinsci.plugins.postbuildscript.PostBuildScript>
+      <buildSteps>
+        <hudson.tasks.Shell>
+          <command>echo "line one" echo "line two"</command>
+        </hudson.tasks.Shell>
+      </buildSteps>
+      <scriptOnlyIfSuccess>true</scriptOnlyIfSuccess>
+      <scriptOnlyIfFailure>false</scriptOnlyIfFailure>
+      <executeOn>BOTH</executeOn>
+    </org.jenkinsci.plugins.postbuildscript.PostBuildScript>
+  </publishers>
+  <buildWrappers/>
+</project>

data/spec/unit_tests/fixtures/files/post_build_script.yaml

@@ -0,0 +1,11 @@
+---
+- job:
+    name: post_build_script
+    publishers:
+      - post_build_script:
+          shell_command: |
+            echo "line one"
+            echo "line two"
+          on_success: true
+          on_failure: false
+          execute_on: BOTH

data/spec/unit_tests/fixtures/files/properties_file.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders/>
+  <publishers/>
+  <buildWrappers>
+    <EnvInjectBuildWrapper>
+      <info>
+        <propertiesFilePath>foo.prop</propertiesFilePath>
+        <propertiesContent>
+          foo=bar
+        </propertiesContent>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+      </info>
+    </EnvInjectBuildWrapper>
+  </buildWrappers>
+</project>

data/spec/unit_tests/fixtures/files/properties_file.yaml

@@ -0,0 +1,8 @@
+---
+- job:
+    name: properties_file
+    wrappers:
+      - inject_env_var:
+          file: 'foo.prop'
+          content: |
+            foo=bar

data/spec/unit_tests/generator_spec.rb

@@ -16,7 +16,8 @@ describe 'Test YAML jobs conversion to XML' do
     end
 
     def compare_jobs(job, path)
-      xml = @generator.compile_job_to_xml(job)
+      success, xml = @generator.compile_job_to_xml(job)
+      expect(success).to be_true
       doc1 = Nokogiri::XML(xml)
 
       sample_job_xml = File.read(path + '.xml')
@@ -26,19 +27,25 @@ describe 'Test YAML jobs conversion to XML' do
       doc1.should be_equivalent_to(doc2)
     end
 
-    [
+    files = [
       'Job-Multi-Project',
       'Job-Build-Maven',
       'Job-Build-Flow',
-      'Job-Gem-Build'
-    ].each do |file|
+      'Job-Gem-Build',
+      'post_build_script',
+      'properties_file',
+      'downstream'
+    ]
+
+    files.each do |file|
       it "should create expected XML from YAML '#{file}'" do
         path = File.expand_path('../fixtures/files/' + file, __FILE__)
 
         @generator.load_collection_from_path path + '.yaml'
         job_name = @generator.job_collection.keys.first
-        job = @generator.resolve_job_by_name(job_name)
+        success, job = @generator.resolve_job_by_name(job_name)
 
+        expect(success).to be_true
         compare_jobs job, path
       end
     end
@@ -50,7 +57,9 @@ describe 'Test YAML jobs conversion to XML' do
 
       project_name = @generator.projects.first[:name]
 
-      project = @generator.resolve_project(@generator.get_item(project_name))
+      success, project = @generator.resolve_project(@generator.get_item(project_name))
+
+      expect(success).to be_true
 
       project[:value][:jobs].should_not be_nil
 

data/spec/unit_tests/resolve_dependencies_spec.rb

@@ -63,8 +63,10 @@ describe 'Templates resolver' do
     project = YAML.load(str)
     @generator.load_job_collection project
 
-    @generator.resolve_project(@generator.get_item('project-name')).should ==
-        {:name=>"project-name",
+    success, project = @generator.resolve_project(@generator.get_item('project-name'))
+
+    expect(success).to be_true
+    expect(project).to eq({:name=>"project-name",
          :type=>:project,
          :value=>
              {:name=>"project-name",
@@ -78,7 +80,7 @@ describe 'Templates resolver' do
          :settings=>
              {:name=>"project-name",
               :description=>"Do not edit this job through the web!",
-              :db=>"my_own_db"}}
+              :db=>"my_own_db"}})
   end
 
   it 'should build project collection from jobs templates' do
@@ -112,8 +114,9 @@ describe 'Templates resolver' do
     project = YAML.load(str)
     @generator.load_job_collection project
 
-    @generator.resolve_project(@generator.get_item('project-name')).should ==
-        {:name=>"project-name",
+    success, project = @generator.resolve_project(@generator.get_item('project-name'))
+    expect(success).to be_true
+    expect(project).to eq( {:name=>"project-name",
          :type=>:project,
          :value=>
              {:name=>"project-name",
@@ -129,7 +132,7 @@ describe 'Templates resolver' do
                         {:name=>"project-name-perf-tests",
                          :builders=>[{:shell=>"perftest"}],
                          :publishers=>[{:email=>{:recipients=>"projmanager@nowhere.net"}}]}}]},
-         :settings=>{:name=>"project-name", :db=>"my_own_db"}}
+         :settings=>{:name=>"project-name", :db=>"my_own_db"}})
   end
 
   it 'should build project collection from jobs and jobs templates' do
@@ -159,7 +162,9 @@ describe 'Templates resolver' do
     project = YAML.load(str)
     @generator.load_job_collection project
 
-    @generator.resolve_project(@generator.get_item('project-name')).should ==
+    success, project = @generator.resolve_project(@generator.get_item('project-name'))
+      expect(success).to be_true
+    expect(project).to eq(
         {:name=>"project-name",
          :type=>:project,
          :value=>
@@ -175,23 +180,27 @@ describe 'Templates resolver' do
                         {:name=>"project-name-unit-tests",
                          :builders=>[{:shell=>"unittest"}],
                          :publishers=>[{:email=>{:recipients=>"projmanager@nowhere.net"}}]}}]},
-         :settings=>{:name=>"project-name", :db=>"my_own_db"}}
+         :settings=>{:name=>"project-name", :db=>"my_own_db"}})
   end
 
 
   describe 'compilation of templates' do
     it 'compiles String' do
-      JenkinsPipelineBuilder::Compiler.compile('blah', { item1: 'data1'}).should == 'blah'
+      success, string = JenkinsPipelineBuilder::Compiler.compile('blah', { item1: 'data1'})
+      expect(success).to be_true
+      expect(string).to eq 'blah'
     end
 
     it 'compiles simple Hash' do
-      JenkinsPipelineBuilder::Compiler.compile({ name: 'item-{{item1}}', value: 'item1-data'}, { item1: 'data1'}).should ==
-          { name: 'item-data1', value: 'item1-data'}
+      success, hash = JenkinsPipelineBuilder::Compiler.compile({ name: 'item-{{item1}}', value: 'item1-data'}, { item1: 'data1'})
+      expect(success).to be_true
+      expect(hash).to eq({ name: 'item-data1', value: 'item1-data'})
     end
 
     it 'compiles nested Hash' do
-      JenkinsPipelineBuilder::Compiler.compile({ name: 'item-{{item1}}', value: { house: 'house-{{item1}}'}}, { item1: 'data1'}).should ==
-          { name: 'item-data1', value: { house: 'house-data1'}}
+      success, hash = JenkinsPipelineBuilder::Compiler.compile({ name: 'item-{{item1}}', value: { house: 'house-{{item1}}'}}, { item1: 'data1'})
+      expect(success).to be_true
+      expect(hash).to eq( { name: 'item-data1', value: { house: 'house-data1'}} )
     end
 
     it 'compiles complex Hash' do
@@ -200,10 +209,12 @@ describe 'Templates resolver' do
                   :publishers=>[{:email=>{:recipients=>"{{mail-to}}"}}]}
       settings = {:name=>"project-name", :db=>"my_own_db", :'mail-to' => 'developer@nowhere.net'}
 
-      JenkinsPipelineBuilder::Compiler.compile(template, settings).should ==
+      success, hash = JenkinsPipelineBuilder::Compiler.compile(template, settings)
+      expect(success).to be_true
+      expect(hash).to eq(
           {:name=>"project-name-unit-tests",
            :builders=>[{:shell=>"unittest"}],
-           :publishers=>[{:email=>{:recipients=>"developer@nowhere.net"}}]}
+           :publishers=>[{:email=>{:recipients=>"developer@nowhere.net"}}]})
     end
   end
 
@@ -214,10 +225,12 @@ describe 'Templates resolver' do
 
     @generator.load_job_collection project
 
-    @generator.resolve_job_by_name('{{name}}-unit-tests', { name: 'project-name', db: 'my_own_db', :'mail-to' => 'developer@nowhere.net' }).should ==
+    success, job = @generator.resolve_job_by_name('{{name}}-unit-tests', { name: 'project-name', db: 'my_own_db', :'mail-to' => 'developer@nowhere.net' })
+    expect(success).to be_true
+    expect(job).to eq(
         {:name=>"project-name-unit-tests",
          :builders=>[{:shell=>"unittest"}],
-         :publishers=>[{:email=>{:recipients=>"developer@nowhere.net"}}]}
+         :publishers=>[{:email=>{:recipients=>"developer@nowhere.net"}}]})
   end
 
   it 'should load from folder' do
@@ -227,4 +240,4 @@ describe 'Templates resolver' do
     @generator.job_collection.count.should == 4
     @generator.projects.count == 1
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Igor Moochnick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.18.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +319,13 @@ files:
 - spec/unit_tests/fixtures/files/Job-Generate-From-Template.yaml
 - spec/unit_tests/fixtures/files/Job-Multi-Project.xml
 - spec/unit_tests/fixtures/files/Job-Multi-Project.yaml
+- spec/unit_tests/fixtures/files/downstream.xml
+- spec/unit_tests/fixtures/files/downstream.yaml
+- spec/unit_tests/fixtures/files/post_build_script.xml
+- spec/unit_tests/fixtures/files/post_build_script.yaml
 - spec/unit_tests/fixtures/files/project.yaml
+- spec/unit_tests/fixtures/files/properties_file.xml
+- spec/unit_tests/fixtures/files/properties_file.yaml
 - spec/unit_tests/fixtures/templates/external_job.yaml
 - spec/unit_tests/fixtures/templates/project_with_jobs.yaml
 - spec/unit_tests/generator_spec.rb
@@ -353,7 +373,13 @@ test_files:
 - spec/unit_tests/fixtures/files/Job-Generate-From-Template.yaml
 - spec/unit_tests/fixtures/files/Job-Multi-Project.xml
 - spec/unit_tests/fixtures/files/Job-Multi-Project.yaml
+- spec/unit_tests/fixtures/files/downstream.xml
+- spec/unit_tests/fixtures/files/downstream.yaml
+- spec/unit_tests/fixtures/files/post_build_script.xml
+- spec/unit_tests/fixtures/files/post_build_script.yaml
 - spec/unit_tests/fixtures/files/project.yaml
+- spec/unit_tests/fixtures/files/properties_file.xml
+- spec/unit_tests/fixtures/files/properties_file.yaml
 - spec/unit_tests/fixtures/templates/external_job.yaml
 - spec/unit_tests/fixtures/templates/project_with_jobs.yaml
 - spec/unit_tests/generator_spec.rb