git-heatmap 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 256be1e25dbb670296b2920019da24a553218a7b8c742c2fd5292ea632e136f4
-  data.tar.gz: ba835b8d95b1b2ab6416297455f79f899590f6445cebd1ef770eb618f6c8e79f
+  metadata.gz: c8764bb0188dcd5f4b9b153940a3a5e074447b418e6de705a95638a013fb8845
+  data.tar.gz: 56679e70910bc167fa99c505b48b27247c77c4bb129d2b5d388b3f5ed0ee5250
 SHA512:
-  metadata.gz: 726fd85534592c2148a8ec97d5b6f1a1eeb9372fc5fcd62ff1a6f54a00fa840ff3b134b9c07a3d14cf69ee7f0de461a9447087d2adbd8ed1bbb49547ed983c27
-  data.tar.gz: c626dbf885e982085f21c7c63c09bdcc8665b48fa17d89c6fa714d6931defe6bf192297eec90f24565783e79319bf49c7516d4490d147b0ed5db649ab6700fa3
+  metadata.gz: 7bfcdb43d912ee98518ed270dbea47f99ffeca4f68d7c70d403cdd0610ab5d402f594a139ddb1f0149832b8b1022bafe012530f13ad5b4d6a2b7330d210b5348
+  data.tar.gz: 5d60ca821d0554f96ff065b9285b0f22d5cd6f048e263aec189e8225efc20ffa52d171122f4cf468d5d18d5eecaeee29d22c70154654a7bc91b93b52593d56bc

data/README.md

@@ -2,7 +2,9 @@
 
 Visualise git history over time.
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/build.svg)](http://travis-ci.org/ioquatix/build)
+![A screenshot of the visualisation](Screenshot.png)
+
+[![Build Status](https://secure.travis-ci.org/ioquatix/git-heatmap.svg)](http://travis-ci.org/ioquatix/git-heatmap)
 
 ## Installation
 

data/lib/git/heatmap/commits.rb

@@ -33,6 +33,10 @@ module Git
 				@latest_commit_at = nil
 				
 				@maximum = 0
+				
+				@additions = Hash.new{|h,k| h[k] = 0}
+				@deletions = Hash.new{|h,k| h[k] = 0}
+				@churn = Hash.new{|h,k| h[k] = 0}
 			end
 			
 			attr :commits
@@ -41,25 +45,38 @@ module Git
 			attr :earliest_commit_at
 			attr :latest_commit_at
 			
+			attr :additions
+			attr :deletions
+			attr :churn
+			
 			def size
 				@commits.size
 			end
 			
 			attr :maximum
 			
-			def << commit
-				return if @commits.include?(commit.oid)
-				
-				@commits[commit.oid] = commit
-				
+			def add(commit, patch)
 				author = commit.author
 				time = author[:time]
 				key = @filter.key(time)
-				commits = (@periods[key] ||= [])
-				commits << commit
 				
-				if commits.size > @maximum
-					@maximum = commits.size
+				unless @commits.include?(commit.oid)
+					@commits[commit.oid] = commit
+					
+					commits = (@periods[key] ||= [])
+					commits << commit
+				end
+				
+				@additions[key] += patch.additions
+				@deletions[key] += patch.deletions
+				
+				churn = patch.additions + patch.deletions.abs
+				@churn[key] += churn
+				
+				total_churn = @churn[key]
+				
+				if total_churn > @maximum
+					@maximum = total_churn
 				end
 				
 				if @earliest_commit_at.nil? or time < @earliest_commit_at
@@ -114,9 +131,10 @@ module Git
 				
 				if parent = commit.parents.first
 					# Documentation seems to imply this shouldn't be needed.
-					diff = commit.diff(commit.parents.first.tree)
+					diff = parent.diff(commit.tree)
 				else
-					diff = commit.diff
+					empty_tree = Rugged::Tree.empty(commit.tree.repo)
+					diff = empty_tree.diff(commit.tree)
 				end
 				
 				author = commit.author
@@ -140,7 +158,7 @@ module Git
 					parts.pop # Remove file name
 					root = parts[0...@depth]
 					
-					@directories[root] << commit
+					@directories[root].add(commit, patch)
 				end
 			end
 			

data/lib/git/heatmap/templates/series.rb

@@ -40,12 +40,13 @@ module Git
 				attr :commits
 				attr :title
 				
-				def ramp(x, max = commits.maximum)
-					i = x.to_f / max
-					# j = Math::sqrt(i)
-					# k = i ** 2
-					# return interpolate(i, [j], [k])[0]
-					return i
+				def ramp(i, max = commits.maximum)
+					x = i.to_f / max
+					
+					# Smoothstep:
+					# return (3*x*x - 2*x*x*x)
+					
+					return Math::sqrt(x)
 				end
 				
 				def interpolate(t, x, y)

data/lib/git/heatmap/templates/series/main.css

@@ -62,6 +62,10 @@ table.summary {
 	flex-shrink: 0;
 }
 
+.heatmap ul.data li:hover {
+	background-color: rgba(0, 0, 0, 0.1);
+}
+
 .heatmap .hover .box, .heatmap ul.paths li.hover {
 	background-color: rgba(0, 0, 0, 0.2);
 }

data/lib/git/heatmap/templates/series/template.trenni

@@ -27,9 +27,9 @@
 				<li class="stats">
 					<?r commits.each_period do |period| ?>
 						<?r if period_commits = aggregate.periods[period]
-							size = period_commits.size
+							size = aggregate.churn[period]
 						?>
-						<a class="temperature box" style="background-color: #{background_color(size)}" title="#{period_commits.collect(&:oid).join(', ')}">#{size}</a>
+						<a class="temperature box" style="background-color: #{background_color(size)}" title="+#{aggregate.additions[period]}/-#{aggregate.deletions[period]} #{period_commits.collect(&:oid).join(', ')}">#{size}</a>
 						<?r else ?>
 						<div class="box"></div>
 						<?r end ?>

data/lib/git/heatmap/version.rb

@@ -1,5 +1,25 @@
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 module Git
-  module Heatmap
-    VERSION = "0.2.0"
-  end
+	module Heatmap
+		VERSION = "0.2.1"
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-heatmap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -122,6 +122,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- Screenshot.png
 - bin/git-heatmap
 - git-heatmap.gemspec
 - lib/git/heatmap.rb
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate heatmap style visualisations based on git history.