mgit 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb3bdcd576ecd50f3d7d8a184f5bc58d8834562
-  data.tar.gz: 22d8aac580b7b69cf884120b9005c9bff8e8135b
+  metadata.gz: 72dbe1352a6bd0ec28b0bcb8f058cd6827f4e2f1
+  data.tar.gz: 28d308609a2eccfe69bfab61574f251b31e562e4
 SHA512:
-  metadata.gz: b6a82916b544e654920d4c63da49bff65ceaa88bbbf40330499a97d1b8e1fbca7cb8654ae67a365a42a03661801fa81be05ef1df5c0a48092df7b26b05352df2
-  data.tar.gz: e9d9dbb58cd51a1cab081e07637c19c299ab714ecab5feab47faec7889366b397dcc2126b80267bd330b1d5b551b6c57f9e6116078364e4581e98a4645cd9128
+  metadata.gz: 4f2f0cc707a0f1e7a3cf1171348b06de20fc5f5bb3242f7a3cc2638b188ddb1bf7922290c955c3218c976093d67819f6f3902154deb30d26a8f548abc5380362
+  data.tar.gz: cc4893566bb6ffe38ad6169a6d25d786260f59b9c9336ce87331018c242ae466ff9639fa0bc30004d4dfc9f55198e360996914ce9004d9408e4a787932e3c4c5

data/lib/mgit/cli.rb

@@ -8,9 +8,6 @@ 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

@@ -63,3 +63,6 @@ module MGit
     end
   end
 end
+
+# Initialize Commands.
+MGit::Command.load_commands

data/lib/mgit/commands/add.rb

@@ -6,9 +6,7 @@ module MGit
       raise CommandUsageError.new('First argument must be a path to a git repository.', self) unless is_git_dir?(path)
       raise CommandUsageError.new('Sorry, mgit can not handle bare repositories.', self) if is_bare?(path)
 
-      # NOTE: The to_s to the HighLine::String is needed due to a bug in YAML/Psych in Ruby 2.0.0.
-      # https://github.com/JEG2/highline/issues/69
-      name = (args.size == 2) ? args[1] : (ask('Name of the repository? ') { |q| q.default = File.basename(path) }).to_s
+      name = (args.size == 2) ? args[1] : File.basename(path)
       raise CommandUsageError.new("Repository named #{name} already exists with different path.", self) unless is_new_or_same?(name, path)
       
       Registry.add(name, path)
@@ -36,11 +34,11 @@ module MGit
     end
 
     def is_git_dir?(path)
-      Dir.chdir(path) { `git status 2>&1` !~ /fatal: Not a git repository/ }
+      System::git('status', :chdir => path) !~ /fatal: Not a git repository/
     end
 
     def is_bare?(path)
-      Dir.chdir(path) { `git status 2>&1` =~ /fatal: This operation must be run in a work tree/}
+      System::git('status', :chdir => path) =~ /fatal: This operation must be run in a work tree/
     end
   end
 end

data/lib/mgit/commands/clone.rb

@@ -1,9 +1,8 @@
 module MGit
   class CloneCommand < Command
     def execute(args)
-      log = `git clone #{args.join(' ')}`
-      raise GitError.new('Clone command failed.') if $?.exitstatus != 0
-
+      log = System::git("clone #{args.join(' ')}", { :raise => true, :print_stderr => true }).stdout
+      
       m = /Cloning into '(.*)'/.match(log.split("\n").first)
       Command.execute('add', [m[1]])
     end

data/lib/mgit/commands/config.rb

@@ -1,16 +1,30 @@
 module MGit
   class ConfigCommand < Command
     def execute(args)
-      key = args[0]
-      value = args[1]
+      if args.size == 0
+        t = []
+        Configuration.each { |k, v| t << [k.to_s, v] }
+        ptable t
+      else
+        key = args[0]
 
-      Configuration.set(key, value)
-    rescue ConfigurationError => e
-      raise CommandUsageError.new(e.to_s, self)
+        if args.size == 1
+          psystem Configuration.send(key.to_sym).to_s
+        else
+          key = args[0]
+          value = args[1]
+
+          begin
+            Configuration.set(key, value)
+          rescue ConfigurationError => e
+            raise CommandUsageError.new(e.to_s, self)
+          end
+        end
+      end
     end
 
     def arity
