mgit 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e1ae3652e0ef938b2ab3718e16138819fa7cef
-  data.tar.gz: 0de46a8745d26340c709fa541cd285b4495bf2e4
+  metadata.gz: 701280b683790872b7dec9ba0bb84c1c8af87556
+  data.tar.gz: 65ecbe1775dca509ff2e49f43898bb734f25b179
 SHA512:
-  metadata.gz: ad59a05c35345e75306e78a086a2ae2543236ae58c3b88e2286c846ba636b7824cc15d6a3a321553ec1d1170d06899b80fc618cd62f64f31f9d42ff5c3b228ed
-  data.tar.gz: 4e1286094835753887f271eaed10589875dd391b064b4362adf6dc7724e41e5840a2f4485de0f9f6e871654ca8acbb059b666d9870b2bf2c0cdc4ed454f0c8a8
+  metadata.gz: 60f46155d0bec27d85a1612c65739ac7771cf6f91279610b3a481ee2f4262e26cbf2196b0572d5a7cb6da1b8f48fbd0d2ca9d3c73d0b48dcefecdad4c7e9b5dd
+  data.tar.gz: ad4dcb31ff9a501b5cf09ef9102ba2ff7727a5fbbf2c7076fa4dbc3481c3386c6e5eca3c4ab488ac68517e5d876d0345637214a1abca69b8de66d37b4d7cccd0

data/lib/mgit/appdata.rb

@@ -3,7 +3,6 @@ require 'yaml'
 
 module MGit
   module AppData
-
     ####################
     # Module interface #
     ####################
@@ -29,27 +28,26 @@ module MGit
     #########################################
 
     class AppDataVersion
-      @@versions = []
-
       def self.inherited(version)
-        @@versions << version.new
+        @versions ||= []
+        @versions << version.new
         super
       end
 
       def self.sorted
-        @@versions.sort_by { |v| v.version }
+        @versions.sort_by { |v| v.version }
       end
 
       def self.updates
-        self.sorted.drop_while { |v| !v.active? }.drop(1)
+        sorted.drop_while { |v| !v.active? }.drop(1)
       end
 
       def self.active
-        self.sorted.find { |v| v.active? }
+        sorted.find { |v| v.active? }
       end
 
       def self.latest
-        self.sorted.last
+        sorted.last
       end
 
       include Comparable
@@ -60,7 +58,7 @@ module MGit
 
       [:version, :active?, :load, :save!, :migrate!].each do |meth|
         define_method(meth) do
-          raise ImplementationError.new("AppDataVersion #{self.class.name} doesn't implement the #{meth.to_s} method.")
+          fail ImplementationError, "AppDataVersion #{self.class.name} doesn't implement the #{meth} method."
         end
       end
     end
@@ -83,17 +81,17 @@ module MGit
       end
 
       def load(key, default)
-        raise ImplementationError.new("LegacyAppData::load called with unknown key #{key}.") if key != :repositories
+        fail ImplementationError, "LegacyAppData::load called with unknown key #{key}." if key != :repositories
         repos = YAML.load_file(repofile)
         repos ? repos : default
       end
 
       def save!(key, value)
-        raise ImplementationError.new("LegacyAppData::save! called with unknown key #{key}.") if key != :repositories
+        fail ImplementationError, "LegacyAppData::save! called with unknown key #{key}." if key != :repositories
         File.open(repofile, 'w') { |fd| fd.write value.to_yaml }
       end
 
-    private
+      private
 
       def repofile
         XDG['CONFIG_HOME'].to_path.join('mgit.yml')
@@ -118,7 +116,7 @@ module MGit
 
       def setup!
         FileUtils.mkdir_p(config_dir)
-        File.open(config_file, 'w') { |fd| fd.write ({ :version => '1' }.to_yaml) }
+        File.open(config_file, 'w') { |fd| fd.write({ version: '1' }.to_yaml) }
         FileUtils.touch(repo_file)
       end
 
@@ -129,9 +127,9 @@ module MGit
           repos ? repos : default
         when *Configuration::KEYS.keys, :version
           config = YAML.load_file(config_file)
-          (config && config.has_key?(key)) ? config[key] : default
+          (config && config.key?(key)) ? config[key] : default
         else
-          raise ImplementationError.new("AppDataVersion1::load called with unknown key #{key}.")
+          fail ImplementationError, "AppDataVersion1::load called with unknown key #{key}."
         end
       end
 
@@ -144,11 +142,11 @@ module MGit
           config[key] = value
           File.open(config_file, 'w') { |fd| fd.write config.to_yaml }
         else
-          raise ImplementationError.new("AppDataVersion1::save! called with unknown key #{key}.")
+          fail ImplementationError, "AppDataVersion1::save! called with unknown key #{key}."
         end
       end
 
-    private
+      private
 
       def config_dir
         XDG['CONFIG_HOME'].to_path.join('mgit')

data/lib/mgit/cli.rb

@@ -3,12 +3,12 @@ module MGit
     include Output
 
     def start
-      raise NoCommandError if ARGV.size == 0
+      fail NoCommandError if ARGV.size == 0
 
       MGit.init
 
       # Run command, consuming its name from the list of arguments.
-      command = Command.execute(ARGV.shift, ARGV)
+      Command.execute(ARGV.shift, ARGV)
     rescue UsageError => e
       perror e.to_s
     rescue GitError => e

data/lib/mgit/command.rb

@@ -11,7 +11,7 @@ module MGit
     end
 
     def self.execute(name, args)
-      cmd = self.create(name)
+      cmd = create(name)
       cmd.check_arity(args)
       cmd.execute(args)
     end
@@ -35,26 +35,24 @@ module MGit
     end
 
     def check_arity(args)
-      arity_min, arity_max = self.arity
-      raise TooFewArgumentsError.new(self) if arity_min && args.size < arity_min
-      raise TooManyArgumentsError.new(self) if arity_max && args.size > arity_max
+      arity_min, arity_max = arity
+      fail TooFewArgumentsError, self if arity_min && args.size < arity_min
+      fail TooManyArgumentsError, self if arity_max && args.size > arity_max
     end
 
     [: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.")
+        fail ImplementationError, "Command #{self.class.name} doesn't implement the #{meth} method."
       end
     end
 
-  private
-
     def self.create(cmd)
       cmd = cmd.downcase.to_sym
       klass = @@commands[cmd] || @@aliases[cmd]
       if klass
         klass.new
       else
-        raise UnknownCommandError.new(cmd)
+        fail UnknownCommandError, cmd
       end
     end
 

data/lib/mgit/commands/add.rb

@@ -2,13 +2,13 @@ module MGit
   class AddCommand < Command
     def execute(args)
       path = File.expand_path(args[0])
-      raise CommandUsageError.new('First argument must be a path to a directory.', self) unless File.directory?(path)
-      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)
+      fail CommandUsageError.new('First argument must be a path to a directory.', self) unless File.directory?(path)
+      fail CommandUsageError.new('First argument must be a path to a git repository.', self) unless git_dir?(path)
+      fail CommandUsageError.new('Sorry, mgit can not handle bare repositories.', self) if bare?(path)
 
       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)
-      
+      fail CommandUsageError.new("Repository named #{name} already exists with different path.", self) unless new_or_same?(name, path)
+
       Registry.add(name, path)
     end
 
@@ -26,19 +26,19 @@ module MGit
 
     register_command :add
 
-  private
+    private
 
-    def is_new_or_same?(name, path)
+    def new_or_same?(name, path)
       repo = Registry.find { |r| r.name == name }
       repo.nil? || repo.path == path
     end
 
-    def is_git_dir?(path)
-      System::git('status', :chdir => path) !~ /fatal: Not a git repository/
+    def git_dir?(path)
+      System.git('status', chdir: path) !~ /fatal: Not a git repository/
     end
 
-    def is_bare?(path)
-      System::git('status', :chdir => path) =~ /fatal: This operation must be run in a work tree/
+    def bare?(path)
+      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,8 +1,9 @@
 module MGit
   class CloneCommand < Command
     def execute(args)
-      log = System::git("clone #{args.join(' ')}", { :raise => true, :print_stderr => true }).stdout
-      
+      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
@@ -21,7 +22,7 @@ module MGit
 
     register_command :clone
 
-  private
+    private
 
     def option?(arg)
       arg.start_with?('-')

data/lib/mgit/commands/fetch.rb

@@ -2,10 +2,10 @@ require 'open3'
 
 module MGit
   class FetchCommand < Command
-    def execute(args)
+    def execute(_)
       thread_class = Configuration.threads ? Thread : NullThread
 
-      threads = Registry.collect do |repo|
+      threads = Registry.map do |repo|
         thread_class.new { fetch(repo) }
       end
 
@@ -26,18 +26,18 @@ module MGit
 
     register_command :fetch
 
-  private
+    private
 
     def fetch(repo)
-      sc = System::git('remote', :chdir => repo.path)
+      sc = System.git('remote', chdir: repo.path)
 
-      if !sc.success?
+      unless sc.success?
         perror "Failed to read remotes for repository #{repo.name}! Abort."
         return
       end
 
       sc.stdout.strip.split.each do |remote|
-        if System::git("fetch #{remote}", :chdir => repo.path).success?
+        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

@@ -1,6 +1,6 @@
 module MGit
   class FFMergeCommand < Command
-    def execute(args)
+    def execute(_)
       Registry.chdir_each do |repo|
         branches = mergable_branches(repo)
         next if branches.empty?
@@ -28,12 +28,12 @@ module MGit
 
     register_command :ffmerge
 
-  private
+    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.keys
     end
 
     def merge_branches(repo, branches)
@@ -45,15 +45,15 @@ module MGit
         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."
+        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)
+        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 })
+      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

@@ -6,9 +6,10 @@ module MGit
       Registry.each do |repo|
         pinfo "Executing command in repository #{repo.name}..."
 
-        sc = System::run(command, { :chdir => repo.path, :print_stdout => true, :print_stderr => true })
+        sc = System.run(command, chdir: repo.path, print_stdout: true, print_stderr: true)
+        next if sc.success?
 
-        if !sc.success? && !agree("Executing command '#{command}' in repository '#{repo.name}' failed. Would you like to continue anyway?".red)
+        unless 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

@@ -5,7 +5,7 @@ module MGit
 
       Registry.each do |repo|
         pinfo "Looking for pattern '#{ptrn}' in repository #{repo.name}..."
-        System::git("grep #{ptrn}", { :chdir => repo.path, :print_stdout => true })
+        System.git("grep #{ptrn}", chdir: repo.path, print_stdout: true)
       end
     end
 

data/lib/mgit/commands/head.rb

@@ -1,9 +1,9 @@
 module MGit
   class HeadCommand < Command
-    def execute(args)
+    def execute(_)
       t = []
       Registry.each { |repo| t << [repo.name, repo.current_branch, repo.current_head] }
-      ptable t, :columns => [24, nil, nil]
+      ptable t, columns: [24, nil, nil]
     end
 
     def arity

data/lib/mgit/commands/help.rb

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

data/lib/mgit/commands/list.rb

@@ -1,9 +1,9 @@
 module MGit
   class ListCommand < Command
-    def execute(args)
+    def execute(_)
       t = []
       Registry.each { |repo| t << [repo.name, repo.path] }
-      ptable t, :columns => [24, nil]
+      ptable t, columns: [24, nil]
     end
 
     def arity

data/lib/mgit/commands/log.rb

@@ -1,13 +1,13 @@
 module MGit
   class LogCommand < Command
-    def execute(args)
+    def execute(_)
       Registry.chdir_each do |repo|
         repo.remote_tracking_branches.each do |branch, upstream|
           uc = repo.unmerged_commits(branch, upstream)
           next if uc.empty?
 
           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

data/lib/mgit/commands/remove.rb

@@ -3,11 +3,11 @@ module MGit
     def execute(args)
       ptrn = args[0]
 
-      repo = Registry.find do |repo|
-        repo.name == ptrn || repo.path == File.expand_path(ptrn)
+      repo = Registry.find do |r|
+        r.name == ptrn || r.path == File.expand_path(ptrn)
       end
-      
-      raise CommandUsageError.new("Couldn't find repository matching '#{ptrn}'.", self) unless repo
+
+      fail CommandUsageError.new("Couldn't find repository matching '#{ptrn}'.", self) unless repo
 
       Registry.remove(repo.name)
       pinfo "Removed repository #{repo.name}."

data/lib/mgit/commands/remove_all.rb

@@ -1,9 +1,7 @@
 module MGit
   class RemoveAllCommand < Command
-    def execute(args)
-      if agree('This will delete all repositories from mgit. Are you sure?'.red)
-        Registry.clean
-      end
+    def execute(_)
+      Registry.clean if agree('This will delete all repositories from mgit. Are you sure?'.red)
     end
 
     def arity

data/lib/mgit/commands/show.rb

@@ -27,24 +27,24 @@ module MGit
 
     register_command :show
 
-  private
+    private
 
     def repos
       @rs || begin
         @rs = []
         Registry.chdir_each do |r|
-          @rs << r if has_commit?
+          @rs << r if commit?
         end
         @rs
       end
     end
 
-    def has_commit?
-      !(System::git("rev-parse --quiet --verify #{@commit}").stdout.empty?)
+    def commit?
+      !(System.git("rev-parse --quiet --verify #{@commit}").stdout.empty?)
     end
 
     def show_commit(repo)
-      System::git("show #{@commit}", { :chdir => repo.path, :print_stdout => true } )
+      System.git("show #{@commit}", chdir: repo.path, print_stdout: true)
     end
 
     def show_menu

data/lib/mgit/commands/status.rb

@@ -2,10 +2,10 @@ require 'set'
 
 module MGit
   class StatusCommand < Command
-    def execute(args)
+    def execute(_)
       t = []
       Registry.chdir_each { |repo| t << [repo.name, repo.current_branch, decorate_flags(repo)] }
-      ptable t, :columns => [24, nil, nil]
+      ptable t, columns: [24, nil, nil]
     end
 
     def arity
@@ -23,7 +23,7 @@ module MGit
     register_command :status
     register_alias :st
 
-  private
+    private
 
     def decorate_flags(repo)
       flags = repo.flags
@@ -34,9 +34,9 @@ module MGit
     end
 
     def decorate_simple_flags(flags)
-      { :index => :red, :dirty => :red, :untracked => :yellow, :detached => :yellow }
-        .select { |f,_| flags.include?(f) }
-        .map { |f,c| f.to_s.capitalize.send(c) }
+      { index: :red, dirty: :red, untracked: :yellow, detached: :yellow }
+        .select { |f, _| flags.include?(f) }
+        .map { |f, c| f.to_s.capitalize.send(c) }
     end
 
     def decorate_divergence_flags(divergence)

data/lib/mgit/commands/tags.rb

@@ -2,10 +2,10 @@ require 'open3'
 
 module MGit
   class TagsCommand < Command
-    def execute(args)
+    def execute(_)
       t = []
       Registry.each { |repo| t << print_latest_tag(repo) }
-      ptable t, :columns => [24, nil, nil]
+      ptable t, columns: [24, nil, nil]
     end
 
     def arity
@@ -22,15 +22,18 @@ module MGit
 
     register_command :tags
 
-  private
+    private
 
     def latest_tag(path)
-      sc = System::git('describe --tags --abbrev=0 master', :chdir => path)
+      sc = System.git('describe --tags --abbrev=0 master', chdir: path)
       sc =~ /fatal:/ ? 'none' : sc.stdout.strip
     end
 
     def latest_tag_time(path, tag)
-      Time.at(System::git("log -n 1 --format='%at' #{tag}", :chdir => path).stdout.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/commands/version.rb

@@ -1,6 +1,6 @@
 module MGit
   class VersionCommand < Command
-    def execute(args)
+    def execute(_)
       pinfo "mgit version #{MGit::VERSION}"
     end
 
@@ -16,6 +16,6 @@ module MGit
       'display mgit version'
     end
 
-    register_command :version 
+    register_command :version
   end
 end

data/lib/mgit/configuration.rb

@@ -3,19 +3,19 @@ module MGit
     extend Enumerable
 
     KEYS = {
-      :threads => {
-        :default => true,
-        :description => 'set to true if you want the fetch command to be threaded'
+      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'
+      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'
+      colors: {
+        default: true,
+        description: 'set to false to disable all colored output'
       }
     }
 
@@ -25,11 +25,11 @@ module MGit
           AppData.load(k, v[:default])
         end
 
-        define_method("#{k.to_s}=") do |value|
+        define_method("#{k}=") do |value|
           AppData.save!(k, value)
         end
 
-        private "#{k.to_s}="
+        private "#{k}="
       end
     end
 
@@ -38,35 +38,36 @@ module MGit
       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.")
+        unless File.directory?(value)
+          fail ConfigurationError, 'Illegal value for key plugindir. Has to be a directory.'
         end
         self.plugindir = File.expand_path(value)
       else
-        raise ConfigurationError.new("Unknown key: #{key}.")
+        fail ConfigurationError, "Unknown key: #{key}."
       end
     end
 
     def self.each
       KEYS.each do |key|
-        yield [key.first.to_s, self.send(key.first).to_s]
+        yield [key.first.to_s, send(key.first).to_s]
       end
     end
 
-    def self.method_missing(meth, *args, &block)
-      raise ConfigurationError.new("Unknown key: #{key}")
+    def self.method_missing(meth, *)
+      fail ConfigurationError, "Unknown key: #{meth}"
     end
 
-  private
+    private
 
     def self.set_boolean(key, value)
-      unless ['true', 'false', 'on', 'off'].include?(value)
-        raise ConfigurationError.new("Illegal value for key #{key}.")
+      unless %w( true, false, on, off ).include?(value)
+        fail ConfigurationError, "Illegal value for key #{key}."
       end
-      if ['true', 'on'].include?(value)
-        self.send("#{key}=", true)
+
+      if %w( true, on ).include?(value)
+        send("#{key}=", true)
       else
-        self.send("#{key}=", false)
+        send("#{key}=", false)
       end
     end
   end

data/lib/mgit/output.rb

@@ -20,7 +20,7 @@ module MGit
       print_to_screen TableOutputter.new(table, options).to_s
     end
 
-  private
+    private
 
     def print_to_screen(s)
       if Configuration.colors
@@ -37,7 +37,7 @@ module MGit
         @table = table
         @options = options
         @options[:columns] = []
-        raise ImplementationError.new('ptable called with invalid table') unless valid_table?
+        fail ImplementationError, 'ptable called with invalid table' unless valid_table?
       end
 
       def to_s
@@ -46,7 +46,7 @@ module MGit
         cw = column_widths
 
         table.map do |row|
-          row.map.with_index do |cell, i| 
+          row.map.with_index do |cell, i|
             # Only justify the column if it is not the last one.
             # This avoids too many line breaks.
             i < (columns - 1) ? justify(cell, cw[i]) : cell
@@ -54,7 +54,7 @@ module MGit
         end.join("\n")
       end
 
-    private
+      private
 
       def valid_table?
         table.empty? || table.all? { |c| c.is_a?(Array) && c.size == table.first.size }
@@ -73,7 +73,7 @@ module MGit
       end
 
       def column_widths
-        column_max_widths.each_with_index.map do |c, i| 
+        column_max_widths.each_with_index.map do |c, i|
           (options[:columns].size > i && options[:columns][i]) ? options[:columns][i] : c
         end
       end
@@ -85,7 +85,7 @@ module MGit
       end
 
       def justify(s, n)
-       (s.size > n) ? (s[0..(n - 3)] + '...') : s.ljust(n, ' ')
+        (s.size > n) ? (s[0..(n - 3)] + '...') : s.ljust(n, ' ')
       end
     end
   end

data/lib/mgit/registry.rb

@@ -3,19 +3,19 @@ module MGit
     extend Enumerable
 
     def self.all
-      self.load.map { |name, path| Repository.new(name, path) }.sort_by(&:path)
+      load.map { |name, path| Repository.new(name, path) }.sort_by(&:path)
     end
 
     def self.available
-      self.all.select(&:available?)
+      all.select(&:available?)
     end
 
     def self.each(&block)
-      self.available.each(&block)
+      available.each(&block)
     end
 
     def self.chdir_each
-      self.available.select(&:available?).each do |repo|
+      available.select(&:available?).each do |repo|
         Dir.chdir(repo.path) do
           yield repo
         end
@@ -23,26 +23,26 @@ module MGit
     end
 
     def self.find(&block)
-      self.all.find(&block)
+      all.find(&block)
     end
 
     def self.add(name, path)
-      repos = self.load
+      repos = load
       repos[name] = path
-      self.save! repos
+      save! repos
     end
 
     def self.remove(name)
-      repos = self.load
+      repos = load
       repos.delete name
-      self.save! repos
+      save! repos
     end
 
     def self.clean
-      self.save!({})
+      save!({})
     end
 
-  private
+    private
 
     def self.load
       AppData.load(:repositories)

data/lib/mgit/repository.rb

@@ -12,7 +12,7 @@ module MGit
     end
 
     def available?
-      if !File.directory?(path)
+      unless File.directory?(path)
         pwarn "Repository #{name} is not available anymore. Failed to read #{path}."
         return false
       end
@@ -21,71 +21,72 @@ module MGit
     end
 
     def current_branch
-      in_repo {
-        sc = System::git('rev-parse --abbrev-ref HEAD')
+      in_repo do
+        sc = System.git('rev-parse --abbrev-ref HEAD')
         sc.success? ? sc.stdout.strip : 'HEAD'
-      }
+      end
     end
 
     def current_head
-      in_repo { System::git('rev-parse --verify --short HEAD').stdout.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
-        System::git("for-each-ref --format='%(refname:short) %(upstream:short)' refs/heads")
+        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]
     end
 
     def remote_branches
       in_repo do
-        System::git('branch -r').stdout.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
-        System::git("log --pretty=format:'%h#%an#%s' --reverse  --relative-date #{branch}..#{upstream}")
+        System.git("log --pretty=format:'%h#%an#%s' --reverse  --relative-date #{branch}..#{upstream}")
           .stdout
           .split("\n")
           .map { |line| line.split('#') }
-          .map do |words| 
+          .map do |words|
             {
-              :commit => words[0],
-              :author => words[1],
-              :subject => words[2..-1].join('#')
+              commit: words[0],
+              author: words[1],
+              subject: words[2..-1].join('#')
             }
           end
       end
     end
 
+    SIMPLE_FLAGS = { 'A' => :index, 'M' => :dirty, '??' => :untracked }
+
     def flags
       flags = Set.new
       status_lines do |s|
-        case s.split[0]
-        when 'A'
-          flags << :index
-        when 'M'
-          flags << :dirty
-        when '??'
-          flags << :untracked
+        indicator = s.split[0]
+
+        case indicator
+        when *SIMPLE_FLAGS.keys
+          flags << SIMPLE_FLAGS[indicator]
         when '##'
-          if /## [\w,\/]+\.\.\.[\w,\/]+ \[.+\]/ =~ s
+          if %r{## [\w,/]+\.\.\.[\w,/]+ \[.+\]} =~ s
             flags << :diverged
           elsif /## HEAD \(no branch\)/ =~ s
             flags << :detached
           end
         end
       end
+
       flags
     end
 
@@ -93,13 +94,13 @@ module MGit
       divergence = []
       status_lines do |s|
         if s.split[0] == '##'
-          if(m = /## ([\w,\/]+)\.\.\.([\w,\/]+) \[ahead (\d+), behind (\d+)\]/.match(s))
-            divergence << { :ahead => { :branch => m[2], :by => m[3] }, :behind => { :branch => m[2], :by => m[4] } }
-          elsif(m = /## ([\w,\/]+)\.\.\.([\w,\/]+) \[(\w+) (\d+)\]/.match(s))
+          if (m = %r{## ([\w,/]+)\.\.\.([\w,/]+) \[ahead (\d+), behind (\d+)\]}.match(s))
+            divergence << { ahead: { branch: m[2], by: m[3] }, behind: { branch: m[2], by: m[4] } }
+          elsif (m = %r{## ([\w,/]+)\.\.\.([\w,/]+) \[(\w+) (\d+)\]}.match(s))
             if m[3] =~ /behind/
-              divergence << { :behind => { :branch => m[2], :by => m[4] } }
+              divergence << { behind: { branch: m[2], by: m[4] } }
             else
-              divergence << { :ahead => { :branch => m[2], :by => m[4] } }
+              divergence << { ahead: { branch: m[2], by: m[4] } }
             end
           end
         end
@@ -117,10 +118,10 @@ module MGit
 
     alias_method :chdir, :in_repo
 
-  private
+    private
 
     def status
-      @status ||= in_repo { System::git('status --short --branch --ignore-submodules').stdout.split("\n") }
+      @status ||= in_repo { System.git('status --short --branch --ignore-submodules').stdout.split("\n") }
     end
 
     def status_lines

data/lib/mgit/system.rb

@@ -13,26 +13,26 @@ module MGit
 
         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
+        return if success?
+
+        psystem(stderr.strip) if opts[:print_stderr]
+        fail SystemCommandError.new(cmd, opts[:error]) if opts[:raise]
       end
 
       def success?
         @st.exitstatus == 0
       end
 
-      def =~(re)
-        (@stdout =~ re) || (@stderr =~ re)
+      def =~(other)
+        (@stdout =~ other) || (@stderr =~ other)
       end
 
       def default_options
         {
-          :print_stdout => false,
-          :print_stderr => false,
-          :raise => false,
-          :error => 'Command failed.',
+          print_stdout: false,
+          print_stderr: false,
+          raise: false,
+          error: 'Command failed.'
         }
       end
 
@@ -41,7 +41,7 @@ module MGit
 
         opts = Hash[
           default_options.map do |k, v|
-            [k, popen_opts.has_key?(k) ? popen_opts.delete(k) : v]
+            [k, popen_opts.key?(k) ? popen_opts.delete(k) : v]
           end
         ]
 
@@ -51,11 +51,9 @@ module MGit
 
     class GitCommand < SystemCommand
       def initialize(cmd, opts)
-        begin
-          super("git #{cmd}", opts)
-        rescue SystemCommandError => e
-          raise GitError.new(e.error)
-        end
+        super("git #{cmd}", opts)
+      rescue SystemCommandError => e
+        raise GitError, e.error
       end
     end
 

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize