git-bundle 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8feeeb925b20aaf6289003e567f9f243e03d518
-  data.tar.gz: e8eac2a34eefd759c6a726c9e04e227fc736b623
+  metadata.gz: cc213a9a96e4df28ae91c20989a06431fd3202ce
+  data.tar.gz: 7be0ca2bca7c8d53a275b8d5ecd2fcfc63cd5951
 SHA512:
-  metadata.gz: 457e165a94c0e638a4437b6eb85aa6ad983673ae4573c24abb52f08e6e41942b1ac3f5105e3a3bb79ff4e9df6edef349eb7ae06ee5807846a46809ba8196ffd5
-  data.tar.gz: f3c240557a740e25d9ee5baab591e9ff224123d7732f65f3703b8c44545418a02a747109fe489fdf3bd8df6237b9d8bc151b24ef843a74d81987ce28c3441c75
+  metadata.gz: 23105fce66785c11cbd80adf4635251a77db4e5aaa4326f635cc739a1a141c01a2f6837cc25203655aa633ab7a857d1e6e3f1b8775f28f378a8385a5f3aa3ba7
+  data.tar.gz: 9b8e0e887bc405c619015524b4a5038b89df568ccbbdebdb855b0f8dc189d3b797711b4bafd58cbeba949d7704b24de48f1f3b7067c607b1e45fb7624bc60073

data/lib/git_bundle/commands/push.rb

@@ -12,7 +12,10 @@ module GitBundle
         return false unless prompt_confirm
 
         lockfile = Bundler.default_lockfile.basename.to_s
-        if gemfile_lock_stale?
+        stale_repos = @repositories.select { |repo| !repo.main && repo.stale? }
+        stale_commits_message = stale_repos.map { |repo| "#{repo.name}(#{repo.stale_commits_count})" }.join(', ')
+
+        if stale_repos.any?
           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.'
@@ -20,8 +23,19 @@ module GitBundle
           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|
+        if main_repository.file_changed?(lockfile)
+          main_repository.add_file(lockfile)
+          if stale_commits_message.empty?
+            message = 'Updated Gemfile.lock.'
+          else
+            message = "Gemfile.lock includes new commits of: #{stale_commits_message}."
+          end
+
+          main_repository.commit(message, lockfile)
+          puts message
+        end
+
+        @repositories.select { |repo| !repo.main && repo.commits_not_pushed_count > 0 }.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."
@@ -30,11 +44,6 @@ module GitBundle
         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
@@ -82,7 +91,7 @@ module GitBundle
       end
 
       def gemfile_lock_stale?
-        @repositories.any? { |repo| repo.revision != repo.locked_revision }
+        @repositories.any? { |repo| repo.stale? }
       end
 
       def build_gemfile_lock
@@ -93,4 +102,4 @@ module GitBundle
       end
     end
   end
-end
+end

data/lib/git_bundle/repository.rb

@@ -36,13 +36,24 @@ module GitBundle
       @locked_revision || revision
     end
 
+    def stale?
+      revision != locked_revision
+    end
+
+    def stale_commits
+      execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', "#{locked_revision}..#{revision}")
+    end
+
+    def stale_commits_count
+      execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', '--count', "#{locked_revision}..#{revision}").to_i
+    end
+
     def commits_not_pushed
       execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', "origin/#{branch}..#{branch}")
     end
 
-    def commit_messages_not_pushed
-      count = execute_git('rev-list', "origin/#{branch}..#{branch}", '--count').to_i
-      count.times.map { |num| execute_git('rev-list', '--pretty=oneline', "--skip=#{num}", '--max-count=1', "origin/#{branch}..#{branch}").sub(/\h*\s/, '').strip }
+    def commits_not_pushed_count
+      execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', '--count', "origin/#{branch}..#{branch}").to_i
     end
 
     def push(args)

data/lib/git_bundle/version.rb

@@ -1,3 +1,3 @@
 module GitBundle
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,4 +75,3 @@ specification_version: 4
 summary: Simplifies working with gems from git repositories in combination with local
   overrides.
 test_files: []
-has_rdoc: