2 files changed, 82 insertions, 6 deletions

diff --git a/lib/oxidized/output/git.rb b/lib/oxidized/output/git.rb
index 8b605f6..8d9dae1 100644
--- a/lib/oxidized/output/git.rb
+++ b/lib/oxidized/output/git.rb
@@ -21,7 +21,14 @@ class Git < Output
       Oxidized.asetus.save :user
       raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
     end
-    @cfg.repo = File.expand_path @cfg.repo
+
+    if @cfg.repo.respond_to?(:each)
+      @cfg.repo.each do |group, repo|
+        @cfg.repo["#{group}="] = File.expand_path repo
+      end
+    else
+      @cfg.repo = File.expand_path @cfg.repo
+    end
   end
 
   def store file, outputs, opt={}
@@ -70,7 +77,10 @@ class Git < Output
     def version node, group
       begin
         repo = @cfg.repo
-        if group
+        path = node
+        if group and @cfg.single_repo?
+          path = "#{group}/#{node}"
+        elsif group
           repo = File.join File.dirname(repo), group + '.git'
         end
         repo = Rugged::Repository.new repo
@@ -80,7 +90,7 @@ class Git < Output
         i = -1
         tab  = []
         walker.each do |commit|
-          if commit.diff(paths: [node]).size > 0
+          if commit.diff(paths: [path]).size > 0
             hash = {}
             hash[:date] = commit.time.to_s
             hash[:oid] = commit.oid
@@ -100,8 +110,10 @@ class Git < Output
     def get_version node, group, oid
       begin
         repo = @cfg.repo
-        if group && group != ''
+        if group && group != '' && !@cfg.single_repo?
           repo = File.join File.dirname(repo), group + '.git'
+        elsif group && group != ''
+          node = File.join group, node
         end
         repo = Rugged::Repository.new repo
         repo.blob_at(oid,node).content
@@ -115,7 +127,7 @@ class Git < Output
       begin
         repo = @cfg.repo
         diff_commits = nil
-        if group && group != ''
+        if group && group != '' && !@cfg.single_repo?
           repo = File.join File.dirname(repo), group + '.git'
         end
         repo = Rugged::Repository.new repo
@@ -147,13 +159,19 @@ class Git < Output
 
   def update repo, file, data
     return if data.empty?
+
     if @opt[:group]
       if @cfg.single_repo?
         file = File.join @opt[:group], file
       else
-        repo = File.join File.dirname(repo), @opt[:group] + '.git'
+        repo = if repo.is_a?(::String)
+                 File.join File.dirname(repo), @opt[:group] + '.git'
+               else
+                 repo[@opt[:group]]
+               end
       end
     end
+
     begin
       repo = Rugged::Repository.new repo
       update_repo repo, file, data, @msg, @user, @email
diff --git a/lib/oxidized/output/http.rb b/lib/oxidized/output/http.rb
new file mode 100644
index 0000000..13ba300
--- /dev/null
+++ b/lib/oxidized/output/http.rb
@@ -0,0 +1,58 @@
+module Oxidized
+  class Http < Output
+    attr_reader :commitref
+    def initialize
+      @cfg = Oxidized.config.output.http
+    end
+
+    def setup
+      if @cfg.empty?
+        CFGS.user.output.http.user  = 'Oxidized'
+        CFGS.user.output.http.pasword = 'secret'
+        CFGS.user.output.http.url  =  'http://localhost/web-api/oxidized'
+        CFGS.save :user
+        raise NoConfig, 'no output http config, edit ~/.config/oxidized/config'
+      end
+    end
+    require "net/http"
+    require "uri"
+    require "json"
+    def store node, outputs, opt={}
+      @commitref = nil
+      json = JSON.pretty_generate(
+          {
+              'msg' => opt[:msg],
+              'user' => opt[:user],
+              'email' => opt[:email],
+              'group' => opt[:group],
+              'node' => node,
+              'config' => outputs.to_cfg,
+              # actually we need to also iterate outputs, for other types like in gitlab. But most people don't use 'type' functionality.
+          }
+      )
+      uri = URI.parse @cfg.url
+      http = Net::HTTP.new uri.host, uri.port
+      #http.use_ssl = true if uri.scheme = 'https'
+      req = Net::HTTP::Post.new(uri.request_uri, initheader = { 'Content-Type' => 'application/json'})
+      req.basic_auth @cfg.user, @cfg.password
+      req.body = json
+      response = http.request req
+
+      case response.code.to_i
+        when 200 || 201
+          Oxidized.logger.info "Configuration http backup complete for #{node}"
+          p [:success]
+        when (400..499)
+          Oxidized.logger.info "Configuration http backup for #{node} failed status: #{response.body}"
+          p [:bad_request]
+        when (500..599)
+          p [:server_problems]
+          Oxidized.logger.info "Configuration http backup for #{node} failed status: #{response.body}"
+      end
+
+    end
+
+  end
+end
+
+