summaryrefslogtreecommitdiff
path: root/lib/oxidized/output
diff options
context:
space:
mode:
authorElvin Efendi <elvin.efendiyev@gmail.com>2016-01-04 10:22:00 -0500
committerElvin Efendi <elvin.efendiyev@gmail.com>2016-01-04 10:22:00 -0500
commitdb5545d760a5baad052370504dd03585ac6f3215 (patch)
tree1c8923703da25cbc56ad3dea2b59d639c39a5b22 /lib/oxidized/output
parentef1a59d2b29df5b00246ee34eba96b0cf4927fa2 (diff)
parentf112dfa0c604ae1c990f6411a002806924c00bf3 (diff)
Merge remote-tracking branch 'upstream/master' into merge-upstream
Diffstat (limited to 'lib/oxidized/output')
-rw-r--r--lib/oxidized/output/file.rb12
-rw-r--r--lib/oxidized/output/git.rb7
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index ba08683..bb13827 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -2,6 +2,8 @@ module Oxidized
class OxidizedFile < Output
require 'fileutils'
+ attr_reader :commitref
+
def initialize
@cfg = Oxidized.config.output.file
end
@@ -22,6 +24,7 @@ class OxidizedFile < Output
FileUtils.mkdir_p file
file = File.join file, node
open(file, 'w') { |fh| fh.write outputs.to_cfg }
+ @commitref = file
end
def fetch node, group
@@ -39,5 +42,14 @@ class OxidizedFile < Output
end
end
+ def version node, group
+ # not supported
+ []
+ end
+
+ def get_version node, group, oid
+ 'not supported'
+ end
+
end
end
diff --git a/lib/oxidized/output/git.rb b/lib/oxidized/output/git.rb
index eedf51d..8b605f6 100644
--- a/lib/oxidized/output/git.rb
+++ b/lib/oxidized/output/git.rb
@@ -7,6 +7,8 @@ class Git < Output
raise OxidizedError, 'rugged not found: sudo gem install rugged'
end
+ attr_reader :commitref
+
def initialize
@cfg = Oxidized.config.output.git
end
@@ -27,6 +29,7 @@ class Git < Output
@user = (opt[:user] or @cfg.user)
@email = (opt[:email] or @cfg.email)
@opt = opt
+ @commitref = nil
repo = @cfg.repo
outputs.types.each do |type|
@@ -63,7 +66,7 @@ class Git < Output
end
end
- #give a hash of all oid revision for the givin node, and the date of the commit
+ #give a hash of all oid revision for the given node, and the date of the commit
def version node, group
begin
repo = @cfg.repo
@@ -176,7 +179,7 @@ class Git < Output
if tree_old != tree_new
repo.config['user.name'] = user
repo.config['user.email'] = email
- Rugged::Commit.create(repo,
+ @commitref = Rugged::Commit.create(repo,
:tree => index.write_tree(repo),
:message => msg,
:parents => repo.empty? ? [] : [repo.head.target].compact,