dri 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfdbd437522c61a85ee277d56572906e94f8b9c33d2b511701e5e0daa6ad576
-  data.tar.gz: 93c8566dc5c2cc610aa181e0242562dc84db111a1bf149448032cbbba0a4ee54
+  metadata.gz: c1c589c770547e0142cb5b2942316e41af19cad293ed2e141d95e54a7379f741
+  data.tar.gz: b1cc881757273745c40485c469b34abb642a8edcda18ae1baf22bfe80ed8bacd
 SHA512:
-  metadata.gz: 432a698eb76717876ab269523cae3377ea546103dfedaa04001ff7b07a7080ab4a069f4b795d6b949c78bca02cd500e584bccfbee8c9470bcafda2029eb095c2
-  data.tar.gz: 152bbfc469b575c0f7e65e28ffdeba5517449b635016630d677ffded81c9e01a89acb93b0c9f6cc176b2e4226f7e1bf797505f162521a73791e5224a14462efd
+  metadata.gz: 0fa73e3af14a31bcf96f919c1b37465695a52a7db5d0fcaedf8ee36e51c817bf4c789c3fe24bc2169de0b385b83d0ec92ae716f8da6fbb55cb134c6219a0b26a
+  data.tar.gz: 880ae4a81c350dcfe7b49c9db00c3760d7f98b56383b7516d0c890dae24034fc3d8ebb86f37592c8d65655c3cbe8671bddf3c26327d49a6006b0e9f5f0313afa

data/.gitignore

@@ -6,9 +6,11 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/bundle
 
 # rspec failure tracking
 .rspec_status
 
 .dri_profile.yml
