git_analysis 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d2cf9257f65553a99f093ed87ab95b54f6cc50
-  data.tar.gz: f97582d793741002e2766ca967281e3aa4136672
+  metadata.gz: 08645a52eaadeb1867565675437d912c6f2e9902
+  data.tar.gz: 8e05322c0bbbbb96e0938b3d57251056fabc677d
 SHA512:
-  metadata.gz: 20f0882da6026806f1932a0bb4436ab0cfae7d4b95a0e082e7a62753392cc5592743262f8c2c376f0e3cde453551e117716b6dd87dc9c8f807193deeb7af2a82
-  data.tar.gz: e64295b927764850a513af55c1317f4394fc7cd88420cbe5391054d65c22c13e1daf642b9ac4a4d1bf81a796d5dffdf862beac383e63ded7417b1eda28d7c292
+  metadata.gz: ca59b4804e69e9e5d01fef1b7841af885d1dd6046d5d445689a011eb25fed9c5d4343a5700a884ba337e92f225784afd9146719694a10d9a4604672c5faa5554
+  data.tar.gz: 0f279e1d0a2e0683de45453e46939ae822c22af472dcfa7be94e0967f641d8984e0cefecb6fdd1f3c4bcfe4e3ca3a4147581bd75b8ad52c2871b63b8552c3bc0

data/README.md

@@ -34,30 +34,98 @@ $ cd git_analysis
 
 $ git-analysis count -d |jq '.'
 {
-  "total": 5,
-  "gmail.com": 5
+  "count": {
+    "gmail.com": 14
+  },
+  "infomation": {
+    "last_commit_oid": "7bf2839121b1940c4999b187cd5717f9e94a4a85",
+    "last_commit_date": "2014-08-04 23:55:25 +0900",
+    "total_commit": 14
+  }
 }
-```
 
 total = `git log --pretty=oneline |wc -l`
+```
+### Count E-mail Domain (topN add v0.0.3)
+if N = 1, display most domain. and others is `total_commit - top1_commit`
+
+```
+$ git clone https://github.com/libgit2/rugged.git
+$ cd rugged
+
+$ git-analysis count -d -n 2 |jq '.'
+{
+  "count": {
+    "gmail.com": 882,
+    "googlemail.com": 453,
+    "others": 437
+  },
+  "infomation": {
+    "last_commit_oid": "e96d26174b2bf763e9dd5dd2370e79f5e29077c9",
+    "last_commit_date": "2014-07-23 20:16:10 +0900",
+    "total_commit": 1772
+  }
+}
+```
+
 
 ### Count Addition & Deletion by Domain (add v0.0.2)
 ```
 $ git-analysis count -l |jq '.'
 {
-  "gmail.com": {
-    "addition": 290,
-    "deletion": 50
+  "count": {
+    "gmail.com": {
+      "addition": 364,
+      "deletion": 74
+    }
   },
-  "total": {
-    "addition": 290,
-    "deletion": 50
+  "infomation": {
+    "last_commit_oid": "022403ad80ee7b22231e40f9a3679a019d5439f6",
+    "last_commit_date": "2014-08-06 00:02:01 +0900",
+    "total_commit": {
+      "addition": 364,
+      "deletion": 74
+    }
   }
 }
 
 note: sort by addition
 ```
 
+### Count Addition & Deletion by Domain (topN add v0.0.3)
+if N = 1, display most domain. and others is `total_commit(add/del) - top1_commit(add/del)`
+
+```
+$ git clone https://github.com/libgit2/rugged.git
+$ cd rugged
+
+$ git-analysis count -l -n 2 |jq '.'
+{
+  "count": {
+    "gmail.com": {
+      "addition": 32308,
+      "deletion": 15641
+    },
+    "googlemail.com": {
+      "addition": 17668,
+      "deletion": 7277
+    },
+    "others": {
+      "addition": 21768,
+      "deletion": 7098
+    }
+  },
+  "infomation": {
+    "last_commit_oid": "e96d26174b2bf763e9dd5dd2370e79f5e29077c9",
+    "last_commit_date": "2014-07-23 20:16:10 +0900",
+    "total_commit": {
+      "addition": 71744,
+      "deletion": 30016
+    }
+  }
+}
+```
+
 
 ## Contributing
 

data/bin/git-analysis

@@ -7,14 +7,15 @@ require 'thor'
 
 class Cli < Thor
 
