git-visualiser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODg1MWRlNWQwZmI1ZWZmMjMxNWQ0MTk1MjA1YTYyMWFiNzRlYTk5Ng==
+    NTU1YTFlNmRmZjg1ZDVlZjViODI3Nzk5YzM5NzAyZjFiYzY3YWMzNA==
   data.tar.gz: !binary |-
-    OTgyYzIyMjAxMjIzMjg0YWU1ZDNjZjRkOWYzNjVlOTBiMmE0ZDNjMQ==
+    NTliMWUzMTZkM2FhNzIwZTE1ZDUzZTI1ZDhkYjQ3ZDFkMmY2NzhjYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWZjYjhmZTlhNTlkYzM4ODA4ZGI1NDc2ODliYTFmYjYwZmQwMTliZDg4MzU0
-    OTFjNDg0ODBhZWY5OTU5NDFhYmUwM2Q5YzBmNTY5ZGJlY2Y5NzM4MmQ2ZGE3
-    NTYzYTlmMDJjMzlkMjdiMGVkNTk4OWYwYjdhMjJhZjc2ZThlYjA=
+    NDdiMWJjMzI4M2FkM2YzYmQxM2YxM2VjYmI0MTYxMGJhZTc1NDNkODY4NTg5
+    ZGE1ODA1NTY3NDQ0N2ZlNTlhNGY5ZGQ5NmVlMzZhOWNlMzA0Y2E0YjQ4MzQ4
+    NzhjMGY5ZjI1YzU3YzVmZDJmNGYwYjFlMmJiMzQzOWMwZWU4ZGQ=
   data.tar.gz: !binary |-
-    MTYxNTVlZGUyYjk5ZjYwMzY0Y2U4YmZmYzU0Yjc3M2Q2NGM4ZGQ5YzViMTU5
-    NDRlOTM4NjkyOTljYWIwMmVhNDdkZDU0ZTkzZjU3ODEwMDA1MmQ2ODM1MWQ5
-    ZGRiMDI5NmE3NjkxZGRhODI2NjI2MmUzMTM0NWFhYjYxYmI3YWQ=
+    N2Q4ZTlkNDc4NDJhYjQxNTBlZGU3ODViMTE3NjczNzI5ZDk5Mzk1NTFhZTFm
+    NjcyYzIzMzE0YzRjZWQxZTMzZDE2M2RkZWYzODRlN2UzNjQ3MmQzNjA3ZTBi
+    NzU1NmFmMjhjMmQzZmZmMGY5MjZkZDRmODNhMDJmYzRkZTU2MzE=

data/lib/application/visualisation.rb

@@ -7,7 +7,7 @@ module Visualisation
     total_additions = total_deletions = 0
     remotes_arr = Visualisation.remotes
     Visualisation.branches_with_remotes.each do |branch|
-      # puts "branch: #{branch}"
+      puts "#{branch}"
       diff = Visualisation.branch_diff_size(branch)
       head_commit = Visualisation.head_commit_sha(branch)
       merged_with_master = Visualisation.branch_contains_commit("master", head_commit)
@@ -22,7 +22,8 @@ module Visualisation
   end
 
   def self.branches_with_remotes
-    `git branch -a`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') and b.gsub!(/remotes\//, '') }.delete_if { |b| b.include?('->') }
+    `git branch -a`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') and b.gsub!(/remotes\//, '') }
+      .delete_if { |b| b.include?('->') }
   end
 
   def self.remotes
@@ -60,19 +61,16 @@ module Visualisation
 
   def self.repo_branches_merged(show_remotes = true)
     merged_branches = {}
-    checked_branches = []
     compare_branches = branches_with_remotes
-    compare_branches.each_with_index do |b1, i|
+    compare_branches.each do |b1|
       b1_merges = {}
-      compare_branches.each_with_index do |b2, j|
-        next if i == j || b2.split("/").last == b1 || 
+      compare_branches.each do |b2|
+        next if b1 == b2 || b2.split("/").last == b1 || 
             (merged_branches.has_key?(b2.to_sym) && merged_branches[b2.to_sym].has_key?(b1.to_sym))
-            # (checked_branches[i] && checked_branches[i].include?(j) 
-        # puts "comparing branches #{b1} and #{b2}"
         directions = {}
+        puts "comparing #{b1} with #{b2}"
         directions.merge!(:left => true) if branch_merged_with_base?(b1, b2, remotes)
         directions.merge!(:right => true) if right = branch_merged_with_base?(b2, b1, remotes)
-
         b1_merges.merge!(b2.to_sym => directions)
       end
       merged_branches.merge!(b1.to_sym => b1_merges)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-visualiser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - James McCann