mgit 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4447be436da4ce6283adfef2ca2e65f522715644
-  data.tar.gz: 2b898725657dea57e19a3a28a7ec0691007fa234
+  metadata.gz: 8174b6f645364ef888f498ffa24274882cf9dd39
+  data.tar.gz: b6752daa7ac077dae28c7c46a47785e05b5b430a
 SHA512:
-  metadata.gz: d1deafe5dfa39f02dbc3b2c9be66fe5830acb45c628fb7be70a27c32685d28f59efdd18c8b89e91427f27472cb05d5d7892389503014c08be01e59f3fed2e12d
-  data.tar.gz: bf2c584feefe6d708e5f04ed660132f836322ad89e874a51ac5a4fe4babfe294c4e7e74352044e8658e79b0da78100866b47d61f31d01f2512cc2569b0f7f178
+  metadata.gz: b4d6463d5a85e932aaa3d575b5c440b2a1b13f352a2efc3a2e366afe6cc81ac782ab66a2efb60e4cf62ddafaa21fdc3cb1d02ef3cc8ee8dc5fc7c85f52f2d671
+  data.tar.gz: fbc6b246c055889649963d7b06d1f82618068d8f27817af27aa6a03394b2ae3fd0f99bc13a912e7d70997b76a9a1f359cc5879df31f114e33d84befdfadd4799

data/lib/mgit/commands/fetch.rb

@@ -1,12 +1,31 @@
+require 'open3'
+
 module MGit
   class FetchCommand < Command
     def execute(args)
-      Registry.chdir_each do |repo|
-        `git remote`.split.each do |remote|
-          pinfo "Fetching #{remote} in repository #{repo.name}..."
-          `git fetch #{remote}`
+      threads = []
+      Registry.each do |repo|
+        threads << Thread.new do
+          remotes, st = Open3.capture2('git remote', :chdir => repo.path)
+
+          if st.exitstatus != 0
+            perror "Failed to read remotes for repository #{repo.name}! Abort." 
+            Thread.exit
+          end
+
+          remotes.split.each do |remote|
+            sout, st = Open3.capture2("git fetch #{remote}", :chdir => repo.path)
+            if st.exitstatus == 0
+              pinfo "Fetched #{remote} in repository #{repo.name}."
+            else
+              perror "Failed to fetch #{remote} in repository #{repo.name}! Abort."
+              break
+            end
+          end
         end
       end
+
+      threads.each { |t| t.join }
     end
 
     def arity

data/lib/mgit/commands/statistics.rb

@@ -0,0 +1,100 @@
+require 'set'
+
+module MGit
+  class StatisticsCommand < Command
+    def execute(args)
+      total_authors = {}
+      total_punchcard = {}
+      Registry.chdir_each do |repo|
+        current_authors = {}
+        current_punchcard = {}
+
+        collect do |author, time, changes|
+          current_authors[author] ||= 0
+          current_authors[author] += changes
+
+          total_punchcard[time.wday] ||= {}
+          total_punchcard[time.wday][time.hour / 4] ||= 0
+          total_punchcard[time.wday][time.hour / 4] += changes
+        end
+
+        print_authors current_authors, repo.name
+        puts
+
+        current_authors.each do |author, changes|
+          total_authors[author] ||= 0
+          total_authors[author] += changes
+        end
+      end
+
+      print_authors total_authors, 'TOTAL'
+      puts
+      print_punchcard total_punchcard, 'TOTAL'
+    end
+
+    def arity
+      [nil, 0]
+    end
+
+    def usage
+      'statistics'
+    end
+
+    def description
+      'display authorship statistics for each repository and in total'
+    end
+
+    register_command :statistics
+
+    # Too close to :status?
+    #register_alias :stats
+
+  private
+
+    def collect
+      log = `git log --format='<><>%ct %aN' --shortstat --all`.strip
+      commits = log.split('<><>').drop(1)
+
+      commits.each do |c|
+        lines = c.split("\n")
+        
+        time = lines[0].split(' ')[0]
+        author = lines[0].split(' ')[1..-1].join(' ')
+
+        if lines.size >= 3
+          m = /changed(?:, (\d+) insertion(?:s)?\(\+\))?(?:, (\d+) deletion(?:s)?\(\-\))?/.match(lines[2])
+          changes = (m.captures[0] || 0).to_i + (m.captures[1] || 0).to_i
+        else
+          changes = 0
+        end
+
+        yield author, Time.at(time.to_i), changes
+      end
+    end
+
+    def print_authors(data, name)
+      pinfo "Authorship statistics (#{name}):"
+      ptable (data.to_a.sort_by { |v| v[1] }.reverse), :columns => [24, nil]
+    end
+
+    def print_punchcard(data, name)
+      pinfo "Punchcard (#{name}):"
+
+      t = []
+      t << ['', '0-4', '4-8', '8-12', '12-16', '16-20', '20-24']
+      ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'].each_with_index do |day, wday|
+        l = [day]
+        6.times do |h|
+          if (data[wday] && data[wday][h])
+            l << data[wday][h].to_s
+          else
+            l << '0'
+          end
+        end
+        t << l
+      end
+
+      ptable t
+    end
+  end
+end

data/lib/mgit/commands/status.rb

@@ -4,7 +4,7 @@ module MGit
   class StatusCommand < Command
     def execute(args)
       t = []
-      Registry.chdir_each { |repo| t << [repo.name, repo.current_branch, flags(repo).to_a.join(', ')] }
+      Registry.chdir_each { |repo| t << [repo.name, repo.current_branch, decorate_flags(repo)] }
       ptable t, :columns => [24, nil, nil]
     end
 
@@ -17,7 +17,7 @@ module MGit
     end
 
     def description
-      'display status for each repositories'
+      'display status for each repository'
     end
 
     register_command :status
@@ -25,27 +25,24 @@ module MGit
 
   private
 
-    def flags(repo)
-      flags = []
-
-      fs = repo.flags
-      flags << 'Index'.red if fs.include?(:index)
-      flags << 'Dirty'.red if fs.include?(:dirty)
-      flags << 'Untracked'.yellow if fs.include?(:untracked)
-      flags << 'Detached'.yellow if fs.include?(:detached)
+    def decorate_flags(repo)
+      flags = repo.flags
+      labels = decorate_simple_flags(flags)
+      labels.concat(decorate_divergence_flags(repo.divergence)) if flags.include?(:diverged)
+      labels = ['Clean'.green] if labels.empty?
+      labels.to_a.join(', ')
+    end
 
-      if fs.include?(:diverged)
-        ds = repo.divergence
-        ds.each do |d|
-          flags << "#{d.first[0].to_s.capitalize} of #{d.first[1][:branch]} by #{d.first[1][:by]}".blue
-        end
-      end
+    def decorate_simple_flags(flags)
+      { :index => :red, :dirty => :red, :untracked => :yellow, :detached => :yellow }
+        .select { |f,_| flags.include?(f) }
+        .map { |f,c| f.to_s.capitalize.send(c) }
+    end
 
-      if flags.empty?
-        flags << 'Clean'.green
+    def decorate_divergence_flags(divergence)
+      divergence.map do |d|
+        "#{d.first[0].to_s.capitalize} of #{d.first[1][:branch]} by #{d.first[1][:by]}".blue
       end
-
-      flags
     end
   end
 end

data/lib/mgit/commands/tags.rb

@@ -3,7 +3,7 @@ module MGit
     def execute(args)
       t = []
       Registry.chdir_each { |repo| t << [repo.name, *latest_tag] }
-      ptable t, :columns => [24, nil]
+      ptable t, :columns => [24, nil, nil]
     end
 
     def arity

data/lib/mgit/registry.rb

@@ -1,7 +1,7 @@
 module MGit
   module Registry
     def self.all
-      self.load.map { |name, path| Repository.new(name, path) }.sort_by(&:path)
+      self.load.map { |name, path| Repository.new(name, path) }.sort_by(&:path).select(&:available?)
     end
 
     def self.each(&block)

data/lib/mgit/repository.rb

@@ -2,6 +2,8 @@ require 'set'
 
 module MGit
   class Repository
+    include Output
+
     attr_reader :name, :path
 
     def initialize(name, path)
@@ -9,6 +11,15 @@ module MGit
       @path = path
     end
 
+    def available?
+      if !File.directory?(path)
+        pwarn "Repository #{name} is not available anymore. Failed to read #{path}."
+        return false
+      end
+
+      true
+    end
+
     def current_branch
       in_repo { 
         b = `git rev-parse --abbrev-ref HEAD 2>&1`.strip 

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -83,6 +83,7 @@ files:
 - lib/mgit/commands/list.rb
 - lib/mgit/commands/grep.rb
 - lib/mgit/commands/remove_all.rb
+- lib/mgit/commands/statistics.rb
 - lib/mgit/commands/version.rb
 - lib/mgit/commands/fetch.rb
 - lib/mgit/commands/head.rb