jenkins_pipeline_builder 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b8dbf5bb5aecf737f7de86141b559cf74704d23ceaa754f4d9c19803401a37
-  data.tar.gz: a412dce1a03b09be9298c5d6381a0fe7c85f4b1f9d7bf2229292de1b845cad86
+  metadata.gz: a89e7eaacca4711e8cfba8ba745799d5b4eb01014a5a78740ff74ab606595f7a
+  data.tar.gz: d9adb6f45f1d7be7ea7c1815e491338ad32bfc7b15859c92955482d550930332
 SHA512:
-  metadata.gz: d4c23fe8ad05dd27dd99a55c771a5b8a423f8b7af3e8069d70f9f6d2f4aa3d72c4a0348b5ffd487a98452190d6ff8c5fd8aad9b5d6d393f1d9ab9cd853cde4c5
-  data.tar.gz: d40e0eb1e3a388975bf324822c334dcc085bf0dc58657b14cef9cbf744e393b383cd882c01fdee438c7e17934a4ca5f5a7563a595912d2a4a239a24baaa7761a
+  metadata.gz: 19c78e7c9801ce59933cd96b37cf259d76d0b9c0e427b2c6dcd3b40491d7e77efb6c22dd09f384cb1221ba062e3bc614bb9ecd4f2c7920f028bed18f7ced6079
+  data.tar.gz: 2fd655ec2dd99d45ddc6f2f794cf6b6b7ecf469f8b8eb4fe22aeb74f5f9791f42b06e5ffb37087e2d9bda7cb35c512e17915ebbe78055984299c97d235870025

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.1.5
+  TargetRubyVersion: 2.3.3
 
 inherit_from: .rubocop_todo.yml
 
@@ -41,3 +41,6 @@ Style/SymbolProc:
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -24,12 +24,6 @@ Metrics/BlockLength:
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
-  Exclude:
-    - 'lib/jenkins_pipeline_builder/cli/list.rb'
-    - 'lib/jenkins_pipeline_builder/compiler.rb'
-    - 'lib/jenkins_pipeline_builder/extensions.rb'
-    - 'lib/jenkins_pipeline_builder/utils.rb'
 
 # Offense count: 1
 # Configuration parameters: MinBodyLength.

data/jenkins_pipeline_builder.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jenkins_pipeline_builder/version'
 

data/lib/jenkins_pipeline_builder.rb

@@ -41,7 +41,7 @@ module JenkinsPipelineBuilder
     attr_reader :client, :credentials, :debug, :file_mode
     attr_writer :logger
     def generator
-      @_generator ||= Generator.new
+      @generator ||= Generator.new
     end
 
     def file_mode!

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -80,6 +80,7 @@ module JenkinsPipelineBuilder
       def self.process_creds_file(file)
         return load File.expand_path(file) if file.end_with? 'rb'
         return self.jenkins_api_creds = JSON.parse(IO.read(File.expand_path(file))) if file.end_with? 'json'
+
         self.jenkins_api_creds = YAML.load_file(File.expand_path(file))
       end
 
@@ -97,14 +98,13 @@ module JenkinsPipelineBuilder
         end
       end
 
-      private_class_method
-
       def self.find_default_file
         default_file_name = "#{ENV['HOME']}/.jenkins_api_client/login"
 
         found_suffix = nil
         DEFAULT_FILE_FORMATS.each do |suffix|
           next unless File.exist?("#{default_file_name}.#{suffix}")
+
           if !found_suffix
             found_suffix = suffix
           else
@@ -118,6 +118,7 @@ module JenkinsPipelineBuilder
       def self.logger
         JenkinsPipelineBuilder.logger
       end
+      private_class_method :find_default_file, :logger
     end
   end
 end

data/lib/jenkins_pipeline_builder/cli/list.rb

@@ -39,6 +39,7 @@ module JenkinsPipelineBuilder
         entries = JenkinsPipelineBuilder.registry.registry[:job]
         entries.each do |name, set|
           next unless set.is_a? ExtensionSet
+
           ext = set.extensions.first
           display_module(name, ext)
         end

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -33,11 +33,14 @@ module JenkinsPipelineBuilder
       item = item_bag[:value]
       bag = {}
       return unless item.is_a?(Hash)
+
       item.keys.each do |k|
         val = item[k]
         next unless val.is_a? String
