geet 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26e6c4b2966c8c93bbfabdcdcdd31972822ddb19
-  data.tar.gz: 31bd0e906eb426836f1fc912bc8e4b63b1f8d94c
+  metadata.gz: f6851bac2fb23c71d05f45df5bb3fd5031f7edd3
+  data.tar.gz: 82d8882974a9ce36099507adbd88f1030da1331a
 SHA512:
-  metadata.gz: 763f77f17b6cdd5b97fe0547f645943c3d0f360598435a96b2de2e01ed4c576d1c2a1110195b1de04e43496d89fd986105cbbac53f56c393ee60533efafb1fab
-  data.tar.gz: 198ba0c2c055ab1269bc3d14d2d4d2f63c26970359cca5b18e80cc790e000cfa2b973285dd5484e0cecb9ac4e1ddf8d139ea07c31cee231c2bda3000fa736623
+  metadata.gz: 66454a2b83427c2cbce5a693a5271f78d4b70f38ab2762f949d53c6ba65151961cc31fde338454a171243732bb23ec35498967299eb883b7f039174798a9fcde
+  data.tar.gz: bb4ac9a4a07dd9a5f72923564b45db22a047576e41c63c05a15442ca5983f20de332c7be1f0edbd183b8780662f11976b9a736813bb2f036202b4018de83c58b

data/.rubocop.yml

@@ -17,10 +17,16 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 29
 
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
 Metrics/PerceivedComplexity:
   Exclude:
     - 'lib/geet/services/create_issue.rb'
 
+Style/ConditionalAssignment:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,13 +1,7 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-11-02 21:37:33 +0100 using RuboCop version 0.49.1.
+# on 2017-11-06 20:05:36 +0100 using RuboCop version 0.51.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
-# Configuration parameters: MinBodyLength.
-# Style/GuardClause:
-#   Exclude:
-#     - 'lib/geet/git/repository.rb'

data/README.md

