jenkins_pipeline_builder 0.10.4 → 0.10.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjNhNjgyYWNjMzcxNTMyYTdhOWVjODdmMWE0NzViZDBhNzllYTkxMg==
+    YWU1ZGI4Y2VjNTc5MmEyMGMyYTA2YjViMDAzNjJlYWNkYWI1M2RkZA==
   data.tar.gz: !binary |-
-    MDQ0Y2MzNjU0NzZmMzYxOGNkYTNjNmUzNjJmMGU5YWYyZTQ0ZmEwNw==
+    MzA4OGQ1MTYwODVlNGQzNzY4N2Q4NjNmMDkxYjY2OWNjMzczMmNjOA==
 SHA512:
   metadata.gz: !binary |-
-    MWIwMGRlMzAxNTFhNGI4YzhmNzFiZmE4MmJhZDE1NTNhYmU1ZjM0MDU3ZGU4
-    YzA2NmI5NDBkNzdjYjQ2MjI5MzdkNWE5ZGY3NDU0MzkyZDA4N2RlODY3YTdj
-    N2I4Y2NlN2E2MzNiZWE5NWI1Y2EzZWU2YmZlODUyZmU3ZTA2ZDk=
+    MjUyYzE2YjRmNGQxNzUzOWI3ZmJmN2NlYjVhZjU3Y2JhYjcxNGNmZGFmNDc2
+    NWE2MmJiYzNkNTVhMzI2NzcxZDExNWRjYTdiZTc4M2M1NDI1MmE3ZmJiNmFm
+    MjM3M2I5Y2U0NWJiNjc2OTllNDZkMmMwNDQzMmJiMDgzN2UwNmI=
   data.tar.gz: !binary |-
-    MDFhZWE3OGFiNTNlODNjNzlhMjlmYzE4OGZlN2M5ZDJkNmZjMmQyOTlkNDVh
-    Mjk2ZWEyMDFjZGJmMGE1ZDViMzFkZmQ4ZWM4NGE3NzlhNTExMmI5ZTQ1Yjhk
-    MGJjMDhiOGM0NjU1OGNjNjU1NjM0YzVmNDkxMWQ2MDY2NzgzOTY=
+    MjJlMWRiN2ZjMGRhNDZiODdlYjJiODgzNTY5Zjk2MjEyZjUxZWFjODZkNWEw
+    ZjQ5YjU2NTQwMzJlNzNkY2M0N2E0NDRjMmIwYjUwNjZlMDM5NDQyZDdmMzQw
+    MmQyZDJmMmIyMDVjYTZjYWJhMjVjODMyZjk5MDc1Y2RiMGU1NDg=

data/lib/jenkins_pipeline_builder/generator.rb

@@ -229,14 +229,18 @@ module JenkinsPipelineBuilder
         end
         name = value[:name]
         if @job_collection.key?(name)
-          if remote
+          existing_remote = @job_collection[name.to_s][:remote]
+          # skip if the existing item is local and the new item is remote
+          if remote && !existing_remote
+            next
+          # override if the existing item is remote and the new is local
+          elsif existing_remote && !remote
             logger.info "Duplicate item with name '#{name}' was detected from the remote folder."
           else
             fail "Duplicate item with name '#{name}' was detected."
           end
-        else
-          @job_collection[name.to_s] = { name: name.to_s, type: key, value: value }
         end
+        @job_collection[name.to_s] = { name: name.to_s, type: key, value: value, remote: remote }
       end
     end
 
@@ -317,7 +321,7 @@ module JenkinsPipelineBuilder
           logger.info 'No specific template specified'
           # Try to load the folder or the pipeline folder
           path = File.join(path, 'pipeline') if Dir.entries(path).include? 'pipeline'
-          return load_collection_from_path(path)
+          return load_collection_from_path(path, true)
         end
 
         load_templates(path, source[:templates])

data/lib/jenkins_pipeline_builder/version.rb

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

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/10.yaml

@@ -0,0 +1,6 @@
+- job_template:
+    name: '{{name}}-10'
+    description: 'Overridden stuff'
+    builders:
+      - shell_command: |
+          echo "Overridden stuff"

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/10_2.yaml

@@ -0,0 +1,6 @@
+- job_template:
+    name: '{{name}}-10'
+    description: 'Overridden stuff'
+    builders:
+      - shell_command: |
+          echo "Overridden stuff"

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/project.yaml

@@ -0,0 +1,15 @@
+- defaults:
+    name: global
+    description: 'Test pipeline for generator_spec.rb'
+
+- dependencies: 
+    - source: 
+        url: 'spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/jobs.tar.gz'
+        templates:
+          - name: test_temp
+
+- project:
+    name: TemplatePipeline
+    jobs:
+      - '{{name}}-10'
+      - '{{name}}-11'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/10.yaml

@@ -0,0 +1,6 @@
+- job_template:
+    name: '{{name}}-10'
+    description: 'Overridden stuff'
+    builders:
+      - shell_command: |
+          echo "Overridden stuff"

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/project.yaml

@@ -0,0 +1,15 @@
+- defaults:
+    name: global
+    description: 'Test pipeline for generator_spec.rb'
+
+- dependencies: 
+    - source: 
+        url: 'spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/jobs.tar.gz'
+        templates:
+          - name: test_temp
+
+- project:
+    name: TemplatePipeline
+    jobs:
+      - '{{name}}-10'
+      - '{{name}}-11'

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -110,6 +110,17 @@ describe JenkinsPipelineBuilder::Generator do
       expect(@generator.module_registry.registry[:job][:wrappers].keys).to include :test_wrapper
       @generator.module_registry.registry[:job][:wrappers].delete(:test_wrapper)
     end
+
+    it 'overrides the remote dependencies with local ones' do
+      errors = bootstrap(fixture_path('local_override/remote_and_local'), 'TemplatePipeline')
+      expect(errors).to be_empty
+      expect(@generator.job_collection['{{name}}-10'][:value][:description]).to eq('Overridden stuff')
+    end
+
+    it 'fails to override when there are duplicate local items' do
+      expect { bootstrap(fixture_path('local_override/all_local'), 'TemplatePipeline') }.to raise_error(StandardError)
+    end
+
     # Things to check for:
     # Fail - Finds duplicate job names (load_job_collection)
     # Extension fails to register?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -372,6 +372,12 @@ files:
 - spec/lib/jenkins_pipeline_builder/extensions/publishers_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/wrappers_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions_spec.rb
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/10.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/10_2.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/10.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/jobs.tar.gz
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/project.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/PullRequest-10-SampleJob.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/PullRequest-40-PullRequestGenerator.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/project.yaml
@@ -430,6 +436,12 @@ test_files:
 - spec/lib/jenkins_pipeline_builder/extensions/publishers_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions/wrappers_spec.rb
 - spec/lib/jenkins_pipeline_builder/extensions_spec.rb
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/10.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/10_2.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/all_local/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/10.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/jobs.tar.gz
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/local_override/remote_and_local/project.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/PullRequest-10-SampleJob.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/PullRequest-40-PullRequestGenerator.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/pullrequest_pipeline/project.yaml