jenkins_pipeline_builder 0.10.3 → 0.10.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjVmMTJkOWM4Y2Q3ZTc2N2FmMDU0MjU2NDk3YTJmNmZiYzIzMWE0Mw==
+    NjNhNjgyYWNjMzcxNTMyYTdhOWVjODdmMWE0NzViZDBhNzllYTkxMg==
   data.tar.gz: !binary |-
-    MzBhZjUyNjgwM2JmN2FhYmEwYjM1NGQ4ZDVkYTVkYzhjMDlhNWQwZQ==
+    MDQ0Y2MzNjU0NzZmMzYxOGNkYTNjNmUzNjJmMGU5YWYyZTQ0ZmEwNw==
 SHA512:
   metadata.gz: !binary |-
-    NmM2YThhNjUxMjlkOTJhODY5YjdjYmQ1Y2IzN2VjMTFmNzNhNzJkZDEyMjFh
-    YmE4NDQzN2QyN2M4MDY1MmM0MDg2ZGVjMTRkYTRkMzI4YWE0MDM1YTRkNzlm
-    Zjg4MzlkN2IxZTAwMzE0MjgzYTQwMTEzZmI5OTViOTRiZGU0MWU=
+    MWIwMGRlMzAxNTFhNGI4YzhmNzFiZmE4MmJhZDE1NTNhYmU1ZjM0MDU3ZGU4
+    YzA2NmI5NDBkNzdjYjQ2MjI5MzdkNWE5ZGY3NDU0MzkyZDA4N2RlODY3YTdj
+    N2I4Y2NlN2E2MzNiZWE5NWI1Y2EzZWU2YmZlODUyZmU3ZTA2ZDk=
   data.tar.gz: !binary |-
-    M2FmNjEyMTk4ZjUwMTA3MzZiYWFhNTAwN2RlY2I3OTBiNWY4N2Q2ODRkMDdk
-    NGFmZjlhMDBjNDA5MmJlZDJjMTliNDcxNTNhNDY0N2UwYjRmMGRjNjFkNDNi
-    NmJmMzA3ZTY3MWNhMzA1Yjg5MzM0MDAzNmNlYWMyODdkMzlhOTY=
+    MDFhZWE3OGFiNTNlODNjNzlhMjlmYzE4OGZlN2M5ZDJkNmZjMmQyOTlkNDVh
+    Mjk2ZWEyMDFjZGJmMGE1ZDViMzFkZmQ4ZWM4NGE3NzlhNTExMmI5ZTQ1Yjhk
+    MGJjMDhiOGM0NjU1OGNjNjU1NjM0YzVmNDkxMWQ2MDY2NzgzOTY=

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -61,6 +61,9 @@ module JenkinsPipelineBuilder
     end
 
     def self.compile(item, settings = {}, job_collection = {})
+      success, item = handle_enable(item, settings, job_collection)
+      return false, item unless success
+
       case item
       when String
         return compile_string item, settings, job_collection
@@ -104,6 +107,7 @@ module JenkinsPipelineBuilder
     end
 
     def self.handle_enable(item, settings, job_collection)
+      return true, item unless item.is_a? Hash
       if item.key?(:enabled) && item.key?(:parameters) && item.length == 2
         enabled_switch = resolve_value(item[:enabled], settings, job_collection)
         return [true, {}] if enabled_switch == 'false'
@@ -122,12 +126,12 @@ module JenkinsPipelineBuilder
     end
 
     def self.compile_hash(item, settings, job_collection)
-      errors = {}
-      result = {}
-
       success, item = handle_enable(item, settings, job_collection)
       return false, item unless success
 
+      errors = {}
+      result = {}
+
       item.each do |key, value|
         if value.nil?
           errors[key] = "key: #{key} has a nil value, this is often a yaml syntax error. Skipping children and siblings"

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.10.3'
+  VERSION = '0.10.4'
 end

data/spec/lib/jenkins_pipeline_builder/compiler_spec.rb

@@ -27,14 +27,26 @@ describe JenkinsPipelineBuilder::Compiler do
   end
 
   describe '#compile' do
-    it 'compile a job with a name change' do
+    it 'compiles a job with a name change' do
       result = compiler.compile(job2, settings_bag, job_collection)
       expect(result[1]).to eq(job2_compiled)
     end
-    it 'compile a job with a downstream name change' do
+
+    it 'compiles a job with a downstream name change' do
       result = compiler.compile(job0, settings_bag, job_collection)
       expect(result[1]).to eq(job0_compiled)
     end
+
+    it 'compiles an enabled job with a string parameter' do
+      my_job = { name: '{{name}}-00',
+                 triggers: [{ periodic_build: { enabled: true, parameters: '{{var}}' } }] }
+      compiled_job = { name: 'name-00',
+                       triggers: [{ periodic_build: 'this_is_a_var' }] }
+      settings_bag = { var: 'this_is_a_var', name: 'name' }
+
+      result = compiler.compile(my_job, settings_bag, job_collection)
+      expect(result[1]).to eq(compiled_job)
+    end
   end
 
   describe '#enable_blocks' do

metadata

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