git-bundle 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5fd3dff341b34d70c5e00235262bb39cfe394cbf
-  data.tar.gz: 36f3501f1d8cda04c76e556728bec30c0c305917
+SHA256:
+  metadata.gz: ee97fbb6a2aa563b72b0abca619fada133610e53c9a738eca1dd2bcd654e0fd5
+  data.tar.gz: bf118e8f68b683b5b860a7ef8019844265c77b99ffbbec8f96d4b33aff090cf3
 SHA512:
-  metadata.gz: 852ec697b4e298057ddaffa3e72f9816336496e9aac114fc2f3385ba1e5d9e19147d4921eb0290b1dbc3fc96db98c30fef818cfd2e03b9de2fb7e96c3e32b605
-  data.tar.gz: 61749820a89a6694db8f698f858ae5f3478666cc5a7cdd4b4897138870e6185095a9658fcded76abe25b66eef703fe6d8597f0b59f8b681920f5021255562774
+  metadata.gz: 5c86d25bf251d24b074181fbfa845daa9a159bdb89f19039bdc21461db26c189cdaa08905a1cd83f1639f58dff7973cd731b3182f6f1789b4702f7d5f8764001
+  data.tar.gz: 5d7e815ae3385a9825b2ec28c9a956ab861e5444f8d0280afbfcd5a9525f91ea5304772dfb0128f7f7f44f5cc49c3f2201d8b95b030a1129870c04d3ab35e036

data/Gemfile.lock

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

data/lib/git_bundle.rb

@@ -1,7 +1,10 @@
 require 'bundler'
 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/commands/generic'
-require 'git_bundle/commands/push'
+require 'git_bundle/commands/push'
+require 'git_bundle/commands/version'

data/lib/git_bundle/cli.rb

@@ -4,7 +4,7 @@ module GitBundle
 
     def initialize
       @errors = []
-      load_repositories
+      @project = GitBundle::Project.new
     end
 
     def invoke(args)
@@ -12,23 +12,14 @@ module GitBundle
         when nil, '--help', 'help'
           puts `git #{args.join(' ')}`.gsub('git', 'gitb')
         when 'push'
-          GitBundle::Commands::Push.new(@repositories, args[1..-1]).invoke
+          GitBundle::Commands::Push.new(@project, args[1..-1]).invoke
+        when '--version'
+          GitBundle::Commands::Version.new.invoke
         else
-          GitBundle::Commands::Generic.new(@repositories, args).invoke
+          GitBundle::Commands::Generic.new(@project, args).invoke
       end
-    end
-
-    private
-    def load_repositories
-      @repositories = []
-      if Bundler.locked_gems
-        Bundler.settings.local_overrides.each do |name, path|
-          spec = Bundler.locked_gems.specs.find { |s| s.name == name }
-          @repositories << GitBundle::Repository.new_dependant(spec.name, path, spec.source.branch, spec.source.revision) if spec
-        end
-      end
-
-      @repositories << GitBundle::Repository.new_main(File.basename(Dir.getwd), Dir.getwd)
+    rescue Bundler::GemfileNotFound => e
+      puts_error("Could not find Gemfile in the current directory")
     end
   end
 end

data/lib/git_bundle/commands/generic.rb

@@ -3,50 +3,18 @@ module GitBundle
     class Generic
       include GitBundle::Console
 
-      def initialize(repositories, args)
-        @repositories = repositories
+      def initialize(project, args)
+        @project = project
         @args = args
       end
 
-      def print_wait_line(names)
-        STDOUT.print "Waiting for #{names.map {|name| colorize(name, COLORS[:highlight], true)}.join(', ')}"
-        STDOUT.flush
-      end
-
       def invoke
-        repository_results = @repositories.map {|repo| {repository: repo, output: '', error: false, complete: false, thread: nil}}
+        @project.load_dependant_repositories
 
-        @repositories.each_with_index do |repo, index|
-          results = repository_results[index]
-          results[:thread] = Thread.new do
-            results[:output] = repo.execute_git(@args, color: true)
-            results[:error] = true unless $?.exitstatus == 0
-          end
+        parallel(@project.repositories) do |repo|
+          output = repo.execute_git(@args, color: true)
+          ExecutionResult.new($?.exitstatus != 0, output)
         end
-
-        waiting_for_repositories = @repositories.map(&:name)
-        print_wait_line(waiting_for_repositories)
-
-        until waiting_for_repositories.empty?
-          repository_results.each do |result|
-            next if result[:complete]
-
-            if result[:thread].join(0.1)
-              result[:complete] = true
-              clear_line
-
-              puts_repo_heading(result[:repository])
-              puts result[:output]
-
-              waiting_for_repositories.delete(result[:repository].name)
-              print_wait_line(waiting_for_repositories) unless waiting_for_repositories.empty?
-            end
-          end
-        end
-
-        puts ''
-        errors = repository_results.select {|r| r[:error]}.map {|r| r[:repository].name}
-        puts_error "Command failed in #{errors.join(', ')}." unless errors.empty?
       end
     end
   end

data/lib/git_bundle/commands/push.rb

@@ -2,18 +2,31 @@ module GitBundle
   module Commands
     class Push
       include GitBundle::Console
+      include GitBundle::Shell
 
-      def initialize(repositories, args)
-        @repositories = repositories
+      def initialize(project, args)
+        @project = project
         @args = args
       end
 
       def invoke
+        @project.load_dependant_repositories
         return false unless prompt_confirm
 
+        main_repository = @project.main_repository
+
         lockfile = Bundler.default_lockfile.basename.to_s
-        stale_repos = @repositories.select { |repo| !repo.main && repo.stale? }
-        stale_commits_message = stale_repos.map { |repo| "#{repo.name}(#{repo.stale_commits_count})" }.join(', ')
+        stale_repos = @project.repositories.select { |repo| !repo.main && repo.stale? }
+        stale_commits_message = stale_repos.map do |repo|
+          repo.upstream_branch_exists? ? "#{repo.name}(#{repo.stale_commits_count})" : "#{repo.name}(new branch)"
+        end.join(', ')
+
+        stale_commits_description = ''
+        stale_repos.select(&:upstream_branch_exists?).each do |repo|
+          stale_commits_description << "== #{repo.name} ==\n"
+          stale_commits_description << repo.stale_commits
+          stale_commits_description << "\n\n"
+        end
 
         if stale_repos.any?
           puts "Local gems were updated. Building new #{lockfile} with bundle install."
@@ -31,52 +44,65 @@ module GitBundle
             message = "Gemfile.lock includes new commits of: #{stale_commits_message}."
           end
 
-          main_repository.commit(message, lockfile)
+          main_repository.commit_with_description(message, stale_commits_description, lockfile)
           puts message
         end
 
-        @repositories.select { |repo| !repo.main && repo.commits_not_pushed_count > 0 }.each do |repo|
+        @project.dependant_repositories.select { |repo| repo.commits_not_pushed? }.each do |repo|
           puts_repo_heading(repo)
-          unless repo.push(@args)
+
+          create_upstream = !repo.upstream_branch_exists?
+          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
           end
         end
 
         puts_repo_heading(main_repository)
-        unless main_repository.push(@args)
+        create_upstream = !main_repository.upstream_branch_exists?
+        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
       end
 
       private
       def prompt_confirm
-        if main_repository.file_changed?('Gemfile')
+        if @project.main_repository.file_changed?('Gemfile')
           puts_error 'Your Gemfile has uncommitted changes.  Commit them first before pushing.'
           return false
         end
 
         commits_to_push = false
-        @repositories.each do |repo|
+        upstream_branches_missing = []
+        @project.repositories.each do |repo|
           commits = repo.commits_not_pushed
           puts_repo_heading(repo)
 
-          if commits.empty?
-            puts 'No changes.'
+          if repo.upstream_branch_exists?
+            if commits.empty?
+              puts 'No changes.'
+            else
+              commits_to_push = true
+              puts commits
+            end
           else
-            commits_to_push = true
-            puts commits
+            upstream_branches_missing << repo.name
+            puts 'Remote branch does not exist yet.'
           end
         end
 
-        if commits_to_push
+        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)')
+
+        elsif commits_to_push
           puts_prompt('Are you sure you want to push these changes? (Y/N)')
 
         elsif gemfile_lock_stale?
           puts_prompt('Although you don\'t have any commits to push, your Gemfile.lock needs to be rebuilt, committed and pushed.')
           puts_prompt('Do you want to continue? (Y/N)')
 
-        elsif main_repository.file_changed?('Gemfile.lock')
+        elsif @project.main_repository.file_changed?('Gemfile.lock')
           puts_prompt('Although you don\'t have any commits to push, your Gemfile.lock needs to be committed and pushed.')
           puts_prompt('Do you want to continue? (Y/N)')
         else
@@ -86,17 +112,13 @@ module GitBundle
         STDIN.getch.upcase == 'Y'
       end
 
-      def main_repository
-        @repositories.find { |repo| repo.main }
-      end
-
       def gemfile_lock_stale?
-        @repositories.any? { |repo| repo.stale? }
+        @project.repositories.any? { |repo| repo.stale? }
       end
 
       def build_gemfile_lock
-        Dir.chdir(main_repository.path) do
-          puts `bundle install --quiet`
+        Dir.chdir(@project.main_repository.path) do
+          execute_live('bundle', 'install', '--quiet')
           return $?.exitstatus == 0
         end
       end

data/lib/git_bundle/commands/version.rb

@@ -0,0 +1,13 @@
+module GitBundle
+  module Commands
+    class Version
+      include GitBundle::Console
+
+      def invoke
+        puts "git-bundle version #{GitBundle::VERSION}"
+        puts "bundler version #{Bundler::VERSION}"
+        system 'git', '--version'
+      end
+    end
+  end
+end

data/lib/git_bundle/console.rb

@@ -1,10 +1,14 @@
+require 'io/console'
+
 module GitBundle
   module Console
-    COLORS = {error: 31,
-              attention: 32,
-              prompt: 33,
-              heading: 34,
-              highlight: 36}
+    COLORS = { error: 31,
+               attention: 32,
+               prompt: 33,
+               heading: 34,
+               highlight: 36 }
+
+    ExecutionResult = Struct.new(:error, :output)
 
     def clear_line
       STDOUT.print "\r\e[0K"
@@ -15,6 +19,10 @@ module GitBundle
       puts colorize("\n=== #{repo.name} (#{repo.branch})", COLORS[:heading], true)
     end
 
+    def puts_repo_heading_switch(repo, new_branch)
+      puts colorize("\n=== #{repo.name} (#{repo.branch} ⇒ #{new_branch})", COLORS[:heading], true)
+    end
+
     def puts_heading(text)
       puts colorize("\n=== #{text}", COLORS[:heading])
     end
@@ -31,6 +39,54 @@ module GitBundle
       puts colorize(text, COLORS[:error])
     end
 
+    def puts_stay_on_line(text)
+      STDOUT.print text
+      STDOUT.flush
+    end
+
+    def puts_wait_line(names)
+      puts_stay_on_line "Waiting for #{names.map { |name| colorize(name, COLORS[:highlight], true) }.join(', ')}"
+    end
+
+    def parallel(items, heading_proc = nil)
+      heading_proc ||= -> (item) { puts_repo_heading(item) }
+
+      item_results = items.map { |item| { item: item, output: '', error: false, complete: false, thread: nil } }
+
+      items.each_with_index do |item, index|
+        results = item_results[index]
+        results[:thread] = Thread.new do
+          result = yield(item)
+          results[:output] = result.output
+          results[:error] = result.error
+        end
+      end
+
+      waiting_for_items = items.map(&:name)
+      puts_wait_line(waiting_for_items)
+
+      until waiting_for_items.empty?
+        item_results.each do |result|
+          next if result[:complete]
+
+          if result[:thread].join(0.1)
+            result[:complete] = true
+            clear_line
+
+            heading_proc.call(result[:item])
+            puts result[:output]
+
+            waiting_for_items.delete(result[:item].name)
+            puts_wait_line(waiting_for_items) unless waiting_for_items.empty?
+          end
+        end
+      end
+
+      puts ''
+      errors = item_results.select { |item| item[:error] }.map { |item| item[:item].name }
+      puts_error "Command failed in #{errors.join(', ')}." unless errors.empty?
+    end
+
     private
     def colorize(text, color_code, bold = false)
       if bold

data/lib/git_bundle/project.rb

@@ -0,0 +1,37 @@
+module GitBundle
+  class Project
+    attr_reader :main_repository, :dependant_repositories
+
+    def initialize
+      # TODO: Find out how to set Bundler's directory so that the directory can be an argument
+      @directory = Dir.getwd
+      @main_repository = GitBundle::Repository.new_main(File.basename(@directory), @directory)
+    end
+
+    def load_dependant_repositories(locked_branches: true)
+      @dependant_repositories = []
+
+      if Bundler.locked_gems
+        if locked_branches
+          specs = Bundler.locked_gems.specs
+        else
+          old_value = Bundler.settings[:disable_local_branch_check]
+          Bundler.settings[:disable_local_branch_check] = true
+          specs = Bundler.definition.specs
+          Bundler.settings[:disable_local_branch_check] = old_value
+        end
+
+        Bundler.settings.local_overrides.each do |name, path|
+          spec = specs.find { |s| s.name == name }
+          if spec && spec.source.respond_to?(:branch)
+            @dependant_repositories << GitBundle::Repository.new_dependant(spec.name, path, spec.source.branch, spec.source.revision)
+          end
+        end
+      end
+    end
+
+    def repositories
+      @dependant_repositories + [@main_repository]
+    end
+  end
+end

data/lib/git_bundle/repository.rb

@@ -1,8 +1,12 @@
 module GitBundle
   class Repository
+    include GitBundle::Shell
+
     attr_reader :name,
                 :path,
-                :main
+                :main,
+                :branch,
+                :locked_branch
 
     def self.new_main(name, path)
       GitBundle::Repository.new(name, path, true, nil, nil)
@@ -16,12 +20,13 @@ module GitBundle
       @name = name
       @path = path
       @main = main_repository
+      @branch = fetch_branch
       @locked_branch = locked_branch
       @locked_revision = locked_revision
     end
 
-    def branch
-      @branch ||= execute_git('rev-parse', '--abbrev-ref', 'HEAD').chomp
+    def fetch_branch
+      execute_git('rev-parse', '--abbrev-ref', 'HEAD').chomp
     end
 
     def locked_branch
@@ -40,6 +45,15 @@ module GitBundle
       revision != locked_revision
     end
 
+    def reference_exists?(reference)
+      execute_git('cat-file', '-e', reference)
+      $?.exitstatus == 0
+    end
+
+    def upstream_branch_exists?
+      reference_exists?("origin/#{branch}")
+    end
+
     def stale_commits
       execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', "#{locked_revision}..#{revision}")
     end
@@ -48,6 +62,11 @@ module GitBundle
       execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', '--count', "#{locked_revision}..#{revision}").to_i
     end
 
+    def commits_not_pushed?
+      return true unless upstream_branch_exists?
+      commits_not_pushed_count > 0
+    end
+
     def commits_not_pushed
       execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', "origin/#{branch}..#{branch}")
     end
@@ -56,8 +75,14 @@ module GitBundle
       execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', '--count', "origin/#{branch}..#{branch}").to_i
     end
 
-    def push(args)
-      puts execute_git('push', args)
+    def push(args, create_upstream: false)
+      args = args.dup + ['--set-upstream', 'origin', branch] if create_upstream
+      execute_git_output('push', args)
+      $?.exitstatus == 0
+    end
+
+    def checkout(args)
+      execute_git_output('checkout', args)
       $?.exitstatus == 0
     end
 
@@ -75,20 +100,23 @@ module GitBundle
       $?.exitstatus == 0
     end
 
-    def execute_git(*args, **options)
+    def commit_with_description(message, description, *files)
+      execute_git('commit', '-m', message, '-m', description, files)
+      $?.exitstatus == 0
+    end
+
+    def git_command(*args, **options)
       git_command = ['git', '-C', @path]
       git_command += %w(-c color.status=always -c color.ui=always) if options.fetch(:color, false)
-      git_command += args.flatten
-      execute(*git_command)
+      git_command + args.flatten
     end
 
-    def execute(*args)
-      puts args.map{ |arg| "'#{arg}'" }.join(' ') if ENV['DEBUG'] == 'true'
+    def execute_git(*args, **options)
+      execute(*git_command(*args, **options))
+    end
 
-      pipe_out, pipe_in = IO.pipe
-      system *args, out: pipe_in, err: pipe_in
-      pipe_in.close
-      pipe_out.read
+    def execute_git_output(*args, **options)
+      execute_live(*git_command(*args, **options))
     end
   end
 end

data/lib/git_bundle/shell.rb

@@ -0,0 +1,29 @@
+require 'io/console'
+
+module GitBundle
+  module Shell
+    def execute_pipe(*args)
+      puts args.map { |arg| "'#{arg}'" }.join(' ') if ENV['DEBUG'] == 'true'
+
+      pipe_out, pipe_in = IO.pipe
+      fork do
+        system *args, out: pipe_in, err: pipe_in
+      end
+      pipe_in.close
+      pipe_out
+    end
+
+    def execute_live(*args)
+      execute_pipe(*args).each_line { |line| puts line.chomp }
+    end
+
+    def execute(*args)
+      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_in.close
+      pipe_out.read
+    end
+  end
+end

data/lib/git_bundle/version.rb

@@ -1,3 +1,3 @@
 module GitBundle
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,8 +46,11 @@ files:
 - lib/git_bundle/cli.rb
 - lib/git_bundle/commands/generic.rb
 - lib/git_bundle/commands/push.rb
+- lib/git_bundle/commands/version.rb
 - lib/git_bundle/console.rb
+- lib/git_bundle/project.rb
 - lib/git_bundle/repository.rb
+- lib/git_bundle/shell.rb
 - lib/git_bundle/version.rb
 homepage: https://github.com/EPI-USE-Labs/git-bundle
 licenses:
@@ -69,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simplifies working with gems from git repositories in combination with local