mgit 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzc1OTY5YThjMGNhNWI3NGQyYjEwYzA4NGVlMDM1YjIyZTlhMWZiNg==
+    Yjg1YmQxYjM1YTZkYTU5Yzg0N2E4MzAwNWZmYTU3ZDQ0MTRhY2I0Yg==
   data.tar.gz: !binary |-
-    ZjcyZjUwMjRlOWUzMDQ1YmU5YmJhMDU0ODVlZmRhYzZiYzUyMTJkNQ==
+    MmJiYWNkNWNhYmUxMDQwYzBjYzg0Mjc0YjRhMDlkM2QxM2EzZWEzNQ==
 SHA512:
   metadata.gz: !binary |-
-    YmNjMzk1ZjI5Yjc1NTRhZDkxZGVkZGIzNmU5MTIxZDYzYjNkYzBiZDQzYjkx
-    YjUxYTI1MjBjMGViNjc5YTA1ZDcxMTVjN2M3YjEwOTkzZjlmNmRlOTBmYTdl
-    YzVhNGJhNDEzYzkzZWY2MGRhYTY2YTBkZDM1NGFmZThlMWYzNGQ=
+    OWI0ZWRhMWJiYWNjYmM0YTgyMDQyYzkwMjA1OWViY2U1MTY0MDRiN2RjZWY3
+    NDQ2ZTIzY2YzODQ5YmI2ZmRiMTkzMmIyM2YxODhhMmZmOTcxMGNlZjBjZDY3
+    MTI2MGFjNWNiOGM0ZGQ2MmVjOTMwOGU1MGU0NzljN2UwZjJlNjg=
   data.tar.gz: !binary |-
-    MjNjYzkxNDY3NzQ3ZWNiMGU5ZDE3NjJjYzM1ZjUzMDFmOTU2ZDUxYjFmMjcx
-    ZjA1N2QxMTRiMTQzZTdjMDg3MDZmZGIwYjliNDc2MGU5ZTYzNTMwZGFhZGM4
-    MWY5NTI5MTYyYTQ4NzUzYWQ4OGYyOGUyMDhjZGY5NGQ5Nzg3OTQ=
+    NTQ1MmI2NTA4OGQ2NDRlMjc4YTFlNGY4NWNmNDcwNDY0NjFmMWNkZWI2MDkz
+    ZTdmNjNiOGRmMzlhY2RmNTZmODJiOGNiOTY4MjFmYmIyMTU0ZTA3YjJmNTlh
+    ZjM2NzhhNmZhNWE4MGFiMzIwNzc5YTBhMmE5YWRmMjBmZjlhODc=

data/lib/mgit.rb

@@ -1,5 +1,6 @@
 require 'colorize'
 require 'highline/import'
+require 'xdg'
 
 require 'mgit/version'
 require 'mgit/exceptions'

data/lib/mgit/commands/ffmerge.rb

@@ -11,9 +11,8 @@ module MGit
 
         puts "Fast-forward merging branches in repository #{repo.name}...".yellow
 
-        tb = tracking_branches
-        cb = current_branch
-        tb.each do |b|
+        cb = repo.current_branch
+        repo.remote_tracking_branches.each do |b, u|
           `git checkout -q #{b}`
           `git merge --ff-only @{u}`
         end
@@ -30,19 +29,5 @@ module MGit
     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/log.rb

@@ -1,47 +1,34 @@
 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]}"
+        repo.remote_tracking_branches.each do |branch, upstream|
+          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
         end
-        puts
       end
     end
 
     def usage
-      'log [number_of_days]'
+      'log'
     end
 
     def description
-      'what happened since *n* days ago'
+      'show unmerged commits for all remote-tracking branches'
     end
 
     register_command :log
 
   private
 
-    def latest_commits(days)
-      `git log --pretty=format:"%h#%an#%s" --reverse --all --since=#{days}.days.ago --relative-date`.
+    def unmerged_commits(branch, upstream)
+      `git log --pretty=format:"%h#%an#%s" --reverse  --relative-date #{branch}..#{upstream}`.
         split("\n").
         map { |line| line.split('#') }.
         map do |words| 

data/lib/mgit/commands/remove.rb

@@ -12,9 +12,8 @@ module MGit
       
       raise CommandUsageError.new("Couldn't find repository matching '#{ptrn}'.", self) unless repo
 
-      name = repo[0]
-      Repository.remove(name)
-      puts "Removed repository #{name}.".yellow
+      Registry.remove(repo.name)
+      puts "Removed repository #{repo.name}.".yellow
     end
 
     def usage

data/lib/mgit/registry.rb

@@ -37,7 +37,7 @@ module MGit
   private
 
     def self.repofile
-      File.join(Dir.home, '.config/mgit.yml')
+      XDG['CONFIG_HOME'].to_path.join('mgit.yml')
     end
 
     def self.load

data/lib/mgit/repository.rb

@@ -9,8 +9,19 @@ module MGit
       @path = path
     end
 
-    def dirty?
-      [:index, :dirty, :untracked].any? { |f| flags.include?(f) }
+    def current_branch
+      in_repo { `git rev-parse --abbrev-ref HEAD` }
+    end
+
+    def remote_tracking_branches
+      a = in_repo do
+        `git for-each-ref --format='%(refname:short) %(upstream:short)' refs/heads`.
+          split("\n").
+          map { |b| b.split(' ') }.
+          reject { |b| b.size != 2 }
+      end
+      
+      Hash[a]
     end
 
     def flags
@@ -50,18 +61,22 @@ module MGit
       divergence
     end
 
+    def dirty?
+      [:index, :dirty, :untracked].any? { |f| flags.include?(f) }
+    end
+
   private
   
+    def in_repo
+      Dir.chdir(path) { yield }
+    end
+
     def status
-      @status ||= `git status --short --branch --ignore-submodules`.split("\n") 
+      @status ||= in_repo { `git status --short --branch --ignore-submodules`.split("\n") }
     end
 
     def status_lines
-      Dir.chdir(path) do
-        status.each do |s|
-          yield s
-        end
-      end
+      status.each { |s| yield s }
     end
   end
 end

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xdg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: M[eta]Git let's you manage multiple git repositories simultaneously
 email: technology@flavoursys.com
 executables: