git_reflow 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6773486dad59a6ec3d71cd0047234005b8d06f1
-  data.tar.gz: 07665f57499a6aab0bd31218a0bf8d5e147c8581
+  metadata.gz: b9d16b34d650be359faa1d19b5984cad9af10aae
+  data.tar.gz: 067b869fe2e45df0162b308cd1fddf60618f8b49
 SHA512:
-  metadata.gz: 930b0d1bb58185c59c0d759ef2aad44a10d2b2481bd78843f842c4b703c4b4770a29574cb34be888d01035db40fd66f10df45e343427c2fafee37e06791a1602
-  data.tar.gz: 8aa0cbcf0db37dcbb527f2275cef16125d7f736a18787700e1fc16c2934b68ac75f0f0e2713d1790c5e90efca256926be9df200f3baa61ae8aae427411facd1c
+  metadata.gz: 1ee6a2721fe04f0ab7bedc0dbf75100aad1398824d00387022ff7faf5fcb99f507743a5388ad287e267f95a23fb4975d14da4dfba25bba270108874aefd46297
+  data.tar.gz: 5f85cac1cab156f241684fa5181218cfcbc7e21ea0568f29d6d6882759f59a605d20c30c520b4f314eabfbb7b087c8cedb1cd25a707985d2800f231efb0437f5

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .rspec
 gemfiles
 *.gem
+.byebug_history

data/Appraisals

@@ -7,6 +7,6 @@ appraise "latest-github-api-release" do
 end
 
 appraise "current-reflow-locked-versions" do
-  gem "gli", "2.13.2"
-  gem "github_api", "0.12.4"
+  gem "gli", "2.14.0"
+  gem "github_api", "0.14.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,80 @@
 # Change Log
 
+## [0.8.0](https://github.com/reenhanced/gitreflow/tree/v0.8.0) (2016-05-26)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.5...v0.8.0)
+
+**Implemented enhancements:**
+
+- Upgrade RSpec [\#162](https://github.com/reenhanced/gitreflow/issues/162)
+
+**Closed issues:**
+
+- Setup doesn't work with GH two-factor turned on [\#175](https://github.com/reenhanced/gitreflow/issues/175)
+- --base switch does not work? [\#174](https://github.com/reenhanced/gitreflow/issues/174)
+- Idea: git reflow promote \<promotion branch\> [\#168](https://github.com/reenhanced/gitreflow/issues/168)
+- add changelog support [\#100](https://github.com/reenhanced/gitreflow/issues/100)
+- Always have reflow start create a branch from master [\#66](https://github.com/reenhanced/gitreflow/issues/66)
+
+**Merged pull requests:**
+
+- Cleanup new Github merge for next release [\#172](https://github.com/reenhanced/gitreflow/pull/172) ([codenamev](https://github.com/codenamev))
+- Bug Fix for Merging "reenhanced:master" instead of "master" [\#171](https://github.com/reenhanced/gitreflow/pull/171) ([simonzhu24](https://github.com/simonzhu24))
+- Sz issue/149 fix commit message to merge instead of close [\#170](https://github.com/reenhanced/gitreflow/pull/170) ([simonzhu24](https://github.com/simonzhu24))
+- Fixing Refresh to take in parameter for "base" instead of "branch" [\#169](https://github.com/reenhanced/gitreflow/pull/169) ([simonzhu24](https://github.com/simonzhu24))
+- \[Issue \#66\] Always have reflow start create a branch from master [\#167](https://github.com/reenhanced/gitreflow/pull/167) ([simonzhu24](https://github.com/simonzhu24))
+- \[162\] Updating Rspec Version to 3.3.0 [\#165](https://github.com/reenhanced/gitreflow/pull/165) ([simonzhu24](https://github.com/simonzhu24))
+- \[Issue \#66 + \#74\] Implementing "Git Reflow Refresh" [\#164](https://github.com/reenhanced/gitreflow/pull/164) ([simonzhu24](https://github.com/simonzhu24))
+- \[issue: 162\] Updating Rspecs: Use "Allow" instead of "Stub" [\#163](https://github.com/reenhanced/gitreflow/pull/163) ([simonzhu24](https://github.com/simonzhu24))
+
+## [v0.7.5](https://github.com/reenhanced/gitreflow/tree/v0.7.5) (2016-04-14)
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.4...v0.7.5)
+
+**Implemented enhancements:**
+
+- Modernize gem file structure [\#158](https://github.com/reenhanced/gitreflow/issues/158)
+
+**Closed issues:**
+
+- Remove unused gitreflow-common [\#154](https://github.com/reenhanced/gitreflow/issues/154)
+- Option to require LGTM from only one person? [\#141](https://github.com/reenhanced/gitreflow/issues/141)
+
+**Merged pull requests:**
+
+- \[Issue \#141\] Fixing Issues and Adding Configurable Nx LGTM and LGTM Regex Options, Adding Rspec Tests [\#161](https://github.com/reenhanced/gitreflow/pull/161) ([simonzhu24](https://github.com/simonzhu24))
+- modernize gem structure; Fixes \#158 [\#159](https://github.com/reenhanced/gitreflow/pull/159) ([pboling](https://github.com/pboling))
+- Remove unused gitreflow-common [\#155](https://github.com/reenhanced/gitreflow/pull/155) ([pboling](https://github.com/pboling))
+
+## [v0.7.4](https://github.com/reenhanced/gitreflow/tree/v0.7.4) (2016-04-08)
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.3...v0.7.4)
+
+**Fixed bugs:**
+
+- Deliver command doesn't sync feature branch before merge [\#152](https://github.com/reenhanced/gitreflow/issues/152)
+- SSL Verification is turned off [\#151](https://github.com/reenhanced/gitreflow/issues/151)
+
+## [v0.7.3](https://github.com/reenhanced/gitreflow/tree/v0.7.3) (2016-03-24)
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.2...v0.7.3)
+
+**Fixed bugs:**
+
+- Setting title is ignored from review [\#127](https://github.com/reenhanced/gitreflow/issues/127)
+- Don't open EDITOR if there is an existing PR for this branch [\#123](https://github.com/reenhanced/gitreflow/issues/123)
+
+**Closed issues:**
+
+- add "Created With Reflow" [\#101](https://github.com/reenhanced/gitreflow/issues/101)
+- Store OAuth token somewhere else? [\#54](https://github.com/reenhanced/gitreflow/issues/54)
+
+## [v0.7.2](https://github.com/reenhanced/gitreflow/tree/v0.7.2) (2016-02-22)
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.1...v0.7.2)
+
+**Closed issues:**
+
+- git: 'reflow' is not a git command. See 'git --help' [\#146](https://github.com/reenhanced/gitreflow/issues/146)
+- option to use non-master branch by default everywhere [\#145](https://github.com/reenhanced/gitreflow/issues/145)
+- Deliver to custom branch? [\#144](https://github.com/reenhanced/gitreflow/issues/144)
+
 ## [v0.7.1](https://github.com/reenhanced/gitreflow/tree/v0.7.1) (2015-10-27)
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.0...v0.7.1)
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.7.5)
+    git_reflow (0.8.0)
       colorize (>= 0.7.0)
-      github_api (= 0.12.4)
-      gli (= 2.13.2)
+      github_api (= 0.14.0)
+      gli (= 2.14.0)
       highline
       httpclient
       reenhanced_bitbucket_api (= 0.3.2)
@@ -13,11 +13,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    appraisal (1.0.3)
+    appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    byebug (8.2.2)
+    byebug (9.0.4)
     chronic (0.10.2)
     coderay (1.1.1)
     colorize (0.7.7)
@@ -30,24 +30,22 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.2)
       faraday (>= 0.7.4, < 0.10)
-    github_api (0.12.4)
-      addressable (~> 2.3)
+    github_api (0.14.0)
+      addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.6)
       oauth2
-    gli (2.13.2)
+    gli (2.14.0)
     hashdiff (0.3.0)
-    hashie (3.4.3)
+    hashie (3.4.4)
     highline (1.7.8)
-    httpclient (2.7.1)
+    httpclient (2.8.0)
     json (1.8.3)
     jwt (1.5.1)
     method_source (0.8.2)
     mini_portile2 (2.0.0)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.7.2)
@@ -62,11 +60,11 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.3.0)
-      byebug (~> 8.0)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
       pry (~> 0.10)
     rack (1.6.4)
-    rake (10.5.0)
+    rake (11.1.2)
     rdoc (4.2.2)
       json (~> 1.4)
     reenhanced_bitbucket_api (0.3.2)
@@ -76,43 +74,44 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (>= 1.5.2)
       simple_oauth (>= 0.3.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     safe_yaml (1.0.4)
     simple_oauth (0.3.1)
     slop (3.6.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    webmock (1.24.0)
+    webmock (2.0.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    wwtd (0.7.0)
+    wwtd (1.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 1.0.3)
-  bundler (~> 1.11)
+  appraisal (= 2.1.0)
+  bundler (~> 1.12)
   chronic
   git_reflow!
   pry-byebug
-  rake (~> 10.0)
+  rake (~> 11.0)
   rdoc
-  rspec (~> 3.0)
+  rspec (~> 3.4.0)
   webmock
-  wwtd (= 0.7.0)
+  wwtd (= 1.3.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.3

data/README.rdoc

@@ -1,6 +1,14 @@
 = git-reflow (2015 Fukuoka Ruby Award Winner)
 
-{<img src="https://circleci.com/gh/reenhanced/gitreflow/tree/master.svg?style=svg" alt="Circle CI" />}[https://circleci.com/gh/reenhanced/gitreflow/tree/master]
+{<img src="https://circleci.com/gh/reenhanced/gitreflow.svg?style=svg" alt="Circle CI" />}[https://circleci.com/gh/reenhanced/gitreflow]
+{<img src="https://img.shields.io/badge/git--reflow-v0.7.5-blue.svg?style=flat&link=https://github.com/reenhanced/gitreflow" alt="Git workflow powered by git-reflow" />}[https://github.com/reenhanced/gitreflow]
+{<img
+src="https://img.shields.io/badge/git--reflow-v0.7.5-blue.svg?style=flat&link=http://www.rubydoc.info/gems/git_reflow"
+alt="Git workflow powered by git-reflow"
+/>}[http://www.rubydoc.info/gems/git_reflow]
+{<img src="http://inch-ci.org/github/reenhanced/gitreflow.svg?branch=master&style=shields" alt="Documentation" />}[http://inch-ci.org/github/reenhanced/gitreflow]
+
+{RDocs}[http://www.rubydoc.info/gems/git_reflow]
 
 http://reenhanced.com/reflow/git-reflow-deliver.gif
 
@@ -20,10 +28,10 @@ Reflow automatically creates pull requests, ensures the code review is approved,
 Create and switch to new branch +nh-branchy-branch+:
   $ git reflow start nh-branchy-branch
 
-Create a pull request for your branch against +master+:
+Create a pull request for your branch against +master+ or a custom +base_branch+:
   $ git reflow review
 
-If your code is 'LGTM'd, squash merge to +master+ and delete the feature branch:
+If your code is 'LGTM'd, squash merge to +base_branch+ and delete the feature branch:
   $ git reflow deliver
 
 ----
@@ -49,6 +57,18 @@ If your code is 'LGTM'd, squash merge to +master+ and delete the feature branch:
 
 == How to use
 
+=== Dependencies
+
+*Editor* When reviewing the title and body for a new pull request, or reviewing the
+commit message when delivering a feature, we will open a temporary file with
+your default editor.  We will use git's chosen editor first ("core.editor" git config key), then we try your
+"EDITOR" environment variable, and lastly we fallback on "vim".
+If you would like to use an editor of your choice, we recommend setting it with
+git's config.  As an example, to use Atom as your editor for all git commands:
+  $ git config --global core.editor "atom --wait"
+See GitHub's full article on [associating text editors with Git](https://help.github.com/articles/associating-text-editors-with-git/) for more information on adding this.
+
+
 === Installation
   $ gem install reflow
 or
@@ -88,6 +108,16 @@ Then for your Enterprise projects, you have to setup GitReflow for each one:
   cd replace_with_your_enterprise_project_path
   git reflow setup --enterprise --local
 
+=== Refreshing your current branch based on your base branch
+
+  git reflow refresh
+
+This command updates your feature_branch and base_branch according to the remote_location and then merges your base_branch into your feature_branch. This is just a handy command to keep your branches up to date at any point in time if someone else has committed to the base_branch or the remote.
+
+  git reflow refresh -r <remote_location> -b <base_branch_name>
+
+You pass in the name of the remote to fetch from and the name of the base_branch that you would like to merge into your feature_branch. The remote_location defaults to "origin" and the base_branch defaults to "master". This command also takes in remote and branch name as flag options.
+
 === Starting a feature branch
 http://reenhanced.com/reflow/git-reflow-start.gif
 
@@ -95,7 +125,14 @@ http://reenhanced.com/reflow/git-reflow-start.gif
 
 This sets up a feature branch remotely and brings a local copy to your machine. Yeah, you can do this by hand pretty easily, so skip this command if you want. This is just a handy shortcut with no magic.
 
-  $ git reflow start nh-branch-name
+  git reflow start nh-branch-name
+
+"Git Reflow Start" takes in the name of the new branch name that you want to create your feature on.
+In addition, it takes in an optional flag of a base branch name. If you don't pass in this parameter, then it defaults to "master".
+The base branch name is the base branch that you want to base your feature off of.
+This ensures that everytime you start a new base branch, it will be based off of your latest remote base.
+
+  git reflow start nh-branch-name --base base-branch-name
 
 [PROTIP]  Use your initials at the beginning of each branch so your team knows
           who is responsible for each. My initials are 'NH', so all of my branches start with +nh-+
@@ -112,9 +149,11 @@ We assume you know what you're doing, so if you need something different, do it
 
 After making commits to your branch, run +review+. Didn't push it up? We don't care, we'll do it for you.
 
-If you do not pass the title or message options to the review command, you will be given an editor to write your PR request in, similar to `git commit`. The first line is the title, the rest is the body. 
+git reflow review -t <title> -m <message>
 
-  $ git reflow review         
+If you do not pass the title or message options to the review command, you will be given an editor to write your PR request commit message, similar to `git commit`. The first line is the title, the rest is the body.
+
+  $ git reflow review
 
   Review your PR:
   --------
@@ -134,13 +173,13 @@ If you do not pass the title or message options to the review command, you will
 
   Successfully created pull request #6: rj_test
   Pull Request URL: https://github.com/meesterdude/gitreflow/pull/6
-  Would you like to open it in your browser? y
+  Would you like to push this branch to your remote repo and cleanup your feature branch? y
 
 
 [OSX/Ubuntu only]  You can automatically open your default web browser to the pull request.
                    This lets you edit the pull request with all of the detailed information you'll need before submitting it to your team.
 
-We output the pull request URL so you can distribute it to your team without leaving the terminal. 
+We output the pull request URL so you can distribute it to your team without leaving the terminal.
 
 ==== How it works
 Behind the scenes, this is how +review+ works:
@@ -177,6 +216,11 @@ This gives you details on who's reviewed your pull request. If someone has parti
 +status+ prevents you from having to open a browser to find out where your pull request is at. But in case you want to take a look, we give you the option to open it for you.
 
 === Delivering approved code
+
+==== Note: This documentation is for the process for the github "remote" merge process via the github_api.
+For the bitbucket standard or github manual process (used when the user applies -f force flag to the "remote" merge via the github_api), please go to section B.
+
+==== A:
 http://reenhanced.com/reflow/git-reflow-deliver.gif
 
   git reflow deliver
@@ -186,24 +230,112 @@ You kick butt. You've got your code reviewed and now you're ready to merge it do
 Reflow's +deliver+ requires you to have a pull request, so you'll be protected on those mornings when the coffee isn't working yet.
 We built this <b>to get in your way and make you follow the process</b>. If you don't like it, do it by hand. You already know what you're doing.
 
-You'll be presented with a prefilled commit message based on the body of your pull request which includes the text <code>Closes #XX</code> that will automatically close the associated pull request on github when deliver completes.
+You'll be presented with a prefilled commit message based on the body of your pull request with references to the pull request and reviewers.
 
-Make a mistake and deliver too early? It happens. You'll be prompted after you edit your commit message if you want to push your updated +master+ to github. If you answer 'n', then you'll want to do <code>git reset --hard origin/master</code> and checkout your branch again.
+Want to clean up your feature branch afterwards? You'll be prompted after you edit your commit message if you want to clean up your +feature_branch+ on github. If you answer 'n', then your feature_branch will exist for you to clean it up later.
 
 This is what it looks like:
+
   $ git reflow deliver
+  Here's the status of your review:
+      branches:     simonzhu24:test1234 -> simonzhu24:master
+      number:       51
+      reviewed by:
+      url:          https://github.com/simonzhu24/test/pull/51
+
+  [notice] No one has reviewed your pull request.
+  Would you like to open it in your browser? n
+  This is the current status of your Pull Request. Are you sure you want to deliver? Y
+  Merging pull request #51: 'last commit message', from 'simonzhu24:test1234' into 'simonzhu24:master'
+  git checkout master
+  Switched to branch 'master'
+  Your branch is ahead of 'origin/master' by 1 commit.
+    (use "git push" to publish your local commits)
+
+  [success] Pull Request successfully merged.
+  Would you like to cleanup your feature branch? Y
+  git pull origin master
+  remote: Counting objects: 1, done.
+  remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
+  Unpacking objects: 100% (1/1), done.
+  From https://github.com/simonzhu24/test
+   * branch            master     -> FETCH_HEAD
+     0d8f5e0..f853efa  master     -> origin/master
+  Updating 0b6782f..f853efa
+  Fast-forward
+   README.md | 2 +-
+   1 file changed, 1 insertion(+), 1 deletion(-)
+
+  git push origin :test1234
+  To https://github.com/simonzhu24/test.git
+   - [deleted]         test1234
+
+  git branch -D test1234
+  Deleted branch test1234 (was e130c7a).
+  Nice job buddy.
+
+==== How it works
+
+This is what we do behind the scenes when you do +deliver+
+
+* Does a pull request exist?
+
+  If not, stop here. You need to run +review+.
+
+* Has the review been completed? Did we get a +LGTM+ from everyone who's participated?
+
+  If not, show a list of authors that need to provide a +LGTM+.
+
+* If the review is done, it's time to merge. Here's what happens:
+
+  First, we use the github_api gem to merge the pull request.
+
+  We call the public API for:
+
+    github.pull_requests.merge 'user-name', 'repo-name', 'number', payload
+
+    Please take a look at lib/git_reflow/git_server/git_hub/pull_request.rb:102-107 for an example of the call.
+    This call makes an HTTP request using the Github API to merge the available pull request passing in the user name, repository name, pull request number, and some additional data in the payload.
+
+    The payload contains data in the following format:
+
+    data = {
+      "commit_title",
+      "commit_message",
+      "sha",
+      "squash"
+    }
+
+    Notice: "squash" is set to true, meaning that we will do a squash-merge for each pull request.
+
+    For more detailed documentation, please read: https://github.com/piotrmurach/github/blob/master/lib/github_api/client/pull_requests.rb#L197
+
+* Next, we prompt you if you want to cleanup
+  Would you like cleanup your feature branch?
+
+  If 'y', then we'll update the +base_branch+ and delete the feature branch
+
+    git pull origin #{base_branch}
+    git push origin :#{feature_branch}
+    git branch -D #{feature_branch}
+
+  If 'n', then just stop here. The user can clean up his branch locally.
+
+    And we're done.
+
+==== Note: This documentation is for the bitbucket standard or github manual process (used when the user applies -f force flag to the "remote" merge via the github_api).
+
+==== B:
+  This is what the process looks like for bitbucket or if you force deliver:
+
   From github.com:reenhanced/gitreflow
   * branch            master     -> FETCH_HEAD
   Merging pull request #36: 'Enforce at least one LGTM before delivery', from 'reenhanced:nh-fail-without-lgtm' into 'reenhanced:master'
-  Switched to branch 'master'
-  From github.com:reenhanced/gitreflow
-   * branch            master     -> FETCH_HEAD
   Already up-to-date.
   Switched to branch 'nh-fail-without-lgtm'
   Switched to branch 'master'
   Updating c2ec1b1..f90e111
-  Fast-forward
-  Squash commit -- not updating HEAD
+   Squash commit -- not updating HEAD
    lib/git_reflow.rb | 71 +++++++++++++++++++++++++++----------------------------
    1 file changed, 35 insertions(+), 36 deletions(-)
   [master d1b4dd5] Enforces LGTM before deliver, even with no comments.
@@ -222,62 +354,50 @@ This is what it looks like:
    - [deleted]         nh-fail-without-lgtm
 
   Deleted branch nh-fail-without-lgtm (was f90e111).
-  Nice job buddy.
-  
-This is what the default commit message looks like:
+
+  This is what the default commit message looks like:
   Enforces LGTM before deliver, even with no comments.
   Removes the need to review the pull request yourself if you make a
   comment.
-  
+
   Better error message if setup fails.
-  
+
   Bug fixes.
-  
+
   Closes #36
-  
+
   LGTM given by: @codenamev
-  
+
   Squashed commit of the following:
-  
+
   commit f90e111
   Author: Nicholas Hance <nhance@reenhanced.com>
   Date:   Thu Jul 11 15:33:29 2013 -0400
   ...
-  
-==== How it works
-This is what we do behind the scenes when you do +deliver+
 
-* Does a pull request exist?
+  If the review is done, it's time to merge. Here's what happens:
 
-  If not, stop here. You need to run +review+.
+  First, update our local +master+ so we don't get conflicts
+    git checkout master
+    git pull origin master
 
-* Has the review been completed? Did we get a +LGTM+ from everyone who's participated?
-
-  If not, show a list of authors that need to provide a +LGTM+.
-  
-If the review is done, it's time to merge. Here's what happens:
+  Next, squash merge our feature branch
+    git merge --squash nh-branch-name
 
-First, update our local +master+ so we don't get conflicts
-  git checkout master
-  git pull origin master
+  Now, we'll apply a little magic so we have a great commit message by default. Your editor will open and you'll see a nice default for your commit message based on the pull request body.
 
-Next, squash merge our feature branch
-  git merge --squash nh-branch-name
-  
-Now, we'll apply a little magic so we have a great commit message by default. Your editor will open and you'll see a nice default for your commit message based on the pull request body.
+  Once you've saved the commit, prompt the user to see if we should continue
+    Merge complete!
+    Would you like to push this branch to your remote repo and cleanup your feature branch?
 
-Once you've saved the commit, prompt the user to see if we should continue
-  Merge complete!
-  Would you like to push this branch to your remote repo and cleanup your feature branch?
-  
-If 'y', then we'll push to +master+ and delete the feature branch
-  git push origin master
-  git push origin :nh-branch-name
-  git branch -D nh-branch-name
-  
-If 'n', then just stop here. The user can reset his local +master+.
+  If 'y', then we'll push to +master+ and delete the feature branch
+    git pull origin master
+    git push origin master
+    git push origin :nh-branch-name
+    git branch -D nh-branch-name
 
-And we're done.
+  If 'n', then just stop here. The user can reset his local +master+.
+  And we're done.
 
 == Guiding principles:
 * Your workflow should resemble the following:
@@ -302,23 +422,30 @@ http://reenhanced.com/images/reflow.png
 
 * If you make a new commit in your branch, you require another review.
 
-* All participants in a pull request must approve the pull request.
-  If 2 people comment, you need 2 'LGTM's before the code is ready to merge.
+* Depending on the minimumApprovals that you specify in your ~/.gitconfig.reflow (created upon reflow setup), you can have the following:
+
+  "" : All participants in a pull request must approve the pull request.
+  "0": 0 approvals required for you to merge PR.
+  "1": You need a minimum of 1 LGTM and the last comment on your PR must be an LGTM.
+  "2": You need a minimum of 2 LGTM and the last comment on your PR must be an LGTM.
+  ...
 
-* Once approved, your feature branch is squash merged to master.
-  This makes the history of the master branch extremely clean and easy to follow.
+* Once approved, your feature branch is squash-merged to your base_branch.
+  This makes the history of the base_branch branch extremely clean and easy to follow.
 
 * Git blame becomes your friend. You'll know who to blame and can see the full context of changes.
-  Squash commits to master mean every commit represents the whole feature, not a "typo fix".
+  Squash commits to base_branch mean every commit represents the whole feature, not a "typo fix".
 
 
 == Configuration
 
-  In order to streamline delivery you can set the following git config to
-  always push the branch after merge and clean up the feature branch.
+  In order to streamline delivery you can set the following git config to:
 
-  git config --global --add "reflow.always-deploy-and-cleanup" "true"
+  1. always clean up the feature branch after the PR is merged
+  2. always deliver without further prompt
 
+  git config --global --add "reflow.always-cleanup" "true"
+  git config --global --add "reflow.always-deliver" "true"
 
 ---
 

data/circle.yml

@@ -1,16 +1,16 @@
 dependencies:
   pre:
-    - rvm install 2.0.0
-    - rvm install 2.1.8
-    - rvm install 2.2.4
+    - rvm install 2.1.10
+    - rvm install 2.2.5
+    - rvm install 2.3.1
 
   override:
-    - 'rvm-exec 2.0.0-p648 bundle install'
-    - 'rvm-exec 2.1.8 bundle install'
-    - 'rvm-exec 2.2.4 bundle install'
+    - 'rvm-exec 2.1.10 bundle install'
+    - 'rvm-exec 2.2.5 bundle install'
+    - 'rvm-exec 2.3.1 bundle install'
 
 test:
   override:
-    - 'rvm-exec 2.0.0-p648 bundle exec rake'
-    - 'rvm-exec 2.1.8 bundle exec rake'
-    - 'rvm-exec 2.2.4 bundle exec rake'
+    - 'rvm-exec 2.1.10 bundle exec rake'
+    - 'rvm-exec 2.2.5 bundle exec rake'
+    - 'rvm-exec 2.3.1 bundle exec rake'