jenkins_pipeline_builder 0.13.4 → 0.14.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmI1MTFmZmVkYmNkODgyMGYzNmZjYjFhMmUxZmFlZjkwYzU1MGNkYQ==
+    MDBiZGQ1ODhjMWU2ZTE0Mjk0MDM5ZjIzMmUyYzMwOTcyMDc2ODJkMA==
   data.tar.gz: !binary |-
-    ODFhNzAzMjA0ODI5Mjg1MTI0YjMwZDgyMDk2YmM5MmJmYjlhOWYyOQ==
+    OTExNDQ5YjYyYTlhYzUxNjgxY2QzMDI4ODkyZDM5NjQ4MDI1NDg1Mw==
 SHA512:
   metadata.gz: !binary |-
-    YTE1NjRhYWUyZGRjMDBiNTE0NWFlY2U1NDI0Y2YwMjI5NTU3NDAwMTI5MDlj
-    M2Q1NWM4Njc0YzljNDUwNjgyODQ1ZGZhMjY4ZjcwNTQxOWFhZGQxM2EyZWEx
-    ZDFkMjk0NTkyZTlmY2FhMzU5Y2M0ODEwYzMyNjczMTMzOTA2Mjk=
+    ZmRkMmE4OTA3MDA3YjZkM2Q2NDJkZGFhMTA1Njc0MGQ1N2E2NTBhYzgzYWM1
+    Mjc5ZjMzNjVhMDJjODI3ZjQ4ZDc4MTdjN2VlNjI0NjlmN2M1NDEyNWY2OWI4
+    YmMzMDJjNTZmYmIzNTk4NzNkMjc5MWRlMGE2ZDFlNTkxOWVjMGQ=
   data.tar.gz: !binary |-
-    NWI0YjJhMjU2ZjUzZWNhZDdjZTk5OTU3NjE2NmQxYmRmNTZjNjdhMzJjZDYy
-    NTZkMDc1YjRjNjhkMTNkNmQ3YjJkNjFkNGU4MDkxNjMxNTUwNGEwYzVlYmY4
-    NWEwNmEwMTZhNGExZjJjZWIxM2FhMDk3ZGU5MGYwYmI4OTUxYTc=
+    ZjEwYjc1ODg1MzliMzNkYzkwM2M2ZDU4MGJhNjc4M2EwMTlmMWEzYTNlMmRi
+    Zjk3ZTM3YTlkYzBmOThjOWI1ODJhNzgyMzFhNGI2OWM3YTk5NWY3NWY5OThh
+    Y2M4ZWRmOWQ3YTA2MWJjMjk3OWZhZDkwZGI0YmJlZTgxYTQyOWY=

data/.gitignore

@@ -3,4 +3,5 @@ out
 Gemfile.lock
 *.gem
 .DS_Store
-.idea
+.idea
+.byebug_history

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p247
+ruby-2.2.4

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 rvm:
 - 2.1.4
 - 2.0.0
+before_install: 
+  - gem install bundler
 deploy:
   provider: rubygems
   api_key:

data/jenkins_pipeline_builder.gemspec

@@ -33,7 +33,7 @@ automating Job & Pipeline creation from the YAML files checked-in with your appl
   spec.add_development_dependency 'bump'
   spec.add_development_dependency 'json'
   spec.add_development_dependency 'gem-release'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'kwalify'

data/lib/jenkins_pipeline_builder/cli/describe.rb

@@ -28,11 +28,11 @@ module JenkinsPipelineBuilder
       klass_name = entry.to_s.classify
       # rubocop:disable Style/AccessModifierIndentation
       klass = Class.new(Thor) do
-        if entry == :job_attributes
-          extensions = JenkinsPipelineBuilder.registry.registry[:job].select { |_, x| x.is_a? ExtensionSet }
-        else
-          extensions = JenkinsPipelineBuilder.registry.registry[:job][entry]
-        end
+        extensions = if entry == :job_attributes
+                       JenkinsPipelineBuilder.registry.registry[:job].select { |_, x| x.is_a? ExtensionSet }
+                     else
+                       JenkinsPipelineBuilder.registry.registry[:job][entry]
+                     end
 
         extensions.each do |key, extset|
           # TODO: don't just take the first

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -71,11 +71,8 @@ module JenkinsPipelineBuilder
       end
 
       def self.process_creds_file(file)
-        if file.end_with? 'json'
-          return JSON.parse(IO.read(File.expand_path(file)))
-        else
-          return YAML.load_file(File.expand_path(file))
-        end
+        return JSON.parse(IO.read(File.expand_path(file))) if file.end_with? 'json'
+        YAML.load_file(File.expand_path(file))
       end
 
       def self.process_cli_creds(options)

data/lib/jenkins_pipeline_builder/cli/pipeline.rb

@@ -34,7 +34,7 @@ module JenkinsPipelineBuilder
       desc 'bootstrap Path', 'Generates pipeline from folder or a file'
       def bootstrap(path, project_name = nil)
         failed = Helper.setup(parent_options).bootstrap(path, project_name)
-        fail 'Encountered error during run' unless failed.empty?
+        raise 'Encountered error during run' unless failed.empty?
       end
 
       desc 'pull_request Path', 'Generates jenkins jobs based on a git pull request.'

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -44,9 +44,15 @@ module JenkinsPipelineBuilder
       my_settings_bag.merge(bag)
     end
 
+    def compile_job(item, settings = {})
+      new_item = compile(item, settings)
+      [true, new_item]
+    rescue => e
+      return [false, [e.message]]
+    end
+
     def compile(item, settings = {})
-      success, item = handle_enable(item, settings)
-      return false, item unless success
+      item = handle_enable(item, settings)
 
       case item
       when String
@@ -56,16 +62,16 @@ module JenkinsPipelineBuilder
       when Array
         return compile_array item, settings
       end
-      [true, item]
+      item
     end
 
     def handle_enable(item, settings)
-      return true, item unless item.is_a? Hash
+      return item unless item.is_a? Hash
       if enable_block_present? item
         enabled_switch = resolve_value(item[:enabled], settings)
-        return [true, {}] if enabled_switch == 'false'
+        return {} if enabled_switch == 'false'
         if enabled_switch != 'true'
-          return [false, { 'value error' => "Invalid value for #{item[:enabled]}: #{enabled_switch}" }]
+          raise "Invalid value for #{item[:enabled]}: #{enabled_switch}"
         end
         if item[:parameters].is_a? Hash
           item = item.merge item[:parameters]
@@ -75,7 +81,7 @@ module JenkinsPipelineBuilder
           item = item[:parameters]
         end
       end
-      [true, item]
+      item
     end
 
     private
@@ -85,64 +91,44 @@ module JenkinsPipelineBuilder
     end
 
     def compile_string(item, settings)
-      errors = {}
-      new_value = resolve_value(item, settings)
-      errors[item] = "Failed to resolve #{item}" if new_value.nil?
-      return false, errors unless errors.empty?
-      [true, new_value]
+      resolve_value(item, settings)
+    rescue => e
+      raise "Failed to resolve #{item} because: #{e.message}"
     end
 
     def compile_array(array, settings)
-      errors = {}
       result = []
       array.each do |value|
-        success, payload = compile_array_item value, settings, array
-        errors[value] =  payload unless success
+        payload = compile_array_item value, settings, array
         result << payload
       end
-      return false, errors unless errors.empty?
-      [true, result]
+      result
     end
 
     def compile_array_item(item, settings, array)
-      success, payload = compile(item, settings)
-      return false, "found a nil value when processing following array:\n #{array.inspect}" if item.nil?
-      return false, payload unless success
-      return false, "Failed to resolve:\n===>item #{item}\n\n===>of list: #{array.inspect}" if payload.nil?
-      [true, payload]
+      raise "Found a nil value when processing following array:\n #{array.inspect}" if item.nil?
+      payload = compile(item, settings)
+      raise "Failed to resolve:\n===>item #{item}\n\n===>of list: #{array.inspect}" if payload.nil?
+      payload
     end
 
-    def compile_item(key, value, errors, settings)
+    def compile_item(key, value, settings)
       if value.nil?
-        errors[key] = "key: #{key} has a nil value, this is often a yaml syntax error. Skipping children and siblings"
-        return false, errors[key]
-      end
-      success, payload = compile(value, settings)
-      unless success
-        errors.merge!(payload)
-        return false, payload
+        raise "key: #{key} has a nil value, this is often a yaml syntax error. Skipping children and siblings"
       end
-      if payload.nil?
-        errors[key] = "Failed to resolve:\n===>key: #{key}\n\n===>value: #{value}\n\n===>of: #{item}"
-        return false, errors[key]
-      end
-      [true, payload]
+      payload = compile(value, settings)
+      raise "Failed to resolve:\n===>key: #{key}\n\n===>value: #{value} payload" if payload.nil?
+      payload
     end
 
     def compile_hash(item, settings)
-      success, item = handle_enable(item, settings)
-      return false, item unless success
-
-      errors = {}
+      item = handle_enable(item, settings)
       result = {}
-
       item.each do |key, value|
-        success, payload = compile_item(key, value, errors, settings)
-        next unless success
+        payload = compile_item(key, value, settings)
         result[key] = payload unless payload == {}
       end
-      return false, errors unless errors.empty?
-      [true, result]
+      result
     end
 
     def resolve_value(value, settings)
@@ -155,6 +141,7 @@ module JenkinsPipelineBuilder
       end
 
       settings = settings.with_indifferent_access
+      # TODO: this is actually a shallow copy and should be fixed
       value_s = value.to_s.clone
       correct_job_names! value_s
       # Then we look for normal values to replace
@@ -165,7 +152,8 @@ module JenkinsPipelineBuilder
       vars = value_s.scan(/{{([^{}@]+)}}/).flatten
       vars.select! do |var|
         var_val = settings[var]
-        value_s.gsub!("{{#{var}}}", var_val.to_s) unless var_val.nil?
+        raise "Could not find defined substitution variable: #{var}" if var_val.nil?
+        value_s.gsub!("{{#{var}}}", var_val.to_s)
         var_val.nil?
       end
       return nil if vars.count != 0

data/lib/jenkins_pipeline_builder/extension_set.rb

