spreadtheword 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b676601f96251a4526b79a395e3a7b93a7d83e253d2f7897c2648cf1d529e4ad
-  data.tar.gz: 983c4020d19cb4ffa9d2e2ce7f1cbc94454184301294306b548ff12b16eb94d9
+  metadata.gz: 7c84c6682b953b9bf945cac9fb09fbf03812b01fa172d4afdbeb3de3119a8802
+  data.tar.gz: a15f5544db92ab6963e67c2036b4c4d3ee12a1f77e242e837bb446b195a23a92
 SHA512:
-  metadata.gz: ce7082cff5b1ec90ff41d0002af108010abdc2616f034c44bf6cc86715d72dfd90bd42c604ab15b5d55c9f81bf9367ac4967130832360664b1122a73f097565c
-  data.tar.gz: 6c36e551114b0557c5c57182491835e4eac5ae1eb25669c42cd68b65fb26090b67d9bafd385bb8da692bf5b3e838f8cfef3c864e3fab1b80b9b3e155a71d3ecf
+  metadata.gz: e735dc363ec52272fc3b6268903efb6cb406b09d30f7c9eafaa8c8528828877bab2a5a592009747d273804f6a5de027c5f21ae7c206a462f357deb0d5adb5cea
+  data.tar.gz: 9d2f1abc60d3f7ae0feb2f08b1705f3a6acac897ad1d82d6e012b1b8fda6faaa906e8edd45d0517e5720cc826d10f8dbcf8500b219e213e7d13bf2d3ecddb1a3

data/lib/spreadtheword.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'uri'
 require 'ostruct'
 require 'active_support/all'
@@ -52,7 +53,7 @@ class Spreadtheword
     @getTranslation = lambda { |sentence|
     unless translateCache[sentence]
       @utils.say "Translating\n-> #{sentence}\n"
-      translateCache[sentence] = @translate.translate(sentence, to: "en").text
+      translateCache[sentence] = CGI.unescapeHTML(@translate.translate(sentence, to: "en").text)
       @utils.say "<- #{translateCache[sentence]}\n"
     end
     translateCache[sentence]
@@ -86,7 +87,8 @@ class Spreadtheword
   def run!
     fetchAllLogs
     parseTopics
-    writer = Spreadtheword::LaTeX.new(@title, @author, @topics, @getTranslation)
+    sortTopics
+    writer = Spreadtheword::LaTeX.new(@title, @author, @topics, @getTranslation, @gitlab)
     writer.write!
   end
 
@@ -116,7 +118,7 @@ class Spreadtheword
   end
 
   def fetchLogs
-    cmd = %Q{git log --pretty=format:"%an__spreadtheword__%s"}
+    cmd = %Q{git log --pretty=format:"%an#{CONNECTOR}%s#{CONNECTOR}%H"}
     if @since
       cmd = %Q{#{cmd} #{@since}..master}
     end
@@ -132,6 +134,7 @@ class Spreadtheword
       OpenStruct.new.tap do |y|
         y.author = contents[0]
         y.origMsg = contents[1]
+        y.shaHash = contents[2]
         if @translate && y.origMsg =~ NONASCII
           y.msg = @getTranslation.call(contents[1])
         else
@@ -197,6 +200,17 @@ class Spreadtheword
     end
   end
 
+  def sortTopics
+    topicsH = @topics
+    @topics = []
+    topicsH.each do |k,v|
+      @topics << [k,v]
+    end
+    @topics.sort! do |x,y|
+      y[1].size <=> x[1].size
+    end
+  end
+
   def gitUserName
     `git config --get user.name`.to_s.strip
   end

data/lib/spreadtheword/latex.rb

@@ -1,11 +1,12 @@
 require 'nokogiri'
 
 class Spreadtheword::LaTeX
-  def initialize title, author, topics, getTranslation
+  def initialize title, author, topics, getTranslation, gitlab
     @title = title
     @author = author
     @topics = topics
     @getTranslation = getTranslation
+    @gitlab = gitlab
   end
 
   def write!
@@ -47,7 +48,9 @@ class Spreadtheword::LaTeX
 
   def sections
     ret = ''
-    @topics.each do |k,v|
+    @topics.each do |topic|
+      k=topic[0]
+      v=topic[1]
       next if k.nil?
       first = v[0]
       title = k
@@ -63,7 +66,7 @@ class Spreadtheword::LaTeX
         url = first[:payload][:spreadthewordPermalink]
       end
       ret += %Q_
-\\section{#{escape title}}
+\\section{#{escape title.titleize}}
 
 \\subsection{Background}
 
@@ -71,6 +74,8 @@ class Spreadtheword::LaTeX
 _
 
       if description.present?
+        description.strip!
+        description[0] = description[0].upcase
         ret += %Q_
 \\subsection{Description}
 
@@ -84,11 +89,12 @@ _
 \\newpage
       _
     end
-    if @topics[nil]
+    topicNil = @topics.find{|x| x[0].nil?}
+    if topicNil
       ret += %Q_
 \\section{Others}
       _
-      ret += printDevelopers(@topics[nil])
+      ret += printDevelopers(topicNil[1])
     end
     ret
   end
@@ -104,26 +110,46 @@ _
 
 \\begin{enumerate}
 _
-    developers.each do |k,v|
-      ret += %Q_
-      \\item #{escape k} ($#{v.size*100 / values.size}\\%$)
-      _
+    devArr = developers.map do |k,v|
+      [
+        v.size, %Q_
+\\item #{escape k.titleize} ($#{format('%.2f', v.size*100.0 / values.size)}\\%$)
+        _, k, v
+      ]
+    end
+    devArr.sort! do |x,y|
+      y[0] <=> x[0]
+    end
+    devArr.each do |x|
+      ret += x[1]
     end
     ret += %Q_
 \\end{enumerate}
     _
-    developers.each do |k,v|
+    devArr.each do |dev|
+      k = dev[2]
+      v = dev[3]
       ret += %Q_
-\\subsection{#{escape k}'s Commit Messages}
+\\subsection{#{escape k.titleize}'s Commit Messages}
 \\begin{enumerate}
       _
+      reverseH = {}
       uniqM = v.map do |x|
-        x[:commit].msg
-      end.uniq
-      uniqM.each do |x|
-        ret += %Q_
-\\item #{escape x}
-        _
+        msg = x[:commit].msg.to_s.strip.humanize
+        reverseH[msg] = x
+        msg
+      end.uniq.sort
+      uniqM.each do |msg|
+        x = reverseH[msg]
+        if @gitlab
+          ret += %Q_
+\\item \\href{#{@gitlab.scheme}://#{@gitlab.host}/#{x[:commit].gitlabProject[:namespace]}/#{x[:commit].gitlabProject[:project]}/commit/#{x[:commit].shaHash}}{#{escape msg}}
+          _
+        else
+          ret += %Q_
+\\item #{escape msg}
+          _
+        end
       end      
       ret += %Q_
 \\end{enumerate}

data/lib/spreadtheword/version.rb

@@ -1,3 +1,3 @@
 class Spreadtheword
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadtheword
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Minqi Pan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-01 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab