gitlab-triage 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce7441fc645df64325c4061299790c590bfbdcdb979dd53369f55231479f346
-  data.tar.gz: 3ca3d8cb0d811e5d3e32e2870c0aaf0d671ba5b51fd819341eae831894b131e4
+  metadata.gz: 2f5db61219a126e4c43c284780d0d656c0ab1e28cd5bdda69e8f094f50364b81
+  data.tar.gz: abb1f46dd7ef999685e083b131a80fceceb923b033d8bbe396a1a3b2aa0ab2de
 SHA512:
-  metadata.gz: 92e7edefb97e7849ff2228ab4d842a04583b11a4d24a1f64f553e58b8a850bfc17f1f5fd00e18b436bb2ad6e0b0558cff6e1ff5f98c7fea6cee398b6ced715bc
-  data.tar.gz: 13bc2c8ac796534550dcef8164cd3ace9e5e99757f2f007e5c87c63b67943545ca4800a214798bd4387374b7fa3c3e49cd85682bc5db80665ce52ca1e22d61a8
+  metadata.gz: 0e5d9d0606b3d094b5284e2e67edd75eeec5604521ad54c5a7fea7de2a3c6a1a299b9ce28d11322e78eb72893ddd946b53a3fc134c4a0dd3095f747a642a19a7
+  data.tar.gz: 7f33b9a36ce2f8353782c0194c35dc17d414f27083c5c10e0b98c90742959cf4d71b105433f14d27f7db16bafb0af6b62015e2d684c0e76ed6619b441679cc76

data/.gitlab-ci.yml

@@ -1,82 +1,109 @@
-image: ruby:2.4
+image: ruby:2.6
 
 stages:
   - prepare
   - test
   - triage
 
-.default-cache-config: &default-cache-config
-  key: "ruby-2.4"
-  paths:
-    - vendor/cache/
-    - Gemfile.lock
+.default-only:
+  only:
+    refs:
+      - master
+      - merge_requests
+      - tags
 
-.pull-cache: &pull-cache
-  cache:
-    <<: *default-cache-config
-    policy: pull
-
-before_script:
-  - gem install bundler
-  - bundle --version
-  - bundle update --jobs $(nproc) --retry 3 --quiet
+.default-before_script:
+  before_script:
+    - gem install bundler --no-document
+    - bundle install --jobs $(nproc) --retry 3 --quiet
 
 ###################
 ## Prepare stage ##
 ###################
 setup-test-env:
+  extends: .default-only
   stage: prepare
   script:
-    - echo "All set!"
+    - ruby --version
+    - gem install bundler --no-document
+    - bundle --version
+    - bundle install --clean --jobs $(nproc) --path=vendor --retry=3 --quiet
+    - bundle check
   cache:
-    <<: *default-cache-config
+    key: "$CI_JOB_NAME-ruby-2.6"
+    paths:
+      - vendor/ruby
+      - Gemfile.lock
   artifacts:
     paths:
-      - vendor/cache/
+      - vendor/ruby
       - Gemfile.lock
 
 ################
 ## Test stage ##
 ################
-styles:
-  <<: *pull-cache
-  stage: test
-  script:
-    - bundle exec rubocop
-
-specs:
-  <<: *pull-cache
+rubocop:
+  extends: [".default-only", ".default-before_script"]
   stage: test
+  needs: ["setup-test-env"]
+  dependencies: ["setup-test-env"]
   script:
-    - bundle exec rake spec
+    - bundle exec rubocop --parallel
+  cache:
+    key: "$CI_JOB_NAME"
+    paths:
+      - .cache/rubocop_cache/
 
-codequality:
-  <<: *pull-cache
-  image: docker:latest
+# We need to copy this job's definition from the Code-Quality.gitlab-ci.yml
+# template because `only` is set without `refs`, so it takes precedence over `.default-only`.
+# See https://gitlab.com/gitlab-org/gitlab-ce/issues/66767.
+code_quality:
+  extends: .default-only
+  needs: ["setup-test-env"]
+  dependencies: ["setup-test-env"]
   stage: test
-  variables:
-    DOCKER_DRIVER: overlay
+  image: docker:stable
+  allow_failure: true
   services:
-    - docker:dind
-  before_script: []
+    - docker:stable-dind
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: ""
   script:
+    - |
+      if ! docker info &>/dev/null; then
+        if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
+          export DOCKER_HOST='tcp://localhost:2375'
+        fi
+      fi
     - docker run
-        --env CODECLIMATE_CODE="$PWD"
+        --env SOURCE_CODE="$PWD"
         --volume "$PWD":/code
         --volume /var/run/docker.sock:/var/run/docker.sock
-        --volume /tmp/cc:/tmp/cc
-        dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate
-        analyze -f json > raw_codeclimate.json
-    - cat raw_codeclimate.json | docker run -i stedolan/jq -c 'map({check_name,fingerprint,location})' > codeclimate.json
+        "registry.gitlab.com/gitlab-org/security-products/codequality:12-0-stable" /code
   artifacts:
-    paths:
-      - codeclimate.json
+    reports:
+      codequality: gl-code-quality-report.json
+    expire_in: 1 week
+  except:
+    variables:
+      - $CODE_QUALITY_DISABLED
+
+specs:
+  extends: [".default-only", ".default-before_script"]
+  needs: ["setup-test-env"]
+  dependencies: ["setup-test-env"]
+  stage: test
+  script:
+    - bundle exec rake spec
 
 ##################
 ## Triage stage ##
 ##################
 dry-run:gitlab-triage:
-  <<: *pull-cache
+  extends: [".default-only", ".default-before_script"]
+  needs: ["setup-test-env"]
+  dependencies: ["setup-test-env"]
   stage: triage
   script:
     - bundle exec rake install:local
@@ -84,11 +111,7 @@ dry-run:gitlab-triage:
     - gitlab-triage --init
     - gitlab-triage --dry-run --debug --token $API_TOKEN --source-id $CI_PROJECT_PATH
 
-dry-run:gitlab-ce:
-  <<: *pull-cache
-  stage: triage
-  script:
-    - bundle exec rake install:local
-    - gitlab-triage --help
-    - gitlab-triage --dry-run --debug --token $API_TOKEN --source-id gitlab-org/gitlab-ce
+# This job requires allows to override the `CI_PROJECT_PATH` variable when triggered.
+dry-run:custom:
+  extends: dry-run:gitlab-triage
   when: manual

data/Gemfile

@@ -5,6 +5,6 @@ gemspec
 
 group :test do
   # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '0.51.0'
-  gem 'rubocop-rspec', '1.19.0'
+  gem 'rubocop', '0.69.0'
+  gem 'rubocop-rspec', '1.35.0'
 end

data/README.md

@@ -119,6 +119,8 @@ Available condition types:
 - [`no_additional_labels` condition](#no-additional-labels-condition)
 - [`author_member` condition](#author-member-condition)
 - [`assignee_member` condition](#assignee-member-condition)
+- [`source_branch` condition](#source-branch-condition)
+- [`target_branch` condition](#target-branch-condition)
 - [`ruby` condition](#ruby-condition)
 
 ##### Date condition
@@ -382,7 +384,7 @@ conditions:
     source_id: 9970
 ```
 
-##### Assignee Member condition
+##### Assignee member condition
 
 This condition determines whether the assignee of a resource is a member of the specified group or project.
 
@@ -404,6 +406,28 @@ conditions:
     source_id: 9970
 ```
 
+##### Source branch condition
+
+Accepts the name of a source branch to filter upon.
+
+Example:
+
+```yml
+conditions:
+  source_branch: 'feature-branch'
+```
+
+##### Target branch condition
+
+Accepts the name of a target branch to filter upon.
+
+Example:
+
+```yml
+conditions:
+  target_branch: 'master'
+```
+
 ##### Ruby condition
 
 This condition allows users to write a Ruby expression to be evaluated for

data/gitlab-triage.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitlab/triage/version'
 
@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport', '~> 5.1'
-  spec.add_dependency 'httparty', '~> 0.15'
+  spec.add_dependency 'httparty', '~> 0.17'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'gitlab-styles', '~> 2.1'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'gitlab-styles', '~> 2.8'
+  spec.add_development_dependency 'rake', '~> 10.2'
+  spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'webmock', '~> 3.4'
 end

data/lib/gitlab/triage/command_builders/text_content_builder.rb

@@ -18,6 +18,8 @@ module Gitlab
           author: "@{{author.username}}",
           assignee: "@{{assignee.username}}",
           assignees: "@{{assignees.username}}",
+          source_branch: "{{source_branch}}",
+          target_branch: "{{target_branch}}",
           closed_by: "@{{closed_by.username}}",
           merged_by: "@{{merged_by.username}}",
           milestone: %(%"{{milestone.title}}"),
@@ -29,7 +31,7 @@ module Gitlab
           type: "{{type}}",
           items: "{{items}}"
         }.freeze
-        PLACEHOLDER_REGEX = /{{([\w\.]+)}}/
+        PLACEHOLDER_REGEX = /{{([\w\.]+)}}/.freeze
 
         attr_reader :resource, :network
 

data/lib/gitlab/triage/engine.rb

@@ -216,6 +216,8 @@ module Gitlab
         condition_builders << APIQueryBuilders::MultiQueryParamBuilder.new('labels', conditions[:labels], ',') if conditions[:labels]
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('state', conditions[:state]) if conditions[:state]
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('milestone', Array(conditions[:milestone])[0]) if conditions[:milestone]
+        condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('source_branch', conditions[:source_branch]) if conditions[:source_branch]
+        condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('target_branch', conditions[:target_branch]) if conditions[:target_branch]
 
         condition_builders.each do |condition_builder|
           params[condition_builder.param_name] = condition_builder.param_content

data/lib/gitlab/triage/expand_condition/list.rb

@@ -4,7 +4,7 @@ module Gitlab
   module Triage
     module ExpandCondition
       module List
-        PATTERN = /\{.+?,.+?\}/m
+        PATTERN = /\{.+?,.+?\}/m.freeze
 
         def self.expand(conditions)
           labels = conditions[:labels]

data/lib/gitlab/triage/expand_condition/sequence.rb

@@ -4,7 +4,7 @@ module Gitlab
   module Triage
     module ExpandCondition
       module Sequence
-        PATTERN = /\{\s*(\d+)\s*\.\.\s*(\d+)\s*\}/
+        PATTERN = /\{\s*(\d+)\s*\.\.\s*(\d+)\s*\}/.freeze
 
         def self.expand(conditions)
           labels = conditions[:labels]

data/lib/gitlab/triage/option_parser.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal
-# rubocop:disable Rails/Exit
 
 require 'optparse'
 require 'fileutils'
@@ -57,7 +56,7 @@ module Gitlab
 
             opts.on('-h', '--help', 'Print help message') do
               $stdout.puts opts
-              exit
+              exit # rubocop:disable Rails/Exit
             end
 
             opts.on('--init', 'Initialize the project with a policy file') do
@@ -65,7 +64,7 @@ module Gitlab
                 File.expand_path('../../../support/.triage-policies.example.yml', __dir__)
 
               FileUtils.cp(example_path, '.triage-policies.yml')
-              exit
+              exit # rubocop:disable Rails/Exit
             end
 
             opts.on('--init-ci', 'Initialize the project with a .gitlab-ci.yml file') do
@@ -73,7 +72,7 @@ module Gitlab
                 File.expand_path('../../../support/.gitlab-ci.example.yml', __dir__)
 
               FileUtils.cp(example_path, '.gitlab-ci.yml')
-              exit
+              exit # rubocop:disable Rails/Exit
             end
           end
 

data/lib/gitlab/triage/resource/context.rb

@@ -19,7 +19,7 @@ module Gitlab
         end
 
         def eval(ruby)
-          instance_eval <<~RUBY
+          instance_eval <<~RUBY, __FILE__, __LINE__ + 1
             begin
               #{ruby}
             rescue StandardError, ScriptError => e

data/lib/gitlab/triage/retryable.rb

@@ -13,7 +13,7 @@ module Gitlab
             @tries += 1
             result = yield
             break
-          rescue exception_type
+          rescue exception_type # rubocop:disable Naming/RescuedExceptionsVariableName
             raise if maximum_retries_reached?
           end
         end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,6 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/CODEOWNERS"
-- ".gitlab/issue_templates/Policy.md"
 - ".rubocop.yml"
 - CONTRIBUTING.md
 - Gemfile

data/.gitlab/issue_templates/Policy.md

@@ -1,32 +0,0 @@
-### Policy title
-
-( add a title to accurately describe the policy that you are referring to )
-
-### New Policy/Policy Change/Policy Removal
-
-( declare the type of policy change this is )
-
-### Issues or Merge Requests Policy?
-
-Issues/Merge Requests/both
-
-### Policy Conditions
-
-( declare the conditions for the related policy )
-
-#### Example
-
-- Label: bug
-- not updated for over 6 months
-- no associated milestone (unscheduled)
-- state: open
-
-### Policy Actions
-
-( declare the actions for the related policy )
-
-#### Example
-
-- Add a comment
-- Mention @markglenfletcher
-- Label: "awaiting feedback" "auto updated"