Rebased from master

1 files changed, 113 insertions, 115 deletions

diff --git a/lib/oxidized/output/git.rb b/lib/oxidized/output/git.rb
index fee0ab6..8acfd46 100644
--- a/lib/oxidized/output/git.rb
+++ b/lib/oxidized/output/git.rb
@@ -1,74 +1,73 @@
 module Oxidized
-class Git < Output
-  class GitError < OxidizedError; end
-  begin
-    require 'rugged'
-  rescue LoadError
-    raise OxidizedError, 'rugged not found: sudo gem install rugged'
-  end
-
-  attr_reader :commitref
+  class Git < Output
+    class GitError < OxidizedError; end
+    begin
+      require 'rugged'
+    rescue LoadError
+      raise OxidizedError, 'rugged not found: sudo gem install rugged'
+    end
 
-  def initialize
-    @cfg = Oxidized.config.output.git
-  end
+    attr_reader :commitref
 
-  def setup
-    if @cfg.empty?
-      Oxidized.asetus.user.output.git.user  = 'Oxidized'
-      Oxidized.asetus.user.output.git.email = 'o@example.com'
-      Oxidized.asetus.user.output.git.repo  =  File.join(Config::Root, 'oxidized.git')
-      Oxidized.asetus.save :user
-      raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
+    def initialize
+      @cfg = Oxidized.config.output.git
     end
 
-    if @cfg.repo.respond_to?(:each)
-      @cfg.repo.each do |group, repo|
-        @cfg.repo["#{group}="] = File.expand_path repo
+    def setup
+      if @cfg.empty?
+        Oxidized.asetus.user.output.git.user  = 'Oxidized'
+        Oxidized.asetus.user.output.git.email = 'o@example.com'
+        Oxidized.asetus.user.output.git.repo = File.join(Config::Root, 'oxidized.git')
+        Oxidized.asetus.save :user
+        raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
       end
-    else
-      @cfg.repo = File.expand_path @cfg.repo
-    end
-  end
 
-  def store file, outputs, opt={}
-    @msg   = opt[:msg]
-    @user  = (opt[:user]  or @cfg.user)
-    @email = (opt[:email] or @cfg.email)
-    @opt   = opt
-    @commitref = nil
-    repo   = @cfg.repo
-
-    outputs.types.each do |type|
-      type_cfg = ''
-      type_repo = File.join(File.dirname(repo), type + '.git')
-      outputs.type(type).each do |output|
-        (type_cfg << output; next) if not output.name
-        type_file = file + '--' + output.name
-        if @cfg.type_as_directory?
-          type_file = type + '/' + type_file
-          type_repo = repo
+      if @cfg.repo.respond_to?(:each)
+        @cfg.repo.each do |group, repo|
+          @cfg.repo["#{group}="] = File.expand_path repo
         end
-        update type_repo, type_file, output
+      else
+        @cfg.repo = File.expand_path @cfg.repo
       end
-      update type_repo, file, type_cfg
     end
 
-    update repo, file, outputs.to_cfg
-  end
+    def store file, outputs, opt = {}
+      @msg   = opt[:msg]
+      @user  = (opt[:user]  or @cfg.user)
+      @email = (opt[:email] or @cfg.email)
+      @opt   = opt
+      @commitref = nil
+      repo = @cfg.repo
+
+      outputs.types.each do |type|
+        type_cfg = ''
+        type_repo = File.join(File.dirname(repo), type + '.git')
+        outputs.type(type).each do |output|
+          (type_cfg << output; next) if not output.name
+          type_file = file + '--' + output.name
+          if @cfg.type_as_directory?
+            type_file = type + '/' + type_file
+            type_repo = repo
+          end
+          update type_repo, type_file, output
+        end
+        update type_repo, file, type_cfg
+      end
 
+      update repo, file, outputs.to_cfg
+    end
 
-  def fetch node, group
-    begin
-      repo, path = yield_repo_and_path(node, group)
-      repo = Rugged::Repository.new repo
-      index = repo.index
-      index.read_tree repo.head.target.tree unless repo.empty?
-      repo.read(index.get(path)[:oid]).data
-    rescue
-      'node not found'
+    def fetch node, group
+      begin
+        repo, path = yield_repo_and_path(node, group)
+        repo = Rugged::Repository.new repo
+        index = repo.index
+        index.read_tree repo.head.target.tree unless repo.empty?
+        repo.read(index.get(path)[:oid]).data
+      rescue
+        'node not found'
+      end
     end
-  end
 
     # give a hash of all oid revision for the given node, and the date of the commit
     def version node, group
@@ -80,7 +79,7 @@ class Git < Output
         walker.sorting(Rugged::SORT_DATE)
         walker.push(repo.head.target)
         i = -1
-        tab  = []
+        tab = []
         walker.each do |commit|
           if commit.diff(paths: [path]).size > 0
             hash = {}
@@ -98,18 +97,18 @@ class Git < Output
       end
     end
 
-    #give the blob of a specific revision
+    # give the blob of a specific revision
     def get_version node, group, oid
       begin
         repo, path = yield_repo_and_path(node, group)
         repo = Rugged::Repository.new repo
-        repo.blob_at(oid,path).content
+        repo.blob_at(oid, path).content
       rescue
         'version not found'
       end
     end
 
-    #give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
+    # give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
     def get_diff node, group, oid1, oid2
       begin
         diff_commits = nil
@@ -122,15 +121,15 @@ class Git < Output
           diff = repo.diff(commit_old, commit)
           diff.each do |patch|
             if /#{node.name}\s+/.match(patch.to_s.lines.first)
-              diff_commits = {:patch => patch.to_s, :stat => patch.stat}
+              diff_commits = { :patch => patch.to_s, :stat => patch.stat }
               break
             end
           end
         else
           stat = commit.parents[0].diff(commit).stat
-          stat = [stat[1],stat[2]]
+          stat = [stat[1], stat[2]]
           patch = commit.parents[0].diff(commit).patch
-          diff_commits = {:patch => patch, :stat => stat}
+          diff_commits = { :patch => patch, :stat => stat }
         end
 
         diff_commits
@@ -139,68 +138,67 @@ class Git < Output
       end
     end
 
-  private
+    private
 
-  def yield_repo_and_path(node, group)
-    repo, path = node.repo, node.name
+    def yield_repo_and_path(node, group)
+      repo, path = node.repo, node.name
 
-    if group and @cfg.single_repo?
-      path = "#{group}/#{node.name}"
-    end
+      if group and @cfg.single_repo?
+        path = "#{group}/#{node.name}"
+      end
 
-    [repo, path]
-  end
+      [repo, path]
+    end
 
-  def update repo, file, data
-    return if data.empty?
+    def update repo, file, data
+      return if data.empty?
 
-    if @opt[:group]
-      if @cfg.single_repo?
-        file = File.join @opt[:group], file
-      else
-        repo = if repo.is_a?(::String)
-                 File.join File.dirname(repo), @opt[:group] + '.git'
-               else
-                 repo[@opt[:group]]
-               end
+      if @opt[:group]
+        if @cfg.single_repo?
+          file = File.join @opt[:group], file
+        else
+          repo = if repo.is_a?(::String)
+                   File.join File.dirname(repo), @opt[:group] + '.git'
+                 else
+                   repo[@opt[:group]]
+                 end
+        end
       end
-    end
 
-    begin
-      repo = Rugged::Repository.new repo
-      update_repo repo, file, data, @msg, @user, @email
-    rescue Rugged::OSError, Rugged::RepositoryError => open_error
       begin
-        Rugged::Repository.init_at repo, :bare
-      rescue => create_error
-        raise GitError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
+        repo = Rugged::Repository.new repo
+        update_repo repo, file, data, @msg, @user, @email
+      rescue Rugged::OSError, Rugged::RepositoryError => open_error
+        begin
+          Rugged::Repository.init_at repo, :bare
+        rescue => create_error
+          raise GitError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
+        end
+        retry
       end
-      retry
     end
-  end
 
-  def update_repo repo, file, data, msg, user, email
-    oid = repo.write data, :blob
-    index = repo.index
-    index.read_tree repo.head.target.tree unless repo.empty?
-
-    tree_old = index.write_tree repo
-    index.add :path=>file, :oid=>oid, :mode=>0100644
-    tree_new = index.write_tree repo
-
-    if tree_old != tree_new
-      repo.config['user.name']  = user
-      repo.config['user.email'] = email
-      @commitref = Rugged::Commit.create(repo,
-        :tree       => index.write_tree(repo),
-        :message    => msg,
-        :parents    => repo.empty? ? [] : [repo.head.target].compact,
-        :update_ref => 'HEAD',
-      )
-
-      index.write
-      true
+    def update_repo repo, file, data, msg, user, email
+      oid = repo.write data, :blob
+      index = repo.index
+      index.read_tree repo.head.target.tree unless repo.empty?
+
+      tree_old = index.write_tree repo
+      index.add :path => file, :oid => oid, :mode => 0100644
+      tree_new = index.write_tree repo
+
+      if tree_old != tree_new
+        repo.config['user.name']  = user
+        repo.config['user.email'] = email
+        @commitref = Rugged::Commit.create(repo,
+                                           :tree       => index.write_tree(repo),
+                                           :message    => msg,
+                                           :parents    => repo.empty? ? [] : [repo.head.target].compact,
+                                           :update_ref => 'HEAD',)
+
+        index.write
+        true
+      end
     end
   end
 end
-end