dude-cli 2.1.0.alpha2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6031769a356f360e4c2dcc232c0018aec9b00353908c4158e3fe3e7c030f8a6d
-  data.tar.gz: 5e8697a8d8606d30029996965b347c00e025de94570366804fe9e2f29285a295
+  metadata.gz: 8791dfac3c2ed7f7c58a7a6fef335d4abdb924a504ff09eb3a8dabbd1a882682
+  data.tar.gz: 61d08e0ed19364bc034d093fae732858a6b0c912bbdfc22bb27f32206496119b
 SHA512:
-  metadata.gz: 14ec971a8a01102bbca10813e4e3603d0a8bb132f7055f463016532cc9a28e170fdff23bb99749c0616cd800033d252a1a0eaac3800f093f7329b42dab3e60af
-  data.tar.gz: 8ff94ed54537ea464c7f747d5a572ae98807081ad71ae8e7aa9ac2976c4d002c06af9004a6f8b48d787d87439df6517923a7a4ab113d340a23b45f0899dfb494
+  metadata.gz: eea06c3268ae65e384114ee39bddc9eae6b4141fe84a00f32c88967ce906361cbff4f5a6f8127871c35db0b65951e5ace54a44472a4ded0c9918ea4217a367d1
+  data.tar.gz: e63eab6fcde90c458b235072772991624813d31523737671cfcb99ca068e3a98b9a0159e5306141e3418e95e49c4aa1f21d84823ad265d04be3caa7c34c10135

data/.github/workflows/verify.yml

@@ -10,7 +10,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6 # Not needed with a .ruby-version file
+        ruby-version: 2.7 # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run Rubocop
       run: bundle exec rubocop
@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6 # Not needed with a .ruby-version file
+        ruby-version: 2.7 # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run RSpec
       run: COVERAGE=true bundle exec rspec

data/.gitignore

@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.gem
+.gemrc
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -4,7 +4,7 @@ Style/Documentation:
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
 Metrics/BlockLength:
   IgnoredMethods: ['describe', 'context']

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.1.0] - 2021-08 23
+
+### Added
+- Added `dude commit` feature
+- Fixed Github PR wrong URL's
+- Add install wizard
+
 ## [2.0.7] - 2021-04-02
 
 ### Added

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    dude-cli (2.1.0.alpha2)
+    dude-cli (2.1.0)
       colorize (~> 0.8.1)
       dry-cli (~> 0.6)
       faraday (~> 1.1)
       jira-ruby (~> 2.1)
+      tty-prompt (~> 0.23.1)
 
 GEM
   remote: https://rubygems.org/
@@ -25,19 +26,25 @@ GEM
     diff-lcs (1.4.4)
     docile (1.3.5)
     dry-cli (0.7.0)
-    faraday (1.4.2)
+    faraday (1.7.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jira-ruby (2.1.5)
@@ -51,13 +58,15 @@ GEM
     multipart-post (2.1.1)
     oauth (0.5.6)
     parallel (1.20.1)
-    parser (3.0.1.1)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -73,19 +82,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.15.0)
+    rubocop (1.19.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.10.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -94,9 +103,20 @@ GEM
       simplecov (~> 0.8)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
+    wisper (2.0.1)
     zeitwerk (2.4.2)
 
 PLATFORMS

data/README.md

@@ -8,7 +8,9 @@
 
 A daily assistant in the hard work of a programmer
 
-This program helps to combine such services as [Jira](https://atlassian.net), [Toggl](https://toggl.com) and replace most routine activities with one simple CLI utility.
+This program helps to combine such services as [Jira](https://atlassian.net), [Trello](https://trello.com), [Toggl](https://toggl.com), etc. and replace most routine activities with one simple CLI utility.
+
+![Dude](/demo/dude.gif)
 
 ## Installation
 
@@ -26,54 +28,49 @@ Or install it yourself as:
 
     $ gem install dude-cli
 
-After that create .duderc file in your HOME directory by command:
+After that create .duderc.yml file in your work project directory by command:
 
     $ dude install
 
-And configure all variables in this file 
-
-`PROJECT_MANAGEMENT_TOOL=jira|trello` - Project management (Now only Jira and Trello supported)
-
-##### Jira setup
-
-`ATLASSIAN_EMAIL` - Your Jira email
-
-`ATLASSIAN_TOKEN` - How to create Atlassian token: https://support.siteimprove.com/hc/en-gb/articles/360004317332-How-to-create-an-API-token-from-your-Atlassian-account
-
-`ATLASSIAN_URL` - URL of your project. Example: https://example.atlassian.net
+It will offer you a step by step instruction how to setup dude:
 
-`ATLASSIAN_PROJECT_KEY` - KEY of your project. If your issues have id BT-123 - BT is the key
+![Setup Wizard](/demo/wizard.gif)
 
-`ATLASSIAN_BOARD_ID`:
-Just open your atlassian main board and copy id from the url after rapidView=*ID* part.
+You always could edit this file manually and setup some stuff like Toggl time entry name or Github PR template
 
-Example: https://dealmakerns.atlassian.net/secure/RapidBoard.jspa?rapidView=23&projectKey=DT - 23 is the id
+Default template could be found here: [lib/dude/templates/duderc_template](/lib/dude/templates/duderc_template)
 
-##### Trello setup
-You could generate your key and token here: https://trello.com/app-key
-
-`TRELLO_KEY`
-
-`TRELLO_TOKEN`
+### Additional configuration variables:
 
 #### Replace it with your project list names. Skip for empty lists
 
-```
-TODO_LIST_NAME=To Do
-IN_PROGRESS_LIST_NAME=In Progress
-CODE_REVIEW_LIST_NAME=Code Review
-TESTING_LIST_NAME=TESTABLE
-DONE_LIST_NAME=Done
+```yaml
+:todo_list_name: To Do
+:in_progress_list_name: In Progress
+:code_review_list_name: Code Review
+:testing_list_name: TESTABLE
+:done_list_name: Done
 ```
 
-`TOGGL_PROJECT_NAME` - Your Toggl project name
+#### Use the *{issue_id}* and *{issue_title}* and specify format for the task titles in Toggl or keep it as it is
 
-`TOGGL_TOKEN` - Your Toggl API token can be found at the bottom of the page: https://track.toggl.com/profile
-
-`TOGGL_WORKSPACE_ID` - Can be copied from url here: https://toggl.com/app/projects/. Example: 123456
+```yaml
+:toggl:
+  :task_format: [{issue_id}] {issue_title}
+```
 
-#### Use the *id* and *title* and specify format for the task titles in Toggl or keep it as it is
-`TOGGL_TASK_FORMAT=[id] title`
+#### Github PR template looks like this (Available variables: *{issue_id}*, *{issue_title}*, *{issue_url}*)
+
+```yaml
+:github:
+  :pr_template:
+    :title: "[{issue_id}] {issue_title}\n"
+    :body: |
+      ## Story
+      [**\[{issue_id}\] {issue_title}**]({issue_url})
+      ## Description
+      Example description of the issue
+```
 
 ## Usage
 
@@ -88,14 +85,17 @@ alias dude="rvm 2.7.2 do dude"
 
 |    Command    | Required parameters | Optional parameters |                                       Description                                      |
 |:-------------:|:-------------------|:-------------------|:--------------------------------------------------------------------------------------|
-| dude install  | -                   | -                   | Create .duderc file in your home directory                                             |
-| dude checkout | ISSUE_ID            | -                   | Checkout to branch with name "ID-issue-title"                                          |
-| dude track    | ISSUE_ID            | -                   | Start time entry in Toggl with issue project, title and id                             |
-| dude tasks    | -                   | -                   | Show all issues in current project (For current sprint)                                |
-| dude stop     | -                   | -                   | Stop current time entry in Toggl                                                       |
-| dude start    | ISSUE_ID            | -                   | Do `checkout`, `track` and `move` actions                                              |
-| dude move     | ISSUE_ID            | --list=NAME         | Move issue to another column (Will provide options if called without --list parameter) |
-| dude version  | -                   | -                   | Display gem version                                                                    |
+| dude install      | -                   | -                   | Create .duderc file in your home directory                                             |
+| dude checkout     | ISSUE_ID            | -                   | Checkout to branch with name "ID-issue-title"                                          |
+| dude track        | ISSUE_ID            | -                   | Start time entry in Toggl with issue project, title and id                             |
+| dude tasks        | -                   | -                   | Show all issues in current project (For current sprint)                                |
+| dude commit       | ISSUE_ID            | -                   | Create commit with the ID and title of current story                                   |
+| dude stop         | -                   | -                   | Stop current time entry in Toggl                                                       |
+| dude start        | ISSUE_ID            | -                   | Do `checkout`, `track` and `move` actions                                              |
+| dude move         | ISSUE_ID            | --list=NAME         | Move issue to another column (Will provide options if called without --list parameter) |
+| dude pr create    |                     |                     | Creates PR in Github using template                                                    |
+| dude version      | -                   | -                   | Display gem version                                                                    |
+| dude healthcheck  | -                   | -                   | Check configuration of all dependencies                                                |
 
 You also can use `dude help` for short description of every command.
 
@@ -109,4 +109,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Changelog
 
-https://github.com/npupko/dude/blob/master/CHANGELOG.md
+[CHANGELOG.md](/CHANGELOG.md)

data/dude.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |spec|
   DESC
   spec.homepage      = 'https://github.com/npupko/dude'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/npupko/dude'
   spec.metadata['changelog_uri'] = 'https://github.com/npupko/dude/blob/master/CHANGELOG.md'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|demo)/}) }
 
   spec.bindir        = 'bin'
   spec.executables   = ['dude']
@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-cli', '~> 0.6'
   spec.add_runtime_dependency 'faraday', '~> 1.1'
   spec.add_runtime_dependency 'jira-ruby', '~> 2.1'
+  spec.add_runtime_dependency 'tty-prompt', '~> 0.23.1'
 
   spec.add_development_dependency 'pry', '~> 0.14.0'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/dude.rb

@@ -2,14 +2,24 @@
 
 require 'colorize'
 
+begin
+  require 'pry'
+rescue LoadError
+  nil
+end
+
 require_relative './dude/settings'
 require_relative './dude/version'
 require_relative './dude/commands'
 require_relative './dude/git'
 require_relative './dude/code_management'
+require_relative './dude/config'
 
 module Dude
+  SETTINGS = Dude::Config.configure_with('.duderc.yml')
+  LIST_OF_AVAILABLE_PROJECT_MANAGEMENT_TOOLS = %w[jira trello].freeze
+
   class ToBeImplementedError < StandardError; end
 
-  LIST_OF_AVAILABLE_PROJECT_MANAGEMENT_TOOLS = %w[jira trello].freeze
+  class TaskNotFoundError < StandardError; end
 end

data/lib/dude/code_management/github/client.rb

@@ -6,17 +6,21 @@ module Dude
   module CodeManagement
     module Github
       class Client
-        include Settings
-
         def client
           @client ||= Faraday.new('https://api.github.com/', {
-            headers: { Authorization: "token #{settings['GITHUB_TOKEN']}" }
+            headers: { Authorization: "token #{Dude::SETTINGS.dig(:github, :token)}" }
           })
         end
 
         def create_pull_request(issue:, owner:, repo:, params:)
           CreatePullRequest.new.call(client, issue: issue, owner: owner, repo: repo, params: params)
         end
+
+        def health_check
+          client.get('https://api.github.com/user').status == 200
+        rescue StandardError
+          false
+        end
       end
     end
   end

data/lib/dude/code_management/github/create_pull_request.rb

@@ -6,16 +6,19 @@ module Dude
   module CodeManagement
     module Github
       class CreatePullRequest
-        include Settings
-
         def call(client, issue:, owner:, repo:, params:)
           @issue = issue
           @owner = owner
           @repo = repo
           @params = params
 
+          return unless issue
+
           response = client.post("https://api.github.com/repos/#{owner}/#{repo}/pulls", body.to_json)
           res = JSON.parse(response.body)
+
+          return github_error if res['errors'] && !res['errors'].empty?
+
           url = res['html_url']
           puts "Pull request has been created: #{url}"
         end
@@ -24,20 +27,25 @@ module Dude
 
         attr_reader :issue, :owner, :repo, :params
 
+        def github_error
+          puts <<~HEREDOC
+            #{'Error:'.red.bold} GitHub cannot create new Pull Request from #{params[:head].bold} branch. Try to push your branch and try again
+          HEREDOC
+        end
+
         def body
           {
-            title: params[:title] || template['title'],
-            body: params[:body] || template['body'],
+            title: params[:title] || template[:title],
+            body: params[:body] || template[:body],
             head: params[:head],
             base: params[:base]
           }
         end
 
         def template
-          file = YAML.load_file(File.join(File.dirname(__FILE__), '../../templates/pull_request_template'))
-          file.tap do |template|
-            template['title'] = fill_variables(template['title'])
-            template['body'] = fill_variables(template['body'])
+          Dude::SETTINGS.dig(:github, :pr_template).tap do |template|
+            template[:title] = fill_variables(template[:title])
+            template[:body] = fill_variables(template[:body])
           end
         end
 

data/lib/dude/commands.rb

@@ -5,11 +5,13 @@ require_relative './commands/version'
 require_relative './commands/tasks'
 require_relative './commands/move'
 require_relative './commands/checkout'
+require_relative './commands/commit'
 require_relative './commands/start'
 require_relative './commands/track'
 require_relative './commands/stop'
 require_relative './commands/install'
 require_relative './commands/pr'
+require_relative './commands/health_check'
 
 module Dude
   module Commands
@@ -20,9 +22,11 @@ module Dude
     register 'tasks', Dude::Commands::Tasks, aliases: ['t', '-t', '--tasks']
     register 'move', Dude::Commands::Move, aliases: ['m', '-m', '--move']
     register 'checkout', Dude::Commands::Checkout, aliases: ['co']
+    register 'commit', Dude::Commands::Commit
     register 'track', Dude::Commands::Track, aliases: ['tr']
     register 'stop', Dude::Commands::Stop
     register 'start', Dude::Commands::Start, aliases: ['st']
+    register 'healthcheck', Dude::Commands::HealthCheck
 
     register 'pr' do |prefix|
       prefix.register 'create', Dude::Commands::PR::Create