git-bundle 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb0b6f61ddf85b02b7d6049c0455d718b914bcb15c064400ada6282cc800cc77
-  data.tar.gz: 3695a550182f8fe959fe2c49f74d423a289ed856e1966e3121af81881b3152e8
+  metadata.gz: 12b776d0338d7edbb3ecb6a8e6c41f5489778f61e0d1bd5304d2dd131eb56371
+  data.tar.gz: e03aa0c6178a9c3a2a15e2f2103381226df4aba8e1da657aa00e8b74ef5f6b6d
 SHA512:
-  metadata.gz: db48f086741a74993f3da2ed97c581a0a221e24e9ffdb4a058d2bba17005b91bb70ad07ca33419ba32084d3a0c23480f9fa289faeaabd3fd48ff72d709920c4d
-  data.tar.gz: b47410c2d9d88815d06c590cd28b18b5fbd66a6fd39ac57575c30a49dd5f64d494b6a88aa5071a1f3f1de9cff3d34a06057d82070bd89766a4f6eb5931770571
+  metadata.gz: b137c0527c447066095068e005691b3e186fd21e7048513d91411795a20925f8cb4c7ad19daf34a4d4f048199d087d37065d67e5b5f4d5602f085e64c797850d
+  data.tar.gz: f6fa7c3fabcee252b780bcbbb476c260ddd634fea984b57d089538e70fcffa8de94999494ee78b81dede17f862b2b6b2a65425b7a73e4aac609fda58bb6b4482

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-bundle (1.0.13)
+    git-bundle (1.0.14)
 
 GEM
   remote: https://rubygems.org/

data/lib/git_bundle/commands/push.rb

@@ -66,6 +66,7 @@ module GitBundle
       end
 
       private
+
       def prompt_confirm
         if @project.main_repository.file_changed?('Gemfile')
           puts_error 'Your Gemfile has uncommitted changes.  Commit them first before pushing.'
@@ -74,6 +75,7 @@ module GitBundle
 
         commits_to_push = false
         upstream_branches_missing = []
+        diverged_repos = []
         @project.repositories.each do |repo|
           commits = repo.commits_not_pushed
           puts_repo_heading(repo)
@@ -83,6 +85,7 @@ module GitBundle
               puts 'No changes.'
             else
               commits_to_push = true
+              diverged_repos << repo if repo.branch != @project.main_repository.branch
               puts commits
             end
           else
@@ -91,6 +94,17 @@ module GitBundle
           end
         end
 
+        if diverged_repos.any?
+          puts_prompt("\nThese repositories have changes and have diverged from the main application's branch (#{@project.main_repository.branch})")
+          puts_diverged_repos(diverged_repos)
+          puts_prompt("\nDo you want to continue? (Y/N)")
+          if STDIN.getch.upcase == 'Y'
+            puts ''
+          else
+            return false
+          end
+        end
+
         if !upstream_branches_missing.empty?
           puts_prompt("Missing upstream branches (#{upstream_branches_missing.join(', ')}) will be created and changes pushed.")
           puts_prompt('Do you want to continue? (Y/N)')

data/lib/git_bundle/console.rb

@@ -23,6 +23,10 @@ module GitBundle
       puts colorize("\n=== #{repo.name} (#{repo.branch} ⇒ #{new_branch})", COLORS[:heading], true)
     end
 
+    def puts_diverged_repos(repos)
+      repos.each { |repo| puts colorize("  #{repo.name} (#{repo.branch})", COLORS[:prompt], true) }
+    end
+
     def puts_heading(text)
       puts colorize("\n=== #{text}", COLORS[:heading])
     end
@@ -88,6 +92,7 @@ module GitBundle
     end
 
     private
+
     def colorize(text, color_code, bold = false)
       if bold
         "\e[1m\e[#{color_code}m#{text}\e[0m"
@@ -96,4 +101,4 @@ module GitBundle
       end
     end
   end
-end
+end

data/lib/git_bundle/version.rb

@@ -1,3 +1,3 @@
 module GitBundle
-  VERSION = '1.0.14'
+  VERSION = '1.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler