jenkins_pipeline_builder 1.6.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4d433fdb4421e7ff066fd49444c45abe2d2b29df62228b95b9d0933b0dce7f6
-  data.tar.gz: 2586bd749811dd2848490e146b926e42c7332526282c53ff43c5f706ad49a8fc
+  metadata.gz: 13ad923ce7eec2fe757816e9885e1d4128268aaecd27bc6f87e4154159f16dc2
+  data.tar.gz: ab8cea9c820c7ae1007689ddcd01d207e15702cefc33495c38dda717ea22ed14
 SHA512:
-  metadata.gz: 0969f829a1b73b76c1954ea323352f66d346b90b307705016d28d8b1a74987580f4baaea75dc2ba8f5c59b4e7c41039307c2a4b96019cc0a30c8ab51db861940
-  data.tar.gz: 6a02902dc545bdd9e2086503818b0cf9095edbe0964a290140bbe1bd718bb3c0748de2763d5b290f7af05927efafa9299418d1145e843fe1f81f78c9cb5f3302
+  metadata.gz: fa3a1eaafe161c5a24897e3301951ffc80def639ed5f67dd6f832122906c2ace7925f8db2d1d68fffcec78fabbd4b7f2b19731b126ef3dd41e838efa7031f728
+  data.tar.gz: b5371cf6bb0a81c55f7f8b12107a73971f4b7564ad97e01760529fc19ea2ac910f283d6c5df6d5727b70a22f1378492e9949e0e4595ebc514cdfb048478e442b

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.1.5
+  TargetRubyVersion: 2.3.3
 
 inherit_from: .rubocop_todo.yml
 
@@ -15,7 +15,7 @@ Metrics/ClassLength:
 #######
 # Finalized settings
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
     - 'spec/lib/jenkins_pipeline_builder/compiler_spec.rb'
@@ -32,7 +32,7 @@ Style/Next:
     - 'lib/jenkins_pipeline_builder/extensions/**/*'
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/VariableName:
+Naming/VariableName:
   Exclude:
     - 'lib/jenkins_pipeline_builder/extensions/**/*'
 
@@ -41,3 +41,22 @@ Style/SymbolProc:
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+

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/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-- 2.1.5
 - 2.3.3
 before_install:
   - gem install bundler

data/Dockerfile

@@ -0,0 +1,30 @@
+FROM centos:centos7
+
+ENV RUBY_DIR /ruby
+ENV RUBY_VERSION 2.3.3
+ENV RUBY_INSTALL $RUBY_DIR/$RUBY_VERSION
+ENV BUNDLER_VERSION 1.13.3
+
+RUN yum update -y && \
+    yum install -y make gcc-c++ which wget tar git mysql-devel \
+    gcc patch readline-devel zlib-devel \
+    libyaml-devel libffi-devel openssl-devel \
+    gdbm-devel ncurses-devel libxml-devel bzip2 libxml2-devel
+
+RUN cd /usr/src && \
+    git clone https://github.com/rbenv/ruby-build.git && \
+    ./ruby-build/install.sh && \
+    mkdir -p $RUBY_INSTALL && \
+    /usr/local/bin/ruby-build $RUBY_VERSION $RUBY_INSTALL && \
+    $RUBY_INSTALL/bin/gem install bundler -v $BUNDLER_VERSION && \
+    rm -rf /usr/src/ruby-build
+
+ENV PATH $RUBY_INSTALL/bin:$PATH
+
+WORKDIR /src
+
+RUN gem install jenkins_pipeline_builder
+
+RUN mkdir -p /srv
+WORKDIR /srv
+ENTRYPOINT ["/bin/bash", "-l" ]

data/README.md

@@ -247,6 +247,7 @@ A number of the DSL options rely on Jenkins plugins, including:
 * ansicolor - "AnsiColor"
 * (view) type: 'categorizedView' - "categorized-view"
 * hipchat - "HipChat Plugin"
+* google_chat - "google-chat-notification-plugin"
 * inject_env_vars - "Environment Injector Plugin"
 * priority - "Priority Sorter plugin"
 * downstream - "Parameterized Trigger plugin"

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'
 
@@ -19,8 +18,6 @@ automating Job & Pipeline creation from the YAML files checked-in with your appl
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] = 'true'
-
   spec.add_dependency 'activesupport', '~> 4.2.6'
   spec.add_dependency 'jenkins_api_client', '~> 1.0.0'
   spec.add_dependency 'minitar'
@@ -29,8 +26,8 @@ automating Job & Pipeline creation from the YAML files checked-in with your appl
   spec.add_dependency 'thor', '>= 0.18.0'
 
   spec.add_development_dependency 'bump'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'equivalent-xml'
+  spec.add_development_dependency 'byebug', '= 11.0.1' # last version with compatibility with ruby 2.3.x
+  spec.add_development_dependency 'equivalent-xml', '= 0.6.0' # last version with compatibility with ruby 2.3.x
   spec.add_development_dependency 'gem-release'
   spec.add_development_dependency 'json'
   spec.add_development_dependency 'kwalify'
@@ -38,8 +35,8 @@ automating Job & Pipeline creation from the YAML files checked-in with your appl
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rubocop', '= 0.81' # last version with compatibility with ruby 2.3.x
+  spec.add_development_dependency 'simplecov', '= 0.17.1' # last version with compatibility with ruby 2.3.x
   spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'webmock', '~> 1.0'
   spec.add_development_dependency 'yard'

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!
@@ -83,7 +83,7 @@ require 'jenkins_pipeline_builder/extensions'
 require 'jenkins_pipeline_builder/extension_dsl'
 require 'jenkins_pipeline_builder/extension_set'
 require 'jenkins_pipeline_builder/extensions/helpers/extension_helper'
-Dir[File.join(File.dirname(__FILE__), 'jenkins_pipeline_builder/extensions/helpers/**/*.rb')].each do |file|
+Dir[File.join(File.dirname(__FILE__), 'jenkins_pipeline_builder/extensions/helpers/**/*.rb')].sort.each do |file|
   require file
 end
 

data/lib/jenkins_pipeline_builder/cli/describe.rb

@@ -26,7 +26,6 @@ module JenkinsPipelineBuilder
     entries << :job_attributes
     entries.try(:each) do |entry|
       klass_name = entry.to_s.classify
-      # rubocop:disable Style/AccessModifierIndentation
       klass = Class.new(Thor) do
         extensions = if entry == :job_attributes
                        JenkinsPipelineBuilder.registry.registry[:job].select { |_, x| x.is_a? ExtensionSet }
@@ -49,7 +48,6 @@ module JenkinsPipelineBuilder
           puts "#{ext.name}: #{ext.description}"
         end
       end
-      # rubocop:enable Style/AccessModifierIndentation
       Module.const_set(klass_name, klass)
     end
 

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

@@ -23,7 +23,7 @@
 module JenkinsPipelineBuilder
   module CLI
     class List < Thor
-      JenkinsPipelineBuilder.registry.entries.keys.each do |entry|
+      JenkinsPipelineBuilder.registry.entries.each_key do |entry|
         desc entry, "List all #{entry}"
         define_method(entry) do
           entries = JenkinsPipelineBuilder.registry.registry[:job][entry]
@@ -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/cli/pipeline.rb

@@ -31,7 +31,7 @@ module JenkinsPipelineBuilder
         Helper.setup(parent_options).dump(job_name)
       end
 
-      desc 'bootstrap Path', 'Generates pipeline from folder or a file'
+      desc 'bootstrap Path [ProjectName]', 'Generates pipeline from folder or a file'
       def bootstrap(path, project_name = nil)
         failed = Helper.setup(parent_options).bootstrap(path, project_name)
         exit(0) if failed.empty? # weird ordering, but rubocop decrees
@@ -39,12 +39,13 @@ module JenkinsPipelineBuilder
         exit(1)
       end
 
-      desc 'pull_request Path', 'Generates jenkins jobs based on a git pull request.'
+      option :base_branch_only, type: :boolean
+      desc 'pull_request Path [ProjectName] [--base_branch_only]', 'Generates jenkins jobs based on a git pull request.'
       def pull_request(path, project_name = nil)
-        Helper.setup(parent_options).pull_request(path, project_name)
+        Helper.setup(parent_options).pull_request(path, project_name, options[:base_branch_only])
       end
 
-      desc 'file Path', 'Does the same thing as bootstrap but doesn\'t actually create jobs on the server'
+      desc 'file Path [ProjectName]', 'Does the same thing as bootstrap but doesn\'t actually create jobs on the server'
       def file(path, project_name = nil)
         Helper.setup(parent_options).file(path, project_name)
       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|
+
+      item.each_key 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

@@ -37,9 +37,10 @@ module JenkinsPipelineBuilder
       parameters: []
     }.freeze
 
-    EXT_METHODS.keys.each do |method_name|
+    EXT_METHODS.each_key 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
@@ -86,7 +90,7 @@ module JenkinsPipelineBuilder
 
     def errors
       errors = {}
-      EXT_METHODS.keys.each do |name|
+      EXT_METHODS.each_key do |name|
         errors[name] = 'Must be set' if send(name).nil?
       end
       errors

data/lib/jenkins_pipeline_builder/extensions/build_steps.rb

@@ -54,7 +54,7 @@ build_step do
               end
             end
           else
-            configs(class: 'empty-list'){}
+            configs(class: 'empty-list') {}
           end
 
           projects state[:name]

data/lib/jenkins_pipeline_builder/extensions/helpers/job_attributes/parameters_helper.rb

@@ -1,5 +1,5 @@
 class ParametersHelper < ExtensionHelper
-  # rubocop:disable CyclomaticComplexity
+  # rubocop:disable Metrics/CyclomaticComplexity
   def param_type(param)
     case param[:type]
     when 'string'
@@ -18,5 +18,5 @@ class ParametersHelper < ExtensionHelper
       'hudson.model.StringParameterDefinition'
     end
   end
-  # rubocop:enable CyclomaticComplexity
+  # rubocop:enable Metrics/CyclomaticComplexity
 end