gitlab-triage 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad8914af4bb7b033c4940c70d78c34c23853ad282f959dbbdc24e2a8e11f1bb
-  data.tar.gz: f7e5433d13aba0bd5e2af4bf82c5249e236ef068e976686e6816185f4fc8fdc8
+  metadata.gz: 07c73a42510a969fbfbd9d37b8c0cf3aa5b7194f411845ffa85df71bdd17e014
+  data.tar.gz: 92c16e24e3b60a68cbda012ca44cbef9e20e3d8143425ef6506db0817ee2e80d
 SHA512:
-  metadata.gz: bdd2ef81bc67e09545caead3efa38555dd14c289185de6dab6415758f3a83a03712d3fbee0d09bfebafffe0e38e66555c0956720a21f1bf8f4b5a26699c098f4
-  data.tar.gz: 4886edce0d466c412b9bfd4b60d14654b5069700ff564ecd293ccd10a77278c4092cf0a4207b20e97dbdaadffa7dd2b44e4a5efb44f8d529c23b25d67bf32f50
+  metadata.gz: e078932be7f117f6f6c4ad1bed68b8fb217dec19ffb60d0010507f009cdaeb1c21e718d729795317eaae4c91c30ddaed6acf16c0f75c03859516e23893af7d6f
+  data.tar.gz: c228d7ae359adcc1b4d1f8b9e058242a28f8c7c7f9500e7670c1ee9808d6098e7424c266188d3ebb0c9bd7c4bbe7354ff9dd1feac8a31167d54a28b14014106e

data/.gitlab-ci.yml

@@ -3,7 +3,7 @@ image: ruby:2.4
 stages:
   - prepare
   - test
-  - process_rules
+  - triage
 
 .default-cache-config: &default-cache-config
   key: "ruby-2.4"
@@ -21,6 +21,9 @@ before_script:
   - bundle --version
   - bundle install --jobs $(nproc) --retry 3 --quiet
 
+###################
+## Prepare stage ##
+###################
 setup-test-env:
   stage: prepare
   script:
@@ -31,31 +34,37 @@ setup-test-env:
     paths:
       - vendor/cache/
       - Gemfile.lock
+  except:
+    - schedules
 
+################
+## Test stage ##
+################
 styles:
+  <<: *pull-cache
   stage: test
   script:
     - bundle exec rubocop
   except:
     - schedules
-  <<: *pull-cache
 
 specs:
+  <<: *pull-cache
   stage: test
   script:
     - bundle exec rake spec
-  <<: *pull-cache
 
 build:
+  <<: *pull-cache
   stage: test
   script:
     - bundle exec rake build
     - bundle exec rake clobber
   except:
     - schedules
-  <<: *pull-cache
 
 codequality:
+  <<: *pull-cache
   image: docker:latest
   stage: test
   variables:
@@ -76,26 +85,54 @@ codequality:
     paths:
       - codeclimate.json
   except:
-      - schedules
-  <<: *pull-cache
+    - schedules
 
-dry-run:triage:
-  stage: test
-  script:
-    - bundle exec bin/gitlab-triage --dry-run --token $API_TOKEN --policies-file policies.yml --project-id gitlab-org/triage
+##################
+## Triage stage ##
+##################
+dry-run:bin:gitlab-org/triage:
   <<: *pull-cache
+  stage: triage
+  script:
+    - bundle exec bin/gitlab-triage --dry-run --token $API_TOKEN --project-id gitlab-org/triage
+  except:
+    - schedules
 
-dry-run:gilab-ce:
-  stage: process_rules
+dry-run:bin:gitlab-org/gitlab-ce:
+  <<: *pull-cache
+  stage: triage
   script:
-    - bundle exec bin/gitlab-triage --dry-run --token $API_TOKEN --policies-file policies.yml --project-id gitlab-org/gitlab-ce
+    - bundle exec bin/gitlab-triage --dry-run --token $API_TOKEN --project-id gitlab-org/gitlab-ce
   when: manual
+  except:
+    - schedules
+
+dry-run:gem:gitlab-org/triage:
   <<: *pull-cache
+  stage: triage
+  script:
+    - gem install gitlab-triage
+    - gitlab-triage --help
+    - gitlab-triage --dry-run --token $API_TOKEN --project-id gitlab-org/triage
+  when: manual
+  except:
+    - schedules
 
-results:
-  stage: process_rules
+###############
+## Schedules ##
+###############
+run:triage:gitlab-ce:
+  stage: triage
   script:
-    - bundle exec bin/gitlab-triage --token $API_TOKEN --policies-file policies.yml --project-id gitlab-org/gitlab-ce
+    - gem install gitlab-triage
+    - gitlab-triage --token $API_TOKEN --project-id gitlab-org/gitlab-ce
+  only:
+    - schedules
+
+run:triage:triage:
+  stage: triage
+  script:
+    - gem install gitlab-triage
+    - gitlab-triage --token $API_TOKEN --project-id gitlab-org/triage
   only:
     - schedules
-  <<: *pull-cache

data/{policies.yml → .triage-policies.yml}

@@ -1,7 +1,3 @@
-host_url: https://gitlab.com
-api_version: v4
-project_id: 13083
-per_page: 100
 resource_rules:
   issues:
     rules:

data/lib/gitlab/triage/engine.rb

@@ -8,6 +8,7 @@ require_relative 'command_builders/cc_command_builder'
 require_relative 'command_builders/status_command_builder'
 require_relative 'filter_builders/single_filter_builder'
 require_relative 'filter_builders/multi_filter_builder'
+require_relative 'url_builders/url_builder'
 require_relative 'network'
 require_relative 'network_adapters/httparty_adapter'
 require_relative 'ui'
@@ -123,12 +124,27 @@ module Gitlab
       def build_get_url(resource_type, conditions)
         # Example issues query with state and labels
         # https://gitlab.com/api/v4/projects/test-triage%2Fissue-project/issues?state=open&labels=project%20label%20with%20spaces,group_label_no_spaces
-        query_base = ["#{host_url}/api/#{api_version}/projects/#{CGI.escape(options.project_id.to_s)}/#{resource_type}/?per_page=#{per_page}"]
-        query_base << FilterBuilders::MultiFilterBuilder.new('labels', conditions[:labels], ',').build_filter if conditions[:labels]
-        query_base << FilterBuilders::SingleFilterBuilder.new('state', conditions[:state]).build_filter if conditions[:state]
-        query_base << FilterBuilders::MultiFilterBuilder.new('milestone', conditions[:milestone], ',').build_filter if conditions[:milestone]
+        params = {
+          per_page: per_page
+        }
+
+        condition_builders = []
+        condition_builders << FilterBuilders::MultiFilterBuilder.new('labels', conditions[:labels], ',') if conditions[:labels]
+        condition_builders << FilterBuilders::SingleFilterBuilder.new('state', conditions[:state]) if conditions[:state]
+        condition_builders << FilterBuilders::MultiFilterBuilder.new('milestone', conditions[:milestone], ',') if conditions[:milestone]
+
+        condition_builders.each do |condition_builder|
+          params[condition_builder.filter_name] = condition_builder.filter_content
+        end
+
+        get_url = UrlBuilders::UrlBuilder.new(
+          host_url: host_url,
+          api_version: api_version,
+          project_id: options.project_id,
+          resource_type: resource_type,
+          params: params
+        ).build
 
-        get_url = query_base.join
         puts Gitlab::Triage::UI.debug "get_url: #{get_url}" if options.debug
 
         get_url
@@ -136,7 +152,15 @@ module Gitlab
 
       def build_post_url(resource_type, resource)
         # POST /projects/:id/issues/:issue_iid/notes
-        post_url = "#{host_url}/api/#{api_version}/projects/#{options.project_id}/#{resource_type}/#{resource['iid']}/notes/"
+        post_url = UrlBuilders::UrlBuilder.new(
+          host_url: host_url,
+          api_version: api_version,
+          project_id: options.project_id,
+          resource_type: resource_type,
+          resource_id: resource['iid'],
+          sub_resource_type: 'notes'
+        ).build
+
         puts Gitlab::Triage::UI.debug "post_url: #{post_url}" if options.debug
 
         post_url

data/lib/gitlab/triage/url_builders/url_builder.rb

@@ -0,0 +1,41 @@
+module Gitlab
+  module Triage
+    module UrlBuilders
+      class UrlBuilder
+        def initialize(options)
+          @host_url = options.fetch(:host_url)
+          @api_version = options.fetch(:api_version)
+          @project_id = options.fetch(:project_id)
+          @resource_type = options.fetch(:resource_type)
+          @sub_resource_type = options.fetch(:sub_resource_type, nil)
+          @resource_id = options.fetch(:resource_id, nil)
+          @params = options.fetch(:params, [])
+        end
+
+        def build
+          base_url.tap do |url|
+            url << "/#{@resource_id}" if @resource_id
+            url << "/#{@sub_resource_type}" if @sub_resource_type
+            url << params_string if @params
+          end
+        end
+
+        private
+
+        def host_with_api_url
+          "#{@host_url}/api/#{@api_version}"
+        end
+
+        def base_url
+          "#{host_with_api_url}/projects/#{CGI.escape(@project_id.to_s)}/#{@resource_type}"
+        end
+
+        def params_string
+          "?" << @params.map do |k, v|
+            "#{k}=#{v}"
+          end.join("&")
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '0.0.2'.freeze
+    VERSION = '0.0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -107,6 +107,7 @@ files:
 - ".gitlab-ci.yml"
 - ".gitlab/issue_templates/Policy.md"
 - ".rubocop.yml"
+- ".triage-policies.yml"
 - Gemfile
 - Guardfile
 - README.md
@@ -132,8 +133,8 @@ files:
 - lib/gitlab/triage/network_adapters/test_adapter.rb
 - lib/gitlab/triage/retryable.rb
 - lib/gitlab/triage/ui.rb
+- lib/gitlab/triage/url_builders/url_builder.rb
 - lib/gitlab/triage/version.rb
-- policies.yml
 homepage: https://gitlab.com/gitlab-org/triage
 licenses:
 - MIT