mgit 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 556e8ba86002bf2296aa9a64b22c832e0ffe6b7d
-  data.tar.gz: cfef22c03019ddab0475023c09b83380e17921fa
+  metadata.gz: 0bb3bdcd576ecd50f3d7d8a184f5bc58d8834562
+  data.tar.gz: 22d8aac580b7b69cf884120b9005c9bff8e8135b
 SHA512:
-  metadata.gz: 0d4b7e77396c509b701a5338906fad08c40d97a222dcf7e1bd22131a7e8a888cc3ff197641979b12e8a9e98114d3c7fc1720b8129dd3508607a0598c46c87117
-  data.tar.gz: d81f3c80978f0532014dff8fb51ca1ee39acecb47c3537e264037d8e1a95f8fb5edae7d58cdabd217e29050ec8589e2d4a91c0a4cb3e48e4588d082c9ce1824b
+  metadata.gz: b6a82916b544e654920d4c63da49bff65ceaa88bbbf40330499a97d1b8e1fbca7cb8654ae67a365a42a03661801fa81be05ef1df5c0a48092df7b26b05352df2
+  data.tar.gz: e9d9dbb58cd51a1cab081e07637c19c299ab714ecab5feab47faec7889366b397dcc2126b80267bd330b1d5b551b6c57f9e6116078364e4581e98a4645cd9128

data/lib/mgit/cli.rb

@@ -8,6 +8,9 @@ module MGit
       # Initialize AppData and migrate if necessary.
       AppData.update
 
+      # Initialize Commands.
+      Command.load_commands
+
       # Run command, consuming its name from the list of arguments.
       command = Command.execute(ARGV.shift, ARGV)
     rescue UsageError => e

data/lib/mgit/command.rb

@@ -5,6 +5,11 @@ module MGit
     @@commands = {}
     @@aliases = {}
 
+    def self.load_commands
+      require_commands_from_directory File.expand_path('../commands', __FILE__)
+      require_commands_from_directory Configuration.plugindir
+    end
+
     def self.execute(name, args)
       cmd = self.create(name)
       cmd.check_arity(args)
@@ -52,5 +57,9 @@ module MGit
         raise UnknownCommandError.new(cmd)
       end
     end
+
+    def self.require_commands_from_directory(dir)
+      Dir["#{dir}/*.rb"].each { |file| require file }
+    end
   end
 end

data/lib/mgit/configuration.rb

@@ -4,6 +4,11 @@ module MGit
       :threads => {
         :default => true,
         :description => 'set to true if you want the fetch command to be threaded'
+      },
+
+      :plugindir => {
+        :default => File.join(AppData::AppDataVersion.latest.send(:config_dir), 'plugins'),
+        :description => 'directory from where plugin commands are loaded'
       }
     }
 
@@ -12,6 +17,12 @@ module MGit
         define_method(k.to_s) do
           AppData.load(k, v[:default])
         end
+
+        define_method("#{k.to_s}=") do |value|
+          AppData.save!(k, value)
+        end
+
+        private "#{k.to_s}="
       end
     end
 
@@ -31,15 +42,5 @@ module MGit
         raise ConfigurationError.new("Unknown key: #{key}.")
       end
     end
-
-  private
-
-    class << self
-      KEYS.each do |k, v|
-        define_method("#{k.to_s}=") do |value|
-          AppData.save!(k, value)
-        end
-      end
-    end
   end
 end

data/lib/mgit/output.rb

@@ -24,6 +24,7 @@ module MGit
       def initialize(table, options)
         @table = table
         @options = options
+        @options[:columns] = []
         raise ImplementationError.new('ptable called with invalid table') unless valid_table?
       end
 
@@ -31,11 +32,6 @@ module MGit
         return '' if table.empty?
 
         cw = column_widths
-        if options[:columns]
-          options[:columns].each_with_index do |c, i|
-            cw[i] = c if c
-          end
-        end
 
         table.map do |row|
           row.map.with_index do |cell, i| 
@@ -65,6 +61,12 @@ module MGit
       end
 
       def column_widths
+        column_max_widths.each_with_index.map do |c, i| 
+          (options[:columns].size > i && options[:columns][i]) ? options[:columns][i] : c
+        end
+      end
+
+      def column_max_widths
         transpose.map do |col|
           col.map { |cell| cell.size }.max
         end

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/lib/mgit.rb

@@ -12,7 +12,6 @@ require 'mgit/repository'
 
 require 'mgit/cli'
 require 'mgit/command'
-Dir["#{File.expand_path('../mgit/commands', __FILE__)}/*.rb"].each { |file| require file }
 
 module MGit
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -85,7 +85,6 @@ files:
 - lib/mgit/commands/grep.rb
 - lib/mgit/commands/config.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

data/lib/mgit/commands/statistics.rb

@@ -1,100 +0,0 @@
-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