mgit 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjEzMDA0N2Y1ODg5MDZmMmJiYmY4YTMxNjkwOGY4NGE2NTVmYWE2Yw==
+    ZjllZmRiNWExNjk4ZmJjZmVkNjI4ZTJhZGRiZThhOWMyYWVjNDEwZQ==
   data.tar.gz: !binary |-
-    YjA2NTMwODQ0MGQ5YjA1MmM1ZDhhOWMxYTY0MmY0ZjM0ZDQxN2NhOA==
+    NzY1NmE3YWEwOWY5NjJiOGI1ZjNmMTczNjJkNTlhMjA1NDhmYmYzZQ==
 SHA512:
   metadata.gz: !binary |-
-    MzMwMDJmODQ1YTMyOTEyZjg3NmQwODY4ZjhiNWYwOTMxYmVjMDhjMDU3MjJh
-    NGYwNTNhYzA3NTRmZGQ0MTMwZmRhYTFmMGFjNTM1OGY4MjExYjUyY2VjZTg2
-    YTc1YmI5M2MxZDBkZWE2YTc5ZDE2MzI0YmJjOWQ5NjMxZTgzOTQ=
+    ZmEyZWI3M2Y4Njg4NjkwZGU1NWRiZjk0Y2QzOWNiOWRkNjM2YjllNDg4NWVj
+    NmYzYjJkZWVmZjQwNWZiZjE1NDFjYjVlZGU4ZDBlYWQxYmJhMjZmZTE2ZjE4
+    YWQ1ODQxMzAyNzU4ZWY1ZTlhYzg3MWJkZjQ5ZmJmNzVlODFhMmE=
   data.tar.gz: !binary |-
-    OTIwMWFiMWIzMDQ2NjE4Nzk0YjQ5OWFhMTFiMmU0MmMxZWY4YTk3YmI1MTFl
-    MDI3OTE5NzNmMDhlMDliOGVhODRjNzU1MTcyM2M0NGVhZDdiZjcyNmE4NzNh
-    NDQ1YjNmYTA4ZDQ3NDE5Yzc2OWJmMGViNWI5YTViNTFiN2U1MjQ=
+    MDUyZGY4N2I5ZGY4NTRkZmFlMmM0YTJhYmU0Y2MzOGQ0MDE5Y2QzMmRhYjE1
+    MzQ5NTkzZGFiMTJmYTExNzBlODI2MmYyMjA5NjAxZTZlM2I1Yzg4NDkxYmJh
+    OTgwYTg4NGZhMzYwM2NjZDEyZGRmMjA4ZWFhYWMzODYwZGQ5ZmM=

data/lib/mgit.rb

@@ -4,6 +4,7 @@ require 'xdg'
 
 require 'mgit/version'
 require 'mgit/exceptions'
+require 'mgit/output'
 require 'mgit/registry'
 require 'mgit/repository'
 

data/lib/mgit/command.rb

@@ -1,5 +1,7 @@
 module MGit
   class Command
+    include Output
+
     @@commands = {}
     @@aliases = {}
 
@@ -31,20 +33,10 @@ module MGit
       end
     end
 
-    def arity
-      raise ImplementationError.new("Command #{self.class.name} doesn't implement the arity method.")
-    end
-
-    def usage
-      raise ImplementationError.new("Command #{self.class.name} doesn't implement the usage method.")
-    end
-
-    def help
-      raise ImplementationError.new("Command #{self.class.name} doesn't implement the help method.")
-    end
-
-    def description
-      raise ImplementationError.new("Command #{self.class.name} doesn't implement the description method.")
+    [:arity, :usage, :help, :description].each do |meth|
+      define_method(meth) do
+        raise ImplementationError.new("Command #{self.class.name} doesn't implement the #{meth.to_s} method.")
+      end
     end
 
   private

data/lib/mgit/commands/clone.rb

@@ -5,7 +5,6 @@ module MGit
       raise GitError.new('Clone command failed.') if $?.exitstatus != 0
 
       m = /Cloning into '(.*)'/.match(log.split("\n").first)
-      puts m[1]
       Command.execute('add', [m[1]])
     end
 

data/lib/mgit/commands/fetch.rb

@@ -3,7 +3,7 @@ module MGit
     def execute(args)
       Registry.chdir_each do |repo|
         `git remote`.split.each do |remote|
-          puts "Fetching #{remote} in repository #{repo.name}...".yellow
+          pinfo "Fetching #{remote} in repository #{repo.name}..."
           `git fetch #{remote}`
         end
       end

data/lib/mgit/commands/ffmerge.rb

@@ -3,11 +3,11 @@ module MGit
     def execute(args)
       Registry.chdir_each do |repo|
         if repo.dirty?
-          puts "Skipping repository #{repo.name} since it's dirty.".red
+          pwarn "Skipping repository #{repo.name} since it's dirty."
           next
         end 
 
-        puts "Fast-forward merging branches in repository #{repo.name}...".yellow
+        pinfo "Fast-forward merging branches in repository #{repo.name}..."
 
         cb = repo.current_branch
         repo.remote_tracking_branches.each do |b, u|

data/lib/mgit/commands/foreach.rb

@@ -4,7 +4,7 @@ module MGit
       command = args.join(' ')
 
       Registry.chdir_each do |repo|
-        puts "Executing command in repository #{repo.name}...".yellow
+        pinfo "Executing command in repository #{repo.name}..."
         if !system(command) && !ask("Executing command '#{command}' in repository '#{repo.name}' failed. Would you like to continue anyway?".red)
           break
         end

data/lib/mgit/commands/grep.rb

@@ -4,7 +4,7 @@ module MGit
       ptrn = args[0]
 
       Registry.chdir_each do |repo|
-        puts "Looking for pattern '#{ptrn}' in repository #{repo.name}...".yellow
+        pinfo "Looking for pattern '#{ptrn}' in repository #{repo.name}..."
         puts `git grep #{ptrn}`
         puts
       end

data/lib/mgit/commands/help.rb

@@ -2,14 +2,14 @@ module MGit
   class HelpCommand < Command
     def execute(args)
       if args.size == 0
-        puts "M[eta]Git - manage multiple git repositories at the same time"
+        pinfo "M[eta]Git - manage multiple git repositories at the same time"
         puts
-        puts "Usage:"
+        pinfo "Usage:"
         Command.instance_each do |cmd|
-          puts "mgit #{cmd.usage}\n\t- #{cmd.description}"
+          pinfo "mgit #{cmd.usage}\n\t- #{cmd.description}"
         end
       else
-        puts Command.create(args[0]).help
+        pinfo Command.create(args[0]).help
       end
     end
 

data/lib/mgit/commands/list.rb

@@ -1,11 +1,9 @@
 module MGit
   class ListCommand < Command
     def execute(args)
-      Registry.each do |repo|
-        nc = 24
-        display = (repo.name.size > nc) ? (repo.name[0..(nc - 3)] + '...') : repo.name.ljust(nc, ' ')
-        puts "#{display} => #{repo.path}"
-      end
+      t = []
+      Registry.each { |repo| t << [repo.name, repo.path] }
+      ptable t, :columns => [24, nil]
     end
 
     def arity

data/lib/mgit/commands/log.rb

@@ -6,11 +6,11 @@ module MGit
           uc = unmerged_commits(branch, upstream)
           next if uc.empty?
 
-          puts "In repository #{repo.name}, branch #{upstream} the following commits were made:".yellow
-          longest_name = uc.map { |c| c[:author].size }.max
-          uc.each do |c|
-            puts "#{c[:commit]}  #{c[:author].ljust(longest_name, ' ')}  #{c[:subject]}"
-          end
+          pinfo "In repository #{repo.name}, branch #{upstream} the following commits were made:"
+          
+          t = []
+          uc.each { |c| t << [c[:commit], c[:author], c[:subject]] }
+          ptable t
         end
       end
     end

data/lib/mgit/commands/remove.rb

@@ -10,7 +10,7 @@ module MGit
       raise CommandUsageError.new("Couldn't find repository matching '#{ptrn}'.", self) unless repo
 
       Registry.remove(repo.name)
-      puts "Removed repository #{repo.name}.".yellow
+      pinfo "Removed repository #{repo.name}."
     end
 
     def arity

data/lib/mgit/commands/status.rb

@@ -3,11 +3,9 @@ require 'set'
 module MGit
   class StatusCommand < Command
     def execute(args)
-      Registry.chdir_each do |repo|
-        nc = 36
-        display = (repo.name.size > nc) ? (repo.name[0..(nc - 3)] + '...') : repo.name.ljust(nc, ' ')
-        puts "#{display} => [#{flags(repo).to_a.join(', ')}]"
-      end
+      t = []
+      Registry.chdir_each { |repo| t << [repo.name, flags(repo).to_a.join(', ')] }
+      ptable t, :columns => [24, nil]
     end
 
     def arity

data/lib/mgit/commands/version.rb

@@ -1,7 +1,7 @@
 module MGit
   class VersionCommand < Command
     def execute(args)
-      puts "mgit version #{MGit::VERSION}"
+      pinfo "mgit version #{MGit::VERSION}"
     end
 
     def arity

data/lib/mgit/output.rb

@@ -0,0 +1,73 @@
+module MGit
+  module Output
+    def pinfo(s)
+      puts s.green
+    end
+
+    def pwarn
+      puts s.yellow
+    end
+
+    def perror
+      puts s.red
+    end
+
+    def ptable(table, options = {})
+      puts TableOutputter.new(table, options).to_s
+    end
+
+  private
+
+    class TableOutputter
+      attr_reader :table, :options
+
+      def initialize(table, options)
+        @table = table
+        @options = options
+        raise ImplementationError.new('ptable called with invalid table') unless valid_table?
+      end
+
+      def to_s
+        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 { |cell, i| justify(cell, cw[i]) }.join(' | ')
+        end.join("\n")
+      end
+
+    private
+
+      def valid_table?
+        table.empty? || table.all? { |c| c.is_a?(Array) && c.size == table.first.size }
+      end
+
+      def columns
+        table.first.size
+      end
+
+      def column(nth)
+        table.map { |c| c[nth] }
+      end
+
+      def transpose
+        (0..(columns - 1)).map { |i| column(i) }
+      end
+
+      def column_widths
+        transpose.map do |col|
+          col.map { |cell| cell.size }.max
+        end
+      end
+
+      def justify(s, n)
+       (s.size > n) ? (s[0..(n - 3)] + '...') : s.ljust(n, ' ')
+      end
+    end
+  end
+end

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mgit/exceptions.rb
+- lib/mgit/output.rb
 - lib/mgit/cli.rb
 - lib/mgit/command.rb
 - lib/mgit/commands/clone.rb