git_reflow 0.9.3 → 0.9.7

data/Gemfile.lock

@@ -1,29 +1,47 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.9.3)
+    git_reflow (0.9.7)
       bundler (>= 1.10.0)
       codenamev_bitbucket_api (= 0.4.1)
-      colorize (>= 0.7.0)
-      github_api (= 0.18.2)
+      colorize (>= 0.8.1)
+      github_api (= 0.19)
       highline
       httpclient
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.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)
+    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)
     codenamev_bitbucket_api (0.4.1)
@@ -33,28 +51,36 @@ GEM
       multi_json (< 2.0)
       nokogiri (>= 1.5.2)
       simple_oauth (>= 0.3.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.6)
-    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.17.3)
+    diff-lcs (1.4.4)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
-    github_api (0.18.2)
+    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)
-    github_changelog_generator (1.15.2)
+    github_changelog_generator (1.16.1)
       activesupport
+      async (>= 1.25.0)
+      async-http-faraday
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
@@ -65,81 +91,95 @@ GEM
     hashie (3.6.0)
     highline (2.0.3)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
+    jwt (2.3.0)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    multi_json (1.14.1)
+    mini_portile2 (2.7.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
+    nio4r (2.5.7)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
+      racc (~> 1.4)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.18.0)
+    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)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    public_suffix (4.0.5)
-    rack (2.2.2)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rdoc (6.2.1)
+    rake (13.0.3)
+    rdoc (6.3.0)
     retriable (3.1.2)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.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.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    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 (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    webmock (3.8.3)
+    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.3.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 2.2.0)
+  appraisal (= 2.4.0)
   chronic
   git_reflow!
   github_changelog_generator
-  pry-byebug
-  rake (~> 13.0.1)
+  rake (~> 13.0.3)
   rdoc
-  rspec (~> 3.9)
+  rspec (~> 3.10)
+  ruby_jard
   webmock
   wwtd (= 1.4)
 
 BUNDLED WITH
-   2.1.4
+   2.2.4

data/README.md

@@ -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/git_reflow.gemspec

@@ -19,20 +19,20 @@ Gem::Specification.new do |s|
   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('github_changelog_generator')
-  s.add_development_dependency('pry-byebug')
-  s.add_development_dependency('rake', '~> 13.0.1')
+  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.9')
+  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('codenamev_bitbucket_api', '0.4.1')
-  s.add_dependency('colorize', '>= 0.7.0')
-  s.add_dependency('github_api', '0.18.2')
+  s.add_dependency('colorize', '>= 0.8.1')
+  s.add_dependency('github_api', '0.19')
   s.add_dependency('highline')
   s.add_dependency('httpclient')
 

data/lib/git_reflow/config.rb

@@ -14,7 +14,7 @@ module GitReflow
     # @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)
+    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 ' : ''
@@ -32,7 +32,7 @@ module GitReflow
     # @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)
+    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
@@ -47,7 +47,7 @@ module GitReflow
     # @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)
+    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
@@ -63,7 +63,7 @@ module GitReflow
     # @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)
+    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,8 +84,9 @@ module GitReflow
       end
 
       def authenticate(options = {silent: false})
-        self.class.user = options[:user]
-        if self.class.user.empty?
+        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
 

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.3"
+  VERSION = "0.9.7"
 end

data/lib/git_reflow/workflow.rb

@@ -132,7 +132,7 @@ module GitReflow
         @workflows
       end
 
-      # Creates a singleton method on the inlcuded class
+      # Creates a singleton method on the included class
       #
       # This method will take any number of keyword parameters. If @defaults keyword is provided, and the given
       # key(s) in the defaults are not provided as keyword parameters, then it will use the value given in the
@@ -157,7 +157,8 @@ module GitReflow
         self.commands[name] = params
         self.command_docs[name] = params
 
-        self.define_singleton_method(name) do |**args|
+        logger.debug "adding new command '#{name}' with #{defaults.inspect}"
+        self.define_singleton_method(name) do |args = {}|
           args_with_defaults = {}
           args.each do |name, value|
             if "#{value}".length <= 0 && !defaults[name].nil?
@@ -230,7 +231,7 @@ module GitReflow
         end
       end
 
-      # Creates a singleton method on the inlcuded class
+      # Creates a singleton method on the included class
       #
       # This method updates the help text associated with the provided command.
       #
@@ -310,13 +311,19 @@ module GitReflow
           opts.separator  "COMMAND OPTIONS:" if docs[:flags].any? || docs[:switches].any?
 
           self.commands[name][:flags].each do |flag_name, flag_default|
-            opts.on("-#{flag_name[0]}", "--#{flag_name} #{flag_name.upcase}", command_docs[name][:flags][flag_name]) do |f|
+            # There is a bug in Ruby that will not parse the flag value if no
+            # help text is provided.  Fallback to the flag name.
+            flag_help = command_docs[name][:flags][flag_name] || flag_name
+            opts.on("-#{flag_name[0]}", "--#{flag_name} #{flag_name.upcase}", flag_help) do |f|
               options[kebab_to_underscore(flag_name)] = f || flag_default
             end
           end
 
           self.commands[name][:switches].each do |switch_name, switch_default|
-            opts.on("-#{switch_name[0]}", "--[no-]#{switch_name}", command_docs[name][:switches][switch_name]) do |s|
+            # There is a bug in Ruby that will not parse the switch value if no
+            # help text is provided.  Fallback to the switch name.
+            switch_help = command_docs[name][:switches][switch_name] || switch_name
+            opts.on("-#{switch_name[0]}", "--[no-]#{switch_name}", switch_help) do |s|
               options[kebab_to_underscore(switch_name)] = s || switch_default
             end
           end