git-bundle 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12b776d0338d7edbb3ecb6a8e6c41f5489778f61e0d1bd5304d2dd131eb56371
-  data.tar.gz: e03aa0c6178a9c3a2a15e2f2103381226df4aba8e1da657aa00e8b74ef5f6b6d
+  metadata.gz: b3695e18c4ce00b28d229d3a0c471066be6fabb1117b2a363f2fa447766b8c4a
+  data.tar.gz: 27ef1522b91ef11574b109096a36fb62f41990630de84d9b31c97110e1da2523
 SHA512:
-  metadata.gz: b137c0527c447066095068e005691b3e186fd21e7048513d91411795a20925f8cb4c7ad19daf34a4d4f048199d087d37065d67e5b5f4d5602f085e64c797850d
-  data.tar.gz: f6fa7c3fabcee252b780bcbbb476c260ddd634fea984b57d089538e70fcffa8de94999494ee78b81dede17f862b2b6b2a65425b7a73e4aac609fda58bb6b4482
+  metadata.gz: 4322df4990c97e2fd8f6b41fda7471ace527a89c1f4aab6868e679493a88bc09df39a32bed5d3a5045b4b912497b6a3343ca796b1751582cb41ac8e31c60f358
+  data.tar.gz: d6b2258ae386d3b39bcd9757e9c5f2dc3e902a6b5e28152f027d6050180053dc338915f550baa7ba5a6855e0698e7db5593bc0359ec071183a4f2d8369318aa7

data/Gemfile.lock

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

data/lib/git_bundle/commands/generate.rb

@@ -10,9 +10,17 @@ module GitBundle
 
       def invoke
         @project.load_dependant_repositories
-        @project.dependant_repositories.each {|p| @project.branch_config.current[p.name] = p.branch}
+        @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,7 +68,7 @@ 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
@@ -67,7 +76,7 @@ module GitBundle
 
       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
@@ -90,7 +99,7 @@ module GitBundle
             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
 

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.15'
+  VERSION = '1.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,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