gl 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85f487df6edced1c8dd32945ff67087d368cb20939a4106fab5fb08922482b4c
-  data.tar.gz: 25188a4405e2a305c1ef6c35254a56e5e44b65106f9d38e011ff650a8f027a87
+  metadata.gz: dd4f959f120be84fffe69fcab73589c752645bcf380e5d489bbdeee74f979fa1
+  data.tar.gz: 8d627f1d6bd8bda3645f57ccefea0c2de35d275deaeb9317ee300bcb6df798ed
 SHA512:
-  metadata.gz: ede46461e79ffeae427e1e25b3a74af2edd9ca9dd887dd3d047709c853ea832bf65d9435e49e74ec8e3885f2e970049fe33f39f3ddc7f4966fe78fec5441b51e
-  data.tar.gz: 11e7ee7b46f33f7142880702ce33340a98a09f11939d342ea7e81c3a23915659210c747539dc3d489ed49ad286f308aa1346e7a166bbad94e79c83aca3142751
+  metadata.gz: e7d77af2ee3236e7db33a49ac1808d7c32e93dbcb1715e24329ec6300faab1670c4a5e1dbbfc720ac26166a4018ada46b80b59f74053952dae7634a43c359fe0
+  data.tar.gz: 56e18bab0459050cf6fa4258fb1850ee9f1f0665fae1c87cd448d38ed6891ee5d3881592a482c4223607202439fbfa7f79a0e67d5ebc70c39760052ca3916862

data/.rubocop_todo.yml

@@ -1,21 +1,26 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-19 16:08:47 +0200 using RuboCop version 0.74.0.
+# on 2019-08-21 14:37:45 +0200 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
+# Offense count: 2
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'lib/gl/cli/registry.rb'
 
-# Offense count: 4
+# Offense count: 5
 Metrics/AbcSize:
   Max: 48
 
-# Offense count: 5
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 113
+
+# Offense count: 7
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 35

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    gl (0.2.1)
+    gl (0.3.1)
       gitlab (~> 4.12)
       thor (~> 0.20.3)
+      tty-box
       tty-progressbar (~> 0.17.0)
       tty-prompt (~> 0.19.0)
+      tty-screen
       tty-spinner (~> 0.9.1)
       tty-table (~> 0.11.0)
 
@@ -50,6 +52,10 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
+    tty-box (0.4.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.5)
+      tty-cursor (~> 0.7)
     tty-color (0.5.0)
     tty-cursor (0.7.0)
     tty-progressbar (0.17.0)

data/README.md

@@ -1,5 +1,22 @@
 # Gl
 
