git-bundle 1.0.12 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44ca1512e752fc39175da8c2a9b585372a40b0aaf437e2cf8dfc3aa3f01c0798
-  data.tar.gz: f648e9ef0701364938990823c8b477010cab190e28e37dcbf165643f36b42b1e
+  metadata.gz: b3695e18c4ce00b28d229d3a0c471066be6fabb1117b2a363f2fa447766b8c4a
+  data.tar.gz: 27ef1522b91ef11574b109096a36fb62f41990630de84d9b31c97110e1da2523
 SHA512:
-  metadata.gz: 4874bdf0f1b08b019820a377e8b98474a606eeae36f978280aa3f3cb99d38f2d5eb4dc5a4071b323e01b58a5150b7dd315fdd11d1640e44456c2caa5d93c5245
-  data.tar.gz: 3c78b5ff23ae4412a114c1d60f3de6ae1b7d1745b59aff66eacfac6598871dd2697f37fbcd628d40ad43b49a7a9a3bf65fc08462221b2ece71448e6fcf1296ac
+  metadata.gz: 4322df4990c97e2fd8f6b41fda7471ace527a89c1f4aab6868e679493a88bc09df39a32bed5d3a5045b4b912497b6a3343ca796b1751582cb41ac8e31c60f358
+  data.tar.gz: d6b2258ae386d3b39bcd9757e9c5f2dc3e902a6b5e28152f027d6050180053dc338915f550baa7ba5a6855e0698e7db5593bc0359ec071183a4f2d8369318aa7

data/Gemfile.lock

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

data/lib/git_bundle/branch_config.rb

@@ -0,0 +1,42 @@
+module GitBundle
+  class BranchConfig
+    include GitBundle::Console
+    BRANCH_CONFIG_FILE = '.gitb.yml'
+
+    attr_reader :filename
+
+    def initialize(filename = nil)
+      @filename = filename || BRANCH_CONFIG_FILE
+    end
+
+    def path
+      File.join(Dir.pwd, filename)
+    end
+
+    def current
+      return @current if defined?(@current)
+      @current = read
+    end
+
+    def read
+      File.exists?(path) ? YAML.load_file(path) || {} : nil
+    end
+
+    def changed?
+      current != read
+    end
+
+    def save
+      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('identical', 34, bold: true)}\t#{filename}"
+      end
+    end
+  end
+end

data/lib/git_bundle/cli.rb

@@ -9,16 +9,18 @@ module GitBundle
 
     def invoke(args)
       case args[0]
-        when nil, '--help', 'help'
-          puts `git #{args.join(' ')}`.gsub('git', 'gitb')
-        when 'push'
-          GitBundle::Commands::Push.new(@project, args[1..-1]).invoke
-        when 'checkout'
-          GitBundle::Commands::Checkout.new(@project, args[1..-1]).invoke
-        when '--version'
-          GitBundle::Commands::Version.new.invoke
-        else
-          GitBundle::Commands::Generic.new(@project, args).invoke
+      when nil, '--help', 'help'
+        puts `git #{args.join(' ')}`.gsub('git', 'gitb')
+      when 'push'
+        GitBundle::Commands::Push.new(@project, args[1..-1]).invoke
+      when 'checkout'
+        GitBundle::Commands::Checkout.new(@project, args[1..-1]).invoke
+      when 'generate', 'g'
+        GitBundle::Commands::Generate.new(@project, args[1..-1]).invoke
+      when '--version'
+        GitBundle::Commands::Version.new.invoke
+      else
+        GitBundle::Commands::Generic.new(@project, args).invoke
       end
     rescue Bundler::GemfileNotFound => e
       puts_error("Could not find Gemfile in the current directory")

data/lib/git_bundle/commands/checkout.rb

@@ -1,7 +1,6 @@
 module GitBundle
   module Commands
     class Checkout
-      BRANCH_CONFIG_FILE = '.gitb.yml'
       include GitBundle::Console
 
       def initialize(project, args)
@@ -19,13 +18,18 @@ module GitBundle
           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)}
           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)}
+          end
+          @project.branch_config.save if @project.branch_config.changed?
         else
-          puts_error "Invalid arguments for checkout.  Usage: \n\tgitb checkout\n\tgitb checkout <branch>\n\tgitb checkout -b <new_branch>"
+          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>"
         end
       end
 
@@ -46,33 +50,19 @@ module GitBundle
         repo.refresh_branch
         puts_repo_heading(repo) unless create_new && !force
         success ? puts(output) : puts_error(output)
-        if create_new && success && branch_config
-          branch_config[repo.name] = branch
-          write_branch_config
+        if success && !repo.main && @project.branch_config.current && @project.branch_config.current[repo.name] != branch
+          @project.branch_config.current[repo.name] = branch
         end
         success
       end
 
       def checkout_parallel(repositories, fallback_branch)
         parallel(repositories) do |repo|
-          output = repo.execute_git(['checkout', branch_config&.dig(repo.name) || fallback_branch], color: true)
+          output = repo.execute_git(['checkout', @project.branch_config.current&.dig(repo.name) || fallback_branch], color: true)
           repo.refresh_branch
           ExecutionResult.new($?.exitstatus != 0, output)
         end
       end
-
-      def branch_config
-        return @branch_config if defined?(@branch_config)
-        @branch_config ||= File.exists?(config_file) ? YAML.load_file(config_file) || {} : nil
-      end
-
-      def config_file
-        File.join(Dir.pwd, BRANCH_CONFIG_FILE)
-      end
-
-      def write_branch_config
-        File.open(File.join(Dir.pwd, BRANCH_CONFIG_FILE), 'w') {|file| file.write(branch_config.to_yaml.lines[1..-1].join)}
-      end
     end
   end
 end

data/lib/git_bundle/commands/generate.rb

@@ -0,0 +1,26 @@
+module GitBundle
+  module Commands
+    class Generate
+      include GitBundle::Console
+
+      def initialize(project, args)
+        @project = project
+        @args = args
+      end
+
+      def invoke
+        @project.load_dependant_repositories
+        @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/project.rb

@@ -30,6 +30,10 @@ module GitBundle
       end
     end
 
+    def branch_config
+      @branch_config ||= GitBundle::BranchConfig.new
+    end
+
     def repositories
       @dependant_repositories + [@main_repository]
     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.12'
+  VERSION = '1.0.16'
 end

data/lib/git_bundle.rb

@@ -6,7 +6,9 @@ require 'git_bundle/shell'
 require 'git_bundle/cli'
 require 'git_bundle/repository'
 require 'git_bundle/project'
+require 'git_bundle/branch_config'
 require 'git_bundle/commands/generic'
 require 'git_bundle/commands/push'
 require 'git_bundle/commands/checkout'
+require 'git_bundle/commands/generate'
 require 'git_bundle/commands/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.16
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,8 +43,10 @@ files:
 - bin/gitb
 - git-bundle.gemspec
 - lib/git_bundle.rb
+- lib/git_bundle/branch_config.rb
 - lib/git_bundle/cli.rb
 - lib/git_bundle/commands/checkout.rb
+- lib/git_bundle/commands/generate.rb
 - lib/git_bundle/commands/generic.rb
 - lib/git_bundle/commands/push.rb
 - lib/git_bundle/commands/version.rb
@@ -72,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