-  desc "count [-d][-l]", "count. email-domain or line. please run `git-analysis help count`)"
+  desc "count [-d][-l][-n]", "count. email-domain or line. please run `git-analysis help count`)"
   option :"domain", :type => :boolean, :aliases => '-d', :desc => "count e-mail domain. export json"
   option :"line", :type => :boolean, :aliases => '-l', :desc => "count insertion & deletion"
+  option :"number", :type => :numeric, :aliases => '-n', :desc => "topN."
   def count
     if options[:domain]
-      GitAnalysis.count_domain
+      GitAnalysis.count_domain(options[:number])
     elsif options[:line]
-      GitAnalysis.count_diff
+      GitAnalysis.count_diff(options[:number])
     end
   end
 

data/lib/git_analysis.rb

@@ -7,22 +7,35 @@ require "oj"
 module GitAnalysis
 
   # count domain
-  def self.count_domain()
+  def self.count_domain(number=0)
     repo = load_repo()
     count = Hash.new(0)
+    total = 0
     repo.walk(repo.last_commit).each do |commit|
       # TODO more Faster
       domain = commit.author[:email].gsub(/\A[a-zA-Z0-9\_\-\.\+ ]+@/,"").rstrip
       count[:"#{domain}"] += 1
-      count[:"total"] += 1
+      total += 1
     end
-    sorted = count.sort_by{|a,b| -b }
-    puts Oj.dump(Hash[sorted], :mode => :compat)
+    if number.nil?
+      sorted = count.sort_by{|a,b| -b }
+    else
+      sorted = count.sort_by{|a,b| -b }.first(number)
+      sum =0
+      sorted.each{|c| sum += c[1] } 
+      sorted << [:others, total - sum] 
+    end
+    result = Hash.new
+    result[:'count'] = Hash.new
+    result[:'count'] = Hash[sorted]
+    result[:'infomation'] = get_info(repo,total)
+    puts Oj.dump(result, :mode => :compat)
   end
 
-  def self.count_diff()
+  def self.count_diff(number=0)
     repo = load_repo()
     count = Hash.new{|h,k| h[k] = Hash.new(0) }
+    total = Hash.new(0)
     repo.walk(repo.last_commit).each do |commit|
       domain = commit.author[:email].gsub(/\A[a-zA-Z0-9\_\-\.\+ ]+@/,"").rstrip
       diff = commit_diff(repo, commit)
@@ -30,12 +43,29 @@ module GitAnalysis
       count[:"#{domain}"][:"addition"] += diff[1].to_i
       count[:"#{domain}"][:"deletion"] += diff[2].to_i
 
-      count[:"total"][:"addition"] += diff[1].to_i
-      count[:"total"][:"deletion"] += diff[2].to_i
+      total[:"addition"] += diff[1].to_i
+      total[:"deletion"] += diff[2].to_i
     end
-    # TODO more Faster! it takes 50 sec(10k / sec).
-    sorted = count.sort_by{|a,b| -b[:"addition"] }
-    puts Oj.dump(Hash[sorted], :mode => :compat)
+    if number.nil?
+      # TODO more Faster! it takes 50 sec(10k / sec).
+      sorted = count.sort_by{|a,b| -b[:"addition"] }
+    else
+      sorted = count.sort_by{|a,b| -b[:"addition"] }.first(number)
+      sum = Hash.new(0)
+      sorted.each{|c|
+        sum["addition"] += c[1][:"addition"]
+        sum["deletion"] += c[1][:"deletion"]
+      }
+      tmp = Hash.new(0)
+      tmp[:"addition"] = total[:"addition"] - sum["addition"]
+      tmp[:"deletion"] = total[:"deletion"] - sum["deletion"]
+      sorted << [:"others",tmp]
+    end
+    result = Hash.new
+    result[:'count'] = Hash.new
+    result[:'count'] = Hash[sorted]
+    result[:'infomation'] = get_info(repo,total)
+    puts Oj.dump(result, :mode => :compat)
   end
 
   # export
@@ -84,4 +114,11 @@ module GitAnalysis
     return diff_stat
   end
 
+  def self.get_info(repo,total)
+    info = Hash.new
+    info[:'last_commit_oid'] = repo.last_commit.oid
+    info[:'last_commit_date'] = repo.last_commit.time.to_s
+    info[:'total_commit'] = total
+    return info
+  end
 end

data/lib/git_analysis/version.rb

@@ -1,3 +1,3 @@
 module GitAnalysis
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_analysis
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - volanja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler