git_reflow 0.8.10 → 0.9.4

data/Gemfile.lock

@@ -1,115 +1,145 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.8.10)
+    git_reflow (0.9.4)
+      bundler (>= 1.10.0)
+      codenamev_bitbucket_api (= 0.4.1)
       colorize (>= 0.7.0)
-      github_api (= 0.15.0)
-      gli (= 2.17.0)
+      github_api (= 0.19)
       highline
       httpclient
-      reenhanced_bitbucket_api (= 0.3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    byebug (10.0.2)
+    byebug (11.1.3)
     chronic (0.10.2)
-    coderay (1.1.2)
+    codenamev_bitbucket_api (0.4.1)
+      faraday (< 2.0)
+      faraday_middleware (< 2.0)
+      hashie
+      multi_json (< 2.0)
+      nokogiri (>= 1.5.2)
+      simple_oauth (>= 0.3.0)
+    coderay (1.1.3)
     colorize (0.8.1)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    concurrent-ruby (1.1.7)
+    crack (0.4.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    faraday (0.9.2)
+    diff-lcs (1.4.4)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.2)
-      faraday (>= 0.7.4, < 0.10)
-    github_api (0.15.0)
-      addressable (~> 2.4.0)
+      ruby2_keywords
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    github_api (0.19.0)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
+      faraday (>= 0.8, < 2)
+      hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    gli (2.17.0)
-    hashdiff (0.3.7)
-    hashie (3.5.7)
-    highline (1.7.10)
+    github_changelog_generator (1.15.2)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.2.1)
+      rake (>= 10.0)
+      retriable (~> 3.0)
+    hashdiff (1.0.1)
+    hashie (3.6.0)
+    highline (2.0.3)
     httpclient (2.8.3)
-    jwt (1.5.6)
-    method_source (0.9.0)
-    mime-types (2.99.3)
-    mini_portile2 (2.3.0)
-    multi_json (1.13.1)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    jwt (2.2.2)
+    method_source (1.0.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rack (2.0.4)
-    rake (12.3.1)
-    rdoc (6.0.3)
-    reenhanced_bitbucket_api (0.3.2)
-      faraday (~> 0.9.0)
-      faraday_middleware (~> 0.9.0)
-      hashie (>= 3.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (>= 1.5.2)
-      simple_oauth (>= 0.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    octokit (4.19.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rdoc (6.2.1)
+    retriable (3.1.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    safe_yaml (1.0.4)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    ruby2_keywords (0.0.2)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     simple_oauth (0.3.1)
-    thor (0.20.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    webmock (3.3.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    webmock (3.9.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
-    wwtd (1.3.0)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    wwtd (1.4.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal (= 2.2.0)
-  bundler (~> 1.16)
   chronic
   git_reflow!
+  github_changelog_generator
   pry-byebug
-  rake (~> 12.3)
+  rake (~> 13.0.1)
   rdoc
-  rspec (~> 3.7.0)
+  rspec (~> 3.9)
   webmock
-  wwtd (= 1.3.0)
+  wwtd (= 1.4)
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/LICENSE

@@ -1,20 +1,20 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Reenhanced L.L.C.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2014 Reenhanced L.L.C.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -4,11 +4,11 @@
 </h1>
 
 <p>
-  <a href="https://circleci.com/gh/reenhanced/git-reflow/tree/master" title="current build status">
-    <img alt="Circle CI" src="https://circleci.com/gh/reenhanced/gitreflow.svg?style=svg&circle-token=d94825c17c7e33558dc2a82b37afad7b558e5a12">
+  <a href="https://actions-badge.atrox.dev/reenhanced/gitreflow/goto?ref=master" title="git workflow">
+    <img alt="Git workflow powered by git-reflow"  src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Freenhanced%2Fgitreflow%2Fbadge%3Fref%3Dmaster&style=flat">
   </a>
   <a href="https://github.com/reenhanced/gitreflow" title="git workflow">
-    <img alt="Git workflow powered by git-reflow"  src="https://img.shields.io/badge/git--reflow-v0.8.10-blue.svg?style=flat">
+    <img alt="Git workflow powered by git-reflow"  src="https://img.shields.io/badge/git--reflow-v0.9.0-blue.svg?style=flat">
   </a>
   <a href="http://inch-ci.org/github/reenhanced/gitreflow" title="documentation coverage">
     <img src="http://inch-ci.org/github/reenhanced/gitreflow.svg?branch=master&style=shields" alt="Git-Reflow Documentation" />
@@ -117,7 +117,7 @@ This sets up a feature branch remotely and brings a local copy to your machine.
 
 `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 (`--base`). 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.
+then it will look up the `reflow.base-branch` git configuration or default to "master". The base branch name is the base branch that you want to base your feature off of.
 This ensures that every time 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
@@ -137,6 +137,9 @@ git reflow refresh -r <remote-location> -b <base-branch>
 
 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.
 
+> **Note:** If no `base-branch` argument is provided, then we'll look for a `reflow.base-branch` git
+> configuration and fallback to `master` as the default.
+
 ### Reviewing your work
 ![git reflow review](http://reenhanced.com/reflow/git-reflow-review.gif)
 ```
@@ -150,9 +153,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? No problem, we'll do it for you.
 ```
-git reflow review -t <title> -m <message>
+git reflow review -t <title> -m <message> <base-branch>
 ```
-> **Note:** `-t` and `-m` are optional.
+> **Note:** `-t` and `-m` are optional, as is the `base-branch` argument. If no
+> base-branch is provided, then we'll look for a `reflow.base-branch` git
+> configuration and fallback to `master` as the default.
 
 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.
 
@@ -202,9 +207,12 @@ If not, create it and print "Pull request created at http://pull-url/". If so, p
 ### Checking your branch status
 ![git reflow status](http://reenhanced.com/reflow/git-reflow-status.gif)
 ```
-git reflow status
+git reflow status <base-branch>
 ```
 
+> **Note:** If no `base-branch` is provided, then we'll look for a `reflow.base-branch` git
+> configuration and fallback to `master` as the default.
+
 Sometimes you start working on a branch and can't get back to it for a while. It happens. Use +status+ to check on the status of your work.
 
 ```
@@ -226,10 +234,13 @@ to find out where your pull request is at. But in case you want to take a look,
 ### Delivering approved code
 ![git-reflow deliver](http://reenhanced.com/reflow/git-reflow-deliver.gif)
 ```
-git reflow deliver
+git reflow deliver <base-branch>
 ```
 
-> **Note:** This documentation is for the process for the github "remote" merge process via the github_api.
+> **Note:** If no `base-branch` argument is provided, then we'll look for a `reflow.base-branch` git
+> configuration and fallback to `master` as the default.
+
+> **Also:** 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.
 
 
@@ -432,17 +443,30 @@ If the review is done, it's time to merge. Here's what happens:
 
   In order to streamline delivery you can set the following git config to:
 
-  1. always clean up the feature branch after the PR is merged
+  1. always clean up the remote feature branch after the PR is merged
+    ```
+    git config --global --add "reflow.always-cleanup-remote" "true"
     ```
-    git config --global --add "reflow.always-cleanup" "true"
+  2. always clean up the local feature branch after the PR is merged
     ```
-  2. always deliver without further prompt
+    git config --global --add "reflow.always-cleanup-local" "true"
+    ```
+  3. always deliver without further prompt
     ```
     git config --global --add "reflow.always-deliver" "true"
     ```
 
   See our [Advanced Usage](https://github.com/reenhanced/gitreflow/wiki/Full-List-of-Configuration-Options) for more ways you can customize your workflow.
 
+## Customization
+
+Git-reflow's default process isn't meant to fit every team, which is why we've introduced [Custom Workflows](https://github.com/reenhanced/gitreflow/wiki/Custom-Workflows). With a custom workflow, you can:
+
+* Add hooks to be run before, or after any command
+* Use one of our pre-configured workflows as a basis for your own
+* Override any of the default commands
+* Create new commands
+
 ---
 
 ## Contributing

data/Rakefile

@@ -1,8 +1,15 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "github_changelog_generator/task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.user = 'reenhanced'
+  config.project = 'gitreflow'
+  config.since_tag = 'v0.9.2'
+  config.future_release = 'master'
+end
+
+task :default => :spec

data/Workflow

@@ -0,0 +1,3 @@
+# This file is empty on purpose in case there are any custom workflows configured locally.
+# Eventually we will update it to:
+# use "OpenSourceWorkflow"

data/bin/console

@@ -1,7 +1,7 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "git_reflow"
-
-require "irb"
-IRB.start
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "git_reflow"
+
+require "irb"
+IRB.start

data/bin/setup

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/exe/git-reflow

@@ -1,36 +1,20 @@
 #!/usr/bin/env ruby
 $: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
 require 'rubygems'
-require 'gli'
 require 'git_reflow'
 
-include GLI::App
-
-program_desc 'Git Reflow manages your git workflow.'
-
-version GitReflow::VERSION
-
-commands_from 'git_reflow/commands'
-
-pre do |global,command,options,args|
-  # Pre logic here
-  # Return true to proceed; false to abourt and not call the
-  # chosen command
-  # Use skips_pre before a command to skip this block
-  # on that command only
-  true
+reflow_command = ARGV.shift
+if reflow_command.nil? || GitReflow.workflow.commands[reflow_command.to_sym].nil?
+  GitReflow.help
+elsif ARGV.include? "--help"
+  GitReflow.documentation_for_command(reflow_command)
+else
+  trap 'INT' do
+    GitReflow.say "Aborted.", :error
+    exit
+  end
+
+  command_options = GitReflow.parse_command_options!(reflow_command)
+  GitReflow.logger.debug "Running command `#{reflow_command}` with options: #{command_options.inspect}"
+  GitReflow.public_send(reflow_command.to_sym, command_options)
 end
-
-post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
-end
-
-on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
-  true
-end
-
-exit run(ARGV)