@@ -7,7 +7,7 @@ module JenkinsPipelineBuilder
       :description,
       :announced,
       :type
-    ]
+    ].freeze
     SET_METHODS.each do |method_name|
       define_method method_name do |value = nil|
         return settings[method_name] if value.nil?
@@ -54,7 +54,7 @@ module JenkinsPipelineBuilder
       return @version if @version
       reg = JenkinsPipelineBuilder.registry
       version = reg.versions[settings[:plugin_id]]
-      fail "Plugin #{settings[:name]} is not installed (plugin_id: #{settings[:plugin_id]})" if version.nil?
+      raise "Plugin #{settings[:name]} is not installed (plugin_id: #{settings[:plugin_id]})" if version.nil?
       self.installed_version = version
       @version
     end
@@ -66,7 +66,7 @@ module JenkinsPipelineBuilder
       extension = versions[highest_allowed_version]
 
       unless extension
-        fail "Can't find version of #{name} lte #{installed_version}, available versions: #{versions.keys.map(&:to_s)}"
+        raise "Can't find version of #{name} lte #{installed_version}, available versions: #{versions.keys.map(&:to_s)}"
       end
       extension
     end
@@ -81,7 +81,7 @@ module JenkinsPipelineBuilder
       mismatch.each do |error|
         puts error
       end
-      fail 'Values did not match, cannot merge extension sets' if mismatch.any?
+      raise 'Values did not match, cannot merge extension sets' if mismatch.any?
 
       self.extensions = versions.merge(other_set.versions).values
     end
@@ -100,7 +100,7 @@ module JenkinsPipelineBuilder
         deprecation_warning(settings[:name], 'xml')
       end
       unless block
-        fail "no block found for version #{version}" unless blocks.key version
+        raise "no block found for version #{version}" unless blocks.key version
         return blocks[version][:block]
       end
       store_xml version, block, path

data/lib/jenkins_pipeline_builder/extensions.rb

@@ -35,7 +35,7 @@ module JenkinsPipelineBuilder
       after: false,
       xml: false,
       parameters: []
-    }
+    }.freeze
     EXT_METHODS.keys.each do |method_name|
       define_method method_name do |value = nil|
         return instance_variable_get("@#{method_name}") if value.nil?

data/lib/jenkins_pipeline_builder/extensions/builders.rb

@@ -282,14 +282,10 @@ builder do
       else
         send('selector', 'class' => 'hudson.plugins.copyartifact.StatusBuildSelector')
       end
-      if params[:fingerprint].nil?
+      if params[:fingerprint].nil? || params[:fingerprint].to_s == 'true'
         doNotFingerprintArtifacts false
       else
-        if params[:fingerprint].to_s == 'true'
-          doNotFingerprintArtifacts false
-        else
-          doNotFingerprintArtifacts true
-        end
+        doNotFingerprintArtifacts true
       end
       flatten true if params[:flatten]
       optional true if params[:optional]
@@ -307,10 +303,10 @@ builder do
   xml do |params|
     send('hudson.plugins.groovy.SystemGroovy', 'plugin' => 'groovy@1.24') do
       if params.key?(:script) && params.key?(:file)
-        fail 'Configuration invalid. Both \'script\' and \'file\' keys can not be specified'
+        raise 'Configuration invalid. Both \'script\' and \'file\' keys can not be specified'
       end
       unless params.key?(:script) || params.key?(:file)
-        fail 'Configuration invalid. At least one of \'script\' and \'file\' keys must be specified'
+        raise 'Configuration invalid. At least one of \'script\' and \'file\' keys must be specified'
       end
 
       scriptSource('class' => 'hudson.plugins.groovy.StringScriptSource') do
@@ -381,4 +377,31 @@ builder do
       filterPattern params[:filterPattern]
     end
   end
+
+  builder do
+    name :sonar_standalone
+    plugin_id 'sonar'
+    description 'Quickly benefit from Sonar, the open source platform for Continuous Inspection of code quality.'
+    jenkins_name 'SonarQube Plugin'
+    announced false
+    parameters [
+      :sonarInstallation,
+      :taskToRun,
+      :jdk,
+      :pathToProjectProperties,
+      :projectProperties,
+      :jvmOptions
+    ]
+
+    xml do |params|
+      send('hudson.plugins.sonar.SonarRunnerBuilder', 'plugin' => 'sonar@2.1') do
+        installationName params[:sonarInstallation]
+        project params[:pathToProjectProperties]
+        properties params[:projectProperties]
+        javaOpts params[:jvmOptions]
+        jdk params[:jdk]
+        task params[:taskToRun]
+      end
+    end
+  end
 end

data/lib/jenkins_pipeline_builder/extensions/helpers/extension_helper.rb

@@ -6,11 +6,11 @@ class ExtensionHelper < SimpleDelegator
     # That will allow for defaults to be pulled out of the extension and it
     # will also let better enable overriding of those values that do not have
     # an option to do so currently.
-    if params.is_a? Hash
-      @params = defaults.merge params
-    else
-      @params = params
-    end
+    @params = if params.is_a? Hash
+                defaults.merge params
+              else
+                params
+              end
     @builder = builder
     super @params
   end

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -32,7 +32,7 @@ job_attribute do
   end
 
   xml path: '//project' do |description|
-    description "#{description}"
+    description description.to_s
   end
 end
 
@@ -44,7 +44,7 @@ job_attribute do
   announced false
 
   xml path: '//project' do |jdk|
-    jdk "#{jdk}"
+    jdk jdk.to_s
   end
 end
 
@@ -60,7 +60,7 @@ job_attribute do
   end
 
   xml path: '//project' do |disabled|
-    disabled "#{disabled}"
+    disabled disabled.to_s
   end
 end
 
@@ -169,7 +169,7 @@ job_attribute do
       extensions do
         if params[:changelog_to_branch]
           opts = params[:changelog_to_branch]
-          fail 'remote and branch are required for changelog_to_branch' unless opts[:remote] && opts[:branch]
+          raise 'remote and branch are required for changelog_to_branch' unless opts[:remote] && opts[:branch]
           send('hudson.plugins.git.extensions.impl.ChangelogToBranch') do
             options do
               compareRemote opts[:remote]
@@ -215,7 +215,7 @@ job_attribute do
   announced false
 
   xml path: '//properties' do |params|
-    fail 'No HipChat room specified' unless params[:room]
+    raise 'No HipChat room specified' unless params[:room]
 
     send('jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty') do
       room params[:room]
@@ -257,7 +257,7 @@ job_attribute do
     send('hudson.model.ParametersDefinitionProperty') do
       parameterDefinitions do
         params.each do |param|
-          send(params.param_type param) do
+          send(params.param_type(param)) do
             name param[:name]
             description param[:description]
             defaultValue param[:default]

data/lib/jenkins_pipeline_builder/extensions/publishers.rb

@@ -315,6 +315,7 @@ publisher do
       settings class: 'jenkins.mvn.DefaultSettingsProvider'
       globalSettings class: 'jenkins.mvn.DefaultGlobalSettingsProvider'
       usePrivateRepository false
+      installationName params[:installation_name]
     end
   end
 end

data/lib/jenkins_pipeline_builder/generator.rb

@@ -86,11 +86,11 @@ module JenkinsPipelineBuilder
 
     def resolve_job_by_name(name, settings = {})
       job = job_collection.get_item(name)
-      fail "Failed to locate job by name '#{name}'" if job.nil?
+      raise "Failed to locate job by name '#{name}'" if job.nil?
       job_value = job[:value]
       logger.debug "Compiling job #{name}"
       compiler = JenkinsPipelineBuilder::Compiler.new self
-      success, payload = compiler.compile(job_value, settings)
+      success, payload = compiler.compile_job(job_value, settings)
       [success, payload]
     end
 
@@ -115,11 +115,11 @@ module JenkinsPipelineBuilder
     end
 
     def publish(project_name)
-      if job_collection.projects.any?
-        errors = publish_project(project_name)
-      else
-        errors = publish_jobs(job_collection.standalone_jobs)
-      end
+      errors = if job_collection.projects.any?
+                 publish_project(project_name)
+               else
+                 publish_jobs(job_collection.standalone_jobs)
+               end
       print_compile_errors errors
       errors
     end
@@ -142,12 +142,9 @@ module JenkinsPipelineBuilder
     end
 
     def print_project_errors(errors)
-      errors.each do |k, v|
-        puts "Encountered errors processing: #{k}:"
-        v.each do |key, error|
-          puts "  key: #{key} had the following error:"
-          puts "  #{error.inspect}"
-        end
+      errors.each do |error|
+        puts 'Encountered errors processing:'
+        puts error.inspect
       end
     end
 
@@ -210,12 +207,10 @@ module JenkinsPipelineBuilder
 
     def create_jobs_and_views(project)
       success, payload = resolve_project(project)
-      if success
-        logger.info 'successfully resolved project'
-        compiled_project = payload
-      else
-        return { project_name: 'Failed to resolve' }
-      end
+      return { project_name: 'Failed to resolve' } unless success
+
+      logger.info 'successfully resolved project'
+      compiled_project = payload
 
       errors = publish_jobs(compiled_project[:value][:jobs]) if compiled_project[:value][:jobs]
       return errors unless compiled_project[:value][:views]
@@ -225,14 +220,14 @@ module JenkinsPipelineBuilder
 
     def publish_project(project_name)
       project = job_collection.projects.find { |p| p[:name] == project_name }
-      create_jobs_and_views(project || fail("Project #{project_name} not found!"))
+      create_jobs_and_views(project || raise("Project #{project_name} not found!"))
     end
 
     def publish_jobs(jobs, errors = {})
       jobs.each do |i|
         logger.info "Processing #{i}"
         job = i[:result]
-        fail "Result is empty for #{i}" if job.nil?
+        raise "Result is empty for #{i}" if job.nil?
         job = Job.new job
         success, payload = job.create_or_update
         errors[job.name] = payload unless success

data/lib/jenkins_pipeline_builder/job.rb

@@ -29,7 +29,7 @@ module JenkinsPipelineBuilder
     end
 
     def to_xml
-      fail 'Job name is not specified' unless name
+      raise 'Job name is not specified' unless name
 
       logger.info "Creating Yaml Job #{job}"
       job[:job_type] = 'free_style' unless job[:job_type]
@@ -59,7 +59,7 @@ module JenkinsPipelineBuilder
 
     def local_output(xml)
       logger.info "Will create job #{job}"
-      logger.info "#{xml}" if @debug
+      logger.info xml.to_s if @debug
       FileUtils.mkdir_p(out_dir) unless File.exist?(out_dir)
       File.open("#{out_dir}/#{name}.xml", 'w') { |f| f.write xml }
       [true, nil]
@@ -112,7 +112,7 @@ module JenkinsPipelineBuilder
       # I'm pretty unclear what these templates are...
       if params.key?(:template)
         template_name = params[:template]
-        fail "Job template '#{template_name}' can't be resolved." unless @job_templates.key?(template_name)
+        raise "Job template '#{template_name}' can't be resolved." unless @job_templates.key?(template_name)
         params.delete(:template)
         template = @job_templates[template_name]
         puts "Template found: #{template}"

data/lib/jenkins_pipeline_builder/job_collection.rb

@@ -2,7 +2,7 @@ module JenkinsPipelineBuilder
   class JobCollection
     attr_accessor :collection, :remote_dependencies
     attr_reader :loaded
-    alias_method :loaded?, :loaded
+    alias loaded? loaded
 
     def initialize
       @collection = {}
@@ -70,15 +70,17 @@ module JenkinsPipelineBuilder
     private
 
     def load_file(path, remote = false)
-      if path.end_with? 'json'
-        hash = JSON.parse(IO.read(path))
-      else # elsif path.end_with?("yml") || path.end_with?("yaml")
-        hash = YAML.load_file(path)
-      end
+      hash = if path.end_with? 'json'
+               JSON.parse(IO.read(path))
+             else # elsif path.end_with?("yml") || path.end_with?("yaml")
+               YAML.load_file(path)
+             end
       logger.info "Loading file #{path}"
       hash.each do |section|
         load_section section, remote
       end
+    rescue StandardError => err
+      raise "There was an error while parsing a file #{err.message}"
     end
 
     def load_section(section, remote)
@@ -100,14 +102,10 @@ module JenkinsPipelineBuilder
       if collection.key?(name)
         existing_remote = collection[name.to_s][:remote]
         # skip if the existing item is local and the new item is remote
-        if remote && !existing_remote
-          return
-          # 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
+        return if remote && !existing_remote
+        raise "Duplicate item with name '#{name}' was detected." unless existing_remote && !remote
+        # override if the existing item is remote and the new is local
+        logger.info "Duplicate item with name '#{name}' was detected from the remote folder."
       end
       collection[name.to_s] = { name: name.to_s, type: key, value: value, remote: remote }
     end

data/lib/jenkins_pipeline_builder/module_registry.rb

@@ -90,7 +90,7 @@ module JenkinsPipelineBuilder
       params.each do |key, value|
         next unless registry.is_a? Hash
         unless registry.key? key
-          fail "!!!! could not find key #{key} !!!!" if strict
+          raise "!!!! could not find key #{key} !!!!" if strict
           next
         end
         reg_value = registry[key]
@@ -115,7 +115,7 @@ module JenkinsPipelineBuilder
     def execute_extension(ext, value, n_xml)
       logger.debug "Using #{ext.type} #{ext.name} version #{ext.min_version}"
       success = ext.execute value, n_xml
-      fail 'Encountered errors compiling the xml' unless success
+      raise 'Encountered errors compiling the xml' unless success
     end
   end
 end

data/lib/jenkins_pipeline_builder/project.rb

@@ -10,12 +10,10 @@ module JenkinsPipelineBuilder
 
     def publish
       success, payload = resolve_project(input)
-      if success
-        logger.info 'successfully resolved project'
-        compiled_project = payload
-      else
-        return { project_name: 'Failed to resolve' }
-      end
+      return { project_name: 'Failed to resolve' } unless success
+
+      logger.info 'successfully resolved project'
+      compiled_project = payload
 
       self.errors = publish_jobs(compiled_project[:value][:jobs]) if compiled_project[:value][:jobs]
       return unless compiled_project[:value][:views]

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -25,12 +25,13 @@ module JenkinsPipelineBuilder
     attr_accessor :open_prs, :application_name
 
     def initialize(defaults = {})
-      @application_name = defaults[:application_name] || fail('Please set "application_name" in your project!')
+      @application_name = defaults[:application_name] || raise('Please set "application_name" in your project!')
       @open_prs = active_prs defaults[:github_site], defaults[:git_org], defaults[:git_repo_name]
     end
 
     def convert!(job_collection, pr)
       job_collection.defaults[:value][:application_name] = "#{application_name}-PR#{pr}"
+      job_collection.defaults[:value][:pull_request_number] = pr.to_s
       job_collection.jobs.each { |j| override j[:value], pr }
     end
 
@@ -56,7 +57,7 @@ module JenkinsPipelineBuilder
     end
 
     def active_prs(git_url, git_org, git_repo)
-      (git_url && git_org && git_repo) || fail('Please set github_site, git_org and git_repo_name in your project.')
+      (git_url && git_org && git_repo) || raise('Please set github_site, git_org and git_repo_name in your project.')
       # Build the Git URL
       url = "#{git_url}/api/v3/repos/#{git_org}/#{git_repo}/pulls"
       # Download the JSON Data from the API

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.13.4'
+  VERSION = '0.14.0'.freeze
 end

data/lib/jenkins_pipeline_builder/view.rb

@@ -35,11 +35,11 @@ module JenkinsPipelineBuilder
     end
 
     def generate(path)
-      if path.end_with? 'json'
-        hash = JSON.parse(IO.read(path))
-      else
-        hash = YAML.load_file(path)
-      end
+      hash = if path.end_with? 'json'
+               JSON.parse(IO.read(path))
+             else
+               YAML.load_file(path)
+             end
 
       hash.each do |item|
         Utils.symbolize_keys_deep!(item)
@@ -66,7 +66,7 @@ module JenkinsPipelineBuilder
     #
     def create(params)
       # Name is a required parameter. Raise an error if not specified
-      fail ArgumentError, 'Name is required for creating view' unless params.is_a?(Hash) && params[:name]
+      raise ArgumentError, 'Name is required for creating view' unless params.is_a?(Hash) && params[:name]
       clean_up_views(params) unless JenkinsPipelineBuilder.debug
       params[:type] ||= 'listview'
       create_base_view(params[:name], params[:type], params[:parent_view])
@@ -90,16 +90,19 @@ module JenkinsPipelineBuilder
       if params[:parent_view]
         create_base_view(params[:parent_view], 'nestedView') unless exists?(params[:parent_view])
         delete(params[:name], params[:parent_view]) if exists?(params[:name], params[:parent_view])
-      else
-        delete(params[:name]) if exists?(params[:name])
+      elsif exists?(params[:name])
+        delete(params[:name])
       end
     end
 
     def post_params(params)
       payload = post_payload params
-      payload.merge!('filterQueue' => 'on') if params[:filter_queue]
-      payload.merge!('filterExecutors' => 'on') if params[:filter_executors]
-      payload.merge!('useincluderegex' => 'on', 'includeRegex' => params[:regex]) if params[:regex]
+      payload['filterQueue'] = 'on' if params[:filter_queue]
+      payload['filterExecutors'] = 'on' if params[:filter_executors]
+      if params[:regex]
+        payload['useincluderegex'] = 'on'
+        payload['includeRegex'] = params[:regex]
+      end
       payload
     end
 
@@ -113,7 +116,7 @@ module JenkinsPipelineBuilder
         'statusFilter' => '',
         'columns' => get_columns(params[:type])
       }
-      json.merge!('groupingRules' => params[:groupingRules]) if params[:groupingRules]
+      json['groupingRules'] = params[:groupingRules] if params[:groupingRules]
 
       {
         'name' => params[:name],
@@ -133,7 +136,7 @@ module JenkinsPipelineBuilder
         'dashboardView' => 'hudson.plugins.view.dashboard.Dashboard',
         'multijobView' => 'com.tikal.jenkins.plugins.multijob.views.MultiJobView'
       }
-      fail "Type #{type} is not supported by Jenkins." unless types.keys.include? type
+      raise "Type #{type} is not supported by Jenkins." unless types.keys.include? type
       types[type]
     end
 
@@ -211,11 +214,8 @@ module JenkinsPipelineBuilder
       path = parent_view.nil? ? '' : "/view/#{parent_view}"
       response_json = @client.api_get_request(path)
       response_json['views'].each do |view|
-        if ignorecase
-          view_names << view['name'] if view['name'] =~ /#{filter}/i
-        else
-          view_names << view['name'] if view['name'] =~ /#{filter}/
-        end
+        filter_exp = ignorecase ? /#{filter}/i : /#{filter}/
+        view_names << view['name'] if view['name'] =~ filter_exp
       end
       view_names
     end

data/spec/lib/jenkins_pipeline_builder/compiler_spec.rb

@@ -63,7 +63,7 @@ describe JenkinsPipelineBuilder::Compiler do
         builders: [{ shell_command: "echo 'Running DummyPipeline'" }]
       }
       result = compiler.compile(job, settings_bag)
-      expect(result[1]).to eq(job_compiled)
+      expect(result).to eq(job_compiled)
     end
 
     it 'compiles a job with a downstream name change' do
@@ -96,7 +96,7 @@ describe JenkinsPipelineBuilder::Compiler do
         publishers: [{ downstream: { project: 'DummyPipeline-02' } }]
       }
       result = compiler.compile(job, settings_bag)
-      expect(result[1]).to eq(job_compiled)
+      expect(result).to eq(job_compiled)
     end
 
     it 'compiles an enabled job with a string parameter' do
@@ -107,7 +107,7 @@ describe JenkinsPipelineBuilder::Compiler do
       settings_bag = { var: 'this_is_a_var', name: 'name' }
 
       result = compiler.compile(my_job, settings_bag)
-      expect(result[1]).to eq(compiled_job)
+      expect(result).to eq(compiled_job)
     end
   end
 
@@ -115,39 +115,34 @@ describe JenkinsPipelineBuilder::Compiler do
     it 'generates correct new jobs with true' do
       item = { enabled: '{{use1}}', parameters: { rootPom: 'path_to_pomasd' } }
       settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true }
-      success, item = compiler.handle_enable(item, settings)
-      expect(success).to be true
+      item = compiler.handle_enable(item, settings)
       expect(item).to eq(rootPom: 'path_to_pomasd')
     end
 
     it 'generates correct new jobs when the params are a string' do
       item = { enabled: '{{use1}}', parameters: 'path_to_pomasd' }
       settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true }
-      success, item = compiler.handle_enable(item, settings)
-      expect(success).to be true
+      item = compiler.handle_enable(item, settings)
       expect(item).to eq('path_to_pomasd')
     end
 
     it 'generates correct new jobs with false' do
       item = { enabled: '{{use1}}', parameters: { rootPom: 'path_to_pomasd' } }
       settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: false }
-      success, item = compiler.handle_enable(item, settings)
-      expect(success).to be true
+      item = compiler.handle_enable(item, settings)
       expect(item).to eq({})
     end
 
     it 'fails when value not found' do
       item = { enabled: '{{use_fail}}', parameters: { rootPom: 'path_to_pomasd' } }
       settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true }
-      success, _item = compiler.handle_enable(item, settings)
-      expect(success).to be false
+      expect { compiler.handle_enable(item, settings) }.to raise_error(/Could not find defined substitution variable: use_fail/)
     end
 
     it 'removes empty builders' do
       item = { enabled: '{{use}}', parameters: { rootPom: 'one' } }
       settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use: false }
-      success, result = compiler.handle_enable(item, settings)
-      expect(success).to be true
+      result = compiler.handle_enable(item, settings)
       expect(result).to eq({})
     end
   end

data/spec/lib/jenkins_pipeline_builder/extensions/registered_spec.rb

@@ -9,7 +9,7 @@ WRAPPERS = {
   rvm: ['0', '0.5'],
   timestamp: ['0'],
   xvfb: ['0']
-}
+}.freeze
 PUBLISHERS = {
   archive_artifact: ['0'],
   brakeman: ['0'],
@@ -30,7 +30,7 @@ PUBLISHERS = {
   publish_tap_results: ['0'],
   sonar_result: ['0'],
   xunit: ['0']
-}
+}.freeze
 BUILDERS = {
   blocking_downstream: ['0'],
   copy_artifact: ['0'],
@@ -40,14 +40,16 @@ BUILDERS = {
   remote_job: ['0'],
   shell_command: ['0'],
   checkmarx_scan: ['0'],
-  system_groovy: ['0']
-}
+  system_groovy: ['0'],
+  sonar_standalone: ['0']
+
+}.freeze
 TRIGGERS = {
   git_push: ['0'],
   periodic_build: ['0'],
   scm_polling: ['0'],
   upstream: ['0']
-}
+}.freeze
 JOB_ATTRIBUTES = {
   concurrent_build: ['0'],
   description: ['0'],
@@ -62,7 +64,7 @@ JOB_ATTRIBUTES = {
   promoted_builds: ['0'],
   scm_params: ['0', '2.0'],
   throttle: ['0']
-}
+}.freeze
 
 describe 'built in extensions' do
   before :each do

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_json_files/project.json

@@ -0,0 +1,15 @@
+[
+  {
+    "defaults": {
+      "name": "global",
+      "description": "Tests, all the tests"
+    }
+  },
+  {
+    "project": {
+      "name": "TestProject",
+      "jobs": [
+        "{{name}}-part1"
+      ]
+    }
+]

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_json_files/view.json

@@ -0,0 +1,10 @@
+[
+  {
+    "view": {
+      "name": "{{name}} View",
+      "type": "listview",
+      "description": "{{description}}",
+      "regex": "{{name}}.*"
+    }
+  }
+]

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

@@ -0,0 +1,8 @@
+- defaults:
+    name: global
+    description: 'Tests, all the tests'
+
+- project:
+    name: BadTestProject
+    jobs:
+      - '{{name}}-part1'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_yaml_files/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

@@ -174,7 +174,7 @@ describe JenkinsPipelineBuilder::Generator do
                              git_repo_name: 'generator_tests'))
         .and_return(pr_generator)
       expect(pr_generator).to receive(:delete_closed_prs)
-      pr_generator.stub(:convert!) do |job_collection, pr|
+      allow(pr_generator).to receive(:convert!) do |job_collection, pr|
         job_collection.defaults[:value][:application_name] = "testapp-PR#{pr}"
       end
       expect(pr_generator).to receive(:open_prs).and_return [1, 2]
@@ -210,6 +210,19 @@ describe JenkinsPipelineBuilder::Generator do
       path = File.expand_path('../fixtures/generator_tests/test_combo_files', __FILE__)
       @generator.job_collection.load_from_path path
     end
+
+    it 'errors when reading a bad yaml file' do
+      path = File.expand_path('../fixtures/generator_tests/test_bad_yaml_files', __FILE__)
+      expect { @generator.job_collection.load_from_path path }.to raise_error(
+        RuntimeError, /There was an error while parsing a file/
+      )
+    end
+    it 'errors when reading a bad json file' do
+      path = File.expand_path('../fixtures/generator_tests/test_bad_json_files', __FILE__)
+      expect { @generator.job_collection.load_from_path path }.to raise_error(
+        RuntimeError, /There was an error while parsing a file/
+      )
+    end
   end
 
   describe '#dump' do
@@ -224,7 +237,7 @@ describe JenkinsPipelineBuilder::Generator do
         end
       end
       stub_request(:get, 'http://username:password@127.0.0.1:8080/job/test_job/config.xml')
-        .to_return(status: 200, body: "#{body}", headers: {})
+        .to_return(status: 200, body: body.to_s, headers: {})
       @generator.dump(job_name)
       expect(File.exist?("#{job_name}.xml")).to be true
       File.delete("#{job_name}.xml")
@@ -234,7 +247,7 @@ describe JenkinsPipelineBuilder::Generator do
   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)
+      expect(@generator.projects(path)).to eq %w(SamplePipeline1 SamplePipeline2 SamplePipeline3)
     end
   end
 
@@ -243,6 +256,13 @@ describe JenkinsPipelineBuilder::Generator do
       allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(
         list_installed: { 'description' => '20.0', 'git' => '20.0' })
     end
+    after :each do
+      file_paths = ['out/xml/TemplatePipeline-10.xml',
+                    'out/xml/TemplatePipeline-11.xml']
+      file_paths.each do |file_path|
+        File.delete(file_path) if File.exist?(file_path)
+      end
+    end
     it 'generates xml and saves to disk without sending jobs to the server' do
       job_name = 'TemplatePipeline'
       path = File.expand_path('../fixtures/generator_tests/template_pipeline', __FILE__)

data/spec/lib/jenkins_pipeline_builder/module_registry_spec.rb

@@ -96,7 +96,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
     end
 
     it 'calls the xml block when executing the item' do
-      @ext.xml -> (_) { fail XmlException, 'foo' }
+      @ext.xml -> (_) { raise XmlException, 'foo' }
 
       expect do
         JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
@@ -104,7 +104,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
     end
 
     it 'calls the before block' do
-      @ext.before -> (_) { fail BeforeException, 'foo' }
+      @ext.before -> (_) { raise BeforeException, 'foo' }
 
       expect do
         JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
@@ -112,7 +112,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
     end
 
     it 'calls the after block' do
-      @ext.after -> (_) { fail AfterException, 'foo' }
+      @ext.after -> (_) { raise AfterException, 'foo' }
 
       expect do
         JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
@@ -132,7 +132,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
           plugin_id 'unorderedTest'
 
           before do
-            fail BeforeException, 'foo'
+            raise BeforeException, 'foo'
           end
 
           xml do
@@ -154,7 +154,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
           plugin_id 'unorderedTest'
 
           after do
-            fail AfterException, 'foo'
+            raise AfterException, 'foo'
           end
 
           xml do
@@ -176,7 +176,7 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
           plugin_id 'unorderedTest'
 
           xml do
-            fail XmlException, 'foo'
+            raise XmlException, 'foo'
           end
 
           after do

data/spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb

@@ -82,25 +82,28 @@ describe JenkinsPipelineBuilder::PullRequestGenerator do
   end
 
   context '#convert!' do
-    it 'converts the job application name' do
+    before(:each) do
       stub_request(:get, url)
         .with(headers: { 'Accept' => '*/*',
                          'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
                          'Host' => 'github.com',
                          'User-Agent' => 'Ruby' })
         .to_return(status: 200, body: open_prs_json, headers: {})
+    end
+
+    it 'converts the job application name' do
       collection = job_collection.clone
       subject.convert! collection, 8
       expect(collection.defaults[:value][:application_name]).to eq "#{application_name}-PR8"
     end
 
+    it 'provides the PR number to the job settings' do
+      collection = job_collection.clone
+      subject.convert! collection, 8
+      expect(collection.defaults[:value][:pull_request_number]).to eq '8'
+    end
+
     it 'overrides the git params' do
-      stub_request(:get, url)
-        .with(headers: { 'Accept' => '*/*',
-                         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-                         'Host' => 'github.com',
-                         'User-Agent' => 'Ruby' })
-        .to_return(status: 200, body: open_prs_json, headers: {})
       pr = 8
       collection = job_collection.clone
       subject.convert! collection, pr
@@ -115,12 +118,6 @@ describe JenkinsPipelineBuilder::PullRequestGenerator do
     end
 
     it 'does not override extra params' do
-      stub_request(:get, url)
-        .with(headers: { 'Accept' => '*/*',
-                         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-                         'Host' => 'github.com',
-                         'User-Agent' => 'Ruby' })
-        .to_return(status: 200, body: open_prs_json, headers: {})
       pr = 8
       collection = job_collection.clone
       subject.convert! collection, pr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -166,7 +166,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -412,6 +412,10 @@ files:
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/project.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/jobs.tar.gz
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_json_files/project.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_json_files/view.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_yaml_files/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_yaml_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/project.json
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_job.xml
@@ -455,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This gem is will boostrap your Jenkins pipelines
@@ -494,6 +498,10 @@ test_files:
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/project.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/jobs.tar.gz
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline_nested/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_json_files/project.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_json_files/view.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_yaml_files/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_bad_yaml_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/project.json
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_job.xml