geet 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e8a6a20ed456c7b17bfde4830eb57877163ef09487de59b67238011638177a
-  data.tar.gz: 2e0205cbd2447689d9fdcf55fd1a8bdba9de5c72301aff16823cc4baf2a7c2bc
+  metadata.gz: 65b80e94214a854c8cf6407560d97051f4882cdd11b34f9c3031b2b288a9a2c6
+  data.tar.gz: b9eba4b14a9238c3ea09cb9d370ad91a6768ce8ca4d3ca5a4b7c93d29bc56bad
 SHA512:
-  metadata.gz: 6a493c1b2ab0250859d215f06271f27d2c2caabcc819c049623d644a12351ceaaca7668ad765f62887317de36c2213847addb9e95aeba258ee7263d70f58e3f6
-  data.tar.gz: a9774631c431a33e6a6eb9851953e3294978086ecc51ebe1d3f9e33b2a64392a796c1894019ce9f1515186f81d8800f659dde509d325c84f1dc628e1df02370f
+  metadata.gz: 07c2b9f337bc0f3e3b991f4bd6e95d61f5827a2fcb00fafb265efe260ca73636e4c0fcf29ba688038ee670032cbca84a620ef65aaa4ddebb25f0cb337ba5a86e
+  data.tar.gz: 1f56fce624d2f9252d3b99ce9ddc0b71bf0674e8ff2e0339a219edf35fc0a4faa094c42030ff97f88798e0df724d38f72465dad2e0d7b6bd2a8d6fae4090e971

data/bin/geet

@@ -49,7 +49,7 @@ class GeetLauncher
     when MILESTONE_LIST_COMMAND
       Services::ListMilestones.new(repository).execute
     when PR_CREATE_COMMAND
-      summary = options[:summary] || edit_pr_summary
+      summary = options[:summary] || edit_pr_summary(base: options[:base])
       title, description = split_summary(summary)
 
       options = default_to_manual_selection(options, :labels, :milestone, :reviewers)
@@ -66,11 +66,13 @@ class GeetLauncher
 
   private
 
-  def edit_pr_summary
+  def edit_pr_summary(base: nil)
+    base ||= 'master'
+
     # Tricky. It would be best to have Git logic exlusively inside the services,
     # but at the same time, the summary editing should be out.
     git = Utils::GitClient.new
-    pr_commits = git.cherry('master')
+    pr_commits = git.cherry(base)
 
     if pr_commits.size == 1
       prepopulated_summary = git.show_description('HEAD')

data/geet.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.3.0'
   s.authors     = ['Saverio Miroddi']
-  s.date        = '2018-04-01'
+  s.date        = '2018-04-12'
   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/commandline/configuration.rb

@@ -52,6 +52,7 @@ module Geet
       PR_CREATE_OPTIONS = [
         ['-A', '--automated-mode',                          "Automate the branch operations (see long help)"],
         ['-n', '--no-open-pr',                              "Don't open the PR link in the browser after creation"],
+        ['-b', '--base develop',                            "Specify the base branch; defaults to `master`"],
         ['-l', '--labels "legacy,code review"',             'Labels'],
         ['-m', '--milestone 1.5.0',                         'Milestone title pattern'],
         ['-r', '--reviewers john,tom,adrian,kevin',         'Reviewer logins'],

data/lib/geet/git/repository.rb

@@ -70,11 +70,11 @@ module Geet
         attempt_provider_call(:Milestone, :list, api_interface)
       end
 
-      def create_pr(title, description, head)
+      def create_pr(title, description, head, base: nil)
         confirm(LOCAL_ACTION_ON_UPSTREAM_REPOSITORY_MESSAGE) if local_action_on_upstream_repository? && @warnings
         confirm(ACTION_ON_PROTECTED_REPOSITORY_MESSAGE) if action_on_protected_repository? && @warnings
 
-        attempt_provider_call(:PR, :create, title, description, head, api_interface)
+        attempt_provider_call(:PR, :create, title, description, head, api_interface, base: base)
       end
 
       def prs(head: nil)

data/lib/geet/github/pr.rb

@@ -8,15 +8,16 @@ module Geet
     class PR < AbstractIssue
       # See https://developer.github.com/v3/pulls/#create-a-pull-request
       #
-      def self.create(title, description, head, api_interface)
+      def self.create(title, description, head, api_interface, base: nil)
         api_path = 'pulls'
+        base ||= 'master'
 
         if api_interface.upstream?
           authenticated_user = Geet::Github::User.authenticated(api_interface).username
           head = "#{authenticated_user}:#{head}"
         end
 
-        request_data = { title: title, body: description, head: head, base: 'master' }
+        request_data = { title: title, body: description, head: head, base: base }
 
         response = api_interface.send_request(api_path, data: request_data)
 

data/lib/geet/services/create_pr.rb

@@ -23,7 +23,7 @@ module Geet
       #
       def execute(
         title, description, labels: nil, milestone: nil, reviewers: nil,
-        no_open_pr: nil, automated_mode: false, **
+        base: nil, no_open_pr: nil, automated_mode: false, **
       )
         ensure_clean_tree if automated_mode
 
@@ -37,7 +37,7 @@ module Geet
 
         sync_with_upstream_branch if automated_mode
 
-        pr = create_pr(title, description)
+        pr = create_pr(title, description, base)
 
         if user_has_write_permissions
           edit_pr(pr, selected_labels, selected_milestone, selected_reviewers)
@@ -93,10 +93,10 @@ module Geet
         end
       end
 
-      def create_pr(title, description)
+      def create_pr(title, description, base)
         @out.puts 'Creating PR...'
 
-        @repository.create_pr(title, description, @git_client.current_branch)
+        @repository.create_pr(title, description, @git_client.current_branch, base: base)
       end
 
       def edit_pr(pr, labels, milestone, reviewers)

data/lib/geet/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-01 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting