socialcast-git-extensions 3.2 → 3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecdfa89c3f7f393389f3bde1e5d26a9a48776536
-  data.tar.gz: 4a49a0336e87e091f3dd5301e17a9254fbc2689d
+  metadata.gz: 283e0ebc38ce457e94ca898703a5ab8df99835b6
+  data.tar.gz: 61d4adc96c8f42e659a03320f2182d844c0aa4ef
 SHA512:
-  metadata.gz: 16673110b211af70bbd33b5ec58035976932b576c3f221e22ac2df8b00ee62dcc88f7317fc1ff765cbda6d915dfa9223c5ffb165aadf96604a3ef24ba5ac26be
-  data.tar.gz: 8e0d1ac0094f6229cc672f65261732d86fa7062c2d43ec465578ae31c87c1e6b90dd8f1fa75476b0c459222d64d5b921fc5ca41439d854655cd64b02d48f7ba3
+  metadata.gz: 310fc3393cfae32881d2b4e5ce1ae3fe1645ba9aeff0a2278b60991a89eff7ccd8d4742e4a2191c1ac7424746063ccad0f8828d0dc681f0357796ef31b0ad0a8
+  data.tar.gz: 2f8234257b185d9b817be64b9c9c1ca21b790bc2bf867513f66f795f3c6e253fe7141dcd76e3cf34e9b0cdcad381cb45d62df88c8aaf3e37427641edb7b723bd

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.2
+ruby-2.2.4

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.2.4

data/README.md

@@ -46,6 +46,10 @@ integrate the current feature branch into an aggregate branch (ex: prototype, st
 
 Find pull requests on github including a given commit
 
+## git branchdiff <branch> <base_branch (optional, default: master)>
+
+List branches merged into remote origin/`branch` and not also merged into origin/`base_branch`
+
 ## git reviewrequest
 
 create a pull request on github for peer review of the current branch.

data/bin/git-branchdiff

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+Socialcast::Gitx::CLI.start (['branchdiff'] + ARGV)

data/lib/socialcast-git-extensions/cli.rb

@@ -233,6 +233,18 @@ module Socialcast
         post message.strip
       end
 
+      desc 'branchdiff', 'show branches merged into one remote branch but not merged into another (default = master)'
+      def branchdiff(branch = nil, other_branch = 'master')
+        branch ||= ask "What remote branch would you like to compare against '#{other_branch}' (ex: staging)?"
+        run_cmd "git fetch origin"
+        results = branch_difference(branch, other_branch)
+        if results.any?
+          say "\nBranches in origin/#{branch} and not in origin/#{other_branch}:\n\n#{results.join("\n")}\n\n"
+        else
+          say "\nNo branches found in origin/#{branch} that are not also in origin/#{other_branch}\n\n"
+        end
+      end
+
       desc 'release', 'release the current branch to production'
       def release
         branch = current_branch

data/lib/socialcast-git-extensions/git.rb

@@ -74,6 +74,11 @@ module Socialcast
         branches.uniq
       end
 
+      # retrieve a list of branches merged into one remote branch but not merged into another
+      def branch_difference(branch, other_branch)
+        branches(:remote => true, :merged => "origin/#{branch}") - branches(:remote => true, :merged => "origin/#{other_branch}")
+      end
+
       # reset the specified branch to the same set of commits as the destination branch
       # reverts commits on aggregate branches back to a known good state
       # returns list of branches that were removed
@@ -87,7 +92,7 @@ module Socialcast
 
         run_cmd "git checkout #{base_branch}"
         refresh_branch_from_remote head_branch
-        removed_branches = branches(:remote => true, :merged => "origin/#{branch}") - branches(:remote => true, :merged => "origin/#{head_branch}")
+        removed_branches = branch_difference(branch, head_branch)
         run_cmd "git branch -D #{branch}" rescue nil
         run_cmd "git push origin --delete #{branch}" rescue nil
         run_cmd "git checkout -b #{branch}"
@@ -151,8 +156,8 @@ module Socialcast
             dir
           end
           dir_counts = Hash.new(0)
-          dirs.each {|dir| dir_counts[dir] += 1 }
-          changes = dir_counts.to_a.sort_by {|k,v| v}.reverse.first(5).map {|k,v| "#{k} (#{v} file#{'s' if v > 1})"}
+          dirs.each { |dir| dir_counts[dir] += 1 }
+          changes = dir_counts.to_a.sort_by { |k, v| [-v, k] }.first(5).map { |k, v| "#{k} (#{v} file#{'s' if v > 1})" }
         else
           changes = changes.map do |line|
             added, removed, filename = line.split

data/lib/socialcast-git-extensions/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.2"
+    VERSION = "3.3"
   end
 end

data/spec/cli_spec.rb

@@ -365,6 +365,47 @@ describe Socialcast::Gitx::CLI do
     end
   end
 
+  describe '#branchdiff' do
+    subject(:branchdiff) { Socialcast::Gitx::CLI.start(['branchdiff'] + args) }
+    let(:said_messages) { [] }
+    before do
+      expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:run_cmd).with('git fetch origin')
+      allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:say) do |_instance, msg|
+        said_messages << msg
+      end
+    end
+    context 'with one branch-name argument' do
+      let(:args) { ['my-branch'] }
+      before do
+        expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branch_difference).with('my-branch', 'master').and_return(['dummy_branch'])
+        branchdiff
+      end
+      it do
+        expect(said_messages).to eq ["\nBranches in origin/my-branch and not in origin/master:\n\ndummy_branch\n\n"]
+      end
+    end
+    context 'with two branch-name arguments' do
+      let(:args) { ['my-branch', 'other-branch'] }
+      before do
+        expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branch_difference).with('my-branch', 'other-branch').and_return(['dummy_branch'])
+        branchdiff
+      end
+      it do
+        expect(said_messages).to eq ["\nBranches in origin/my-branch and not in origin/other-branch:\n\ndummy_branch\n\n"]
+      end
+    end
+    context 'when no results are found' do
+      let(:args) { ['my-branch'] }
+      before do
+        expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branch_difference).with('my-branch', 'master').and_return([])
+        branchdiff
+      end
+      it do
+        expect(said_messages).to eq ["\nNo branches found in origin/my-branch that are not also in origin/master\n\n"]
+      end
+    end
+  end
+
   describe '#nuke' do
     before { allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).and_return([]) }
     context 'when target branch == staging and --destination == last_known_good_staging' do

data/spec/git_spec.rb

@@ -10,6 +10,20 @@ describe Socialcast::Gitx::Git do
   let(:test_instance) { TestClass.new }
   subject { test_instance }
 
+  describe '#branch_difference' do
+    subject { test_instance.send(:branch_difference, branch, other_branch) }
+    let(:other_branch) { 'master' }
+    let(:branch) { 'my-branch' }
+    before do
+      allow(test_instance).to receive(:branches) do |options|
+        expect(options[:remote]).to be_truthy
+        next %w(branch_a branch_b branch_c branch_z) if options[:merged] == "origin/#{branch}"
+        %w(branch_b branch_d branch_e branch_z) if options[:merged] == "origin/#{other_branch}"
+      end
+    end
+    it { is_expected.to eq %w(branch_a branch_c) }
+  end
+
   describe '#changelog_summary' do
     subject { test_instance.send(:changelog_summary, branch) }
     let(:base_branch) { 'master' }
@@ -64,13 +78,13 @@ describe Socialcast::Gitx::Git do
           1       0       doc/images.md
         EOS
       end
-      it 'summarizes the changes by directory' do
+      it 'summarizes the changes by directory, sorting by count desc then alpha asc' do
         is_expected.to eq <<-EOS.strip_heredoc
           engines/shoelaces/spec/models (2 files)
-          lib/tasks (1 file)
-          script (1 file)
           doc (1 file)
           engines/shoelaces/app/models (1 file)
+          lib/tasks (1 file)
+          script (1 file)
           6 files changed, 35 insertions(+), 129 deletions(-)
         EOS
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: '3.2'
+  version: '3.3'
 platform: ruby
 authors:
 - Socialcast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -141,6 +141,7 @@ email:
 - developers@socialcast.com
 executables:
 - git-backportpr
+- git-branchdiff
 - git-cleanup
 - git-findpr
 - git-integrate
@@ -166,6 +167,7 @@ files:
 - README.md
 - Rakefile
 - bin/git-backportpr
+- bin/git-branchdiff
 - bin/git-cleanup
 - bin/git-findpr
 - bin/git-integrate