+
         new_value = resolve_value(val, settings_bag)
         return nil if new_value.nil?
+
         bag[k] = new_value
       end
       my_settings_bag = settings_bag.clone
@@ -48,7 +51,7 @@ module JenkinsPipelineBuilder
       new_item = compile(item, settings)
       [true, new_item]
     rescue StandardError => e
-      return [false, [e.message]]
+      [false, [e.message]]
     end
 
     def compile(item, settings = {})
@@ -67,10 +70,12 @@ module JenkinsPipelineBuilder
 
     def handle_enable(item, settings)
       return item unless item.is_a? Hash
+
       if enable_block_present? item
         enabled_switch = resolve_value(item[:enabled], settings)
         return {} if enabled_switch == 'false'
         raise "Invalid value for #{item[:enabled]}: #{enabled_switch}" if enabled_switch != 'true'
+
         if item[:parameters].is_a? Hash
           item = item.merge item[:parameters]
           item.delete :parameters
@@ -105,8 +110,10 @@ module JenkinsPipelineBuilder
 
     def compile_array_item(item, settings, array)
       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
 
@@ -114,8 +121,10 @@ module JenkinsPipelineBuilder
       if value.nil?
         raise "key: #{key} has a nil value, this is often a yaml syntax error. Skipping children and siblings"
       end
+
       payload = compile(value, settings)
       raise "Failed to resolve:\n===>key: #{key}\n\n===>value: #{value} payload" if payload.nil?
+
       payload
     end
 
@@ -135,6 +144,7 @@ module JenkinsPipelineBuilder
       pull_job = value.to_s.match(/{{pull@(.*)}}/)
       if pull_job
         return pull_job[1] unless settings[:pull_request_number]
+
         value = pull_job[1]
       end
 
@@ -151,16 +161,19 @@ module JenkinsPipelineBuilder
       vars.select! do |var|
         var_val = settings[var]
         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
+
       value_s
     end
 
     def correct_job_names!(value)
       vars = value.scan(/{{job@(.*)}}/).flatten
       return unless vars.count > 0
+
       vars.select! do |var|
         var_val = job_collection[var.to_s]
         value.gsub!("{{job@#{var}}}", var_val[:value][:name]) unless var_val.nil?

data/lib/jenkins_pipeline_builder/extension_set.rb

@@ -12,6 +12,7 @@ module JenkinsPipelineBuilder
     SET_METHODS.each do |method_name|
       define_method method_name do |value = nil|
         return settings[method_name] if value.nil?
+
         settings[method_name] = value
       end
     end
@@ -35,7 +36,6 @@ module JenkinsPipelineBuilder
     end
 
     def installed_version=(version)
-      version = version.match(/\d+\.\d+(\.\d+)?/)
       @version = Gem::Version.new version
     end
 
@@ -53,9 +53,11 @@ module JenkinsPipelineBuilder
 
     def installed_version
       return @version if @version
+
       reg = JenkinsPipelineBuilder.registry
       version = reg.versions[settings[:plugin_id]]
       raise "Plugin #{settings[:name]} is not installed (plugin_id: #{settings[:plugin_id]})" if version.nil?
+
       self.installed_version = version
       @version
     end
@@ -103,6 +105,7 @@ module JenkinsPipelineBuilder
       end
       unless block
         raise "no block found for version #{version}" unless blocks.key version
+
         return blocks[version][:block]
       end
       store_xml version, block, path
@@ -122,6 +125,7 @@ module JenkinsPipelineBuilder
         end
 
         return instance_variable_get(method_name) unless block
+
         blocks[version] = {} unless blocks[version]
         blocks[version][method_name] = block
       end

data/lib/jenkins_pipeline_builder/extensions.rb

@@ -40,6 +40,7 @@ module JenkinsPipelineBuilder
     EXT_METHODS.keys.each do |method_name|
       define_method method_name do |value = nil|
         return instance_variable_get("@#{method_name}") if value.nil?
+
         instance_variable_set("@#{method_name}", value)
       end
     end
@@ -59,6 +60,7 @@ module JenkinsPipelineBuilder
     def execute(value, n_xml)
       errors = check_parameters value
       raise ArgumentError, errors.join("\n") if errors.any?
+
       unless path
         raise ArgumentError, %(Extension #{name} has no valid path
         Check ModuleRegistry#entries and the definition of the extension
@@ -76,9 +78,11 @@ module JenkinsPipelineBuilder
     def check_parameters(value)
       return [] if parameters && parameters.empty?
       return [] unless value.is_a? Hash
+
       errors = []
       value.each_key do |key|
         next if parameters && parameters.include?(key)
+
         errors << "Extension #{name} does not support parameter #{key}"
       end
       errors

data/lib/jenkins_pipeline_builder/extensions/helpers/publishers/cobertura_report_helper.rb

@@ -2,6 +2,7 @@ class CoberturaReportHelper < ExtensionHelper
   def thresholds
     @thresholds ||= params[:metric_targets]
     return @thresholds if @thresholds
+
     @thresholds = {
       failing: [
         { type: 'type', value: 0 },

data/lib/jenkins_pipeline_builder/extensions/job_attributes.rb

@@ -227,6 +227,7 @@ job_attribute do
         if params[:changelog_to_branch]
           opts = params[:changelog_to_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]

data/lib/jenkins_pipeline_builder/extensions/wrappers.rb

@@ -26,7 +26,6 @@ wrapper do
   announced false
   jenkins_name 'Color ANSI Console Output'
   description 'This plugin adds support for ANSI escape sequences, including color, to Console Output.'
-
   xml do |_|
     send('hudson.plugins.ansicolor.AnsiColorBuildWrapper') do
       colorMapName 'xterm'
@@ -99,6 +98,7 @@ wrapper do
         passwords = wrapper
       end
       break unless passwords
+
       passwordEntries do
         passwords.each do |password|
           EnvInjectPasswordEntry do
@@ -148,6 +148,7 @@ wrapper do
       resolvePattern
       matrixParams wrapper[:properties]
       deployBuildInfo wrapper[:'publish-build-info']
+      useSpecs false
       includeEnvVars false
       envVarsPatterns do
         includePatterns

data/lib/jenkins_pipeline_builder/generator.rb

@@ -66,6 +66,7 @@ module JenkinsPipelineBuilder
       errors = []
       pr_generator.open_prs.each do |pr|
         next if base_branch_only && defaults[:git_branch] != pr[:base]
+
         pr_generator.convert! job_collection, pr[:number]
         error = publish(project_name)
         errors << error unless error.empty?
@@ -105,6 +106,7 @@ module JenkinsPipelineBuilder
     def resolve_job_by_name(name, settings = {})
       job = job_collection.get_item(name)
       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
@@ -214,6 +216,7 @@ module JenkinsPipelineBuilder
       # A hash of promoted_builds names => associated job names
       promotion_job_pairs = jobs.each_with_object({}) do |j, acc|
         next unless j[:result][:promoted_builds]
+
         j[:result][:promoted_builds].each do |promotion_name|
           acc[promotion_name] = j[:result][:name]
         end
@@ -238,6 +241,7 @@ module JenkinsPipelineBuilder
         logger.info "Processing #{i}"
         job = i[:result]
         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

@@ -17,6 +17,7 @@ module JenkinsPipelineBuilder
     def create_or_update
       success, payload = to_xml
       return success, payload unless success
+
       xml = payload
       return local_output(xml) if JenkinsPipelineBuilder.debug || JenkinsPipelineBuilder.file_mode
 
@@ -31,6 +32,7 @@ module JenkinsPipelineBuilder
       job[:job_type] = 'free_style' unless job[:job_type]
       type = job[:job_type]
       return false, "Job type: #{type} is not one of #{job_methods.join(', ')}" unless known_type? type
+
       @xml = setup_freestyle_base(job)
       payload = send("update_#{type}")
 
@@ -109,6 +111,7 @@ module JenkinsPipelineBuilder
       if params.key?(:template)
         template_name = params[:template]
         raise "Job template '#{template_name}' can't be resolved." unless @job_templates.key?(template_name)
+
         params.delete(:template)
         template = @job_templates[template_name]
         params = template.deep_merge(params)

data/lib/jenkins_pipeline_builder/job_collection.rb

@@ -108,6 +108,7 @@ module JenkinsPipelineBuilder
         # skip if the existing item is local and the new item is remote
         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
@@ -118,6 +119,7 @@ module JenkinsPipelineBuilder
       path = "#{path}/extensions"
       path = File.expand_path(path, Dir.getwd)
       return unless File.directory?(path)
+
       logger.info "Loading extensions from folder #{path}"
       logger.info Dir.glob("#{path}/*.rb").inspect
       Dir.glob("#{path}/**/*.rb").each do |file|

data/lib/jenkins_pipeline_builder/module_registry.rb

@@ -29,6 +29,7 @@ module JenkinsPipelineBuilder
     def versions
       # Return a hash with a default of 1000 so that we'll get the newest in debug
       return Hash.new { |_| '1000.0' } if JenkinsPipelineBuilder.debug
+
       @versions ||= JenkinsPipelineBuilder.client.plugin.list_installed
     end
 
@@ -77,6 +78,7 @@ module JenkinsPipelineBuilder
     def get_by_path_collection(path, registry)
       item = registry[path.shift.to_sym]
       return item if path.count == 0
+
       get_by_path_collection(path, item)
     end
 
@@ -88,8 +90,10 @@ module JenkinsPipelineBuilder
     def traverse_registry(registry, params, n_xml, strict = false)
       params.each do |key, value|
         next unless registry.is_a? Hash
+
         unless registry.key? key
           raise TypeError, "!!!! could not find key #{key} !!!!" if strict
+
           next
         end
         reg_value = registry[key]

data/lib/jenkins_pipeline_builder/promotion.rb

@@ -31,6 +31,7 @@ module JenkinsPipelineBuilder
     def create(params, job_name)
       success, payload = prom_to_xml(params)
       return success, payload unless success
+
       xml = payload
       return local_output(xml) if JenkinsPipelineBuilder.debug || JenkinsPipelineBuilder.file_mode
 

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -37,6 +37,7 @@ module JenkinsPipelineBuilder
 
     def delete_closed_prs
       return if JenkinsPipelineBuilder.debug
+
       jobs_to_delete = JenkinsPipelineBuilder.client.job.list "^#{application_name}-PR(\\d+)-(.*)$"
       open_prs.each do |pr|
         jobs_to_delete.reject! { |j| j.start_with? "#{application_name}-PR#{pr[:number]}" }

data/lib/jenkins_pipeline_builder/remote_dependencies.rb

@@ -88,8 +88,8 @@ module JenkinsPipelineBuilder
     def download_yaml(url, file, remote_opts = {})
       entries[url] = file
       logger.info "Downloading #{url} to #{file}.tar"
-      open("#{file}.tar", 'w') do |local_file|
-        open(url, remote_opts) do |remote_file|
+      File.open("#{file}.tar", 'w') do |local_file|
+        URI.parse(url).open(remote_opts) do |remote_file|
           local_file.write(Zlib::GzipReader.new(remote_file).read)
         end
       end

data/lib/jenkins_pipeline_builder/utils.rb

@@ -30,13 +30,14 @@ end
 module JenkinsPipelineBuilder
   class Utils
     # Code was duplicated from jeknins_api_client
-    def self.symbolize_keys_deep!(h)
-      return unless h.is_a?(Hash)
-      h.keys.each do |k|
-        ks    = k.respond_to?(:to_sym) ? k.to_sym : k
-        h[ks] = h.delete k # Preserve order even when k == ks
-        symbolize_keys_deep! h[ks] if h[ks].is_a? Hash
-        h[ks].each { |item| symbolize_keys_deep!(item) } if h[ks].is_a?(Array)
+    def self.symbolize_keys_deep!(to_symbolize)
+      return unless to_symbolize.is_a?(Hash)
+
+      to_symbolize.keys.each do |k|
+        ks = k.respond_to?(:to_sym) ? k.to_sym : k
+        to_symbolize[ks] = to_symbolize.delete k # Preserve order even when k == ks
+        symbolize_keys_deep! to_symbolize[ks] if to_symbolize[ks].is_a? Hash
+        to_symbolize[ks].each { |item| symbolize_keys_deep!(item) } if to_symbolize[ks].is_a?(Array)
       end
     end
 

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.8.0'.freeze
 end

data/lib/jenkins_pipeline_builder/view.rb

@@ -67,6 +67,7 @@ module JenkinsPipelineBuilder
     def create(params)
       # Name is a required parameter. Raise an error if not specified
       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])
@@ -133,7 +134,8 @@ module JenkinsPipelineBuilder
         'dashboardView' => 'hudson.plugins.view.dashboard.Dashboard',
         'multijobView' => 'com.tikal.jenkins.plugins.multijob.views.MultiJobView'
       }
-      raise "Type #{type} is not supported by Jenkins." unless types.keys.include? type
+      raise "Type #{type} is not supported by Jenkins." unless types.key?(type)
+
       types[type]
     end
 

data/spec/lib/jenkins_pipeline_builder/cli/helper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::CLI::Helper do
   file_suffixes = JenkinsPipelineBuilder::CLI::Helper::DEFAULT_FILE_FORMATS

data/spec/lib/jenkins_pipeline_builder/compiler_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 describe JenkinsPipelineBuilder::Compiler do
   before :all do
     JenkinsPipelineBuilder.credentials = {

data/spec/lib/jenkins_pipeline_builder/extension_dsl_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe 'extension dsl' do
   before :all do

data/spec/lib/jenkins_pipeline_builder/extension_set_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::ExtensionSet do
   subject(:set) { JenkinsPipelineBuilder::ExtensionSet.new('foo') {} }
@@ -108,7 +108,7 @@ describe JenkinsPipelineBuilder::ExtensionSet do
     it 'works for snapshot/beta stuff' do
       ext_versions ['1.9', '2.3']
 
-      set.installed_version = '2.0-SNAPSHOT (private-06/06/2014 09:51-bgaulin)'
+      set.installed_version = '2.0-SNAPSHOT'
       # Other examples
       # set.installed_version = '2.0-beta-1'
       # set.installed_version = '2.0+build.93'

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 
 describe 'build_steps' do
   after :each do

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 
 describe 'builders' do
   after :each do

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 
 describe 'job_attributes' do
   after :each do

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 
 describe 'promotion_conditions' do
   after :each do

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 
 describe 'publishers' do
   after :each do

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 WRAPPERS = {
   ansicolor: ['0'],
   artifactory: ['0'],

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 
 describe 'triggers' do
   after :each do

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

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __dir__)
 
 describe 'wrappers' do
   after :each do

data/spec/lib/jenkins_pipeline_builder/extensions_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::Extension do
   subject(:extension) { JenkinsPipelineBuilder::Extension.new }

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::Generator do
   before :all do
@@ -89,31 +89,52 @@ describe JenkinsPipelineBuilder::Generator do
       expect(errors).to be_empty
     end
 
-    it 'produces no errors while creating pipeline TemplatePipeline' do
-      errors = bootstrap(fixture_path('template_pipeline'), 'TemplatePipeline')
-      expect(errors).to be_empty
-    end
+    context 'when creating pipeline templates' do
+      before(:each) do
+        tar_path = File.join(__dir__, 'fixtures/generator_tests/template_pipeline/jobs.tar.gz')
+        parsed_url = URI.parse('https://www.test.com')
+        file_contents = Zlib::GzipReader.new(File.open(tar_path)).read
+        file_object = double
+        allow(URI).to receive(:parse).and_return(parsed_url)
+        allow(parsed_url).to receive(:open).and_yield('A String')
+        allow(Zlib::GzipReader).to receive(:new).and_return(file_object)
+        allow(file_object).to receive(:read).and_return(file_contents)
+      end
 
-    it 'produces no errors while creating pipeline TemplatePipeline_nested' do
-      errors = bootstrap(fixture_path('template_pipeline_nested'), 'TemplatePipeline_nested')
-      expect(errors).to be_empty
-    end
+      it 'produces no errors while creating pipeline TemplatePipeline' do
+        errors = bootstrap(fixture_path('template_pipeline'), 'TemplatePipeline')
+        expect(errors).to be_empty
+      end
 
-    it 'loads extensions in remote dependencies' do
-      errors = bootstrap(fixture_path('template_pipeline'), 'TemplatePipeline')
-      expect(errors).to be_empty
-      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.collection['{{name}}-10'][:value][:description]).to eq('Overridden stuff')
+      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.collection['{{name}}-10'][:value][:description]).to eq('Overridden stuff')
-    end
+      it 'loads extensions in remote dependencies' do
+        errors = bootstrap(fixture_path('template_pipeline'), 'TemplatePipeline')
+        expect(errors).to be_empty
+        expect(@generator.module_registry.registry[:job][:wrappers].keys).to include :test_wrapper
+        @generator.module_registry.registry[:job][:wrappers].delete(:test_wrapper)
+      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
 
-    it 'fails to override when there are duplicate local items' do
-      expect { bootstrap(fixture_path('local_override/all_local'), 'TemplatePipeline') }.to raise_error(StandardError)
+      it 'produces no errors while creating pipeline TemplatePipeline_nested' do
+        tar_path = File.join(__dir__, 'fixtures/generator_tests/template_pipeline_nested/jobs.tar.gz')
+        parsed_url = URI.parse('https://www.test.com')
+        file_contents = Zlib::GzipReader.new(File.open(tar_path)).read
+        file_object = double
+        allow(URI).to receive(:parse).and_return(parsed_url)
+        allow(parsed_url).to receive(:open).and_yield('A String')
+        allow(Zlib::GzipReader).to receive(:new).and_return(file_object)
+        allow(file_object).to receive(:read).and_return(file_contents)
+        errors = bootstrap(fixture_path('template_pipeline_nested'), 'TemplatePipeline_nested')
+        expect(errors).to be_empty
+      end
     end
 
     # Things to check for:
@@ -136,7 +157,7 @@ describe JenkinsPipelineBuilder::Generator do
     let(:pr_master) { { number: 1, base: 'master' } }
     let(:pr_not_master) { { number: 2, base: 'not-master' } }
     let(:open_prs) { [pr_master, pr_not_master] }
-    let(:path) { File.expand_path('../fixtures/generator_tests/pullrequest_pipeline', __FILE__) }
+    let(:path) { File.expand_path('fixtures/generator_tests/pullrequest_pipeline', __dir__) }
     it 'produces no errors while creating pipeline PullRequest' do
       job_name = 'PullRequest'
       pr_generator = double('pr_generator')
@@ -195,7 +216,7 @@ describe JenkinsPipelineBuilder::Generator do
                 github_site: 'https://github.com',
                 git_org: 'testorg',
                 git_repo_name: 'generator_tests'
-        )).and_return(pr_generator)
+              )).and_return(pr_generator)
 
       expect(pr_generator).to receive(:open_prs).and_return open_prs
       expect(pr_generator).to receive(:delete_closed_prs)
@@ -227,26 +248,26 @@ describe JenkinsPipelineBuilder::Generator do
     end
 
     it 'loads a yaml collection from a path' do
-      path = File.expand_path('../fixtures/generator_tests/test_yaml_files', __FILE__)
+      path = File.expand_path('fixtures/generator_tests/test_yaml_files', __dir__)
       @generator.job_collection.load_from_path path
     end
     it 'loads a json collection from a path' do
-      path = File.expand_path('../fixtures/generator_tests/test_json_files', __FILE__)
+      path = File.expand_path('fixtures/generator_tests/test_json_files', __dir__)
       @generator.job_collection.load_from_path path
     end
     it 'loads both yaml and json files from a path' do
-      path = File.expand_path('../fixtures/generator_tests/test_combo_files', __FILE__)
+      path = File.expand_path('fixtures/generator_tests/test_combo_files', __dir__)
       @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__)
+      path = File.expand_path('fixtures/generator_tests/test_bad_yaml_files', __dir__)
       expect { @generator.job_collection.load_from_path path }.to raise_error(
         CustomErrors::ParseError, /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__)
+      path = File.expand_path('fixtures/generator_tests/test_bad_json_files', __dir__)
       expect { @generator.job_collection.load_from_path path }.to raise_error(
         CustomErrors::ParseError, /There was an error while parsing a file/
       )
@@ -258,7 +279,7 @@ describe JenkinsPipelineBuilder::Generator do
       allow(JenkinsPipelineBuilder).to receive(:debug).and_return true
       job_name = 'test_job'
       body = ''
-      test_path = File.expand_path('../fixtures/generator_tests', __FILE__)
+      test_path = File.expand_path('fixtures/generator_tests', __dir__)
       File.open("#{test_path}/#{job_name}.xml", 'r') do |f|
         f.each_line do |line|
           body << line
@@ -274,7 +295,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__)
+      path = File.expand_path('fixtures/generator_tests/multi_project', __dir__)
       expect(@generator.projects(path)).to eq %w[SamplePipeline1 SamplePipeline2 SamplePipeline3]
     end
   end
@@ -292,9 +313,19 @@ describe JenkinsPipelineBuilder::Generator do
         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
+      tar_path = File.join(__dir__, 'fixtures/generator_tests/template_pipeline_nested/jobs.tar.gz')
+      parsed_url = URI.parse('https://www.test.com')
+      file_contents = Zlib::GzipReader.new(File.open(tar_path)).read
+      file_object = double
+      allow(URI).to receive(:parse).and_return(parsed_url)
+      allow(parsed_url).to receive(:open).and_yield('A String')
+      allow(Zlib::GzipReader).to receive(:new).and_return(file_object)
+      allow(file_object).to receive(:read).and_return(file_contents)
+
       job_name = 'TemplatePipeline'
-      path = File.expand_path('../fixtures/generator_tests/template_pipeline', __FILE__)
+      path = File.expand_path('fixtures/generator_tests/template_pipeline', __dir__)
       errors = @generator.file(path, job_name)
       expect(errors).to be_empty
       expect(File.exist?("out/xml/#{job_name}-10.xml")).to be true

data/spec/lib/jenkins_pipeline_builder/job_collection_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::JobCollection do
   before :all do
@@ -21,7 +21,7 @@ describe JenkinsPipelineBuilder::JobCollection do
 
   context '#load_from_path' do
     before :all do
-      path = File.expand_path('../fixtures/job_collection/', __FILE__)
+      path = File.expand_path('fixtures/job_collection', __dir__)
       described_class.new.load_from_path path
     end
 

data/spec/lib/jenkins_pipeline_builder/job_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::Job do
   before :all do

data/spec/lib/jenkins_pipeline_builder/module_registry_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::ModuleRegistry do
   after :each do

data/spec/lib/jenkins_pipeline_builder/promotion_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::Promotion do
   before :all do

data/spec/lib/jenkins_pipeline_builder/pull_request_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 require 'json'
 
 describe JenkinsPipelineBuilder::PullRequestGenerator do

data/spec/lib/jenkins_pipeline_builder/spec_helper.rb

@@ -6,7 +6,7 @@ require 'simplecov-rcov'
 require 'webmock/rspec'
 require 'equivalent-xml'
 
-require File.expand_path('../../../../lib/jenkins_pipeline_builder', __FILE__)
+require File.expand_path('../../../lib/jenkins_pipeline_builder', __dir__)
 
 RSpec::Matchers.define :have_min_version do |version|
   match do |base|

data/spec/lib/jenkins_pipeline_builder/utils_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::Utils do
   let(:utils) { JenkinsPipelineBuilder::Utils }

data/spec/lib/jenkins_pipeline_builder/view_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 describe JenkinsPipelineBuilder::View do
   before(:all) do
@@ -12,7 +12,7 @@ describe JenkinsPipelineBuilder::View do
     generator = JenkinsPipelineBuilder.generator
     @view = JenkinsPipelineBuilder::View.new(generator)
   end
-  let(:path) { File.expand_path('../fixtures/view_test/', __FILE__) }
+  let(:path) { File.expand_path('fixtures/view_test', __dir__) }
   let(:view) { { name: 'view', parent_view: 'ParentView', type: 'categorizedView', description: 'ViewTest', regex: 'ViewTest.*', groupingRules: [{ groupRegex: 'ViewTest-1.*', namingRule: '1. Commit Stage' }] } }
 
   describe '#generate' do

data/spec/requests/pipeline_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../lib/jenkins_pipeline_builder/spec_helper', __FILE__)
+require File.expand_path('../lib/jenkins_pipeline_builder/spec_helper', __dir__)
 
 describe 'Pipeline' do
   before :all do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -394,7 +394,6 @@ files:
 - lib/jenkins_pipeline_builder/utils.rb
 - lib/jenkins_pipeline_builder/version.rb
 - lib/jenkins_pipeline_builder/view.rb
-- out/.keep
 - pipeline/Jenkins-Pipeline-Builder.yaml
 - pipeline/project.yaml
 - spec/lib/jenkins_pipeline_builder/cli/helper_spec.rb
@@ -485,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: This gem is will boostrap your Jenkins pipelines