git_reflow 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7692bb55eed68ee06c7ef9e1b2fe26875e47f9bf312d1f255632adba2d67e86a
-  data.tar.gz: 2a84dec6c6c94bcdf9ed06c2fa6759a7a241cd3cf90330f3f4c56c82758650c8
+  metadata.gz: 328d9e72bc031e3fd7adedd2ed882c922937670ba95ac98d8c42f86f9e2ee129
+  data.tar.gz: 6ef4dcd1023199822a01140292c050ebda60d812909b479d9a4a57e0f40c4855
 SHA512:
-  metadata.gz: b27fc6914668bf71637cc55cdb551e603eaa9584c4c2ff140dfc186fe942ebd50cfabab180d20a526ff322c908db7383dd68a912a432437a622e91cbc2469f3a
-  data.tar.gz: f4053198734d076e4e3b53385091be46fc00d4b182287db22f5bd0be93355a17fbe77cc28536ceb0c47e9a3d2a5079dcf73e7f2f255745aa931c2e15ef479d83
+  metadata.gz: 193cd5e199b43000044f268157acc6c74e5075682d75fb3cd14a495367d99eb7e16565e1ab683a9a74b795bc7ce2acfb0783a191232092ebff6b13a52fb24da3
+  data.tar.gz: c272eb8a4b5fde35215a90b38763daa83bb1b87978ed3b24ee6f3415c02867f0c85e18d0c8ba5751865ebb7ca4008311d60d4c7e1798933e6fc37732340673cd

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.9.3)
+    git_reflow (0.9.4)
       bundler (>= 1.10.0)
       codenamev_bitbucket_api (= 0.4.1)
       colorize (>= 0.7.0)
-      github_api (= 0.18.2)
+      github_api (= 0.19)
       highline
       httpclient
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -33,24 +33,24 @@ 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.7)
+    crack (0.4.4)
     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.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_middleware (1.0.0)
+      faraday (~> 1.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)
@@ -65,16 +65,16 @@ GEM
     hashie (3.6.0)
     highline (2.0.3)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
+    jwt (2.2.2)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    multi_json (1.14.1)
+    minitest (5.14.2)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
@@ -82,7 +82,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pry (0.13.1)
@@ -91,26 +91,26 @@ GEM
     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)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.1)
     rdoc (6.2.1)
     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)
+    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.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       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.0)
+    ruby2_keywords (0.0.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -119,12 +119,12 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    webmock (3.8.3)
+    webmock (3.9.3)
       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.1)
 
 PLATFORMS
   ruby

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

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   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('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_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/git_hub/pull_request.rb

@@ -147,13 +147,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/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.4"
 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
@@ -230,7 +230,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.
       #

data/spec/lib/git_reflow/git_server/git_hub/pull_request_spec.rb

@@ -100,7 +100,7 @@ describe GitReflow::GitServer::GitHub::PullRequest do
     context "Testing Nil Comments" do
       before do
         stub_request(:get, "https://api.github.com/repos/reenhanced/repo/pulls/2/comments?access_token=a1b2c3d4e5f6g7h8i9j0").
-         with(:headers => {'Accept'=>'application/vnd.github.v3+json,application/vnd.github.beta+json;q=0.5,application/json;q=0.1', 'Accept-Charset'=>'utf-8', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'token a1b2c3d4e5f6g7h8i9j0', 'User-Agent'=>'Github API Ruby Gem 0.18.2'}).
+         with(:headers => {'Accept'=>'application/vnd.github.v3+json,application/vnd.github.beta+json;q=0.5,application/json;q=0.1', 'Accept-Charset'=>'utf-8', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'token a1b2c3d4e5f6g7h8i9j0', 'User-Agent'=>'Github API Ruby Gem 0.19.0'}).
          to_return(:status => 200, :body => "", :headers => {})
 
         FakeGitHub.new(

data/spec/lib/git_reflow/git_server/pull_request_spec.rb

@@ -491,14 +491,42 @@ describe GitReflow::GitServer::PullRequest do
         allow(GitReflow::Config).to receive(:get).with('reflow.always-cleanup').and_return('false')
       end
 
-      context "and user chooses to cleanup" do
-        before { expect(pr).to receive(:ask).with('Would you like to push this branch to your remote repo and cleanup your feature branch? ').and_return('yes') }
+      context "and always cleanup local config is set" do
+      end
+
+      context "and always cleanup remote config is set" do
+      end
+
+      context "and user chooses to cleanup local only" do
+        before do
+          expect(pr).to receive(:ask).with('Would you like to cleanup your local feature branch? ').and_return('yes')
+          allow(pr).to receive(:ask).with('Would you like to cleanup your remote feature branch? ').and_return('no')
+        end
+        it { should be_truthy }
+      end
+
+      context "and user chooses to cleanup remote only" do
+        before do
+          expect(pr).to receive(:ask).with('Would you like to cleanup your local feature branch? ').and_return('no')
+          expect(pr).to receive(:ask).with('Would you like to cleanup your remote feature branch? ').and_return('yes')
+        end
         it     { should be_truthy }
       end
 
-      context "and user chooses not to cleanup" do
-        before { expect(pr).to receive(:ask).with('Would you like to push this branch to your remote repo and cleanup your feature branch? ').and_return('no') }
-        it     { should be_falsy }
+      context "and user chooses to cleanup local and remote" do
+        before do
+          allow(pr).to receive(:ask).with('Would you like to cleanup your local feature branch? ').and_return('yes')
+          allow(pr).to receive(:ask).with('Would you like to cleanup your remote feature branch? ').and_return('yes')
+        end
+        it { should be_truthy }
+      end
+
+      context "and user chooses to cleanup neither local nor remote" do
+        before do
+          expect(pr).to receive(:ask).with('Would you like to cleanup your local feature branch? ').and_return('no')
+          allow(pr).to receive(:ask).with('Would you like to cleanup your remote feature branch? ').and_return('no')
+        end
+        it     { should be_falsey }
       end
     end
   end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Valentino Stoll
 - Robert Stern
 - Nicholas Hance
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -186,14 +186,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -336,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A better git process
 test_files: