git-bundle 1.0.16 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3695e18c4ce00b28d229d3a0c471066be6fabb1117b2a363f2fa447766b8c4a
-  data.tar.gz: 27ef1522b91ef11574b109096a36fb62f41990630de84d9b31c97110e1da2523
+  metadata.gz: 863b8414db95b8fac7f015027b77d76ac56566b44c5d2666543fd881ea0f6e86
+  data.tar.gz: 70dfb3f91242a1262e6a0fa24d283d3381c7ebade58f05a3f397cc0e661981f1
 SHA512:
-  metadata.gz: 4322df4990c97e2fd8f6b41fda7471ace527a89c1f4aab6868e679493a88bc09df39a32bed5d3a5045b4b912497b6a3343ca796b1751582cb41ac8e31c60f358
-  data.tar.gz: d6b2258ae386d3b39bcd9757e9c5f2dc3e902a6b5e28152f027d6050180053dc338915f550baa7ba5a6855e0698e7db5593bc0359ec071183a4f2d8369318aa7
+  metadata.gz: 659b2bd1f1390e5f2332dc6764fc07fe21ee53194ea2acfca92fbc80e12abdf104b061a3eff8f7addde4062ce8a15633a12d910874886be76fcef1d1df5cf943
+  data.tar.gz: aed803f26f4b3ad1195e5be1eac230cce5cede1b7a7b5b669075bc7073a42e9877ea567b2b6bddce7ef408ac0c1fdc704d5a8e7301dfb14262a5639496b7e3f1

data/.gitignore

@@ -1,3 +1,4 @@
 =======
+.ruby-version
 *.gem
 /.idea/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-bundle (1.0.15)
+    git-bundle (1.0.19)
 
 GEM
   remote: https://rubygems.org/
@@ -11,8 +11,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
+  bundler (~> 2.4.19)
   git-bundle!
 
 BUNDLED WITH
-   1.17.3
+   2.4.19

data/git-bundle.gemspec

@@ -6,8 +6,8 @@ require 'git_bundle/version'
 Gem::Specification.new do |spec|
   spec.name          = 'git-bundle'
   spec.version       = GitBundle::VERSION
-  spec.authors       = ['Pierre Pretorius']
-  spec.email         = ['pierre@labs.epiuse.com']
+  spec.authors       = ['Pierre Pretorius', 'Divan Burger']
+  spec.email         = ['pierre@labs.epiuse.com', 'divan@labs.epiuse.com']
   spec.summary       = %q{Simplifies working with gems from git repositories in combination with local overrides.}
   spec.description   = %q{Simplifies working with gems from git repositories in combination with local overrides.
                           See the github page for more detail.}
@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.executables   = 'gitb'
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'bundler', '~> 2.4.19'
 end

data/lib/git_bundle/branch_config.rb

@@ -18,8 +18,26 @@ 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
+      File.exist?(path) ? YAML.load_file(path) || {} : nil
     end
 
     def changed?
@@ -28,8 +46,8 @@ module GitBundle
 
     def save
       if changed?
-        File.open(path, 'w') {|file| file.write(current.to_yaml.lines[1..-1].join)}
-        if File.exists?(path)
+        File.open(path, 'w') { |file| file.write(current.to_yaml.lines[1..-1].join) }
+        if File.exist?(path)
           puts "\t#{colorize('update', 34, bold: true)}\t#{filename}"
         else
           puts "\t#{colorize('create', 32, bold: true)}\t#{filename}"

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

@@ -16,7 +16,7 @@ module GitBundle
 
       def remote_branch_reference(repository)
         if repository.remote
-          "#{repository.remote}/#{repository.branch}"
+          "#{repository.remote} #{repository.branch}"
         else
           repository.branch
         end

data/lib/git_bundle/version.rb

@@ -1,3 +1,3 @@
 module GitBundle
-  VERSION = '1.0.16'
+  VERSION = '1.0.19'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.19
 platform: ruby
 authors:
 - Pierre Pretorius
-autorequire: 
+- Divan Burger
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,19 +17,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.4.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.4.19
 description: |-
   Simplifies working with gems from git repositories in combination with local overrides.
                             See the github page for more detail.
 email:
 - pierre@labs.epiuse.com
+- divan@labs.epiuse.com
 executables:
 - gitb
 extensions: []
@@ -59,7 +61,7 @@ homepage: https://github.com/EPI-USE-Labs/git-bundle
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,8 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Simplifies working with gems from git repositories in combination with local
   overrides.