git-bundle 1.0.13 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3be318a54723d942310503e63607c65c123d90c6523f8112bc9a33e47682f0de
-  data.tar.gz: dac2dade83c04bac6f2e716b5c2b0eab2c85ebd0d2d0faf078cf89fa641a23a1
+  metadata.gz: 5d5e435d1dd24f9d955632075556705ba3503475ef4bea749b8c3814c473b6f1
+  data.tar.gz: 452aa1be724f46937ee68975f6813c622470fb50d3d2302cc18c0f239c4916ca
 SHA512:
-  metadata.gz: 5d0b2b23d325b0e0abc79016868c998862234f8f029c0d171693883595706deec34ff2807a91d2eac39c786f48a4b72e1fa3354f8b04ee99bef7f4b8b32e5389
-  data.tar.gz: 5563b33d87947c8dc0861fb37c5101b4fc162b1d053f6939dcc75b8a5c1a57ff9c434065f1ef87e76ec4f2a22ea4557527ba71e76a7b4e176d4b09a0e4752ff6
+  metadata.gz: 8fdbd6c5a9c6eb2a414384828439eb249e7692a6987912b00e04f1e037893f2a1724f3c0c572d30cbb5e30d31bfa0d1801e536faea1bda027dfec7430d85fdcc
+  data.tar.gz: 235a9d14af3802d74e22ac5cddda6e62a4baf9e1ed00fb85920c10511a7a6d747ba5b8470984e554fa659090b1e3ffa439ecc04cb84611044c2f962f45443d10

data/Gemfile.lock

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

data/lib/git_bundle/branch_config.rb

@@ -18,6 +18,24 @@ module GitBundle
       @current = read
     end
 
+    def remote(repo_name)
+      source = current[repo_name]
+      if source.include?(' ')
+        source.split(' ').first
+      else
+        nil
+      end
+    end
+
+    def branch(repo_name)
+      source = current[repo_name]
+      if source&.include?(' ')
+        source.split(' ').last
+      else
+        source
+      end
+    end
+
     def read
       File.exists?(path) ? YAML.load_file(path) || {} : nil
     end
@@ -27,11 +45,15 @@ module GitBundle
     end
 
     def save
-      File.open(path, 'w') {|file| file.write(current.to_yaml.lines[1..-1].join)}
-      if File.exists?(path)
-        puts "\t#{colorize('update', 34, bold: true)}\t#{filename}"
+      if changed?
+        File.open(path, 'w') { |file| file.write(current.to_yaml.lines[1..-1].join) }
+        if File.exists?(path)
+          puts "\t#{colorize('update', 34, bold: true)}\t#{filename}"
+        else
+          puts "\t#{colorize('create', 32, bold: true)}\t#{filename}"
+        end
       else
-        puts "\t#{colorize('create', 32, bold: true)}\t#{filename}"
+        puts "\t#{colorize('identical', 34, bold: true)}\t#{filename}"
       end
     end
   end

data/lib/git_bundle/commands/checkout.rb

@@ -10,55 +10,68 @@ module GitBundle
 
       def invoke
         @project.load_dependant_repositories
+        remaining_args = @args.dup
+        flag = remaining_args.first&.chars&.first == "-" ? remaining_args.shift : nil
+        branch = remaining_args.shift
 
-        if @args.empty?
-          checkout_parallel(@project.dependant_repositories, @project.main_repository.branch)
+        if remaining_args.any? || (flag && branch.nil?)
+          puts_error "Invalid arguments for checkout.  Usage: \n\tgitb checkout\n\tgitb checkout <branch>\n\tgitb checkout <remote/branch>\n\tgitb checkout -b <new branch>\n\tgitb checkout -a <force branch all repositories>"
+          return
+        end
 
-        elsif @args.size == 1
-          if checkout(@project.main_repository, @args.first)
-            checkout_parallel(@project.dependant_repositories, @args.first)
-          end
-        elsif @args.size == 2 && @args.first == '-b'
-          if checkout(@project.main_repository, @args.last, create_new: true, force: true)
-            @project.dependant_repositories.each {|r| checkout(r, @args.last, create_new: true)}
+        case
+        when flag == "-a" || flag == "--all"
+          if checkout(@project.main_repository, branch)
+            @project.dependant_repositories.each { |r| checkout(r, branch) }
           end
           @project.branch_config.save if @project.branch_config.changed?
-        elsif @args.size == 2 && (@args.first == '-a' || @args.first == '--all')
-          if checkout(@project.main_repository, @args.last)
-            @project.dependant_repositories.each {|r| checkout(r, @args.last)}
+        when flag == "-b"
+          if checkout(@project.main_repository, branch, create_new: true, force: true)
+            @project.dependant_repositories.each { |r| checkout(r, branch, create_new: true) }
           end
           @project.branch_config.save if @project.branch_config.changed?
+        when branch.nil?
+          checkout_parallel(@project.dependant_repositories, fallback_branch: @project.main_repository.branch)
         else
-          puts_error "Invalid arguments for checkout.  Usage: \n\tgitb checkout\n\tgitb checkout <branch>\n\tgitb checkout -b <new branch>\n\tgitb checkout -a <force branch all repositories>"
+          if checkout(@project.main_repository, branch)
+            checkout_parallel(@project.dependant_repositories, fallback_branch: branch)
+          end
         end
       end
 
       def checkout(repo, branch, create_new: false, force: false)
+        args = ['checkout']
         if create_new
           unless force
             puts_repo_heading(repo)
             puts_prompt("Create #{branch}? (Y/N)")
             return unless STDIN.getch.upcase == 'Y'
           end
-          args = ['checkout', '-b', branch]
-        else
-          args = ['checkout', branch]
+          args << '-b'
         end
+        args << branch
 
         output = repo.execute_git(args, color: true)
         success = $?.exitstatus == 0
         repo.refresh_branch
         puts_repo_heading(repo) unless create_new && !force
-        success ? puts(output) : puts_error(output)
-        if success && !repo.main && @project.branch_config.current && @project.branch_config.current[repo.name] != branch
-          @project.branch_config.current[repo.name] = branch
+        if success && !repo.main && create_new && @project.branch_config.current
+          old_remote = @project.branch_config.remote(repo.name)
+          if old_remote
+            @project.branch_config.current[repo.name] = "#{old_remote} #{branch}"
+          else
+            @project.branch_config.current[repo.name] = branch
+          end
+          puts(output)
+        else
+          puts_error(output)
         end
         success
       end
 
-      def checkout_parallel(repositories, fallback_branch)
+      def checkout_parallel(repositories, fallback_branch: nil)
         parallel(repositories) do |repo|
-          output = repo.execute_git(['checkout', @project.branch_config.current&.dig(repo.name) || fallback_branch], color: true)
+          output = repo.execute_git(['checkout', @project.branch_config.branch(repo.name) || fallback_branch], color: true)
           repo.refresh_branch
           ExecutionResult.new($?.exitstatus != 0, output)
         end

data/lib/git_bundle/commands/generate.rb

@@ -10,9 +10,17 @@ module GitBundle
 
       def invoke
         @project.load_dependant_repositories
-        @project.repositories.each {|p| @project.branch_config.current[p.name] = p.branch}
+        @project.dependant_repositories.each { |repo| @project.branch_config.current[repo.name] = remote_branch_reference(repo) }
         @project.branch_config.save
       end
+
+      def remote_branch_reference(repository)
+        if repository.remote
+          "#{repository.remote} #{repository.branch}"
+        else
+          repository.branch
+        end
+      end
     end
   end
 end

data/lib/git_bundle/commands/push.rb

@@ -11,7 +11,12 @@ module GitBundle
 
       def invoke
         @project.load_dependant_repositories
-        return false unless prompt_confirm
+        remote = @args.first || @project.main_repository.remote
+        unless remote
+          puts_error "New branch '#{@project.main_repository.branch}' is not tracking a remote branch. Specify which remote to push to, example:\n\tgitb push origin"
+          return false
+        end
+        return false unless prompt_confirm(remote)
 
         main_repository = @project.main_repository
 
@@ -22,7 +27,7 @@ module GitBundle
         end.join(', ')
 
         stale_commits_description = ''
-        stale_repos.select(&:upstream_branch_exists?).each do |repo|
+        stale_repos.select { |r| r.upstream_branch_exists? }.each do |repo|
           stale_commits_description << "== #{repo.name} ==\n"
           stale_commits_description << repo.stale_commits
           stale_commits_description << "\n\n"
@@ -51,7 +56,11 @@ module GitBundle
         @project.dependant_repositories.select { |repo| repo.commits_not_pushed? }.each do |repo|
           puts_repo_heading(repo)
 
-          create_upstream = !repo.upstream_branch_exists?
+          create_upstream = repo.upstream_branch_exists? ? nil : remote
+          if create_upstream && !repo.remote_exists?(create_upstream)
+            puts_error "Invalid remote: #{remote}"
+            return false
+          end
           unless repo.push(@args, create_upstream: create_upstream)
             puts_error "Failed to push changes of #{repo.name}.  Try pulling the latest changes or resolve conflicts first."
             return false
@@ -59,14 +68,15 @@ module GitBundle
         end
 
         puts_repo_heading(main_repository)
-        create_upstream = !main_repository.upstream_branch_exists?
+        create_upstream = main_repository.upstream_branch_exists? ? nil : remote
         unless main_repository.push(@args, create_upstream: create_upstream)
           puts_error "Failed to push changes of #{main_repository.name}.  Try pulling the latest changes or resolve conflicts first."
         end
       end
 
       private
-      def prompt_confirm
+
+      def prompt_confirm(remote)
         if @project.main_repository.file_changed?('Gemfile')
           puts_error 'Your Gemfile has uncommitted changes.  Commit them first before pushing.'
           return false
@@ -74,6 +84,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,11 +94,23 @@ module GitBundle
               puts 'No changes.'
             else
               commits_to_push = true
+              diverged_repos << repo if repo.branch != @project.main_repository.branch
               puts commits
             end
           else
             upstream_branches_missing << repo.name
-            puts 'Remote branch does not exist yet.'
+            puts "Remote branch #{remote}/#{repo.branch} does not exist yet."
+          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
 

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/repository.rb

@@ -5,6 +5,7 @@ module GitBundle
     attr_reader :name,
                 :path,
                 :main,
+                :remote,
                 :branch,
                 :locked_branch
 
@@ -26,6 +27,7 @@ module GitBundle
     end
 
     def refresh_branch
+      @remote = execute(*git_command('rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'), silence_err: true).split('/').first
       @branch = execute_git('rev-parse', '--abbrev-ref', 'HEAD').chomp
     end
 
@@ -50,8 +52,12 @@ module GitBundle
       $?.exitstatus == 0
     end
 
+    def remote_exists?(remote_name)
+      execute_git('remote').split("\n").include?(remote_name)
+    end
+
     def upstream_branch_exists?
-      reference_exists?("origin/#{branch}")
+      reference_exists?("#{remote}/#{branch}")
     end
 
     def stale_commits
@@ -68,15 +74,16 @@ module GitBundle
     end
 
     def commits_not_pushed
-      execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', "origin/#{branch}..#{branch}")
+      execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', "#{remote}/#{branch}..#{branch}")
     end
 
     def commits_not_pushed_count
-      execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', '--count', "origin/#{branch}..#{branch}").to_i
+      execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', '--count', "#{remote}/#{branch}..#{branch}").to_i
     end
 
-    def push(args, create_upstream: false)
-      args = args.dup + ['--set-upstream', 'origin', branch] if create_upstream
+    # Example: push([], create_upstream: 'origin')
+    def push(args, create_upstream: nil)
+      args = args.dup + ['--set-upstream', create_upstream, branch] if create_upstream
       execute_git_output('push', args)
       $?.exitstatus == 0 || (create_upstream && $?.exitstatus == 128)
     end

data/lib/git_bundle/shell.rb

@@ -17,11 +17,12 @@ module GitBundle
       execute_pipe(*args).each_line { |line| puts line.chomp }
     end
 
-    def execute(*args)
+    def execute(*args, silence_err: false)
       puts args.map { |arg| "'#{arg}'" }.join(' ') if ENV['DEBUG'] == 'true'
 
       pipe_out, pipe_in = IO.pipe
-      system *args, out: pipe_in, err: pipe_in
+      pipe_err_in = silence_err ? File::NULL : pipe_in
+      system *args, out: pipe_in, err: pipe_err_in
       pipe_in.close
       pipe_out.read
     end

data/lib/git_bundle/version.rb

@@ -1,3 +1,3 @@
 module GitBundle
-  VERSION = '1.0.13'
+  VERSION = '1.0.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.18
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,8 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Simplifies working with gems from git repositories in combination with local