git-bundle 1.0.10 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4a6f54ab617ba63055efff63cbf9d37153e72d31854e026f29f488f18fb684c
-  data.tar.gz: a806019ec6771dd366685e9010378e13307da996e12953c35dc6924d4c92f7b8
+  metadata.gz: 12b776d0338d7edbb3ecb6a8e6c41f5489778f61e0d1bd5304d2dd131eb56371
+  data.tar.gz: e03aa0c6178a9c3a2a15e2f2103381226df4aba8e1da657aa00e8b74ef5f6b6d
 SHA512:
-  metadata.gz: afa4e548fe51edd754276848913b6a28b64feb117fc7986166f2f3a55aecff48b0cfcbd0bbfcc793a6117a3925b160439899c492b5df963b52e1d3818407d57b
-  data.tar.gz: 3a64d54bd5b22032ba155ed97b374f7e03a035682c236f8876bce70abf717805e1f46c28ea68613966f76dc66b4a48f73802de3b0f83247219d008e5d182fdc2
+  metadata.gz: b137c0527c447066095068e005691b3e186fd21e7048513d91411795a20925f8cb4c7ad19daf34a4d4f048199d087d37065d67e5b5f4d5602f085e64c797850d
+  data.tar.gz: f6fa7c3fabcee252b780bcbbb476c260ddd634fea984b57d089538e70fcffa8de94999494ee78b81dede17f862b2b6b2a65425b7a73e4aac609fda58bb6b4482

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-bundle (1.0.10)
+    git-bundle (1.0.14)
 
 GEM
   remote: https://rubygems.org/
@@ -15,4 +15,4 @@ DEPENDENCIES
   git-bundle!
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/lib/git_bundle.rb

@@ -1,10 +1,14 @@
 require 'bundler'
+require 'yaml'
 require 'git_bundle/version'
 require 'git_bundle/console'
 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'

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,14 +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 '--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

@@ -0,0 +1,68 @@
+module GitBundle
+  module Commands
+    class Checkout
+      include GitBundle::Console
+
+      def initialize(project, args)
+        @project = project
+        @args = args
+      end
+
+      def invoke
+        @project.load_dependant_repositories
+
+        if @args.empty?
+          checkout_parallel(@project.dependant_repositories, @project.main_repository.branch)
+
+        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)}
+          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>\n\tgitb checkout -a <force branch all repositories>"
+        end
+      end
+
+      def checkout(repo, branch, create_new: false, force: false)
+        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]
+        end
+
+        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
+        end
+        success
+      end
+
+      def checkout_parallel(repositories, fallback_branch)
+        parallel(repositories) do |repo|
+          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
+    end
+  end
+end

data/lib/git_bundle/commands/generate.rb

@@ -0,0 +1,18 @@
+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 {|p| @project.branch_config.current[p.name] = p.branch}
+        @project.branch_config.save
+      end
+    end
+  end
+end

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/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

@@ -20,13 +20,13 @@ module GitBundle
       @name = name
       @path = path
       @main = main_repository
-      @branch = fetch_branch
       @locked_branch = locked_branch
       @locked_revision = locked_revision
+      refresh_branch
     end
 
-    def fetch_branch
-      execute_git('rev-parse', '--abbrev-ref', 'HEAD').chomp
+    def refresh_branch
+      @branch = execute_git('rev-parse', '--abbrev-ref', 'HEAD').chomp
     end
 
     def locked_branch

data/lib/git_bundle/version.rb

@@ -1,3 +1,3 @@
 module GitBundle
-  VERSION = '1.0.10'
+  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.10
+  version: 1.0.15
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,7 +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