git-bundle 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44ca1512e752fc39175da8c2a9b585372a40b0aaf437e2cf8dfc3aa3f01c0798
-  data.tar.gz: f648e9ef0701364938990823c8b477010cab190e28e37dcbf165643f36b42b1e
+  metadata.gz: 3be318a54723d942310503e63607c65c123d90c6523f8112bc9a33e47682f0de
+  data.tar.gz: dac2dade83c04bac6f2e716b5c2b0eab2c85ebd0d2d0faf078cf89fa641a23a1
 SHA512:
-  metadata.gz: 4874bdf0f1b08b019820a377e8b98474a606eeae36f978280aa3f3cb99d38f2d5eb4dc5a4071b323e01b58a5150b7dd315fdd11d1640e44456c2caa5d93c5245
-  data.tar.gz: 3c78b5ff23ae4412a114c1d60f3de6ae1b7d1745b59aff66eacfac6598871dd2697f37fbcd628d40ad43b49a7a9a3bf65fc08462221b2ece71448e6fcf1296ac
+  metadata.gz: 5d0b2b23d325b0e0abc79016868c998862234f8f029c0d171693883595706deec34ff2807a91d2eac39c786f48a4b72e1fa3354f8b04ee99bef7f4b8b32e5389
+  data.tar.gz: 5563b33d87947c8dc0861fb37c5101b4fc162b1d053f6939dcc75b8a5c1a57ff9c434065f1ef87e76ec4f2a22ea4557527ba71e76a7b4e176d4b09a0e4752ff6

data/Gemfile.lock

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

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'

data/lib/git_bundle/branch_config.rb

@@ -0,0 +1,38 @@
+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
+      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
+    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,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.repositories.each {|p| @project.branch_config.current[p.name] = p.branch}
+        @project.branch_config.save
+      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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-05-25 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