git_reflow 0.9.2 → 0.9.6

data/Gemfile.lock

@@ -1,113 +1,185 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.9.2)
+    git_reflow (0.9.6)
       bundler (>= 1.10.0)
-      colorize (>= 0.7.0)
-      github_api (= 0.18.2)
+      codenamev_bitbucket_api (= 0.4.1)
+      colorize (>= 0.8.1)
+      github_api (= 0.19)
       highline
       httpclient
-      reenhanced_bitbucket_api (= 0.3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.0)
       bundler
       rake
       thor (>= 0.14.0)
-    byebug (11.0.1)
+    async (1.28.9)
+      console (~> 1.10)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.54.1)
+      async (~> 1.25)
+      async-io (~> 1.28)
+      async-pool (~> 0.2)
+      protocol-http (~> 0.21.0)
+      protocol-http1 (~> 0.13.0)
+      protocol-http2 (~> 0.14.0)
+    async-http-faraday (0.9.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.30.2)
+      async (~> 1.14)
+    async-pool (0.3.5)
+      async (~> 1.25)
+    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.8)
+    console (1.10.1)
+      fiber-local
+    crack (0.4.5)
+      rexml
     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.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.2)
-      faraday (>= 0.7.4, < 0.10)
-    github_api (0.18.2)
+      ruby2_keywords
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-net_http (1.0.1)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fiber-local (1.0.0)
+    github_api (0.19.0)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8)
+      faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    hashdiff (1.0.0)
+    github_changelog_generator (1.16.1)
+      activesupport
+      async (>= 1.25.0)
+      async-http-faraday
+      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.2)
+    highline (2.0.3)
     httpclient (2.8.3)
-    jwt (2.2.1)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    multi_json (1.13.1)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    jwt (2.3.0)
+    method_source (1.0.0)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    nio4r (2.5.7)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    oauth2 (1.4.7)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
-      byebug (~> 11.0)
-      pry (~> 0.10)
-    public_suffix (4.0.1)
-    rack (2.0.7)
-    rake (12.3.3)
-    rdoc (6.2.0)
-    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.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    octokit (4.20.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    protocol-hpack (1.4.2)
+    protocol-http (0.21.0)
+    protocol-http1 (0.13.2)
+      protocol-http (~> 0.19)
+    protocol-http2 (0.14.2)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    rdoc (6.3.0)
+    retriable (3.1.2)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    safe_yaml (1.0.5)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
+    ruby_jard (0.3.1)
+      byebug (>= 9.1, < 12.0)
+      pry (~> 0.13.0)
+      tty-screen (~> 0.8.1)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     simple_oauth (0.3.1)
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    webmock (3.7.1)
+    timers (4.3.3)
+    tty-screen (0.8.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     wwtd (1.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 2.2.0)
+  appraisal (= 2.4.0)
   chronic
   git_reflow!
-  pry-byebug
-  rake (~> 12.3)
+  github_changelog_generator
+  rake (~> 13.0.3)
   rdoc
-  rspec (~> 3.8)
+  rspec (~> 3.10)
+  ruby_jard
   webmock
   wwtd (= 1.4)
 
 BUNDLED WITH
-   2.0.2
+   2.2.4

data/README.md

@@ -4,8 +4,8 @@
 </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.9.0-blue.svg?style=flat">
@@ -443,11 +443,15 @@ 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" "true"
+    git config --global --add "reflow.always-cleanup-remote" "true"
     ```
-  2. always deliver without further prompt
+  2. always clean up the local feature branch after the PR is merged
+    ```
+    git config --global --add "reflow.always-cleanup-local" "true"
+    ```
+  3. always deliver without further prompt
     ```
     git config --global --add "reflow.always-deliver" "true"
     ```

data/Rakefile

@@ -1,8 +1,15 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "github_changelog_generator/task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :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/git_reflow.gemspec

@@ -1,38 +1,40 @@
+# frozen_string_literal: true
+
 # Ensure we require the local version and not one we might have installed already
-require File.join([File.dirname(__FILE__),'lib','git_reflow/version.rb'])
+require File.join([File.dirname(__FILE__), 'lib', 'git_reflow/version.rb'])
 Gem::Specification.new do |s|
-  s.name             = 'git_reflow'
-  s.version          = GitReflow::VERSION
-  s.license          = 'MIT'
-  s.authors          = ["Valentino Stoll", "Robert Stern", "Nicholas Hance"]
-  s.email            = ["dev@reenhanced.com"]
-  s.homepage         = "http://github.com/reenhanced/gitreflow"
-  s.summary          = "A better git process"
-  s.description      = "Git Reflow manages your git workflow."
-  s.platform         = Gem::Platform::RUBY
-  s.files            = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables      = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  s.has_rdoc         = true
-  s.bindir           = "exe"
-  s.require_paths    = ["lib"]
-  s.rdoc_options     << '--title' << 'git_reflow' << '-ri'
+  s.name          = 'git_reflow'
+  s.version       = GitReflow::VERSION
+  s.license       = 'MIT'
+  s.authors       = ['Valentino Stoll', 'Robert Stern', 'Nicholas Hance']
+  s.email         = ['dev@reenhanced.com']
+  s.homepage      = 'http://github.com/reenhanced/gitreflow'
+  s.summary       = 'A better git process'
+  s.description   = 'Git Reflow manages your git workflow.'
+  s.platform      = Gem::Platform::RUBY
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.bindir        = 'exe'
+  s.require_paths = ['lib']
+  s.rdoc_options << '--title' << 'git_reflow' << '-ri'
 
-  s.add_development_dependency('appraisal', '2.2.0')
+  s.add_development_dependency('appraisal', '2.4.0')
   s.add_development_dependency('chronic')
-  s.add_development_dependency('pry-byebug')
-  s.add_development_dependency('rake', "~> 12.3")
+  s.add_development_dependency('github_changelog_generator')
+  s.add_development_dependency('ruby_jard')
+  s.add_development_dependency('rake', '~> 13.0.3')
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('rspec', "~> 3.8")
+  s.add_development_dependency('rspec', '~> 3.10')
   s.add_development_dependency('webmock')
   s.add_development_dependency('wwtd', '1.4')
 
   s.add_dependency('bundler', '>= 1.10.0')
-  s.add_dependency('colorize', '>= 0.7.0')
+  s.add_dependency('codenamev_bitbucket_api', '0.4.1')
+  s.add_dependency('colorize', '>= 0.8.1')
+  s.add_dependency('github_api', '0.19')
   s.add_dependency('highline')
   s.add_dependency('httpclient')
-  s.add_dependency('github_api', '0.18.2')
-  s.add_dependency('reenhanced_bitbucket_api', '0.3.2')
 
   s.post_install_message = "You need to setup your GitHub OAuth token\nPlease run 'git-reflow setup'"
 end

data/lib/git_reflow/config.rb

@@ -7,7 +7,14 @@ module GitReflow
 
     module_function
 
-    def get(key, reload: false, all: false, local: false)
+    # Gets the reqested git configuration variable.
+    #
+    # @param [String] key The key to get the value(s) for
+    # @option options [Boolean] :reload (false) whether to reload the value or use a cached value if available
+    # @option options [Boolean] :all (false) whether to return all keys for a multi-valued key
+    # @option options [Boolean] :local (false) whether to get the value specific to the current project
+    # @return the value of the git configuration
+    def get(key, reload: false, all: false, local: false, **_other_options)
       return cached_git_config_value(key) unless reload || cached_git_config_value(key).empty?
 
       local = local ? '--local ' : ''
@@ -19,7 +26,13 @@ module GitReflow
       cache_git_config_key(key, new_value)
     end
 
-    def set(key, value, local: false)
+    # Sets the reqested git configuration variable.
+    #
+    # @param [String] key The key to set the value for
+    # @param [String] value The value to set it to
+    # @option options [Boolean] :local (false) whether to set the value specific to the current project
+    # @return the value of the git configuration
+    def set(key, value, local: false, **_other_options)
       value = value.to_s.strip
       if local
         GitReflow::Sandbox.run "git config --replace-all #{key} \"#{value}\"", loud: false, blocking: false
@@ -28,7 +41,13 @@ module GitReflow
       end
     end
 
-    def unset(key, value: nil, local: false)
+    # Remove values of the reqested git configuration variable.
+    #
+    # @param [String] key The key to remove
+    # @option options [Boolean] :value (nil) The value of the key to remove
+    # @option options [Boolean] :local (false) whether to remove the value specific to the current project
+    # @return the result of running the git command
+    def unset(key, value: nil, local: false, **_other_options)
       value = value.nil? ? '' : "\"#{value}\""
       if local
         GitReflow::Sandbox.run "git config --unset-all #{key} #{value}", loud: false, blocking: false
@@ -37,7 +56,14 @@ module GitReflow
       end
     end
 
-    def add(key, value, local: false, global: false)
+    # Adds a new git configuration variable.
+    #
+    # @param [String] key The new key to set the value for
+    # @param [String] value The value to set it to
+    # @option options [Boolean] :local (false) whether to set the value specific to the current project
+    # @option options [Boolean] :global (false) whether to set the value globaly. if neither local or global is set gitreflow will default to using a configuration file
+    # @return the result of running the git command
+    def add(key, value, local: false, global: false, **_other_options)
       if global
         GitReflow::Sandbox.run "git config --global --add #{key} \"#{value}\"", loud: false, blocking: false
       elsif local

data/lib/git_reflow/git_helpers.rb

@@ -47,23 +47,29 @@ module GitReflow
     end
 
     def pull_request_template
-      filenames_to_try = %w[.github/PULL_REQUEST_TEMPLATE.md
-                            .github/PULL_REQUEST_TEMPLATE
-                            PULL_REQUEST_TEMPLATE.md
-                            PULL_REQUEST_TEMPLATE].map do |file|
+      custom_template = GitReflow::Config.get('templates.pull-request')
+      filenames_to_try = %w[
+        .github/PULL_REQUEST_TEMPLATE.md
+        .github/PULL_REQUEST_TEMPLATE
+        PULL_REQUEST_TEMPLATE.md
+        PULL_REQUEST_TEMPLATE
+      ].map do |file|
         "#{git_root_dir}/#{file}"
       end
+      filenames_to_try.unshift(custom_template) unless custom_template.empty?
 
       parse_first_matching_template_file(filenames_to_try)
     end
 
     def merge_commit_template
+      custom_template = GitReflow::Config.get('templates.merge-commit')
       filenames_to_try = %w[.github/MERGE_COMMIT_TEMPLATE.md
                             .github/MERGE_COMMIT_TEMPLATE
                             MERGE_COMMIT_TEMPLATE.md
                             MERGE_COMMIT_TEMPLATE].map do |file|
         "#{git_root_dir}/#{file}"
       end
+      filenames_to_try.unshift(custom_template) unless custom_template.empty?
 
       parse_first_matching_template_file(filenames_to_try)
     end

data/lib/git_reflow/git_server/git_hub/pull_request.rb

@@ -24,8 +24,18 @@ module GitReflow
             base:  options[:base]))
         end
 
-        def self.find_open(to: 'master', from: GitReflow.git_server.class.current_branch)
-          matching_pull = GitReflow.git_server.connection.pull_requests.all(GitReflow.remote_user, GitReflow.remote_repo_name, base: to, head: "#{GitReflow.remote_user}:#{from}", state: 'open').first
+        def self.find_open(options = {})
+          options[:to] ||= 'master'
+          options[:from] ||= GitReflow.git_server.class.current_branch
+
+          matching_pull = GitReflow.git_server.connection.pull_requests.all(
+            GitReflow.remote_user,
+            GitReflow.remote_repo_name,
+            base: options[:to],
+            head: "#{GitReflow.remote_user}:#{options[:from]}",
+            state: 'open'
+          ).first
+
           if matching_pull
             self.new matching_pull
           end
@@ -147,13 +157,19 @@ module GitReflow
                 GitReflow.run_command_with_label "git pull origin #{self.base_branch_name}"
                 GitReflow.say "Pull request ##{self.number} successfully merged.", :success
 
-                if cleanup_feature_branch?
-                  GitReflow.run_command_with_label "git push origin :#{self.feature_branch_name}"
+                if cleanup_remote_feature_branch?
+                  GitReflow.run_command_with_label "git push origin :#{self.feature_branch_name}", blocking: false
+                else
+                  GitReflow.say "Skipped. Remote feature branch #{self.feature_branch_name} left in tact."
+                end
+
+                if cleanup_local_feature_branch?
                   GitReflow.run_command_with_label "git branch -D #{self.feature_branch_name}"
-                  GitReflow.say "Nice job buddy."
                 else
-                  cleanup_failure_message
+                  GitReflow.say "Skipped. Local feature branch #{self.feature_branch_name} left in tact."
                 end
+
+                GitReflow.say "Nice job buddy."
               else
                 GitReflow.say merge_response.to_s, :deliver_halted
                 GitReflow.say "There were problems commiting your feature... please check the errors above and try again.", :error

data/lib/git_reflow/git_server/git_hub.rb

@@ -84,56 +84,69 @@ module GitReflow
       end
 
       def authenticate(options = {silent: false})
+        if !options[:user].to_s.empty?
+          self.class.user = options[:user]
+        elsif self.class.user.empty?
+          self.class.user = ask("Please enter your GitHub username: ")
+        end
+
         if connection and self.class.oauth_token.length > 0
-          unless options[:silent]
-            GitReflow.say "Your GitHub account was already setup with: "
-            GitReflow.say "\tUser Name: #{self.class.user}"
-            GitReflow.say "\tEndpoint: #{self.class.api_endpoint}"
-          end
-        else
           begin
-            gh_user     = options[:user] || ask("Please enter your GitHub username: ")
-            gh_password = options[:password] || ask("Please enter your GitHub password (we do NOT store this): ") { |q| q.echo = false }
-
-            @connection = ::Github.new do |config|
-              config.basic_auth = "#{gh_user}:#{gh_password}"
-              config.endpoint   = GitServer::GitHub.api_endpoint
-              config.site       = GitServer::GitHub.site_url
-              config.adapter    = :net_http
+            connection.users.get
+            unless options[:silent]
+              GitReflow.say "Your GitHub account was already setup with: "
+              GitReflow.say "\tUser Name: #{self.class.user}"
+              GitReflow.say "\tEndpoint: #{self.class.api_endpoint}"
             end
+            return connection
+          rescue ::Github::Error::Unauthorized => e
+            GitReflow.logger.debug "[GitHub Error] Current oauth-token is invalid or expired..."
+          end
+        end
 
-            @connection.connection_options = {headers: {"X-GitHub-OTP" => options[:two_factor_auth_code]}} if options[:two_factor_auth_code]
+        begin
+          gh_password = options[:password] || ask("Please enter your GitHub password (we do NOT store this): ") { |q| q.echo = false }
 
-            previous_authorizations = @connection.oauth.all.select {|auth| auth.note == "git-reflow (#{run('hostname', loud: false).strip})" }
-            if previous_authorizations.any?
-              authorization = previous_authorizations.last
-              GitReflow.say "You have previously setup git-reflow on this machine, but we can no longer find the stored token.", :error
-              GitReflow.say "Please visit https://github.com/settings/tokens and delete the token for: git-reflow (#{run('hostname', loud: false).strip})", :notice
-              raise "Setup could not be completed."
-            else
-              authorization = @connection.oauth.create scopes: ['repo'], note: "git-reflow (#{run('hostname', loud: false).strip})"
-            end
+          @connection = ::Github.new do |config|
+            config.basic_auth = "#{self.class.user}:#{gh_password}"
+            config.endpoint   = GitServer::GitHub.api_endpoint
+            config.site       = GitServer::GitHub.site_url
+            config.adapter    = :net_http
+          end
 
-            self.class.oauth_token = authorization.token
+          @connection.connection_options = {headers: {"X-GitHub-OTP" => options[:two_factor_auth_code]}} if options[:two_factor_auth_code]
 
-          rescue ::Github::Error::Unauthorized => e
-            if e.inspect.to_s.include?('two-factor')
-              begin
-                # dummy request to trigger a 2FA SMS since a HTTP GET won't do it
-                @connection.oauth.create scopes: ['repo'], note: "thank Github for not making this straightforward"
-              rescue ::Github::Error::Unauthorized
-              ensure
-                two_factor_code = ask("Please enter your two-factor authentication code: ")
-                self.authenticate options.merge({user: gh_user, password: gh_password, two_factor_auth_code: two_factor_code})
-              end
-            else
-              GitReflow.say "Github Authentication Error: #{e.inspect}", :error
+          previous_authorizations = @connection.oauth.all.select {|auth| auth.note == "git-reflow (#{run('hostname', loud: false).strip})" }
+          if previous_authorizations.any?
+            authorization = previous_authorizations.last
+            GitReflow.say "You have previously setup git-reflow on this machine, but we can no longer find the stored token.", :error
+            GitReflow.say "Please visit https://github.com/settings/tokens and delete the token for: git-reflow (#{run('hostname', loud: false).strip})", :notice
+            raise "Setup could not be completed."
+          else
+            authorization = @connection.oauth.create scopes: ['repo'], note: "git-reflow (#{run('hostname', loud: false).strip})"
+          end
+
+          self.class.oauth_token = authorization.token
+
+        rescue ::Github::Error::Unauthorized => e
+          if e.inspect.to_s.include?('two-factor')
+            begin
+              # dummy request to trigger a 2FA SMS since a HTTP GET won't do it
+              @connection.oauth.create scopes: ['repo'], note: "thank Github for not making this straightforward"
+            rescue ::Github::Error::Unauthorized
+            ensure
+              two_factor_code = ask("Please enter your two-factor authentication code: ")
+              self.authenticate options.merge({user: self.class.user, password: gh_password, two_factor_auth_code: two_factor_code})
             end
-          rescue StandardError => e
-            raise "We were unable to authenticate with Github."
           else
-            GitReflow.say "Your GitHub account was successfully setup!", :success
+            GitReflow.say "Github Authentication Error: #{e.inspect}", :error
+            raise "Setup could not be completed."
           end
+        rescue StandardError => e
+          raise "We were unable to authenticate with Github."
+        else
+          GitReflow.say "Your GitHub account was successfully setup!", :success
+
         end
 
         @connection

data/lib/git_reflow/git_server/pull_request.rb

@@ -178,7 +178,21 @@ module GitReflow
       end
 
       def cleanup_feature_branch?
-        GitReflow::Config.get('reflow.always-cleanup') == "true" || (ask "Would you like to push this branch to your remote repo and cleanup your feature branch? ") =~ /^y/i
+        cleanup_local_feature_branch? || cleanup_remote_feature_branch?
+      end
+
+      def cleanup_local_feature_branch?
+        # backwards compat
+        always_cleanup_local = GitReflow::Config.get('reflow.always-cleanup').to_s
+        always_cleanup_local = GitReflow::Config.get('reflow.always-cleanup-local') if always_cleanup_local.empty?
+        always_cleanup_local == "true" || (ask "Would you like to cleanup your local feature branch? ") =~ /^y/i
+      end
+
+      def cleanup_remote_feature_branch?
+        # backwards compat
+        always_cleanup_remote = GitReflow::Config.get('reflow.always-cleanup').to_s
+        always_cleanup_remote = GitReflow::Config.get('reflow.always-cleanup-remote') if always_cleanup_remote.empty?
+        always_cleanup_remote == "true" || (ask "Would you like to cleanup your remote feature branch? ") =~ /^y/i
       end
 
       def deliver?

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.9.2"
+  VERSION = "0.9.6"
 end