jenkins_pipeline_builder 0.13.3 → 0.13.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDc1ZDNkY2I3M2NkYTk4OThlMTNlMjA0MDkwN2QwYmU0MzEyMzVjNg==
+    ZmI1MTFmZmVkYmNkODgyMGYzNmZjYjFhMmUxZmFlZjkwYzU1MGNkYQ==
   data.tar.gz: !binary |-
-    ZmM5YTA3NWZkYzRmZWYwMDE1Y2I0ZThhNjM0ZDY4YTAxZmNiYTlkNw==
+    ODFhNzAzMjA0ODI5Mjg1MTI0YjMwZDgyMDk2YmM5MmJmYjlhOWYyOQ==
 SHA512:
   metadata.gz: !binary |-
-    MTBkM2VhYTMzOTNjZTA2NWVkYjgzNjQ4MzE3N2Y4OGIyNjQ1YWZjNmZhMWEw
-    NzA2YmE5OWJlNzUzNzg0OTYxYWJjOGM3ODE1NjczNzFkMzQwZjRhOTI0NTAx
-    ODk2NGFkNTgzMjQ5N2VlYjljZWNmNmE2MWNlMmE3MTgyZTE2MDE=
+    YTE1NjRhYWUyZGRjMDBiNTE0NWFlY2U1NDI0Y2YwMjI5NTU3NDAwMTI5MDlj
+    M2Q1NWM4Njc0YzljNDUwNjgyODQ1ZGZhMjY4ZjcwNTQxOWFhZGQxM2EyZWEx
+    ZDFkMjk0NTkyZTlmY2FhMzU5Y2M0ODEwYzMyNjczMTMzOTA2Mjk=
   data.tar.gz: !binary |-
-    Zjc4M2JlNTkyMDYwMmNkMzhkNmIzYTBkOTVjMmE3MGFiNzc2YmQwMDhhMmJk
-    MTA2Yjc0MzFlMzU1ODczODlkNjgyMzE2NjE5OThhMjc2MDdkYjA3NTZmOTdm
-    ZmNlMzhmY2U4NGEyZmQ4OTQ4NDkxMDdjNGUzMGNhOTAyODlhNTM=
+    NWI0YjJhMjU2ZjUzZWNhZDdjZTk5OTU3NjE2NmQxYmRmNTZjNjdhMzJjZDYy
+    NTZkMDc1YjRjNjhkMTNkNmQ3YjJkNjFkNGU4MDkxNjMxNTUwNGEwYzVlYmY4
+    NWEwNmEwMTZhNGExZjJjZWIxM2FhMDk3ZGU5MGYwYmI4OTUxYTc=

data/lib/jenkins_pipeline_builder.rb

@@ -37,6 +37,7 @@ require 'jenkins_pipeline_builder/generator'
 module JenkinsPipelineBuilder
   class << self
     attr_reader :client, :credentials, :debug, :file_mode
+    attr_writer :logger
     def generator
       @_generator ||= Generator.new
     end
@@ -51,23 +52,22 @@ module JenkinsPipelineBuilder
 
     def debug!
       @debug = true
-      @client.logger.level = Logger::DEBUG
+      logger.level = Logger::DEBUG
     end
 
     def no_debug!
       @debug = false
-      @client.logger.level = Logger::INFO
+      logger.level = Logger::INFO
     end
 
     def credentials=(creds)
       @credentials = creds
       @client = JenkinsApi::Client.new(credentials)
-      generator.logger = @client.logger
       @credentials
     end
 
     def logger
-      client.logger
+      @logger ||= client ? client.logger : Logger.new(STDOUT)
     end
 
     def registry

data/lib/jenkins_pipeline_builder/generator.rb

@@ -24,7 +24,7 @@ require 'json'
 
 module JenkinsPipelineBuilder
   class Generator
-    attr_accessor :no_files, :job_templates, :logger, :module_registry, :job_collection
+    attr_accessor :no_files, :job_templates, :module_registry, :job_collection
 
     def initialize
       @job_templates = {}
@@ -45,15 +45,20 @@ module JenkinsPipelineBuilder
       JenkinsPipelineBuilder::View.new(self)
     end
 
+    def projects(path)
+      load_job_collection path unless job_collection.loaded?
+      job_collection.projects.map { |p| p[:name] }
+    end
+
     def bootstrap(path, project_name = nil)
       logger.info "Bootstrapping pipeline from path #{path}"
-      load_job_collection path
+      load_job_collection path unless job_collection.loaded?
       publish(project_name || job_collection.projects.first[:name])
     end
 
     def pull_request(path, project_name)
       logger.info "Pull Request Generator Running from path #{path}"
-      load_job_collection path
+      load_job_collection path unless job_collection.loaded?
       defaults = job_collection.defaults[:value]
       pr_generator = PullRequestGenerator.new defaults
       pr_generator.delete_closed_prs

data/lib/jenkins_pipeline_builder/job_collection.rb

@@ -1,10 +1,13 @@
 module JenkinsPipelineBuilder
   class JobCollection
     attr_accessor :collection, :remote_dependencies
+    attr_reader :loaded
+    alias_method :loaded?, :loaded
 
     def initialize
       @collection = {}
       @remote_dependencies = RemoteDependencies.new self
+      @loaded = false
     end
 
     def clear_remote_dependencies
@@ -61,6 +64,7 @@ module JenkinsPipelineBuilder
       else
         load_file(path, remote)
       end
+      @loaded = true
     end
 
     private

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.13.3'
+  VERSION = '0.13.4'
 end

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/SamplePipeline-10-Commit.yaml

@@ -0,0 +1,3 @@
+- job:
+    name: '{{name}}-10-Commit'
+    description: '{{description}}'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/SamplePipeline-20-Acceptance.yaml

@@ -0,0 +1,3 @@
+- job:
+    name: '{{name}}-20-Acceptance'
+    description: '{{description}}'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/SamplePipeline-30-Release.yaml

@@ -0,0 +1,3 @@
+- job:
+    name: '{{name}}-30-Release'
+    description: '{{description}}'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/project.yaml

@@ -0,0 +1,28 @@
+- defaults:
+    name: global
+    description: 'Test pipeline for generator_spec.rb'
+
+- project:
+    name: SamplePipeline1
+    jobs:
+      - '{{name}}-10-Commit'
+      - '{{name}}-20-Acceptance'
+      - '{{name}}-30-Release'
+    views:
+      - '{{name}} View'
+- project:
+    name: SamplePipeline2
+    jobs:
+      - '{{name}}-10-Commit'
+      - '{{name}}-20-Acceptance'
+      - '{{name}}-30-Release'
+    views:
+      - '{{name}} View'
+- project:
+    name: SamplePipeline3
+    jobs:
+      - '{{name}}-10-Commit'
+      - '{{name}}-20-Acceptance'
+      - '{{name}}-30-Release'
+    views:
+      - '{{name}} View'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/view.yaml

@@ -0,0 +1,5 @@
+- view:
+    name: '{{name}} View'
+    type: 'listview'
+    description: '{{description}}'
+    regex: '{{name}}.*'

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -231,6 +231,13 @@ describe JenkinsPipelineBuilder::Generator do
     end
   end
 
+  describe '#projects' do
+    it 'returns a list of projects' do
+      path = File.expand_path('../fixtures/generator_tests/multi_project', __FILE__)
+      expect(@generator.projects path).to eq %w(SamplePipeline1 SamplePipeline2 SamplePipeline3)
+    end
+  end
+
   describe '#file_mode' do
     before :each do
       allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -395,6 +395,11 @@ files:
 - 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/multi_project/SamplePipeline-10-Commit.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/SamplePipeline-20-Acceptance.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/SamplePipeline-30-Release.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/view.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
@@ -472,6 +477,11 @@ test_files:
 - 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/multi_project/SamplePipeline-10-Commit.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/SamplePipeline-20-Acceptance.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/SamplePipeline-30-Release.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/multi_project/view.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