@@ -6,8 +6,18 @@ The current version supports only creating PRs/issues.
 
 This tool is very similar to [Hub](https://github.com/github/hub), but it supports more complex operations, fully specified via command line.
 
+Please see the [development status](#development-status) section for informations about the current development.
+
 ## Samples
 
+### Prerequisite(s)
+
+Geet requires the `GITHUB_API_TOKEN` environment variable to be set, eg:
+
+    export GITHUB_API_TOKEN=0123456789abcdef0123456789abcdef
+
+All the commands need to be run from the git repository.
+
 ### Create an issue (with label and assignees)
 
 Basic creation of an issue (after creation, will open the page in the browser):
@@ -62,10 +72,18 @@ Create a public gist, with description:
 
 Display the help:
 
-    $ geet [command [subcommand]]--help
+    $ geet [command [subcommand]] --help
 
 Examples:
 
     $ geet --help
     $ geet pr --help
     $ geet pr create --help
+
+## Development status
+
+Geet is in alpha status. Although I use it daily, lots of features are being implemented, and internal/external APIs are frequently changed.
+
+The public release will be 1.0, and is expected to be released in January 2018 or earlier.
+
+The test suite is planned for v0.3.0. In case the project should have any user/developer besides me before that version, I will put any feature on hold, and build the full test suite.

data/bin/geet

@@ -22,16 +22,24 @@ when Helpers::ConfigurationHelper::GIST_CREATE_COMMAND
   Services::CreateGist.new.execute(repository, filename, options)
 when Helpers::ConfigurationHelper::ISSUE_CREATE_COMMAND
   title, description = options.values_at(:title, :description)
+  options[:milestone_pattern] = options.delete(:milestone) if options.key?(:milestone)
 
   Services::CreateIssue.new.execute(repository, title, description, options)
 when Helpers::ConfigurationHelper::ISSUE_LIST_COMMAND
   Services::ListIssues.new.execute(repository)
+when Helpers::ConfigurationHelper::LABEL_LIST_COMMAND
+  Services::ListLabels.new.execute(repository)
+when Helpers::ConfigurationHelper::MILESTONE_LIST_COMMAND
+  Services::ListMilestones.new.execute(repository)
 when Helpers::ConfigurationHelper::PR_CREATE_COMMAND
   title, description = options.values_at(:title, :description)
+  options[:milestone_pattern] = options.delete(:milestone) if options.key?(:milestone)
 
   Services::CreatePr.new.execute(repository, title, description, options)
 when Helpers::ConfigurationHelper::PR_LIST_COMMAND
   Services::ListPrs.new.execute(repository)
+when Helpers::ConfigurationHelper::PR_MERGE_COMMAND
+  Services::MergePr.new.execute(repository)
 else
   raise "Internal error - Unrecognized command #{command.inspect}"
 end

data/geet.gemspec

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 $LOAD_PATH << File.expand_path('lib', __dir__)
@@ -11,7 +10,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.2.0'
   s.authors     = ['Saverio Miroddi']
-  s.date        = '2017-11-06'
+  s.date        = '2017-11-08'
   s.email       = ['saverio.pub2@gmail.com']
   s.homepage    = 'https://github.com/saveriomiroddi/geet'
   s.summary     = 'Commandline interface for performing SCM (eg. GitHub) operations (eg. PR creation).'

data/lib/geet/git/repository.rb

@@ -14,10 +14,13 @@ module Geet
     class Repository
       extend Forwardable
 
+      def_delegators :@remote_repository, :abstract_issues
       def_delegators :@remote_repository, :collaborators, :labels
       def_delegators :@remote_repository, :create_gist
-      def_delegators :@remote_repository, :create_issue, :list_issues
-      def_delegators :@remote_repository, :create_pr, :list_prs
+      def_delegators :@remote_repository, :create_issue, :issues
+      def_delegators :@remote_repository, :labels
+      def_delegators :@remote_repository, :milestones
+      def_delegators :@remote_repository, :create_pr, :prs
       def_delegators :@account, :authenticated_user
 
       DOMAIN_PROVIDERS_MAPPING = {
@@ -68,8 +71,12 @@ module Geet
 
       # DATA
 
-      def current_head
-        `git rev-parse --abbrev-ref HEAD`.strip
+      def current_branch
+        branch = `git rev-parse --abbrev-ref HEAD`.strip
+
+        raise "Couldn't find current branch" if branch == 'HEAD'
+
+        branch
       end
 
       # OTHER

data/lib/geet/git_hub/abstract_issue.rb

@@ -2,62 +2,68 @@
 
 module Geet
   module GitHub
+    # It seems that autoloading will be deprecated, but it's currently the cleanest solution
+    # to the legitimate problem of AbstractIssue needing Issue/PR to be loaded (due to :list),
+    # and viceversa (due to class definition).
+    autoload :Issue, File.expand_path('issue', __dir__)
+    autoload :PR, File.expand_path('pr', __dir__)
+
     # For clarity, in this class we keep only the identical logic between the subclasses, but
     # other methods could be moved in here at some complexity cost.
     class AbstractIssue
-      attr_reader :issue_number
+      attr_reader :number, :title, :link
+
+      def initialize(number, api_helper, title, link)
+        @number = number
+        @api_helper = api_helper
+        @title = title
+        @link = link
+      end
 
-      # Returns an array of Struct(:number, :title); once this workflow is extended,
-      # the struct will likely be converted to a standard class.
-      #
       # See https://developer.github.com/v3/issues/#list-issues-for-a-repository
       #
-      # options:
-      #   filter: :pr, :issue, or nil
-      #
-      def self.list(api_helper, filter: nil)
+      def self.list(api_helper, milestone: nil)
         request_address = "#{api_helper.api_repo_link}/issues"
+        request_params = { milestone: milestone } if milestone
 
-        response = api_helper.send_request(request_address, multipage: true)
-        issue_class = Struct.new(:number, :title, :link)
+        response = api_helper.send_request(request_address, params: request_params, multipage: true)
 
-        response.each_with_object([]) do |issue_data, result|
-          include_issue = \
-            filter.nil? ||
-            filter == :pr && issue_data.key?('pull_request') ||
-            filter == :issue && !issue_data.key?('pull_request')
+        response.map do |issue_data|
+          number = issue_data.fetch('number')
+          title = issue_data.fetch('title')
+          link = issue_data.fetch('html_url')
 
-          if include_issue
-            number = issue_data.fetch('number')
-            title = issue_data.fetch('title')
-            link = issue_data.fetch('html_url')
+          klazz = issue_data.key?('pull_request') ? PR : Issue
 
-            result << issue_class.new(number, title, link)
-          end
+          klazz.new(number, api_helper, title, link)
         end
       end
 
-      def initialize(issue_number, api_helper)
-        @issue_number = issue_number
-        @api_helper = api_helper
-      end
-
       # params:
       #   users:   String, or Array of strings.
       #
       def assign_users(users)
         request_data = { assignees: Array(users) }
-        request_address = "#{@api_helper.api_repo_link}/issues/#{@issue_number}/assignees"
+        request_address = "#{@api_helper.api_repo_link}/issues/#{@number}/assignees"
 
         @api_helper.send_request(request_address, data: request_data)
       end
 
       def add_labels(labels)
         request_data = labels
-        request_address = "#{@api_helper.api_repo_link}/issues/#{@issue_number}/labels"
+        request_address = "#{@api_helper.api_repo_link}/issues/#{@number}/labels"
 
         @api_helper.send_request(request_address, data: request_data)
       end
+
+      # See https://developer.github.com/v3/issues/#edit-an-issue
+      #
+      def edit(milestone:)
+        request_address = "#{@api_helper.api_repo_link}/issues/#{@number}"
+        request_data = { milestone: milestone }
+
+        @api_helper.send_request(request_address, data: request_data, http_method: :patch)
+      end
     end
   end
 end

data/lib/geet/git_hub/api_helper.rb

@@ -36,16 +36,19 @@ module Geet
       # Returns the parsed response, or an Array, in case of multipage.
       #
       # params:
-      #   :data:        (Hash) if present, will generate a POST request
+      #   :params:      (Hash)
+      #   :data:        (Hash) if present, will generate a POST request, otherwise, a GET
       #   :multipage:   set true for paged GitHub responses (eg. issues); it will make the method
       #                 return an array, with the concatenated (parsed) responses
+      #   :http_method: :get, :patch, :post and :put are accepted, but only :patch/:put are meaningful,
+      #                 since the others are automatically inferred by :data.
       #
-      def send_request(address, data: nil, multipage: false)
+      def send_request(address, params: nil, data: nil, multipage: false, http_method: nil)
         # filled only on :multipage
         parsed_responses = []
 
         loop do
-          response = send_http_request(address, data: data)
+          response = send_http_request(address, params: params, data: data, http_method: http_method)
 
           parsed_response = JSON.parse(response.body)
 
@@ -66,17 +69,14 @@ module Geet
 
       private
 
-      def send_http_request(address, data: nil)
-        uri = URI(address)
+      def send_http_request(address, params: nil, data: nil, http_method: nil)
+        uri = encode_uri(address, params)
+        http_class = find_http_class(http_method, data)
 
         Net::HTTP.start(uri.host, use_ssl: true) do |http|
-          if data
-            request = Net::HTTP::Post.new(uri)
-            request.body = data.to_json
-          else
-            request = Net::HTTP::Get.new(uri)
-          end
+          request = http_class.new(uri)
 
+          request.body = data.to_json if data
           request.basic_auth @user, @api_token
           request['Accept'] = 'application/vnd.github.v3+json'
 
@@ -84,6 +84,12 @@ module Geet
         end
       end
 
+      def encode_uri(address, params)
+        address += '?' + URI.encode_www_form(params) if params
+
+        URI(address)
+      end
+
       def error?(response)
         !response['Status'].start_with?('2')
       end
@@ -118,6 +124,23 @@ module Geet
 
         link_header[0][/<(\S+)>; rel="next"/, 1]
       end
+
+      def find_http_class(http_method, data)
+        http_method ||= data ? :post : :get
+
+        case http_method
+        when :get
+          Net::HTTP::Get
+        when :patch
+          Net::HTTP::Patch
+        when :put
+          Net::HTTP::Put
+        when :post
+          Net::HTTP::Post
+        else
+          raise "Unsupported HTTP method: #{http_method.inspect}"
+        end
+      end
     end
   end
 end

data/lib/geet/git_hub/issue.rb

@@ -1,23 +1,38 @@
 # frozen_string_literal: true
 
-require_relative 'abstract_issue'
-
 module Geet
   module GitHub
-    class Issue < AbstractIssue
+    # See AbstractIssue for the circular dependency issue notes.
+    autoload :AbstractIssue, File.expand_path('abstract_issue', __dir__)
+
+    class Issue < Geet::GitHub::AbstractIssue
       def self.create(title, description, api_helper)
         request_address = "#{api_helper.api_repo_link}/issues"
         request_data = { title: title, body: description, base: 'master' }
 
         response = api_helper.send_request(request_address, data: request_data)
 
-        issue_number = response.fetch('number')
+        issue_number, title, link = response.fetch_values('number', 'title', 'html_url')
 
-        new(issue_number, api_helper)
+        new(issue_number, api_helper, title, link)
       end
 
-      def link
-        "#{@api_helper.repo_link}/issues/#{@issue_number}"
+      # See https://developer.github.com/v3/issues/#list-issues-for-a-repository
+      #
+      def self.list(api_helper)
+        request_address = "#{api_helper.api_repo_link}/issues"
+
+        response = api_helper.send_request(request_address, multipage: true)
+
+        response.each_with_object([]) do |issue_data, result|
+          if !issue_data.key?('pull_request')
+            number = issue_data.fetch('number')
+            title = issue_data.fetch('title')
+            link = issue_data.fetch('html_url')
+
+            result << new(number, api_helper, title, link)
+          end
+        end
       end
     end
   end

data/lib/geet/git_hub/milestone.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'date'
+
+module Geet
+  module GitHub
+    class Milestone
+      attr_reader :number, :title, :due_on
+
+      def initialize(number, title, due_on, api_helper)
+        @number = number
+        @title = title
+        @due_on = due_on
+
+        @api_helper = api_helper
+      end
+
+      # See https://developer.github.com/v3/issues/milestones/#get-a-single-milestone
+      #
+      def self.find(number, api_helper)
+        request_address = "#{api_helper.api_repo_link}/milestones/#{number}"
+
+        response = api_helper.send_request(request_address)
+
+        number = response.fetch('number')
+        title = response.fetch('title')
+        due_on = parse_due_on(response.fetch('due_on'))
+
+        new(number, title, due_on, api_helper)
+      end
+
+      # See https://developer.github.com/v3/issues/milestones/#list-milestones-for-a-repository
+      #
+      def self.list(api_helper)
+        request_address = "#{api_helper.api_repo_link}/milestones"
+
+        response = api_helper.send_request(request_address, multipage: true)
+
+        response.map do |milestone_data|
+          number = milestone_data.fetch('number')
+          title = milestone_data.fetch('title')
+          due_on = parse_due_on(milestone_data.fetch('due_on'))
+
+          new(number, title, due_on, api_helper)
+        end
+      end
+
+      class << self
+        private
+
+        def parse_due_on(raw_due_on)
+          Date.strptime(raw_due_on, '%FT%TZ') if raw_due_on
+        end
+      end
+    end
+  end
+end

data/lib/geet/git_hub/pr.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'abstract_issue'
-
 module Geet
   module GitHub
     class PR < AbstractIssue
+      # See AbstractIssue for the circular dependency issue notes.
+      autoload :AbstractIssue, File.expand_path('abstract_issue', __dir__)
+
+      # See https://developer.github.com/v3/pulls/#create-a-pull-request
+      #
       def self.create(repository, title, description, head, api_helper)
         request_address = "#{api_helper.api_repo_link}/pulls"
 
@@ -13,18 +16,39 @@ module Geet
 
         response = api_helper.send_request(request_address, data: request_data)
 
-        issue_number = response.fetch('number')
+        number, title, link = response.fetch_values('number', 'title', 'html_url')
 
-        new(issue_number, api_helper)
+        new(number, api_helper, title, link)
       end
 
-      def link
-        "#{@api_helper.repo_link}/pull/#{@issue_number}"
+      # See https://developer.github.com/v3/pulls/#list-pull-requests
+      #
+      def self.list(api_helper, head: nil)
+        request_address = "#{api_helper.api_repo_link}/pulls"
+        request_params = { head: head } if head
+
+        response = api_helper.send_request(request_address, params: request_params, multipage: true)
+
+        response.map do |issue_data|
+          number = issue_data.fetch('number')
+          title = issue_data.fetch('title')
+          link = issue_data.fetch('html_url')
+
+          new(number, api_helper, title, link)
+        end
+      end
+
+      # See https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
+      #
+      def merge
+        request_address = "#{@api_helper.api_repo_link}/pulls/#{number}/merge"
+
+        @api_helper.send_request(request_address, http_method: :put)
       end
 
       def request_review(reviewers)
         request_data = { reviewers: reviewers }
-        request_address = "#{@api_helper.api_repo_link}/pulls/#{@issue_number}/requested_reviewers"
+        request_address = "#{@api_helper.api_repo_link}/pulls/#{number}/requested_reviewers"
 
         @api_helper.send_request(request_address, data: request_data)
       end

data/lib/geet/git_hub/remote_repository.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'abstract_issue'
 require_relative 'api_helper'
 require_relative 'gist'
 require_relative 'issue'
+require_relative 'milestone'
 require_relative 'pr'
 
 module Geet
@@ -35,16 +37,28 @@ module Geet
         Geet::GitHub::Issue.create(title, description, @api_helper)
       end
 
-      def list_issues
-        Geet::GitHub::AbstractIssue.list(@api_helper, filter: :issue)
+      def abstract_issues(milestone: nil)
+        Geet::GitHub::AbstractIssue.list(@api_helper, milestone: milestone)
+      end
+
+      def issues
+        Geet::GitHub::Issue.list(@api_helper)
+      end
+
+      def milestone(number)
+        Geet::GitHub::Milestone.find(number, @api_helper)
+      end
+
+      def milestones
+        Geet::GitHub::Milestone.list(@api_helper)
       end
 
       def create_pr(title, description, head)
         Geet::GitHub::PR.create(@local_repository, title, description, head, @api_helper)
       end
 
-      def list_prs
-        Geet::GitHub::AbstractIssue.list(@api_helper, filter: :pr)
+      def prs(head: nil)
+        Geet::GitHub::PR.list(@api_helper, head: head)
       end
     end
   end

data/lib/geet/helpers/configuration_helper.rb

@@ -10,8 +10,11 @@ module Geet
       GIST_CREATE_COMMAND = 'gist.create'
       ISSUE_CREATE_COMMAND = 'issue.create'
       ISSUE_LIST_COMMAND = 'issue.list'
+      LABEL_LIST_COMMAND = 'label.list'
+      MILESTONE_LIST_COMMAND = 'milestone.list'
       PR_CREATE_COMMAND = 'pr.create'
       PR_LIST_COMMAND = 'pr.list'
+      PR_MERGE_COMMAND = 'pr.merge'
 
       # Command options
 
@@ -25,6 +28,7 @@ module Geet
       ISSUE_CREATE_OPTIONS = [
         ['-n', '--no-open-issue',                           "Don't open the issue link in the browser after creation"],
         ['-l', '--label-patterns "bug,help wanted"',        'Label patterns'],
+        ['-m', '--milestone number_or_pattern',             'Milestone number or description pattern'],
         ['-a', '--assignee-patterns john,tom,adrian,kevin', 'Assignee login patterns. Defaults to authenticated user'],
         ['-u', '--upstream',                                'Create on the upstream repository'],
         'title',
@@ -35,9 +39,16 @@ module Geet
         ['-u', '--upstream',                                'List on the upstream repository'],
       ].freeze
 
+      LABEL_LIST_OPTIONS = [
+      ].freeze
+
+      MILESTONE_LIST_OPTIONS = [
+      ].freeze
+
       PR_CREATE_OPTIONS = [
         ['-n', '--no-open-pr',                              "Don't open the PR link in the browser after creation"],
         ['-l', '--label-patterns "legacy,code review"',     'Label patterns'],
+        ['-m', '--milestone number_or_pattern',             'Milestone number or description pattern'],
         ['-r', '--reviewer-patterns john,tom,adrian,kevin', 'Reviewer login patterns'],
         ['-u', '--upstream',                                'Create on the upstream repository'],
         'title',
@@ -48,6 +59,11 @@ module Geet
         ['-u', '--upstream',                                'List on the upstream repository'],
       ].freeze
 
+      # rubocop:disable Style/MutableConstant
+      PR_MERGE_OPTIONS = [
+        long_help: 'Merge the PR for the current branch'
+      ]
+
       # Public interface
 
       def decode_argv
@@ -59,9 +75,16 @@ module Geet
             'create' => ISSUE_CREATE_OPTIONS,
             'list' => ISSUE_LIST_OPTIONS,
           },
+          'label' => {
+            'list' => LABEL_LIST_OPTIONS,
+          },
+          'milestone' => {
+            'list' => MILESTONE_LIST_OPTIONS,
+          },
           'pr' => {
             'create' => PR_CREATE_OPTIONS,
             'list' => PR_LIST_OPTIONS,
+            'merge' => PR_MERGE_OPTIONS,
           },
         )
       end

data/lib/geet/services/create_issue.rb

@@ -10,21 +10,25 @@ module Geet
 
       # options:
       #   :label_patterns
+      #   :milestone_pattern:     number or description pattern.
       #   :assignee_patterns
       #   :no_open_issue
       #
-      def execute(repository, title, description, label_patterns: nil, assignee_patterns: nil, no_open_issue: nil, **)
+      def execute(repository, title, description, label_patterns: nil, milestone_pattern: nil, assignee_patterns: nil, no_open_issue: nil, **)
         labels_thread = select_labels(repository, label_patterns) if label_patterns
+        milestone_thread = find_milestone(repository, milestone_pattern) if milestone_pattern
         assignees_thread = select_assignees(repository, assignee_patterns) if assignee_patterns
 
         selected_labels = labels_thread&.join&.value
         assignees = assignees_thread&.join&.value
+        milestone = milestone_thread&.join&.value
 
         puts 'Creating the issue...'
 
         issue = repository.create_issue(title, description)
 
         add_labels_thread = add_labels(issue, selected_labels) if selected_labels
+        set_milestone_thread = set_milestone(issue, milestone) if milestone
 
         if assignees
           assign_users_thread = assign_users(issue, assignees)
@@ -33,6 +37,7 @@ module Geet
         end
 
         add_labels_thread&.join
+        set_milestone_thread&.join
         assign_users_thread.join
 
         if no_open_issue
@@ -56,6 +61,20 @@ module Geet
         end
       end
 
+      def find_milestone(repository, milestone_pattern)
+        puts 'Finding milestone...'
+
+        Thread.new do
+          if milestone_pattern =~ /\A\d+\Z/
+            repository.milestone(milestone_pattern)
+          else
+            all_milestones = repository.milestones
+
+            select_entries(all_milestones, milestone_pattern, type: 'milestones', instance_method: :title).first
+          end
+        end
+      end
+
       def select_assignees(repository, assignee_patterns)
         puts 'Finding collaborators...'
 
@@ -74,6 +93,14 @@ module Geet
         end
       end
 
+      def set_milestone(issue, milestone)
+        puts "Setting milestone #{milestone.title}..."
+
+        Thread.new do
+          issue.edit(milestone: milestone.number)
+        end
+      end
+
       def assign_users(issue, users)
         puts "Assigning users #{users.join(', ')}..."
 
@@ -92,11 +119,14 @@ module Geet
 
       # Generic helpers
 
-      def select_entries(entries, raw_patterns, type: 'entries')
+      def select_entries(entries, raw_patterns, type: 'entries', instance_method: nil)
         patterns = raw_patterns.split(',')
 
         patterns.map do |pattern|
-          entries_found = entries.select { |label| label =~ /#{pattern}/i }
+          entries_found = entries.select do |entry|
+            entry = entry.send(instance_method) if instance_method
+            entry =~ /#{pattern}/i
+          end
 
           case entries_found.size
           when 1

data/lib/geet/services/create_pr.rb

@@ -3,8 +3,6 @@
 require_relative '../helpers/os_helper.rb'
 require_relative '../git/repository.rb'
 
-require 'thread'
-
 module Geet
   module Services
     class CreatePr
@@ -15,21 +13,25 @@ module Geet
       #   :reviewer_patterns
       #   :no_open_pr
       #
-      def execute(repository, title, description, label_patterns: nil, reviewer_patterns: nil, no_open_pr: nil, **)
+      def execute(repository, title, description, label_patterns: nil, milestone_pattern: nil, reviewer_patterns: nil, no_open_pr: nil, **)
         labels_thread = select_labels(repository, label_patterns) if label_patterns
+        milestone_thread = find_milestone(repository, milestone_pattern) if milestone_pattern
         reviewers_thread = select_reviewers(repository, reviewer_patterns) if reviewer_patterns
 
-        selected_labels = selected_labels&.join&.value
+        selected_labels = labels_thread&.join&.value
         reviewers = reviewers_thread&.join&.value
+        milestone = milestone_thread&.join&.value
 
         pr = create_pr(repository, title, description)
 
         assign_user_thread = assign_authenticated_user(pr, repository)
         add_labels_thread = add_labels(pr, selected_labels) if selected_labels
+        set_milestone_thread = set_milestone(pr, milestone) if milestone
         request_review_thread = request_review(pr, reviewers) if reviewers
 
         assign_user_thread.join
         add_labels_thread&.join
+        set_milestone_thread&.join
         request_review_thread&.join
 
         if no_open_pr
@@ -53,6 +55,20 @@ module Geet
         end
       end
 
+      def find_milestone(repository, milestone_pattern)
+        puts 'Finding milestone...'
+
+        Thread.new do
+          if milestone_pattern =~ /\A\d+\Z/
+            repository.milestone(milestone_pattern)
+          else
+            all_milestones = repository.milestones
+
+            select_entries(all_milestones, milestone_pattern, type: 'milestones', instance_method: :title).first
+          end
+        end
+      end
+
       def select_reviewers(repository, reviewer_patterns)
         puts 'Finding collaborators...'
 
@@ -66,7 +82,7 @@ module Geet
       def create_pr(repository, title, description)
         puts 'Creating PR...'
 
-        pr = repository.create_pr(title, description, repository.current_head)
+        repository.create_pr(title, description, repository.current_branch)
       end
 
       def assign_authenticated_user(pr, repository)
@@ -85,6 +101,14 @@ module Geet
         end
       end
 
+      def set_milestone(pr, milestone)
+        puts "Setting milestone #{milestone.title}..."
+
+        Thread.new do
+          pr.edit(milestone: milestone.number)
+        end
+      end
+
       def request_review(pr, reviewers)
         puts "Requesting review from #{reviewers.join(', ')}..."
 
@@ -95,11 +119,14 @@ module Geet
 
       # Generic helpers
 
-      def select_entries(entries, raw_patterns, type: 'entries')
+      def select_entries(entries, raw_patterns, type: 'entries', instance_method: nil)
         patterns = raw_patterns.split(',')
 
         patterns.map do |pattern|
-          entries_found = entries.select { |label| label =~ /#{pattern}/i }
+          entries_found = entries.select do |entry|
+            entry = entry.send(instance_method) if instance_method
+            entry =~ /#{pattern}/i
+          end
 
           case entries_found.size
           when 1

data/lib/geet/services/list_issues.rb

@@ -4,7 +4,7 @@ module Geet
   module Services
     class ListIssues
       def execute(repository)
-        issues = repository.list_issues
+        issues = repository.issues
 
         issues.each do |issue|
           puts "#{issue.number}. #{issue.title} (#{issue.link})"

data/lib/geet/services/list_labels.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Geet
+  module Services
+    class ListLabels
+      def execute(repository)
+        labels = repository.labels
+
+        labels.each do |label|
+          puts "- #{label}"
+        end
+      end
+    end
+  end
+end

data/lib/geet/services/list_milestones.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Geet
+  module Services
+    class ListMilestones
+      def execute(repository)
+        milestones = find_milestones(repository)
+        issues_by_milestone_number = find_milestone_issues(repository, milestones)
+
+        puts
+
+        milestones.each do |milestone|
+          puts milestone_description(milestone)
+
+          milestone_issues = issues_by_milestone_number[milestone.number]
+
+          milestone_issues.each do |issue|
+            puts "  #{issue.number}. #{issue.title} (#{issue.link})"
+          end
+        end
+      end
+
+      private
+
+      # Not included in the Milestone class because descriptions (which will be customizable)
+      # are considered formatters, conceptually external to the class.
+      def milestone_description(milestone)
+        description = "#{milestone.number}. #{milestone.title}"
+        description += " (due #{milestone.due_on})" if milestone.due_on
+        description
+      end
+
+      def find_milestones(repository)
+        puts 'Finding milestones...'
+
+        repository.milestones
+      end
+
+      def find_milestone_issues(repository, milestones)
+        puts 'Finding issues...'
+
+        # Interestingly, on MRI, concurrent hash access is not a problem without mutex,
+        # since due to the GIL, only one thread at a time will actually access it.
+        issues_by_milestone_number = {}
+        mutex = Mutex.new
+
+        issue_threads = milestones.map do |milestone|
+          Thread.new do
+            issues = repository.abstract_issues(milestone: milestone.number)
+
+            mutex.synchronize do
+              issues_by_milestone_number[milestone.number] = issues
+            end
+          end
+        end
+
+        issue_threads.map(&:join)
+
+        issues_by_milestone_number
+      end
+    end
+  end
+end

data/lib/geet/services/list_prs.rb

@@ -4,7 +4,7 @@ module Geet
   module Services
     class ListPrs
       def execute(repository)
-        prs = repository.list_prs
+        prs = repository.prs
 
         prs.each do |pr|
           puts "#{pr.number}. #{pr.title} (#{pr.link})"

data/lib/geet/services/merge_pr.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Geet
+  module Services
+    class MergePr
+      def execute(repository)
+        merge_head = find_merge_head(repository)
+        pr = checked_find_branch_pr(repository, merge_head)
+        merge_pr(pr)
+      end
+
+      private
+
+      def find_merge_head(repository)
+        repository.current_branch
+      end
+
+      # Expect to find only one.
+      def checked_find_branch_pr(repository, head)
+        puts "Finding PR with head (#{head})..."
+
+        prs = repository.prs(head: head)
+
+        raise "Expected to find only one PR for the current branch; found: #{prs.size}" if prs.size != 1
+
+        prs[0]
+      end
+
+      def merge_pr(pr)
+        puts "Merging PR ##{pr.number}..."
+
+        pr.merge
+      end
+    end
+  end
+end

data/lib/geet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geet
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -48,6 +48,7 @@ files:
 - lib/geet/git_hub/api_helper.rb
 - lib/geet/git_hub/gist.rb
 - lib/geet/git_hub/issue.rb
+- lib/geet/git_hub/milestone.rb
 - lib/geet/git_hub/pr.rb
 - lib/geet/git_hub/remote_repository.rb
 - lib/geet/helpers/configuration_helper.rb
@@ -56,7 +57,10 @@ files:
 - lib/geet/services/create_issue.rb
 - lib/geet/services/create_pr.rb
 - lib/geet/services/list_issues.rb
+- lib/geet/services/list_labels.rb
+- lib/geet/services/list_milestones.rb
 - lib/geet/services/list_prs.rb
+- lib/geet/services/merge_pr.rb
 - lib/geet/version.rb
 homepage: https://github.com/saveriomiroddi/geet
 licenses: