jenkins_pipeline_builder 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1cdc633e32aef299d1db9fdd6cb3b7e42a1f898
-  data.tar.gz: 379227595a0b45c9e894986282c126f3874ebff1
+  metadata.gz: 4768b1a1bf8d52cb1bd5724b5a9a23b5fd34ea57
+  data.tar.gz: f0d5e26d5672d1073a50b7a36094ee4968d50ffe
 SHA512:
-  metadata.gz: 2fa000775be3d52541d5b0083319ddd9769488b985aa30103270414c767735b8556fbb94fc08ea3077dd4a4c16e222338cd112d72e748aaab438f0dac342bcbf
-  data.tar.gz: f5f1fcc3999153acde22d4d5c3941c02fcbd86c646da699522b1700ebeb84c03119230f2524c182d87fe17f49706c9256d465c109bba1b9fdf2cd870677cae2e
+  metadata.gz: 7e325592c56f9de7c2182c0d1c8836e752fb7e88049e8c1c233bd37659990b8a0c33911ed32148fb73ed208f14e98a2f3809404d124062c9b43180c6d3db0543
+  data.tar.gz: 14c2863da61416b1072378e13228362e3f858f7b2adb72e1ca8380c9d3fb853c0b7059a132228dd7b547f4d6c69924694ca0962e068fdcfb80e04c64bb0f4a6e

data/lib/jenkins_pipeline_builder/generator.rb

@@ -380,7 +380,7 @@ module JenkinsPipelineBuilder
     end
 
     def resolve_project(project)
-      defaults = get_item('global')
+      defaults = find_defaults
       settings = defaults.nil? ? {} : defaults[:value] || {}
       project[:settings] = Compiler.get_settings_bag(project, settings) unless project[:settings]
       project_body = project[:value]
@@ -402,6 +402,14 @@ module JenkinsPipelineBuilder
       [true, project]
     end
 
+    def find_defaults
+      @job_collection.each_value do |item|
+        return item if item[:type] == 'defaults' || item[:type] == :defaults
+      end
+      # This is here for historical purposes
+      get_item('global')
+    end
+
     def resolve_job_by_name(name, settings = {})
       job = get_item(name)
       fail "Failed to locate job by name '#{name}'" if job.nil?

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: This gem is will boostrap your Jenkins pipelines