+- [Gl](#gl)
+  * [Installation](#installation)
+  * [Usage](#usage)
+    + [Issues](#issues)
+      - [List](#list)
+      - [Open](#open)
+    + [Merge Requests](#merge-requests)
+      - [Interactive](#interactive)
+      - [List](#list-1)
+      - [Open](#open-1)
+      - [Approve](#approve)
+      - [Merge](#merge)
+    + [Registry](#registry)
+  * [Development](#development)
+  * [Contributing](#contributing)
+  * [License](#license)
+
 Gl is a small CLI that hooks into your Git config and GitLab API to easily access information based
 on the project your are currently in.
 
@@ -22,6 +39,8 @@ Commands:
   gl registry        # handle registry of the project
 ```
 
+### Issues
+#### List
 ```bash
 $ gl issues list
 
@@ -34,23 +53,7 @@ $ gl issues list
 | 33  | XXXXXXXXXXXXXX | XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX                                  |
 +-----+----------------+-------------------------------------------------------------------------------+
 ```
-
-```bash
-$ gl mr list
-
-+-----+--------------+-------------------------------------------------------------------------------+
-| IID | Author       | Title                                                                         |
-+-----+--------------+-------------------------------------------------------------------------------+
-| 268 | XXXXXXXXXXXX | XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX                               |
-| 264 | XXXXXXXXXXXX | XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX                               |
-| 217 | XXXXXXXXXXXX | XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX                               |
-| 213 | XXXXXXXXXXXX | XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX                               |
-| 188 | XXXXXXXXXXXX | XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX                               |
-+-----+--------------+-------------------------------------------------------------------------------+
-```
-
-Both commands offer a interactive switch which opens the selected merge request/issue after selecting:
-
+With interactive switch
 ```bash
 $ gl issues list -i
 
@@ -62,15 +65,73 @@ Open a issue (Use ↑/↓ and ←/→ arrow keys, press Enter to select)
   405 - XXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
   404 - XXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 ```
+#### Open
+Open a issue directly with the IID or viathe interactive list
+```bash
+$ gl issue open 409
+```
 
-Your can also directly open an issue or merge request with a IID:
+### Merge Requests
+#### Interactive
+```bash
+$ gl mr list -i
 
+Select a merge request (Use ↑/↓ arrow keys, press Enter to select, and letter keys to filter)
+‣ 2 - robert.mueller - WIP: Update README.md
+```
+
+In interactive mode you can also perform all the other actions
 ```bash
-$ gl issue open 409
-# or
-$ gl mr open 213
+$ gl mr list -i
+
+Select a merge request 2 - robert.mueller - WIP: Update README.md
+┌────────────────────────────────────────WIP: Update README.md─────────────────────────────────────────┐
+│                                                                                                      │
+│ # Nec verum procul trahuntur velle                                                                   │
+│                                                                                                      │
+│ ## Foedantem blandis malorum mox                                                                     │
+│                                                                                                      │
+│     chipsetMyspace.perlUltra.font_document(iscsiStandbyPermalink(                                    │
+│             computing_mac_modem, streamingSli));                                                     │
+│     address_operating = 40 + binComputingTransistor + rw * minimize;                                 │
+│     wired(-1, qbe_export);                                                                           │
+│                                                                                                      │
+└State: opened────────────────────────────────────────────────────────────────────────by robert.mueller┘
+What to do next? (Use ↑/↓ arrow keys, press Enter to select)
+‣ open
+  merge
+  approve
+  exit
+
+```
+
+#### List
+```bash
+$ gl mr list
+
++-----+----------------+-----------------------+
+| IID | Author         | Title                 |
++-----+----------------+-----------------------+
+| 2   | robert.mueller | WIP: Update README.md |
++-----+----------------+-----------------------+
+```
+
+#### Open
+```bash
+$ gl mr open 2
+```
+
+#### Approve
+```bash
+$ gl mr approve 2
+```
+
+#### Merge
+```bash
+$ gl mr merge 2
 ```
 
+### Registry
 With the registry subcommand you can get a overview about the registry usage.
 
 ```bash

data/gl.gemspec

@@ -30,8 +30,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'gitlab', '~> 4.12'
   spec.add_dependency 'thor', '~> 0.20.3'
+  spec.add_dependency 'tty-box'
   spec.add_dependency 'tty-progressbar', '~> 0.17.0'
   spec.add_dependency 'tty-prompt', '~> 0.19.0'
+  spec.add_dependency 'tty-screen'
   spec.add_dependency 'tty-spinner', '~> 0.9.1'
   spec.add_dependency 'tty-table', '~> 0.11.0'
 

data/lib/gl.rb

@@ -6,6 +6,8 @@ require 'tty-spinner'
 require 'tty-progressbar'
 require 'tty-table'
 require 'tty-prompt'
+require 'tty-box'
+require 'tty-screen'
 
 require 'gl/cli'
 

data/lib/gl/cli/issues.rb

@@ -5,20 +5,9 @@ module Gl
     desc 'list', 'list open issues'
     option :i
     def list(project = nil)
-      issues = Gitlab.issues(Gl.current_project(project), state: :opened).auto_paginate
-
-      issues_list = issues.map do |issue|
-        [issue.iid, issue.author.name, issue.title]
-      end
-
       if options[:i]
-        prompt = TTY::Prompt.new(interrupt: :exit)
-        choice = prompt.select('Open a issue') do |menu|
-          issues_list.each do |issue|
-            menu.choice issue.join(' - '), issue[0]
-          end
-        end
-        Gl.open_in_browser("#{Gl.current_project}/issues/#{choice}")
+        id = issue_dialogue(project)
+        Gl.open_in_browser("#{Gl.current_project}/issues/#{id}")
       else
         table = TTY::Table.new(%w[IID Author Title],
                                issues_list)
@@ -30,5 +19,49 @@ module Gl
     def open(id = nil)
       Gl.open_in_browser("#{Gl.current_project}/issues/#{id}")
     end
+
+    desc 'label', 'add a label to an issue'
+    def label(label)
+      label_action(label)
+    end
+
+    desc 'unlabel', 'remove a label from an issue'
+    def unlabel(label)
+      label_action(label)
+    end
+
+    private
+
+    def label_action(label)
+      id = issue_dialogue
+      action = caller_locations(1, 1)[0].label
+
+      begin
+        Gitlab.create_issue_note(Gl.current_project,
+                                 id,
+                                 "/#{action} ~\"#{label}\"")
+      rescue Gitlab::Error::BadRequest
+        true
+      end
+    end
+
+    def issue_dialogue(project = nil)
+      prompt = TTY::Prompt.new(interrupt: :exit)
+      prompt.select('Open a issue', filter: true) do |menu|
+        issues_list(project).each do |issue|
+          menu.choice issue.join(' - '), issue[0]
+        end
+      end
+    end
+
+    def issues_list(project)
+      @issues_list ||= begin
+        issues = Gitlab.issues(Gl.current_project(project), state: :opened).auto_paginate
+
+        issues.map do |issue|
+          [issue.iid, issue.author.name, issue.title]
+        end
+      end
+    end
   end
 end

data/lib/gl/cli/merge_requests.rb

@@ -7,7 +7,32 @@ module Gl
     def list(project = nil)
       if options[:i]
         id = merge_request_dialogue(project)
-        Gl.open_in_browser("#{Gl.current_project}/merge_requests/#{id}")
+        mr = merge_requests.select { |merge_request| merge_request.iid == id.to_i }.first
+        box = TTY::Box.frame(
+          width: TTY::Screen.width,
+          height: mr.description.lines.count + 4,
+          padding: 1,
+          title: { top_center: mr.title[0..TTY::Screen.width - 3],
+                   bottom_left: "State: #{mr.state}",
+                   bottom_right: "by #{mr.author.name}" }
+        ) do
+          mr.description
+        end
+        puts box
+
+        choice = TTY::Prompt.new(interrupt: :exit).select('What to do next?') do |menu|
+          menu.choice :open
+          menu.choice :merge
+          menu.choice :approve
+          menu.choice :exit
+        end
+
+        case choice.to_sym
+        when :open then open_mr_in_browser(mr.iid)
+        when :merge then merge(mr.iid)
+        when :approve then approve(mr.iid)
+        when :exit then exit
+        end
       else
         table = TTY::Table.new(%w[IID Author Title],
                                merge_requests_list(project))
@@ -15,44 +40,94 @@ module Gl
       end
     end
 
+    desc 'approve', 'approves a merge request'
+    def approve(iid = nil)
+      iid ||= merge_request_dialogue
+      begin
+        Gitlab.approve_merge_request(Gl.current_project, iid)
+      rescue Gitlab::Error::Unauthorized
+        TTY::Prompt.new.error('Unable to approve merge request')
+      end
+    end
+
     desc 'open', 'opens the merge request overview in your browser'
-    def open(id = nil)
-      Gl.open_in_browser("#{Gl.current_project}/merge_requests/#{id}")
+    def open(iid = nil)
+      open_mr_in_browser(iid)
+    end
+
+    desc 'label', 'add a label to a merge request'
+    def label(label)
+      label_action(label)
+    end
+
+    desc 'unlabel', 'remove a label from a merge request'
+    def unlabel(label)
+      label_action(label)
     end
 
-    desc 'ready', 'marks a merge request as reviewable'
-    def ready(id = nil)
-      id ||= merge_request_dialogue
+    desc 'merge', 'accept a merge request'
+    method_option 'delete-branch', type: :boolean, default: true, desc: 'Delete branch after merge'
+    method_option 'squash', type: :boolean, default: false, desc: 'Squash commits'
+    def merge(iid = nil)
+      iid ||= merge_request_dialogue.split(' - ')[0]
+      Gitlab.accept_merge_request(Gl.current_project,
+                                  iid,
+                                  squash: options['squash'],
+                                  should_remove_source_branch: options['delete-branch'])
+    rescue Gitlab::Error::MethodNotAllowed => e
+      TTY::Prompt.new.error(
+        case e.response_status
+        when 405
+          'Unable to accept merge request ' \
+          '(ie: Work in Progress, Closed, Pipeline Pending Completion, ' \
+          'or Failed while requiring Success)'
+        else
+          "Could not merge due to unknown error: #{e.response_status}"
+        end
+      )
+    end
+
+    private
+
+    def open_mr_in_browser(iid)
+      Gl.open_in_browser("#{Gl.current_project}/merge_requests/#{iid}")
+    end
+
+    def label_action(label)
+      id = merge_request_dialogue
+      action = caller_locations(1, 1)[0].label
 
       begin
         Gitlab.create_merge_request_note(Gl.current_project,
                                          id,
-                                         '/label ~"Status::Reviewable"')
+                                         "/#{action} ~\"#{label}\"")
       rescue Gitlab::Error::BadRequest
         true
       end
     end
 
-    private
-
     def merge_request_dialogue(project = nil)
       prompt = TTY::Prompt.new(interrupt: :exit)
-      prompt.select('Select a merge request') do |menu|
+      prompt.select('Select a merge request', filter: true) do |menu|
         merge_requests_list(project).each do |merge_request|
           menu.choice merge_request.join(' - '), merge_request[0]
         end
       end
     end
 
-    def merge_requests_list(project)
+    def merge_requests_list(project = nil)
       @merge_requests_list ||= begin
-        merge_requests = Gitlab.merge_requests(Gl.current_project(project),
-                                               state: :opened).auto_paginate
-
-        merge_requests.map do |mr|
+        merge_requests(project).map do |mr|
           [mr.iid, mr.author.name, mr.title]
         end
       end
     end
+
+    def merge_requests(project = nil)
+      @merge_requests ||= begin
+        Gitlab.merge_requests(Gl.current_project(project),
+                              state: :opened).auto_paginate
+      end
+    end
   end
 end

data/lib/gl/cli/registry.rb

@@ -43,7 +43,6 @@ module Gl
           rescue Gitlab::Error::NotFound
             next
           end
-
         end
       end
       puts table.render(:ascii, alignments: %i[left right], padding: [0, 1])

data/lib/gl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gl
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Flipez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.20.3
+- !ruby/object:Gem::Dependency
+  name: tty-box
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement