git-bundle 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fcf00baa552c9594401c3add235f2b13453dac1
-  data.tar.gz: d71d2fc8bccbf51e00414d0763382ce50ba602d1
+  metadata.gz: 6f8a6dbac04e7df74fd20844a8d1b3d9644f1481
+  data.tar.gz: 73c8387f701edb2c52daa89c5dcabfd11623e5d1
 SHA512:
-  metadata.gz: 44439c2d821e11854aad1aef4369c726d7d18b2d839ed7e7745111eee387815a34125ad7ad2d665c7edcb31911c89902e93eff6ed8e7bb716a2a876a4053412b
-  data.tar.gz: d560cf0525edff11740a68edc11019938f02949adaad8ebc407720f9d07b25010490f699913b850bc28a1dce06e18cd065a5fdefc646483235303a8d44a56e16
+  metadata.gz: 0c5d5533464c4aef6dc674c18f70870926955eeb7c3b26c8a511bf73fee90495182f22955639ec8e40f5ec6f90c0a7964eb3ad011409c81fbd78d73512dcadb5
+  data.tar.gz: 9670f36cc2eedc9742e128c474261b5376a4e0031bfc650f46f1182d8339cb448ff6f963de8d8ad33e7a315f4dbdaa1fe8405616321cbf32686a60c89b032d17

data/Gemfile.lock

@@ -0,0 +1,18 @@
+PATH
+  remote: .
+  specs:
+    git-bundle (1.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.12)
+  git-bundle!
+
+BUNDLED WITH
+   1.12.5

data/lib/git_bundle.rb

@@ -3,4 +3,5 @@ require 'git_bundle/version'
 require 'git_bundle/console'
 require 'git_bundle/cli'
 require 'git_bundle/repository'
-require 'git_bundle/push'
+require 'git_bundle/commands/generic'
+require 'git_bundle/commands/push'

data/lib/git_bundle/cli.rb

@@ -12,39 +12,20 @@ module GitBundle
         when nil, '--help', 'help'
           puts `git #{args.join(' ')}`.gsub('git', 'gitb')
         when 'push'
-          push = GitBundle::Push.new(@repositories, args[1..-1])
-          push.invoke if push.prompt_confirm
+          GitBundle::Commands::Push.new(@repositories, args[1..-1]).invoke
         else
-          exec_all(args)
+          GitBundle::Commands::Generic.new(@repositories, args).invoke
       end
-
-      puts_error @errors.join('\n') unless @errors.empty?
-    end
-
-    def exec_all(*argv)
-      exec_errors = []
-      @repositories.each do |repo|
-        puts_repo_heading(repo)
-        puts repo.execute_git(argv.join(' '))
-        exec_errors << repo.name unless $?.exitstatus == 0
-      end
-
-      @errors << "Command failed in #{exec_errors.join(', ')}." unless exec_errors.empty?
     end
 
     private
     def load_repositories
       @repositories = []
-      begin
-        lockfile_content = Bundler.read_file(Bundler.default_lockfile)
-        all_specs = Bundler::LockfileParser.new(lockfile_content).specs
+      if Bundler.locked_gems
         Bundler.settings.local_overrides.each do |name, path|
-          spec = all_specs.find { |s| s.name == name }
+          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
-
-      rescue Bundler::LockfileError
-        @errors << "Error reading #{Bundler.default_lockfile}: \n\t#{error.message}."
       end
 
       @repositories << GitBundle::Repository.new_main(File.basename(Dir.getwd), Dir.getwd)

data/lib/git_bundle/commands/generic.rb

@@ -0,0 +1,23 @@
+module GitBundle
+  module Commands
+    class Generic
+      include GitBundle::Console
+
+      def initialize(repositories, args)
+        @repositories = repositories
+        @args = args
+      end
+
+      def invoke
+        errors = []
+        @repositories.each do |repo|
+          puts_repo_heading(repo)
+          puts repo.execute_git(@args.join(' '))
+          errors << repo.name unless $?.exitstatus == 0
+        end
+
+        puts_error "Command failed in #{errors.join(', ')}." unless errors.empty?
+      end
+    end
+  end
+end

data/lib/git_bundle/commands/push.rb

@@ -0,0 +1,96 @@
+module GitBundle
+  module Commands
+    class Push
+      include GitBundle::Console
+
+      def initialize(repositories, args)
+        @repositories = repositories
+        @args = args
+      end
+
+      def invoke
+        return false unless prompt_confirm
+
+        lockfile = Bundler.default_lockfile.basename.to_s
+        if gemfile_lock_stale?
+          puts "Local gems were updated. Building new #{lockfile} with bundle install."
+          unless build_gemfile_lock
+            puts_error 'Bundle install failed.  Please run it manually before trying to push changes.'
+            return false
+          end
+        end
+
+        combined_messages = @repositories.map { |repo| repo.commit_messages_not_pushed }.uniq.join("\n\n")
+        @repositories.reject { |repo| repo.main || repo.commits_not_pushed.empty? }.each do |repo|
+          puts_repo_heading(repo)
+          unless repo.push(@args)
+            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)
+        if main_repository.file_changed?(lockfile)
+          main_repository.add_file(lockfile)
+          main_repository.commit("Updated Gemfile.lock to include changes: #{combined_messages}", lockfile)
+        end
+
+        unless main_repository.push(@args)
+          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')
+          puts_error 'Your Gemfile has uncommitted changes.  Commit them first before pushing.'
+          return false
+        end
+
+        commits_to_push = false
+        @repositories.each do |repo|
+          commits = repo.commits_not_pushed
+          puts_repo_heading(repo)
+
+          if commits.empty?
+            puts 'No changes.'
+          else
+            commits_to_push = true
+            puts commits
+          end
+        end
+
+        if 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')
+          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
+          return false
+        end
+
+        STDIN.getch.upcase == 'Y'
+      end
+
+      def main_repository
+        @repositories.find { |repo| repo.main }
+      end
+
+      def gemfile_lock_stale?
+        @repositories.any? { |repo| repo.revision != repo.locked_revision }
+      end
+
+      def build_gemfile_lock
+        Dir.chdir(main_repository.path) do
+          puts `bundle install --quiet`
+          return $?.exitstatus == 0
+        end
+      end
+    end
+  end
+end

data/lib/git_bundle/console.rb

@@ -1,13 +1,12 @@
 module GitBundle
   module Console
-    COLORS = {std: 0,
-              error: 31,
+    COLORS = {error: 31,
               attention: 32,
               prompt: 33,
-              heading: 36}
+              heading: 34}
 
     def puts_repo_heading(repo)
-      puts_heading "#{repo.name} (#{repo.branch})"
+      puts colorize("\n=== #{repo.name} (#{repo.branch})", COLORS[:heading], true)
     end
 
     def puts_heading(text)
@@ -27,8 +26,12 @@ module GitBundle
     end
 
     private
-    def colorize(text, color_code)
-      "\e[#{color_code}m#{text}\e[0m"
+    def colorize(text, color_code, bold = false)
+      if bold
+        "\e[1m\e[#{color_code}m#{text}\e[0m"
+      else
+        "\e[#{color_code}m#{text}\e[0m"
+      end
     end
   end
 end

data/lib/git_bundle/repository.rb

@@ -51,15 +51,17 @@ module GitBundle
     end
 
     def file_changed?(filename)
-      !execute_git("diff --name-only #{filename}").empty?
+      !execute_git("diff --name-only #{filename}").empty? && $?.exitstatus == 0
     end
 
     def add_file(filename)
       execute_git("add #{filename}")
+      $?.exitstatus == 0
     end
 
     def commit(message, *files)
       execute_git("commit -m '#{message}' #{files.join(' ')}")
+      $?.exitstatus == 0
     end
 
     def execute_git(command)

data/lib/git_bundle/version.rb

@@ -1,3 +1,3 @@
 module GitBundle
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Pierre Pretorius
@@ -36,14 +36,16 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - bin/gitb
 - git-bundle.gemspec
 - lib/git_bundle.rb
 - lib/git_bundle/cli.rb
+- lib/git_bundle/commands/generic.rb
+- lib/git_bundle/commands/push.rb
 - lib/git_bundle/console.rb
-- lib/git_bundle/push.rb
 - lib/git_bundle/repository.rb
 - lib/git_bundle/version.rb
 homepage: https://github.com/EPI-USE-Labs/git-bundle

data/lib/git_bundle/push.rb

@@ -1,80 +0,0 @@
-module GitBundle
-  class Push
-    include GitBundle::Console
-
-    def initialize(repositories, args)
-      @repositories = repositories
-      @args = args
-    end
-
-    def prompt_confirm
-      commits_to_push = false
-
-      @repositories.each do |repo|
-        commits = repo.commits_not_pushed
-        puts_repo_heading(repo)
-
-        if commits.empty?
-          puts 'No changes.'
-        else
-          commits_to_push = true
-          puts commits
-        end
-      end
-
-      if commits_to_push
-        puts_prompt("\nAre you sure you want to push these changes? (Y/N)")
-        STDIN.getch.upcase == 'Y'
-
-      elsif main_repository.file_changed?('Gemfile.lock')
-        puts_prompt("\nAlthough 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)')
-        STDIN.getch.upcase == 'Y'
-      end
-    end
-
-    def invoke
-      @repositories.each do |repo|
-        if repo.locked_branch != repo.branch
-          puts_error "\nThe git revisions of #{repo.name} does not match.  Are you running the correct branch?"
-          puts_error "You are running #{repo.name} branch: #{repo.branch}"
-          puts_error "Gemfile.lock references: #{repo.locked_branch}"
-          return
-        end
-      end
-
-      message = @repositories.map { |repo| repo.commit_messages_not_pushed }.uniq.join("\n\n")
-      @repositories.reject { |repo| repo.main || repo.commits_not_pushed.empty? }.each do |repo|
-        puts_repo_heading(repo)
-        unless repo.push(@args)
-          puts_error "Failed to push changes of #{repo.name}.  Try pulling the latest changes or resolve conflicts first."
-          return
-        end
-      end
-
-      puts_repo_heading(main_repository)
-      repo_changes = @repositories.any? { |repo| repo.revision == repo.locked_revision }
-
-      build_gemfile_lock if repo_changes
-      if main_repository.file_changed?('Gemfile.lock')
-        main_repository.add_file('Gemfile.lock')
-        main_repository.commit("Updated Gemfile.lock to include changes: #{commit_message}", 'Gemfile.lock')
-      end
-
-      main_repository.push(@args)
-    end
-
-    private
-    def main_repository
-      @repositories.find { |repo| repo.main }
-    end
-
-    def build_gemfile_lock
-      puts 'Local gems were updated. Building new Gemfile.lock with bundle install.'
-      Dir.chdir(main_repository.path) do
-        puts `bundle install --quiet`
-        $?.exitstatus == 0
-      end
-    end
-  end
-end