socialcast-git-extensions 3.1.32 → 3.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91d837e694388341d20e347a4f0352b9c93688b6
-  data.tar.gz: 4c937bd5d45da1e197639c9a52cba4d8e8a96562
+  metadata.gz: d8ea01b7fd80ae11dd510c1adc02a7b542fff16b
+  data.tar.gz: 4feb1e553b2a19e94c5380f15975128246ab4daa
 SHA512:
-  metadata.gz: 6d60e00c25b72164ec40c180d96eccd0cee4711dc1dfcd1b01802ce78a8bd74a4ac552f4b21bd69a22a966d67872cf6c1ecc2e46e36f7126c4f5e7af7a39f7c9
-  data.tar.gz: 30c7690e5ae4dec5095219aeafd147bdcdbd61ae569953f11524ef28fe5775f222dfffb69566e3d6818df6896c14eb964c60dbbba51d1369ffd86b821c508d9e
+  metadata.gz: 7038bed4dbfba680c9c92501d46970ffe5dc47fdfcb349e1c8b89d7d4a7b0c7f6221a485970cebfa5595b92bb5893f65e5c279be8821678ec8d4d84a5ab5e024
+  data.tar.gz: 661f2006acac98cc336c3fbe568a18f8c339a024e0e43fd9c5f3c55419810847557814cb24518f9f9e53d7bdde11b0e03da6e1d4083df26853b4f09888c20b8e

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

@@ -142,17 +142,22 @@ module Socialcast
 
       # build a summary of changes
       def changelog_summary(branch)
-        changes = `git diff --stat origin/#{base_branch}...#{branch}`.split("\n")
-        stats = changes.pop
+        changes = `git diff --numstat origin/#{base_branch}...#{branch}`.split("\n")
+        stats = `git diff --shortstat origin/#{base_branch}...#{branch}`
         if changes.length > 5
           dirs = changes.map do |file_change|
-            filename = "#{file_change.split.first}"
+            filename = "#{file_change.split.last}"
             dir = filename.gsub(/\/[^\/]+$/, '')
             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})"}
+        else
+          changes = changes.map do |line|
+            added, removed, filename = line.split
+            "#{filename} | #{added}+ #{removed}-"
+          end
         end
         (changes + [stats]).join("\n")
       end

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.32"
+    VERSION = "3.1.33"
   end
 end

data/socialcast-git-extensions.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "socialcast-git-extensions"
   s.version     = Socialcast::Gitx::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ryan Sonnek"]
-  s.email       = ["ryan@socialcast.com"]
+  s.authors     = ["Socialcast"]
+  s.email       = ["developers@socialcast.com"]
   s.homepage    = "http://github.com/socialcast/socialcast-git-extensions"
   s.summary     = %q{git extension scripts for socialcast workflow}
   s.description = %q{GIT it done!}

data/spec/git_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe Socialcast::Gitx::Git do
+  before do
+    stub_const 'TestClass', Class.new { |k| include Socialcast::Gitx::Git }
+    allow_any_instance_of(TestClass).to receive(:'`') do |_instance, _cmd|
+      raise 'Unstubbed backticks detected'
+    end
+  end
+  let(:test_instance) { TestClass.new }
+  subject { test_instance }
+
+  describe '#changelog_summary' do
+    subject { test_instance.send(:changelog_summary, branch) }
+    let(:base_branch) { 'master' }
+    let(:branch) { 'my-branch' }
+    let(:numstat_command) { 'git diff --numstat origin/master...my-branch' }
+    let(:shortstat_command) { 'git diff --shortstat origin/master...my-branch' }
+    before do
+      allow(test_instance).to receive(:base_branch).and_return(base_branch)
+      expect(test_instance).to receive(:'`').with(numstat_command).and_return(numstat_output)
+      expect(test_instance).to receive(:'`').with(shortstat_command).and_return(shortstat_output)
+    end
+    context 'when fewer than 6 files are changed' do
+      let(:shortstat_output) do
+        <<-EOS.strip_heredoc
+          5 files changed, 34 insertions(+), 129 deletions(-)
+        EOS
+      end
+      let(:numstat_output) do
+        <<-EOS.strip_heredoc
+          11      4       engines/shoelaces/app/models/hightop.rb
+          21      4       engines/shoelaces/spec/models/hightop_spec.rb
+          2       2       engines/shoelaces/spec/models/bowling_spec.rb
+          0       58      lib/tasks/images.rake
+          0       61      script/img_dev.rb
+        EOS
+      end
+      it 'shows file level detail and overall stats' do
+        is_expected.to eq <<-EOS.strip_heredoc
+          engines/shoelaces/app/models/hightop.rb | 11+ 4-
+          engines/shoelaces/spec/models/hightop_spec.rb | 21+ 4-
+          engines/shoelaces/spec/models/bowling_spec.rb | 2+ 2-
+          lib/tasks/images.rake | 0+ 58-
+          script/img_dev.rb | 0+ 61-
+          5 files changed, 34 insertions(+), 129 deletions(-)
+        EOS
+      end
+    end
+
+    context 'when 6 or more files are changed' do
+      let(:shortstat_output) do
+        <<-EOS.strip_heredoc
+          6 files changed, 35 insertions(+), 129 deletions(-)
+        EOS
+      end
+      let(:numstat_output) do
+        <<-EOS.strip_heredoc
+          11      4       engines/shoelaces/app/models/hightop.rb
+          21      4       engines/shoelaces/spec/models/hightop_spec.rb
+          2       2       engines/shoelaces/spec/models/bowling_spec.rb
+          0       58      lib/tasks/images.rake
+          0       61      script/img_dev.rb
+          1       0       doc/images.md
+        EOS
+      end
+      it 'summarizes the changes by directory' 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)
+          6 files changed, 35 insertions(+), 129 deletions(-)
+        EOS
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.32
+  version: 3.1.33
 platform: ruby
 authors:
-- Ryan Sonnek
+- Socialcast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -138,7 +138,7 @@ dependencies:
         version: '1.21'
 description: GIT it done!
 email:
-- ryan@socialcast.com
+- developers@socialcast.com
 executables:
 - git-backportpr
 - git-cleanup
@@ -188,6 +188,7 @@ files:
 - lib/socialcast-git-extensions/version.rb
 - socialcast-git-extensions.gemspec
 - spec/cli_spec.rb
+- spec/git_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/socialcast/socialcast-git-extensions
 licenses: []
@@ -214,4 +215,5 @@ specification_version: 4
 summary: git extension scripts for socialcast workflow
 test_files:
 - spec/cli_spec.rb
+- spec/git_spec.rb
 - spec/spec_helper.rb