mgit 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTg0NzVjMDFlNDEzNjNjZGE0ZjQ3ZGZhNGFlZjA0MDUxZGNlMDZmNw==
+  data.tar.gz: !binary |-
+    NGYxNWRlMjA4NTJiYjk5MTUwOWRkOThmYzEwMWFmMjNlYmQ3MDJmNQ==
+SHA512:
+  metadata.gz: !binary |-
+    MjNlM2NiZjExMzQ5MzdjMWEzZTAxZDFmYmVmNDQ0YmQyZjk2ZjQ3ZmMyY2Yz
+    ODYyYWQzZTM4OTk3NjhlMjUwZDZiYmJkNDg0MDIyMTc2ZWQ0OTQwNGFkMjE4
+    ZjI3M2Y0YmJmNDU3OTg1NmJkYWYzY2VmYTQxZGNkMDkzODA4Yjg=
+  data.tar.gz: !binary |-
+    ZTQyMGI2ZjNmZjY5ZDRlNzA3YTQxMzkwOWJmZmFjNjNmNGM2MDc5Y2RkNmZl
+    ZGNmN2JkNmUyZTcyYjQ1YmJmMzI2YzA0MGY2NDIzMWZlNmVkYThkMTE2M2Rl
+    ZWFlN2QyMzEzMmZiY2I0NmUzYWY3NjJhMDA2ODBjMGI3YjdmYTE=

data/lib/mgit.rb

@@ -3,6 +3,7 @@ require 'highline/import'
 
 require 'mgit/version'
 require 'mgit/exceptions'
+require 'mgit/registry'
 require 'mgit/repository'
 
 require 'mgit/cli'

data/lib/mgit/commands/add.rb

@@ -9,7 +9,7 @@ module MGit
 
       name = (args.size == 2) ? args[1] : (ask('Name of the repository? ') { |q| q.default = File.basename(path) })
 
-      Repository.add(name, path)
+      Registry.add(name, path)
     end
 
     def usage

data/lib/mgit/commands/fetch.rb

@@ -3,9 +3,9 @@ module MGit
     def execute(args)
       raise TooManyArgumentsError.new(self) if args.size != 0
 
-      Repository.chdir_each do |name, path|
+      Registry.chdir_each do |repo|
         `git remote`.split.each do |remote|
-          puts "Fetching #{remote} in repository #{name}...".yellow
+          puts "Fetching #{remote} in repository #{repo.name}...".yellow
           `git fetch #{remote}`
         end
       end

data/lib/mgit/commands/ffmerge.rb

@@ -0,0 +1,48 @@
+module MGit
+  class FFMergeCommand < Command
+    def execute(args)
+      raise TooManyArgumentsError.new(self) if args.size != 0
+
+      Registry.chdir_each do |repo|
+        if repo.dirty?
+          puts "Skipping repository #{repo.name} since it's dirty.".red
+          next
+        end 
+
+        puts "Fast-forward merging branches in repository #{repo.name}...".yellow
+
+        tb = tracking_branches
+        cb = current_branch
+        tb.each do |b|
+          `git checkout -q #{b}`
+          `git merge --ff-only @{u}`
+        end
+        `git checkout -q #{cb}`
+      end
+    end
+
+    def usage
+      'ffmerge'
+    end
+
+    def description
+      'merge all upstream tracking branches that can be fast-forwarded'
+    end
+
+    register_command :ffmerge
+
+  private
+
+    def tracking_branches
+      `git for-each-ref --format='%(refname:short) %(upstream:short)' refs/heads`.
+        split("\n").
+        map { |b| b.split(' ') }.
+        reject { |b| b.size != 2 }.
+        map(&:first)
+    end
+
+    def current_branch
+      `git rev-parse --abbrev-ref HEAD`
+    end
+  end
+end

data/lib/mgit/commands/foreach.rb

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

data/lib/mgit/commands/grep.rb

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

data/lib/mgit/commands/list.rb

@@ -3,8 +3,10 @@ module MGit
     def execute(args)
       raise TooManyArgumentsError.new(self) if args.size != 0
 
-      Repository.each do |name, path|
-        puts "#{name} => #{path}"
+      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
     end
 

data/lib/mgit/commands/log.rb

@@ -0,0 +1,56 @@
+module MGit
+  class LogCommand < Command
+    def execute(args)
+      raise TooManyArgumentsError.new(self) if args.size > 1
+
+      days = 1
+
+      if args.size == 1
+        begin
+          days = Integer(args[0])
+        rescue ArgumentError => e
+          raise new CommandUsageError("First argument must be an integer", self)
+        end
+      end
+
+      Registry.chdir_each do |repo|
+        lc = latest_commits(days)#.sort_by { |c| c[:author] }
+        next if lc.empty?
+
+        puts "In repository #{repo.name} the following commits were made:".yellow
+
+        longest_name = lc.map { |c| c[:author].size }.max
+
+        lc.each do |c|
+          puts "#{c[:commit]}  #{c[:author].ljust(longest_name, ' ')}  #{c[:subject]}"
+        end
+        puts
+      end
+    end
+
+    def usage
+      'log [number_of_days]'
+    end
+
+    def description
+      'what happened since *n* days ago'
+    end
+
+    register_command :log
+
+  private
+
+    def latest_commits(days)
+      `git log --pretty=format:"%h#%an#%s" --reverse --all --since=#{days}.days.ago --relative-date`.
+        split("\n").
+        map { |line| line.split('#') }.
+        map do |words| 
+          {
+            :commit => words[0],
+            :author => words[1],
+            :subject => words[2..-1].join('#')
+          }
+        end
+    end
+  end
+end

data/lib/mgit/commands/remove.rb

@@ -6,8 +6,8 @@ module MGit
 
       ptrn = args[0]
 
-      repo = Repository.find do |name, path|
-        name == ptrn || path == File.expand_path(ptrn)
+      repo = Registry.find do |repo|
+        repo.name == ptrn || repo.path == File.expand_path(ptrn)
       end
       
       raise CommandUsageError.new("Couldn't find repository matching '#{ptrn}'.", self) unless repo

data/lib/mgit/commands/status.rb

@@ -5,10 +5,10 @@ module MGit
     def execute(args)
       raise TooManyArgumentsError.new(self) if args.size != 0
 
-      Repository.chdir_each do |name, path|
+      Registry.chdir_each do |repo|
         nc = 36
-        display = (name.size > nc) ? (name[0..(nc - 3)] + '...') : name.ljust(nc, ' ')
-        puts "#{display} => [#{flags.to_a.join(', ')}]"
+        display = (repo.name.size > nc) ? (repo.name[0..(nc - 3)] + '...') : repo.name.ljust(nc, ' ')
+        puts "#{display} => [#{flags(repo).to_a.join(', ')}]"
       end
     end
 
@@ -25,25 +25,26 @@ module MGit
 
   private
 
-    def flags
-      flags = Set.new
-      status = `git status --short --branch --ignore-submodules`.split("\n")
-      status.each do |s|
-        case s.split[0]
-        when 'A'
-          flags << 'Index'.red
-        when 'M'
-          flags << 'Dirty'.red
-        when '??'
-          flags << 'Untracked'.yellow
-        when '##'
-          if(m = /## ([\w,\/]+)\.\.\.([\w,\/]+) \[(\w+) (\d+)\]/.match(s))
-            flags << "#{m[3].capitalize} of #{m[2]} by #{m[4]}".blue
-          end
+    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)
+
+      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
 
-      flags.empty? ? ['Clean'.green] : flags
+      if flags.empty?
+        flags << 'Clean'.green
+      end
+
+      flags
     end
   end
 end

data/lib/mgit/registry.rb

@@ -0,0 +1,51 @@
+require 'yaml'
+
+module MGit
+  module Registry
+    def self.all
+      self.load.map { |name, path| Repository.new(name, path) }
+    end
+
+    def self.each(&block)
+      self.all.each(&block)
+    end
+
+    def self.chdir_each
+      self.all.each do |repo|
+        Dir.chdir(repo.path) do
+          yield repo
+        end
+      end
+    end
+
+    def self.find(&block)
+      self.all.find(&block)
+    end
+
+    def self.add(name, path)
+      repos = self.load
+      repos[name] = path
+      self.save! repos
+    end
+
+    def self.remove(name)
+      repos = self.load
+      repos.delete name
+      self.save! repos
+    end
+
+  private
+
+    def self.repofile
+      File.join(Dir.home, '.config/mgit.yml')
+    end
+
+    def self.load
+      File.exists?(self.repofile) ? YAML.load_file(self.repofile) : {}
+    end
+
+    def self.save!(repos)
+      File.open(self.repofile, 'w') { |fd| fd.write repos.to_yaml }
+    end
+  end
+end

data/lib/mgit/repository.rb

@@ -1,47 +1,60 @@
-require 'yaml'
+require 'set'
 
 module MGit
-  module Repository
-    def self.all
-      File.exists?(self.repofile) ? YAML.load_file(self.repofile) : {}
-    end
-
-    def self.each(&block)
-      self.all.each(&block)
-    end
-
-    def self.chdir_each
-      self.all.each do |name, path|
-        Dir.chdir(path) do
-          yield name, path
+  class Repository
+    attr_reader :name, :path
+
+    def initialize(name, path)
+      @name = name
+      @path = path
+    end
+
+    def dirty?
+      [:index, :dirty, :untracked].any? { |f| flags.include?(f) }
+    end
+
+    def flags
+      flags = Set.new
+      status_lines do |s|
+        case s.split[0]
+        when 'A'
+          flags << :index
+        when 'M'
+          flags << :dirty
+        when '??'
+          flags << :untracked
+        when '##'
+          flags << :diverged
         end
       end
-    end
-
-    def self.find(&block)
-      self.all.find(&block)
-    end
-
-    def self.add(name, path)
-      repos = self.all
-      repos[name] = path
-      self.save! repos
-    end
-
-    def self.remove(name)
-      repos = self.all
-      repos.delete name
-      self.save! repos
+      flags
+    end
+
+    def divergence
+      divergence = []
+      status_lines do |s|
+        if s.split[0] == '##'
+          if(m = /## ([\w,\/]+)\.\.\.([\w,\/]+) \[(\w+) (\d+)\]/.match(s))
+            if m[3] =~ /behind/
+              divergence << { :behind => { :branch => m[2], :by => m[4] } }
+            else
+              divergence << { :ahead => { :branch => m[2], :by => m[4] } }
+            end
+          end
+        end
+      end
+      divergence
     end
 
   private
-
-    def self.repofile
-      File.join(Dir.home, '.config/mgit.yml')
-    end
-
-    def self.save!(repos)
-      File.open(self.repofile, 'w') { |fd| fd.write repos.to_yaml }
+  
+    def status_lines
+      Dir.chdir(path) do
+        status = `git status --short --branch --ignore-submodules`.split("\n")
+        status.each do |s|
+          yield s
+        end
+      end
     end
   end
 end

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -59,36 +54,38 @@ files:
 - lib/mgit/commands/foreach.rb
 - lib/mgit/commands/remove.rb
 - lib/mgit/commands/fetch.rb
+- lib/mgit/commands/log.rb
 - lib/mgit/commands/grep.rb
+- lib/mgit/commands/ffmerge.rb
 - lib/mgit/commands/version.rb
 - lib/mgit/commands/status.rb
 - lib/mgit/repository.rb
+- lib/mgit/registry.rb
 - lib/mgit/version.rb
 - lib/mgit.rb
 - bin/mgit
 homepage: http://github.com/flavoursys/mgit
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MGit meta repository tool
 test_files: []