jenkins_pipeline_builder 0.10.9 → 0.10.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2NjMWU0N2Q4MmNhYzVmNGM5YmY5OTBlYjA1YmE0NmIyY2ZlNDU2ZQ==
+    ZmUwNjNjYjdjZmU2MWU4MTkwYTE4MzEzZTVkNGFmODY3YjE4MjA1NQ==
   data.tar.gz: !binary |-
-    YmJmNzUzMDZiOTRmYTZkODY0MTllNDQ2OWM1ZGM4MTYxZGQyYzE3Nw==
+    ZGI1NWE3YWQ5NjBlMjJhZWNjMWU3NmRiN2M0ODRjMTk5YzZmN2I5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NmI4ZmY2OWQxNTQ1NDA0NmY2ZGRmNjgyNjg4YjBjZDUwMmI2MDg2MGM4YjI5
-    MTcxMWY4ZmU2Y2RhMTIwZjc3MzI2NTRkNWYyYjZmM2M0ZDgzNGJhNmM0ZmIz
-    M2Q0YmFiMzFmODg3YWNhMjM0YmUwZjBlZTI5ODQ4MDcyNjZjNDQ=
+    NTZkZDM0Y2QwZjY1YjhlMzBmYjdjZTg2ODA3N2E3OWM5NjVjMjgxYTdlN2M3
+    Y2NiMjg3ZGRhMDA0ZTk1YWY1NzliYjYwODM0ZmFmNTdlY2Q0MDAzNGExM2U1
+    MDU2YmU0NzE0OWY5NzI1MDE3MWQ1NTJkMDllMDFkMmUzYjEwYzE=
   data.tar.gz: !binary |-
-    ZGQ1ODhjNzViZWYwMWViYmVkYmQ5MGYxYjY1ZGU1Y2I0NTE3ZGQzY2Q5NzRm
-    OTEwOGZhNTE1YjI1YmI0NDJkZjc3NzJmOWI2OGY1OTlhODFmNjZjZGY5Yzcy
-    ODA4MjVjOWFlNWUyZmY4N2I4YjlkY2Q5NjhmMWE3NzY4MzVhNjY=
+    OGVhOWQ4MGMwOTAyYjFmMjE4OTQ0MzYwYjg4Yzg1ZDUzMTY1ZjhmNmNjZDg3
+    MTczOGYwOGY5MGJjNDM5ZWI0MGQ3ZTFlOWE5YTJhZmFjOWRhNzE0Mjg4NGNk
+    Y2RmOGIyYWQ2MWI4MDY0NTdhOWU5Y2JmMmNlMmNiYTg2Y2M5ZDM=

data/.ackrc

@@ -2,3 +2,4 @@
 --ignore-dir=doc
 --ignore-dir=out
 --ignore-dir=coverage
+--sort-files

data/.rubocop.yml

@@ -1,24 +1,13 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-06-23 17:07:53 -0400 using RuboCop version 0.23.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
 #######
-# WIP
+# WIP These should all go back to defaults at some point
 Metrics/CyclomaticComplexity:
   Max: 9
-
 Metrics/PerceivedComplexity:
   Max: 11
-
-########
-# Fix these later
-# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 27
 Metrics/ClassLength:
-  #Enabled: false
-  Max: 500
+  Max: 525
 
 #######
 # Finalized settings
@@ -32,10 +21,6 @@ Metrics/LineLength:
     - 'spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb'
     - 'lib/jenkins_pipeline_builder/extensions/*'
 
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 25
-
 Style/Documentation:
   Enabled: false
 

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -23,6 +23,11 @@
 module JenkinsPipelineBuilder
   class Compiler
     def self.resolve_value(value, settings, job_collection)
+      # pull@ designates that this is a reference to a job that will be generated
+      # for a pull request, so we want to save the resolution for the second pass
+      pull_job = value.to_s.match(/{{pull@(.*)}}/)
+      return pull_job[1] if pull_job
+
       settings = settings.with_indifferent_access
       value_s = value.to_s.clone
       # First we try to do job name correction

data/lib/jenkins_pipeline_builder/generator.rb

@@ -90,12 +90,16 @@ module JenkinsPipelineBuilder
       load_collection_from_path(path)
       cleanup_temp_remote
       logger.info "Project: #{projects}"
+      errors = {}
       projects.each do |project|
         next unless project[:name] == project_name || project_name.nil?
         logger.info "Using Project #{project}"
         pull_job = find_pull_request_generator(project)
         p_success, p_payload = compile_pull_request_generator(pull_job[:name], project)
-        next unless p_success
+        unless p_success
+          errors[pull_job[:name]] = p_payload
+          next
+        end
         jobs = filter_pull_request_jobs(pull_job)
         pull = JenkinsPipelineBuilder::PullRequestGenerator.new(project, jobs, p_payload)
         @job_collection.merge! pull.jobs
@@ -103,6 +107,10 @@ module JenkinsPipelineBuilder
         failed = success unless success
         purge_pull_request_jobs(pull)
       end
+      errors.each do |k, v|
+        logger.error "Encountered errors compiling: #{k}:"
+        logger.error v
+      end
       !failed
     end
 
@@ -384,7 +392,7 @@ module JenkinsPipelineBuilder
         next unless j
 
         Utils.hash_merge!(j, job[job_id])
-        j[:value][:name] = j[:job_name] if j[:job_name]
+        j[:value][:name] = j[:value][:job_name] if j[:value][:job_name]
       end
     end
 

data/lib/jenkins_pipeline_builder/version.rb

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

metadata

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