-handover_reports/*
+handover_reports/*
+.idea/

data/.gitlab-ci.yml

@@ -1,28 +1,40 @@
-image: ruby:3.0.2
+.job_base:
+  image: ruby:3.1
+  variables:
+    BUNDLE_PATH: vendor/bundle
+    BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true"
+  before_script:
+    - bundle install
+  cache:
+    key:
+      files:
+        - dri.gemspec
+        - Gemfile.lock
+    paths:
+      - vendor/bundle
+  rules:
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+
+include:
+  - project: gitlab-org/quality/pipeline-common
+    ref: 0.3.4
+    file:
+      - /ci/gem-release.yml
 
 stages:
   - build
   - test
   - deploy
 
-before_script:
-  - gem install bundler:2.2.22
-  - bundle install
-
 build_gem:
   stage: build
+  extends: .job_base
   script:
     - gem build
 
 rspec:
   stage: test
+  extends: .job_base
   script:
     - bundle exec rspec
-
-deploy:
-  stage: deploy
-  script:
-    - gem push dri*.gem
-  rules:
-    - if: '$CI_COMMIT_TAG'
-      when: always

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.2

data/Gemfile

@@ -2,6 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in dri.gemspec
 gemspec
-
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dri (0.1.1)
+    dri (0.1.2)
       httparty (~> 0.20.0)
       json (~> 2.6.1)
       markdown-tables (~> 1.1.1)
@@ -39,19 +39,19 @@ GEM
     public_suffix (4.0.6)
     rake (12.3.3)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     strings (0.2.1)
       strings-ansi (~> 0.2)
       unicode-display_width (>= 1.5, < 3.0)
@@ -98,10 +98,10 @@ PLATFORMS
 
 DEPENDENCIES
   dri!
-  rake (~> 12.0)
-  rspec (~> 3.0)
+  rake
+  rspec (~> 3.10.0)
   timecop (~> 0.9.1)
   webmock (~> 3.5)
 
 BUNDLED WITH
-   2.1.4
+   2.3.9

data/dri.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{CLI app to help triage GitLab QA pipelines}
   spec.homepage      = 'https://gitlab.com/gitlab-org/quality/dri'
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "tty-editor", "~> 0.6"
   spec.add_dependency "pastel", "~> 0.8.0"
   spec.add_dependency "thor", "~> 1.0.1"
-  spec.add_dependency "markdown-tables", "~> 1.1.1"  
+  spec.add_dependency "markdown-tables", "~> 1.1.1"
   spec.add_dependency 'json', '~> 2.6.1'
   spec.add_dependency 'httparty', '~> 0.20.0'
 

data/lib/dri/api_client.rb

@@ -3,10 +3,11 @@
 require "httparty"
 require "json"
 require "tty-config"
+require 'cgi'
 
 module Dri
   class ApiClient
-    
+
     API_URL              = 'https://gitlab.com/api/v4'
     TESTCASES_PROJECT_ID = '11229385'
     TRIAGE_PROJECT_ID    = '15291320'
@@ -50,6 +51,24 @@ module Dri
       fetch_json(url.join)
     end
 
+    # Fetch MRs
+    #
+    # @see https://docs.gitlab.com/ee/api/merge_requests.html for all passable options
+    #
+    # @param [Hash<String>] options
+    # @option options [String] state
+    # @option options [String] order_by
+    # @option options [String] sort
+    # @option options [String] milestone
+    # @option options [String] labels
+    def fetch_mrs(project_id:, **options)
+      uri = URI(API_URL)
+      uri.query = HTTParty::HashConversions.to_params(options)
+      uri.path = File.join(uri.path, 'projects', CGI.escape(project_id), 'merge_requests') # CGI.escape('gitlab-org/gitlab') => 'gitlab-org%2Fgitlab'
+
+      fetch_json(uri.to_s)
+    end
+
     def fetch_current_triage_issue
       url = ["#{API_URL}/projects/"]
       url << "#{TRIAGE_PROJECT_ID}/issues?state=opened"
@@ -97,7 +116,7 @@ module Dri
         }
       }
 
-      response =  HTTParty.post(url, options)      
+      response =  HTTParty.post(url, options)
       handle_response(response)
     end
 
@@ -122,4 +141,4 @@ module Dri
       handle_response(JSON.parse(response.body))
     end
   end
-end
+end

data/lib/dri/command.rb

@@ -2,6 +2,8 @@
 require_relative 'command'
 require_relative 'api_client'
 
+require 'dri/refinements/truncate'
+
 require "tty-config"
 require "pastel"
 require 'forwardable'

data/lib/dri/commands/fetch/failures.rb

@@ -8,6 +8,8 @@ module Dri
   module Commands
     class Fetch
       class Failures < Dri::Command
+        using Refinements
+
         def initialize(options)
           @options = options
           @today_iso_format = Time.now.strftime('%Y-%m-%dT00:00:00Z')
@@ -26,35 +28,38 @@ module Dri
           labels = [ title, triaged, author, url ]
           triaged_counter = 0
 
-          logger.info "Fetching today\'s failures..."
-          
-          spinner.run do 
+          logger.info "Fetching today's failures..."
+
+          spinner.run do
 
             response = api_client.fetch_failures(date: @today_iso_format, state: 'opened')
 
             if response.nil?
-              logger.info "Life is great, there are no new failures today!"
+              logger.info 'Life is great, there are no new failures today!'
               exit 0
             end
 
             response.each do |failure|
-              title = truncate(failure["title"], 60)
-              author = failure["author"]["username"]
-              url = failure["web_url"]
-              award_emoji_url = failure["_links"]["award_emoji"]
+              title = failure['title'].truncate(60)
+              author = failure['author']['username']
+              url = failure['web_url']
+              award_emoji_url = failure['_links']['award_emoji']
               triaged = add_color('x', :red)
 
-              emoji_awards = api_client.fetch_awarded_emojis(award_emoji_url)
+              emoji_awards = api_client.fetch_awarded_emojis(award_emoji_url).find do |e|
+                e['name'] == emoji && e['user']['username'] == username
+              end
 
-              triaged = add_color('✓', :green) && triaged_counter += 1 if emoji_awards.find do |e| 
-                e['name'] == emoji && e['user']['username'] == @username 
+              if emoji_awards
+                triaged = add_color('✓', :green)
+                triaged_counter += 1
               end
 
               if @options[:urgent]
-                labels = failure["labels"]
+                labels = failure['labels']
 
                 labels.each do |label|
-                  if label.include? ("found:canary.gitlab.com" && "found:canary.staging.gitlab.com")
+                  if label.include? ('found:canary.gitlab.com' && 'found:canary.staging.gitlab.com')
                     urgent << [title, triaged, author, url]
                   end
                 end
@@ -67,19 +72,13 @@ module Dri
           if @options[:urgent]
             table = TTY::Table.new(labels, urgent)
             puts table.render(:ascii, resize: true, alignments: [:center, :center, :center, :center])
-            output.puts "\nFound: #{urgent.size} urgent failures, ocurring in both canary.gitlab.com and canary.staging.gitlab.com."
+            output.puts "\nFound: #{urgent.size} urgent failures, occurring in both canary.gitlab.com and canary.staging.gitlab.com."
           else
             table = TTY::Table.new(labels, failures)
             puts table.render(:ascii, resize: true, alignments: [:center, :center, :center, :center])
             output.puts "\nFound: #{failures.size} failures, of these #{triaged_counter} have been triaged with a #{emoji}."
           end
         end
-         
-        private
-
-        def truncate(string, max)
-          string.length > max ? "#{string[0...max]}..." : string
-        end
       end
     end
   end

data/lib/dri/commands/fetch/quarantines.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative '../../command'
+
+require 'tty-table'
+
+module Dri
+  module Commands
+    class Fetch
+      class Quarantines < Dri::Command
+        using Refinements
+
+        def initialize(options)
+          @options = options
+          @today_iso_format = Time.now.strftime('%Y-%m-%dT00:00:00Z')
+        end
+
+        def execute(input: $stdin, output: $stdout)
+          verify_config_exists
+
+          title = add_color('Example name', :bright_yellow)
+          url = add_color('URL', :bright_yellow)
+
+          headers = [title, url]
+          mrs = []
+
+          logger.info 'Fetching Quarantine MRs...'
+
+          spinner.run do
+            response = api_client.fetch_mrs(project_id: 'gitlab-org/gitlab', labels: 'QA,Quality', search: '[QUARANTINE]', in: :title, state: :opened)
+
+            mrs = response.each_with_object([]) do |mr, found_mrs|
+              title = mr['title'][13..] # remove the "[QUARANTINE] " prefix
+              url = mr['web_url']
+
+              found_mrs << [title, url]
+            end
+          end
+
+          puts TTY::Table.new(headers, mrs).render(:ascii, resize: true, alignments: %i[left center])
+          output.puts "Found #{mrs.size} open Quarantine MRs"
+        end
+      end
+    end
+  end
+end

data/lib/dri/commands/fetch/triaged.rb

@@ -20,7 +20,7 @@ module Dri
           failures_triaged = []
 
           logger.info "Fetching your triaged failures..."
-          spinner.start 
+          spinner.start
 
           response = api_client.fetch_triaged_failures(emoji: emoji, state: 'opened')
 
@@ -30,7 +30,7 @@ module Dri
           end
 
           response.each do |triaged|
-            title = truncate(triaged["title"], 70)
+            title = triaged["title"].truncate(70)
             url = triaged["web_url"]
             labels = triaged["labels"]
             type = ""
@@ -40,7 +40,7 @@ module Dri
             end
 
             labels = triaged["labels"]
-  
+
             failures_triaged << [title, url, type]
           end
 
@@ -49,12 +49,6 @@ module Dri
           table = TTY::Table.new(table_labels,failures_triaged)
           puts table.render(:ascii, resize: true, alignments: [:center, :center, :center])
         end
-
-        private
-
-        def truncate(string, max)
-          string.length > max ? "#{string[0...max]}..." : string
-        end
       end
     end
   end

data/lib/dri/commands/fetch.rb

@@ -46,6 +46,18 @@ module Dri
           Dri::Commands::Fetch::Failures.new(options).execute
         end
       end
+
+      desc 'quarantines', 'Display open quarantine MRs'
+      method_option :help, aliases: '-h', type: :boolean,
+        desc: 'Display usage information'
+      def quarantines(*)
+        if options[:help]
+          invoke :help, ['quarantines']
+        else
+          require_relative 'fetch/quarantines'
+          Dri::Commands::Fetch::Quarantines.new(options).execute
+        end
+      end
     end
   end
 end

data/lib/dri/refinements/truncate.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Refinements
+  refine String do
+    # Truncate string to limit of _n_ characters
+    # @param [Integer] limit the limit of characters
+    # @return [String] the resulting string after truncation
+    def truncate(limit = 50)
+      return self.freeze if self.size <= limit
+
+      # limit - 3 for the ellipses
+      self[0...(limit - 3)] << '...'
+    end
+  end
+end

data/lib/dri/version.rb

@@ -1,3 +1,3 @@
 module Dri
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dri
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - GitLab Quality
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-config
@@ -248,7 +248,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-description:
+description: 
 email:
 - quality+dri@gitlab.com
 executables:
@@ -260,6 +260,7 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -275,6 +276,7 @@ files:
 - lib/dri/command.rb
 - lib/dri/commands/fetch.rb
 - lib/dri/commands/fetch/failures.rb
+- lib/dri/commands/fetch/quarantines.rb
 - lib/dri/commands/fetch/testcases.rb
 - lib/dri/commands/fetch/triaged.rb
 - lib/dri/commands/init.rb
@@ -285,6 +287,7 @@ files:
 - lib/dri/commands/rm/emoji.rb
 - lib/dri/commands/rm/profile.rb
 - lib/dri/commands/rm/reports.rb
+- lib/dri/refinements/truncate.rb
 - lib/dri/report.rb
 - lib/dri/utils/markdown_lists.rb
 - lib/dri/version.rb
@@ -292,7 +295,7 @@ homepage: https://gitlab.com/gitlab-org/quality/dri
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -300,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -308,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: CLI app to help triage GitLab QA pipelines
 test_files: []