-      [2, 2]
+      [0, 2]
     end
 
     def usage

data/lib/mgit/commands/fetch.rb

@@ -4,11 +4,9 @@ module MGit
   class FetchCommand < Command
     def execute(args)
       thread_class = Configuration.threads ? Thread : NullThread
-      threads = []
-      Registry.each do |repo|
-        threads << thread_class.new do
-          fetch(repo)
-        end
+
+      threads = Registry.collect do |repo|
+        thread_class.new { fetch(repo) }
       end
 
       threads.each { |t| t.join }
@@ -31,16 +29,15 @@ module MGit
   private
 
     def fetch(repo)
-      remotes, st = Open3.capture2('git remote', :chdir => repo.path)
+      sc = System::git('remote', :chdir => repo.path)
 
-      if st.exitstatus != 0
+      if !sc.success?
         perror "Failed to read remotes for repository #{repo.name}! Abort."
-        Thread.exit
+        return
       end
 
-      remotes.split.each do |remote|
-        sout, st = Open3.capture2("git fetch #{remote}", :chdir => repo.path)
-        if st.exitstatus == 0
+      sc.stdout.strip.split.each do |remote|
+        if System::git("fetch #{remote}", :chdir => repo.path).success?
           pinfo "Fetched #{remote} in repository #{repo.name}."
         else
           perror "Failed to fetch #{remote} in repository #{repo.name}! Abort."

data/lib/mgit/commands/ffmerge.rb

@@ -2,26 +2,15 @@ module MGit
   class FFMergeCommand < Command
     def execute(args)
       Registry.chdir_each do |repo|
-
-        bs = repo.remote_tracking_branches.select do |branch, upstream|
-          !repo.unmerged_commits(branch, upstream).empty?
-        end.map { |b, u| b }
-
-        next if bs.empty?
+        branches = mergable_branches(repo)
+        next if branches.empty?
 
         if repo.dirty?
           pwarn "Skipping repository #{repo.name} since it's dirty."
           next
-        end 
-
-        pinfo "Fast-forward merging branches in repository #{repo.name}..."
-
-        cb = repo.current_branch
-        bs.each do |b|
-          `git checkout -q #{b}`
-          `git merge --ff-only @{u}`
         end
-        `git checkout -q #{cb}`
+
+        merge_branches(repo, branches)
       end
     end
 
@@ -38,5 +27,33 @@ module MGit
     end
 
     register_command :ffmerge
+
+  private
+
+    def mergable_branches(repo)
+      repo.remote_tracking_branches.select do |branch, upstream|
+        !repo.unmerged_commits(branch, upstream).empty?
+      end.map { |b, u| b }
+    end
+
+    def merge_branches(repo, branches)
+      pinfo "Fast-forward merging branches in repository #{repo.name}..."
+
+      cb = repo.current_branch
+
+      begin
+        branches.each { |b| merge_branch(b) }
+      rescue GitError
+        perror "Failed to merge a branch in repository #{repo.name}."
+        pwarn "Please visit this repository and check that everything's alright. Trying to set back to original working branch."
+      ensure
+        System::git("checkout -q #{cb}", :print_stderr => true)
+      end
+    end
+
+    def merge_branch(branch)
+      System::git("checkout -q #{branch}", { :raise => true, :print_stderr => true })
+      System::git("merge --ff-only @{u}", { :raise => true, :print_stderr => true })
+    end
   end
 end

data/lib/mgit/commands/foreach.rb

@@ -3,9 +3,12 @@ module MGit
     def execute(args)
       command = args.join(' ')
 
-      Registry.chdir_each do |repo|
+      Registry.each do |repo|
         pinfo "Executing command in repository #{repo.name}..."
-        if !system(command) && !agree("Executing command '#{command}' in repository '#{repo.name}' failed. Would you like to continue anyway?".red)
+
+        sc = System::run(command, { :chdir => repo.path, :print_stdout => true, :print_stderr => true })
+
+        if !sc.success? && !agree("Executing command '#{command}' in repository '#{repo.name}' failed. Would you like to continue anyway?".red)
           break
         end
       end

data/lib/mgit/commands/grep.rb

@@ -3,10 +3,9 @@ module MGit
     def execute(args)
       ptrn = args[0]
 
-      Registry.chdir_each do |repo|
+      Registry.each do |repo|
         pinfo "Looking for pattern '#{ptrn}' in repository #{repo.name}..."
-        puts `git grep #{ptrn}`
-        puts
+        System::git("grep #{ptrn}", { :chdir => repo.path, :print_stdout => true })
       end
     end
 

data/lib/mgit/commands/head.rb

@@ -1,5 +1,5 @@
 module MGit
-  class ListCommand < Command
+  class HeadCommand < Command
     def execute(args)
       t = []
       Registry.each { |repo| t << [repo.name, repo.current_branch, repo.current_head] }

data/lib/mgit/commands/help.rb

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

data/lib/mgit/commands/show.rb

@@ -40,13 +40,11 @@ module MGit
     end
 
     def has_commit?
-      !(`git rev-parse --quiet --verify #{@commit}`.empty?)
+      !(System::git("rev-parse --quiet --verify #{@commit}").stdout.empty?)
     end
 
     def show_commit(repo)
-      repo.chdir do
-        system("git show #{@commit}")
-      end
+      System::git("show #{@commit}", { :chdir => repo.path, :print_stdout => true } )
     end
 
     def show_menu

data/lib/mgit/commands/tags.rb

@@ -25,13 +25,12 @@ module MGit
   private
 
     def latest_tag(path)
-      sout, serr, st = Open3.capture3('git describe --tags --abbrev=0 master', :chdir => path)
-      (/fatal:/ =~ serr) ? 'none' : sout.strip
+      sc = System::git('describe --tags --abbrev=0 master', :chdir => path)
+      sc =~ /fatal:/ ? 'none' : sc.stdout.strip
     end
 
     def latest_tag_time(path, tag)
-      sout, st = Open3.capture3("git log -n 1 --format='%at' #{tag}", :chdir => path)
-      Time.at(sout.strip.to_i).strftime('%Y-%m-%d')
+      Time.at(System::git("log -n 1 --format='%at' #{tag}", :chdir => path).stdout.strip.to_i).strftime('%Y-%m-%d')
     end
 
     def print_latest_tag(repo)

data/lib/mgit/configuration.rb

@@ -1,5 +1,7 @@
 module MGit
   module Configuration
+    extend Enumerable
+
     KEYS = {
       :threads => {
         :default => true,
@@ -9,6 +11,11 @@ module MGit
       :plugindir => {
         :default => File.join(AppData::AppDataVersion.latest.send(:config_dir), 'plugins'),
         :description => 'directory from where plugin commands are loaded'
+      },
+
+      :colors => {
+        :default => true,
+        :description => 'set to false to disable all colored output'
       }
     }
 
@@ -28,19 +35,39 @@ module MGit
 
     def self.set(key, value)
       case key
-      when 'threads'
-        unless ['true', 'false', 'on', 'off'].include?(value)
-          raise ConfigurationError.new("Illegal value for key threads.")
-        end
-
-        if ['true', 'on'].include?(value)
-          self.threads = true
-        else
-          self.threads = false
+      when 'threads', 'colors'
+        set_boolean(key, value)
+      when 'plugindir'
+        if !File.directory?(value)
+          raise ConfigurationError.new("Illegal value for key plugindir. Has to be a directory.")
         end
+        self.plugindir = File.expand_path(value)
       else
         raise ConfigurationError.new("Unknown key: #{key}.")
       end
     end
+
+    def self.each
+      KEYS.each do |key|
+        yield [key.first.to_s, self.send(key.first).to_s]
+      end
+    end
+
+    def self.method_missing(meth, *args, &block)
+      raise ConfigurationError.new("Unknown key: #{key}")
+    end
+
+  private
+
+    def self.set_boolean(key, value)
+      unless ['true', 'false', 'on', 'off'].include?(value)
+        raise ConfigurationError.new("Illegal value for key #{key}.")
+      end
+      if ['true', 'on'].include?(value)
+        self.send("#{key}=", true)
+      else
+        self.send("#{key}=", false)
+      end
+    end
   end
 end

data/lib/mgit/exceptions.rb

@@ -1,7 +1,20 @@
 module MGit
   class ImplementationError < StandardError; end
 
-  class GitError < StandardError
+  class SystemCommandError < StandardError
+    attr_reader :cmd, :error
+
+    def initialize(cmd, error)
+      @cmd = cmd
+      @error = error
+    end
+
+    def to_s
+      "Error: #{@error}\nCommand was: #{@cmd}"
+    end
+  end
+
+  class GitError < SystemCommandError
     def initialize(error)
       @error = error
     end

data/lib/mgit/output.rb

@@ -1,23 +1,35 @@
 module MGit
   module Output
+    def psystem(s)
+      print_to_screen s
+    end
+
     def pinfo(s)
-      puts s.green
+      print_to_screen s.green
     end
 
     def pwarn(s)
-      puts s.yellow
+      print_to_screen s.yellow
     end
 
     def perror(s)
-      puts s.red
+      print_to_screen s.red
     end
 
     def ptable(table, options = {})
-      puts TableOutputter.new(table, options).to_s
+      print_to_screen TableOutputter.new(table, options).to_s
     end
 
   private
 
+    def print_to_screen(s)
+      if Configuration.colors
+        puts s
+      else
+        puts s.uncolorize
+      end
+    end
+
     class TableOutputter
       attr_reader :table, :options
 

data/lib/mgit/registry.rb

@@ -1,5 +1,7 @@
 module MGit
   module Registry
+    extend Enumerable
+
     def self.all
       self.load.map { |name, path| Repository.new(name, path) }.sort_by(&:path)
     end

data/lib/mgit/repository.rb

@@ -21,25 +21,26 @@ module MGit
     end
 
     def current_branch
-      in_repo { 
-        b = `git rev-parse --abbrev-ref HEAD 2>&1`.strip 
-        $?.exitstatus == 0 ? b : 'HEAD'
+      in_repo {
+        sc = System::git('rev-parse --abbrev-ref HEAD')
+        sc.success? ? sc.stdout.strip : 'HEAD'
       }
     end
 
     def current_head
-      in_repo { `git rev-parse --verify --short HEAD`.strip }
+      in_repo { System::git('rev-parse --verify --short HEAD').stdout.strip }
     end
 
     def remote_tracking_branches(upstream_exists_only = true)
       rb = remote_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 }.
-          select { |b| !upstream_exists_only || rb.include?(b[1]) }
+        System::git("for-each-ref --format='%(refname:short) %(upstream:short)' refs/heads")
+          .stdout
+          .split("\n")
+          .map { |b| b.split(' ') }
+          .reject { |b| b.size != 2 }
+          .select { |b| !upstream_exists_only || rb.include?(b[1]) }
       end
       
       Hash[a]
@@ -47,16 +48,17 @@ module MGit
 
     def remote_branches
       in_repo do
-        `git branch -r`.split("\n").map { |a| a.split(' ')[0] }
+        System::git('branch -r').stdout.split("\n").map { |a| a.split(' ')[0] }
       end
     end
 
     def unmerged_commits(branch, upstream)
       in_repo do
-        `git log --pretty=format:"%h#%an#%s" --reverse  --relative-date #{branch}..#{upstream}`.
-          split("\n").
-          map { |line| line.split('#') }.
-          map do |words| 
+        System::git("log --pretty=format:'%h#%an#%s' --reverse  --relative-date #{branch}..#{upstream}")
+          .stdout
+          .split("\n")
+          .map { |line| line.split('#') }
+          .map do |words| 
             {
               :commit => words[0],
               :author => words[1],
@@ -116,7 +118,7 @@ module MGit
   private
 
     def status
-      @status ||= in_repo { `git status --short --branch --ignore-submodules`.split("\n") }
+      @status ||= in_repo { System::git('status --short --branch --ignore-submodules').stdout.split("\n") }
     end
 
     def status_lines

data/lib/mgit/system.rb

@@ -0,0 +1,70 @@
+require 'open3'
+
+module MGit
+  module System
+    class SystemCommand
+      include Output
+
+      attr_reader :stdout, :stderr
+
+      def initialize(cmd, opts)
+        opts, popen_opts = extract_options(opts)
+        @stdout, @stderr, @st = Open3.capture3(cmd, popen_opts)
+
+        psystem(stdout.strip) if opts[:print_stdout]
+
+        if !success?
+          psystem(stderr.strip) if opts[:print_stderr]
+          raise SystemCommandError.new(cmd, opts[:error]) if opts[:raise]
+        end
+      end
+
+      def success?
+        @st.exitstatus == 0
+      end
+
+      def =~(re)
+        (@stdout =~ re) || (@stderr =~ re)
+      end
+
+      def default_options
+        {
+          :print_stdout => false,
+          :print_stderr => false,
+          :raise => false,
+          :error => 'Command failed.',
+        }
+      end
+
+      def extract_options(opts)
+        popen_opts = opts.dup
+
+        opts = Hash[
+          default_options.map do |k, v|
+            [k, popen_opts.has_key?(k) ? popen_opts.delete(k) : v]
+          end
+        ]
+
+        [opts, popen_opts]
+      end
+    end
+
+    class GitCommand < SystemCommand
+      def initialize(cmd, opts)
+        begin
+          super("git #{cmd}", opts)
+        rescue SystemCommandError => e
+          raise GitError.new(e.error)
+        end
+      end
+    end
+
+    def self.git(cmd, opts = {})
+      GitCommand.new(cmd, opts)
+    end
+
+    def self.run(cmd, opts = {})
+      SystemCommand.new(cmd, opts)
+    end
+  end
+end

data/lib/mgit/version.rb

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

data/lib/mgit.rb

@@ -9,6 +9,7 @@ require 'mgit/exceptions'
 require 'mgit/output'
 require 'mgit/registry'
 require 'mgit/repository'
+require 'mgit/system'
 
 require 'mgit/cli'
 require 'mgit/command'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   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'
 - !ruby/object:Gem::Dependency
   name: highline
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   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
@@ -73,34 +73,35 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/mgit
 - lib/mgit.rb
-- lib/mgit/output.rb
-- lib/mgit/repository.rb
-- lib/mgit/version.rb
 - lib/mgit/appdata.rb
-- lib/mgit/registry.rb
-- lib/mgit/configuration.rb
-- lib/mgit/exceptions.rb
-- lib/mgit/commands/list.rb
-- lib/mgit/commands/grep.rb
+- lib/mgit/cli.rb
+- lib/mgit/command.rb
+- lib/mgit/commands/add.rb
+- lib/mgit/commands/clone.rb
 - lib/mgit/commands/config.rb
-- lib/mgit/commands/remove_all.rb
-- lib/mgit/commands/version.rb
 - lib/mgit/commands/fetch.rb
+- lib/mgit/commands/ffmerge.rb
+- lib/mgit/commands/foreach.rb
+- lib/mgit/commands/grep.rb
 - lib/mgit/commands/head.rb
-- lib/mgit/commands/status.rb
-- lib/mgit/commands/remove.rb
 - lib/mgit/commands/help.rb
-- lib/mgit/commands/foreach.rb
-- lib/mgit/commands/tags.rb
-- lib/mgit/commands/add.rb
+- lib/mgit/commands/list.rb
 - lib/mgit/commands/log.rb
+- lib/mgit/commands/remove.rb
+- lib/mgit/commands/remove_all.rb
 - lib/mgit/commands/show.rb
-- lib/mgit/commands/ffmerge.rb
-- lib/mgit/commands/clone.rb
-- lib/mgit/command.rb
-- lib/mgit/cli.rb
-- bin/mgit
+- lib/mgit/commands/status.rb
+- lib/mgit/commands/tags.rb
+- lib/mgit/commands/version.rb
+- lib/mgit/configuration.rb
+- lib/mgit/exceptions.rb
+- lib/mgit/output.rb
+- lib/mgit/registry.rb
+- lib/mgit/repository.rb
+- lib/mgit/system.rb
+- lib/mgit/version.rb
 homepage: http://github.com/flavoursys/mgit
 licenses:
 - MIT
@@ -111,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MGit meta repository tool