jenkins_pipeline_builder 0.5.2 → 0.6.0

data/lib/jenkins_pipeline_builder/pull_request.rb

@@ -26,22 +26,22 @@ module JenkinsPipelineBuilder
     attr_reader :create
     attr_reader :jobs
 
-    def initialize(project, job_collection, generator_job)
+    def initialize(project, jobs, pull_job)
       @purge = []
       @create = []
       @jobs = {}
 
-      pull_requests = check_for_pull generator_job[:value]
+      pull_requests = check_for_pull pull_job
       purge_old(pull_requests, project)
       pull_requests.each do |number|
         # Manipulate the YAML
-        req = JenkinsPipelineBuilder::PullRequest.new(project, number, job_collection, generator_job)
+        req = JenkinsPipelineBuilder::PullRequest.new(project, number, jobs, pull_job)
         @jobs.merge! req.jobs
-        project_t = req.project
+        project_new = req.project
 
         # Overwrite the jobs from the generator to the project
-        project_t[:value][:jobs] = generator_job[:value][:jobs]
-        @create << project_t
+        project_new[:value][:jobs] = req.jobs.keys
+        @create << project_new
       end
     end
 
@@ -127,7 +127,7 @@ module JenkinsPipelineBuilder
         name = job[:name]
         changes = nil
         # Search the generator for changes
-        @generator[:value][:jobs].each do |gen|
+        @generator[:jobs].each do |gen|
           changes = gen[name.to_sym] if gen.is_a?(Hash) && gen.keys[0] == name.to_sym
         end
         # Apply changes

data/lib/jenkins_pipeline_builder/triggers.rb

@@ -18,53 +18,76 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#
 
-module JenkinsPipelineBuilder
-  class Triggers < Extendable
-    register :git_push do |_, xml|
-      xml.send('com.cloudbees.jenkins.GitHubPushTrigger') do
-        xml.spec
-      end
+trigger do
+  name :git_push
+  plugin_id 123
+  min_version 0
+  announced false
+
+  xml do |_|
+    send('com.cloudbees.jenkins.GitHubPushTrigger') do
+      spec
     end
+  end
+end
 
-    register :scm_polling do |scm_polling, xml|
-      xml.send('hudson.triggers.SCMTrigger') do
-        xml.spec scm_polling
-        xml.ignorePostCommitHooks false
-      end
+trigger do
+  name :scm_polling
+  plugin_id 123
+  min_version 0
+  announced false
+
+  xml do |scm_polling|
+    send('hudson.triggers.SCMTrigger') do
+      spec scm_polling
+      ignorePostCommitHooks false
     end
+  end
+end
 
-    register :periodic_build do |periodic_build, xml|
-      xml.send('hudson.triggers.TimerTrigger') do
-        xml.spec periodic_build
-      end
+trigger do
+  name :periodic_build
+  plugin_id 123
+  min_version 0
+  announced false
+
+  xml do |periodic_build|
+    send('hudson.triggers.TimerTrigger') do
+      spec periodic_build
     end
+  end
+end
 
-    register :upstream do |params, xml|
-      case params[:status]
-      when 'unstable'
-        name = 'UNSTABLE'
-        ordinal = '1'
-        color = 'yellow'
-      when 'failed'
-        name = 'FAILURE'
-        ordinal = '2'
-        color = 'RED'
-      else
-        name = 'SUCCESS'
-        ordinal = '0'
-        color = 'BLUE'
-      end
-      xml.send('jenkins.triggers.ReverseBuildTrigger') do
-        xml.spec
-        xml.upstreamProjects params[:projects]
-        xml.send('threshold') do
-          xml.name name
-          xml.ordinal ordinal
-          xml.color color
-          xml.completeBuild true
-        end
+trigger do
+  name :upstream
+  plugin_id 123
+  min_version 0
+  announced false
+
+  xml do |params|
+    case params[:status]
+    when 'unstable'
+      name = 'UNSTABLE'
+      ordinal = '1'
+      color = 'yellow'
+    when 'failed'
+      name = 'FAILURE'
+      ordinal = '2'
+      color = 'RED'
+    else
+      name = 'SUCCESS'
+      ordinal = '0'
+      color = 'BLUE'
+    end
+    send('jenkins.triggers.ReverseBuildTrigger') do
+      spec
+      upstreamProjects params[:projects]
+      send('threshold') do
+        name name
+        ordinal ordinal
+        color color
+        completeBuild true
       end
     end
   end

data/lib/jenkins_pipeline_builder/utils.rb

@@ -20,27 +20,27 @@
 # THE SOFTWARE.
 #
 
-module JenkinsPipelineBuilder
-  class ::Hash
-    def deep_merge(second)
-      merger = proc { |_key, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.merge(v2, &merger) : v2 }
-      merge(second, &merger)
-    end
+class Hash
+  def deep_merge(second)
+    merger = proc { |_key, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.merge(v2, &merger) : v2 }
+    merge(second, &merger)
   end
+end
 
+module JenkinsPipelineBuilder
   class Utils
     # Code was duplicated from jeknins_api_client
     def self.symbolize_keys_deep!(h)
-      return unless h.kind_of?(Hash)
+      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].kind_of? Hash
+        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)
       end
     end
-    def self.hash_merge!(old, new)
-      old.merge!(new) do |_key, old, new|
+    def self.hash_merge!(old_hash, new_hash)
+      old_hash.merge!(new_hash) do |_key, old, new|
         if old.is_a?(Hash) && new.is_a?(Hash)
           hash_merge!(old, new)
         else

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

data/lib/jenkins_pipeline_builder/view.rb

@@ -43,6 +43,78 @@ module JenkinsPipelineBuilder
       end
     end
 
+    # Creates a listview by accepting the given parameters hash
+    #
+    # @param [Hash] params options to create the new view
+    # @option params [String] :name Name of the view
+    # @option params [String] :type Description of the view
+    # @option params [String] :description Description of the view
+    # @option params [String] :status_filter Filter jobs based on the status.
+    #         Valid options: all_selected_jobs, enabled_jobs_only,
+    #         disabled_jobs_only. Default: all_selected_jobs
+    # @option params [Boolean] :filter_queue true or false
+    # @option params [Boolean] :filter_executors true or false
+    # @option params [String] :regex Regular expression to filter jobs that
+    #         are to be added to the view
+    #
+    # @raise [ArgumentError] if the required parameter +:name+ is not
+    #   specified
+    #
+    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]
+      clean_up_views(params) unless @generator.debug
+      params[:type] ||= 'listview'
+      create_base_view(params[:name], params[:type], params[:parent_view])
+      @logger.debug "Creating a #{params[:type]} view with params: #{params.inspect}"
+
+      if @generator.debug
+        # pp post_params(params)
+        return
+      end
+
+      view_path = params[:parent_view].nil? ? '' : "/view/#{params[:parent_view]}"
+      view_path += "/view/#{params[:name]}/configSubmit"
+
+      @client.api_post_request(view_path, post_params(params))
+    end
+
+    private
+
+    def clean_up_views(params)
+      # If we have a parent view, we need to do some additional checks
+      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])
+      end
+    end
+
+    def post_params(params)
+      statuses = { 'enabled_jobs_only' => '1', 'disabled_jobs_only' => '2' }
+
+      json = {
+        'name' => params[:name],
+        'description' => params[:description],
+        'mode' => get_mode(params[:type]),
+        'statusFilter' => '',
+        'columns' => get_columns(params[:type])
+      }
+      json.merge!('groupingRules' => params[:groupingRules]) if params[:groupingRules]
+      payload = {
+        'name' => params[:name],
+        'mode' => get_mode(params[:type]),
+        'description' => params[:description],
+        'statusFilter' => statuses.fetch(params[:status_filter], ''),
+        'json' => json.to_json
+      }
+      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
+    end
+
     def get_mode(type)
       case type
       when 'listview'
@@ -81,7 +153,7 @@ module JenkinsPipelineBuilder
       }
 
       if @generator.debug
-        pp initial_post_params
+        # pp initial_post_params
         return
       end
 
@@ -91,148 +163,47 @@ module JenkinsPipelineBuilder
       @client.api_post_request(view_path, initial_post_params)
     end
 
-    # Creates a listview by accepting the given parameters hash
-    #
-    # @param [Hash] params options to create the new view
-    # @option params [String] :name Name of the view
-    # @option params [String] :type Description of the view
-    # @option params [String] :description Description of the view
-    # @option params [String] :status_filter Filter jobs based on the status.
-    #         Valid options: all_selected_jobs, enabled_jobs_only,
-    #         disabled_jobs_only. Default: all_selected_jobs
-    # @option params [Boolean] :filter_queue true or false
-    # @option params [Boolean] :filter_executors true or false
-    # @option params [String] :regex Regular expression to filter jobs that
-    #         are to be added to the view
-    #
-    # @raise [ArgumentError] if the required parameter +:name+ is not
-    #   specified
-    #
-    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]
-      unless @generator.debug
-        # If we have a parent view, we need to do some additional checks
-        if params[:parent_view]
-          # If there is no current parent view, create it
-          unless @client.view.exists?(params[:parent_view])
-            create_base_view(params[:parent_view], 'nestedView')
-          end
-          # If the view currently exists, delete it
-          if exists?(params[:name], params[:parent_view])
-            delete(params[:name], params[:parent_view])
-          end
-        else
-          if @client.view.exists?(params[:name])
-            @client.view.delete(params[:name])
-          end
-        end
+    def get_columns(type)
+      column_names = ['Status', 'Weather', 'Last Success', 'Last Failure', 'Last Duration', 'Build Button']
+      if type == 'categorizedView'
+        column_names << 'Categorized - Job'
+      else
+        column_names << 'Name'
       end
-      params[:type] = 'listview' unless params[:type]
-      create_base_view(params[:name], params[:type], params[:parent_view])
-      @logger.debug "Creating a #{params[:type]} view with params: #{params.inspect}"
-      status_filter = case params[:status_filter]
-                      when 'all_selected_jobs'
-                        ''
-                      when 'enabled_jobs_only'
-                        '1'
-                      when 'disabled_jobs_only'
-                        '2'
-                      else
-                        ''
-                      end
-
-      json = {
-        'name' => params[:name],
-        'description' => params[:description],
-        'mode' => get_mode(params[:type]),
-        'statusFilter' => '',
-        'columns' => get_columns(params[:type])
-      }
-      json.merge!('groupingRules' => params[:groupingRules]) if params[:groupingRules]
-      post_params = {
-        'name' => params[:name],
-        'mode' => get_mode(params[:type]),
-        'description' => params[:description],
-        'statusFilter' => status_filter,
-        'json' => json.to_json
-      }
-      post_params.merge!('filterQueue' => 'on') if params[:filter_queue]
-      post_params.merge!('filterExecutors' => 'on') if params[:filter_executors]
-      post_params.merge!('useincluderegex' => 'on',
-                         'includeRegex' => params[:regex]) if params[:regex]
 
-      if @generator.debug
-        pp post_params
-        return
+      result = []
+      column_names.each do |name|
+        result << columns_repository[name]
       end
-
-      view_path = params[:parent_view].nil? ? '' : "/view/#{params[:parent_view]}"
-      view_path += "/view/#{params[:name]}/configSubmit"
-
-      @client.api_post_request(view_path, post_params)
+      result
     end
 
-    def get_columns(type)
-      columns_repository = {
-        'Status' =>
-        {
-          'stapler-class' => 'hudson.views.StatusColumn',
-          'kind' => 'hudson.views.StatusColumn'
-        },
-        'Weather' =>
-        {
-          'stapler-class' => 'hudson.views.WeatherColumn',
-          'kind' => 'hudson.views.WeatherColumn'
-        },
-        'Name' =>
-        {
-          'stapler-class' => 'hudson.views.JobColumn',
-          'kind' => 'hudson.views.JobColumn'
-        },
-        'Last Success' =>
-        {
+    def columns_repository
+      {
+        'Status' => { 'stapler-class' => 'hudson.views.StatusColumn', 'kind' => 'hudson.views.StatusColumn' },
+        'Weather' => { 'stapler-class' => 'hudson.views.WeatherColumn', 'kind' => 'hudson.views.WeatherColumn' },
+        'Name' => { 'stapler-class' => 'hudson.views.JobColumn', 'kind' => 'hudson.views.JobColumn' },
+        'Last Success' => {
           'stapler-class' => 'hudson.views.LastSuccessColumn',
           'kind' => 'hudson.views.LastSuccessColumn'
         },
-        'Last Failure' =>
-        {
+        'Last Failure' => {
           'stapler-class' => 'hudson.views.LastFailureColumn',
           'kind' => 'hudson.views.LastFailureColumn'
         },
-        'Last Duration' =>
-        {
+        'Last Duration' => {
           'stapler-class' => 'hudson.views.LastDurationColumn',
           'kind' => 'hudson.views.LastDurationColumn'
         },
-        'Build Button' =>
-        {
+        'Build Button' => {
           'stapler-class' => 'hudson.views.BuildButtonColumn',
           'kind' => 'hudson.views.BuildButtonColumn'
         },
-        'Categorized - Job' =>
-        {
+        'Categorized - Job' => {
           'stapler-class' => 'org.jenkinsci.plugins.categorizedview.IndentedJobColumn',
           'kind' => 'org.jenkinsci.plugins.categorizedview.IndentedJobColumn'
         }
       }
-
-      column_names = case type
-                     when 'categorizedView'
-                       ['Status', 'Weather', 'Categorized - Job', 'Last Success', 'Last Failure', 'Last Duration', 'Build Button']
-                     else
-                       ['Status', 'Weather', 'Name', 'Last Success', 'Last Failure', 'Last Duration', 'Build Button']
-                     end
-
-      result = []
-      column_names.each do |name|
-        result << columns_repository[name]
-      end
-      result
-    end
-
-    def path_encode(path)
-      URI.escape(path.encode(Encoding::UTF_8))
     end
 
     # This method lists all views
@@ -274,7 +245,7 @@ module JenkinsPipelineBuilder
       if parent_view
         list_children(parent_view, view_name).include?(view_name)
       else
-        list(view_name).include?(view_name)
+        @client.view.list(view_name).include?(view_name)
       end
     end
   end