git-bundle 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4a6f54ab617ba63055efff63cbf9d37153e72d31854e026f29f488f18fb684c
-  data.tar.gz: a806019ec6771dd366685e9010378e13307da996e12953c35dc6924d4c92f7b8
+  metadata.gz: 969518eba015e3e24e4c1a3a99235553eebd7a6df95aac38eede235021a95210
+  data.tar.gz: aa3e87047bbda8e7ce7b7c44f74b0def4fbf1c3c34a9eedac0a15716584ff114
 SHA512:
-  metadata.gz: afa4e548fe51edd754276848913b6a28b64feb117fc7986166f2f3a55aecff48b0cfcbd0bbfcc793a6117a3925b160439899c492b5df963b52e1d3818407d57b
-  data.tar.gz: 3a64d54bd5b22032ba155ed97b374f7e03a035682c236f8876bce70abf717805e1f46c28ea68613966f76dc66b4a48f73802de3b0f83247219d008e5d182fdc2
+  metadata.gz: 87167ce9f08edd4f318fa392b8c4dcec4ce24bc2f5368fb71cf77e5c405030b82dbfac1550c325b529b7a62c8913c3b643c19ee2bc5432348da7fd9d5cdbd1df
+  data.tar.gz: e8bfec3b2f616be96f6cb4758711db8f82a7bde511a10c5d2f52ed314e1e01e47938f248bc655662678ba8859af863e36dd6a25105ec6815b15cc4287ced17de

data/lib/git_bundle.rb

@@ -1,4 +1,5 @@
 require 'bundler'
+require 'yaml'
 require 'git_bundle/version'
 require 'git_bundle/console'
 require 'git_bundle/shell'
@@ -7,4 +8,5 @@ require 'git_bundle/repository'
 require 'git_bundle/project'
 require 'git_bundle/commands/generic'
 require 'git_bundle/commands/push'
+require 'git_bundle/commands/checkout'
 require 'git_bundle/commands/version'

data/lib/git_bundle/cli.rb

@@ -13,6 +13,8 @@ module GitBundle
           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

data/lib/git_bundle/commands/checkout.rb

@@ -0,0 +1,78 @@
+module GitBundle
+  module Commands
+    class Checkout
+      BRANCH_CONFIG_FILE = '.gitb.yml'
+      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
+        else
+          puts_error "Invalid arguments for checkout.  Usage: \n\tgitb checkout\n\tgitb checkout <branch>\n\tgitb checkout -b <new_branch>"
+        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 create_new && success && branch_config
+          branch_config[repo.name] = branch
+          write_branch_config
+        end
+        success
+      end
+
+      def checkout_parallel(repositories, fallback_branch)
+        parallel(repositories) do |repo|
+          output = repo.execute_git(['checkout', branch_config[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/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.11'
 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.11
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,6 +44,7 @@ files:
 - git-bundle.gemspec
 - lib/git_bundle.rb
 - lib/git_bundle/cli.rb
+- lib/git_bundle/commands/checkout.rb
 - lib/git_bundle/commands/generic.rb
 - lib/git_bundle/commands/push.rb
 - lib/git_bundle/commands/version.rb