new functionality for review #99

meesterdude · 2015-05-13T23:52:43Z

I find that using a reflow a lot, i lose track of the PR's it creates, and have a hard time picking up where i left off.

This makes several changes:

like git commit, if you do not pass in the message (or title, in this case) it will prompt you with an editor; first line is the title, rest is the body. This is a change of the default behavior of the review command, but it's more in line with what I'd expect to happen.
if you pass the title and/or the body options to review, it will use that and default to the branch/last commit, if you left either off.
updates the default title to be the branch name, default body to be the last commit
prints the PR on the command line to look over
prompts user before submitting PR; default is yes (enter)
adds an -e flag that allows you to edit in the editor, prefilled with what the default message would be (branch title, last commit body)
updates README to reflect new workflow
bumps version to 0.6.0 per major.minor.bugfix methodology

…e message that would normally be commited

nhance · 2015-05-14T03:31:52Z

lib/git_reflow/commands/review.rb

+    end
+
+    if editor
+      system('nano', commit_msg_file)


Let's use $EDITOR if it's set, cause nano would make me lose my mind

would love to - but i couldn't find a solution that worked. got an example i can run with?

$EDITOR is pretty standard, and we're only supporting OS X and Ubuntu for now. Also, you'll want to take advantage of GitReflow.run for running any system commands (see ref). You can accomplish this with GitReflow.run("$EDITOR #{commit_msg_file}")

@codenamev i tried the code you mentioned - it just hangs, can't even ctrl+C, have to kill -9 in another terminal. I think its around sourcing the environment variables. Maybe we default to nano, and allow cfg to set preference? nano is the least controversial as a default

ah right, I forgot you need GitReflow.run("$EDITOR #{commit_msg_file}", with_system: true) to run it as system instead of backticks

nhance · 2015-05-14T03:32:07Z

I really like this

codenamev · 2015-05-14T12:14:26Z

lib/git_reflow/commands/review.rb


-    review_options['title'] ||=  GitReflow.get_first_commit_message
-    review_options['body']  ||=  review_options['title']
+    commit_msg_file = '/tmp/git_reflow_pr_msg'


I don't think we can guarantee that every system will have a /tmp directory. can we use the .git directory and create another file like git does with the commit messages? maybe .git/GIT_REFLOW_PR_MSG

the naming here is throwing me too after reading more code below. let's rename commit_msg_file to pull_request_msg_file

codenamev · 2015-05-14T13:00:51Z

yeah, HUGE 👍 from me on this too 😸 great work!

codenamev · 2015-05-14T13:06:50Z

lib/git_reflow/commands/review.rb

+    puts "Body:\n#{review_options['body']}\n"
+    puts "--------\n"
+    puts "Submit PR? (Y/n):"
+    exit 0 if STDIN.gets.chop.downcase =~ /n/


we're using the highline gem for input: GitReflow.review review_options if ask("Submit pull request? (y/n)") =~ /y/i

uses ask instead of custom prompting renames variable commit_msg_file to pull_request_msg_file

…avior, and the opposite is inferred

meesterdude · 2015-05-14T21:05:33Z

ok, updated this.

I addressed most of val's concerns. One of them, the use_editor idea i tried but found the code to be less clear, so i undid.

I removed the -e flag, it'll always provide the branch name as the title, at least as a starting point; i will be confused with a blank editor.
simplified some of the code.
removed extra space that might appear between title and body
updated the prompt to be clearer what the default will be with enter key

codenamev · 2015-05-15T11:50:53Z

lib/git_reflow/commands/review.rb

+        'title' => (global_options[:title]   || GitReflow.current_branch),
+        'body' =>  global_options[:message]
+      }
+      editor = false


it still seems strange to have this here... why can't we just change line 22 into an else?

merge project into local

Conflicts: lib/git_reflow/version.rb

meesterdude · 2015-05-15T17:52:26Z

@codenamev updated with your suggestions

codenamev · 2015-05-15T17:57:44Z

LGTM

nhance · 2015-05-15T18:01:43Z

lgtm

meesterdude · 2015-05-15T18:10:38Z

thanks lads!

review command now prompts with editor if title or body options are not provided

@codenamev

LGTM given by: @codenamev, @nhance Closes #99 Squashed commit of the following: commit c5d7be7 Author: Russell Jennings <[email protected]> Date: Fri May 15 13:51:46 2015 -0400 bumps version to 0.6.0 commit 4fa4e75 Author: Russell Jennings <[email protected]> Date: Fri May 15 13:44:39 2015 -0400 updates review command logic, and updates to use git root directory commit 92ef82c Author: Russell Jennings <[email protected]> Date: Fri May 15 13:43:59 2015 -0400 updates readme to remove -e documentation, no longer valid commit d7ef891 Author: Russell Jennings <[email protected]> Date: Thu May 14 17:01:34 2015 -0400 changes prompt question to only show what enter will do; clearer behavior, and the opposite is inferred commit 0fa557f Author: Russell Jennings <[email protected]> Date: Thu May 14 17:00:07 2015 -0400 updates to use whatever the user has defined as commit f9882df Author: Russell Jennings <[email protected]> Date: Thu May 14 15:49:28 2015 -0400 [cmd] updates code per PR uses ask instead of custom prompting renames variable commit_msg_file to pull_request_msg_file commit 3c11bdd Author: Russell Jennings <[email protected]> Date: Wed May 13 19:51:42 2015 -0400 [lib] expands on review functionality and adds ability to exit commit 727594b Author: Russell Jennings <[email protected]> Date: Wed May 13 19:50:53 2015 -0400 [doc] updatyes README with new workflow info commit 970c73c Author: Russell Jennings <[email protected]> Date: Wed May 13 19:15:35 2015 -0400 [lib] updates review command commit 48c60ea Author: Russell Jennings <[email protected]> Date: Wed May 13 18:54:18 2015 -0400 [lib] fixes missing end commit ea9b522 Author: Russell Jennings <[email protected]> Date: Wed May 13 18:51:54 2015 -0400 [lib] updates review.rb to open editor and adds -e option to edit the message that would normally be commited commit be491dc Author: Russell Jennings <[email protected]> Date: Wed May 13 18:51:18 2015 -0400 [version] bumps from 0.5.2 to 0.6.0 per major.minor.bugfix methodology

meesterdude added 6 commits May 13, 2015 18:51

[version] bumps from 0.5.2 to 0.6.0 per major.minor.bugfix methodology

be491dc

[lib] updates review.rb to open editor and adds -e option to edit th…

ea9b522

…e message that would normally be commited

[lib] fixes missing end

48c60ea

[lib] updates review command

970c73c

[doc] updatyes README with new workflow info

727594b

[lib] expands on review functionality and adds ability to exit

3c11bdd

nhance reviewed May 14, 2015
View reviewed changes

codenamev reviewed May 14, 2015
View reviewed changes

meesterdude added 3 commits May 14, 2015 15:49

[cmd] updates code per PR

f9882df

uses ask instead of custom prompting renames variable commit_msg_file to pull_request_msg_file

updates to use whatever the user has defined as

0fa557f

changes prompt question to only show what enter will do; clearer beh…

d7ef891

…avior, and the opposite is inferred

codenamev reviewed May 15, 2015
View reviewed changes

meesterdude added 6 commits May 15, 2015 13:43

updates readme to remove -e documentation, no longer valid

92ef82c

updates review command logic, and updates to use git root directory

4fa4e75

Merge pull request #7 from reenhanced/master

d834a77

merge project into local

Merge branch 'master' of github.com:meesterdude/gitreflow

b02e02f

Conflicts: lib/git_reflow/version.rb

Merge branch 'master' into rj_test

2738e12

bumps version to 0.6.0

c5d7be7

meesterdude added a commit that referenced this pull request May 15, 2015

Merge pull request #99 from meesterdude/rj_test

a081644

review command now prompts with editor if title or body options are not provided

meesterdude merged commit a081644 into reenhanced:master May 15, 2015

meesterdude deleted the rj_test branch May 15, 2015 18:11

meesterdude restored the rj_test branch May 15, 2015 18:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

new functionality for review #99

new functionality for review #99

meesterdude commented May 13, 2015

nhance May 14, 2015

meesterdude May 14, 2015

codenamev May 14, 2015

meesterdude May 14, 2015

codenamev May 14, 2015

nhance commented May 14, 2015

codenamev May 14, 2015

codenamev May 14, 2015

codenamev commented May 14, 2015

codenamev May 14, 2015

meesterdude commented May 14, 2015

codenamev May 15, 2015

meesterdude commented May 15, 2015

codenamev commented May 15, 2015

nhance commented May 15, 2015

meesterdude commented May 15, 2015

new functionality for review #99

new functionality for review #99

Conversation

meesterdude commented May 13, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nhance commented May 14, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codenamev commented May 14, 2015

Choose a reason for hiding this comment

meesterdude commented May 14, 2015

Choose a reason for hiding this comment

meesterdude commented May 15, 2015

codenamev commented May 15, 2015

nhance commented May 15, 2015

meesterdude commented May 15, 2015