diff options
author | ytti <saku@ytti.fi> | 2017-04-15 14:48:04 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-15 14:48:04 +0300 |
commit | 85333df25d743d0a44bf098fba6ebc56b3a53d13 (patch) | |
tree | 2bc049fbde59d14156e26d5b176ccd4070bab40e /lib/oxidized/node.rb | |
parent | 3c1d0886933d90bb24810f622acb9e7f0b41b418 (diff) | |
parent | b0ad6abc0ae43c2af414aadd3e4fac4fe325dd0a (diff) |
Merge pull request #807 from clement-parisot/git-crypt
Add new output GitCrypt
Diffstat (limited to 'lib/oxidized/node.rb')
-rw-r--r-- | lib/oxidized/node.rb | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb index 6f89b56..cf71e48 100644 --- a/lib/oxidized/node.rb +++ b/lib/oxidized/node.rb @@ -166,18 +166,32 @@ module Oxidized end def resolve_repo opt - return unless is_git? opt - - remote_repo = Oxidized.config.output.git.repo - - if remote_repo.is_a?(::String) - if Oxidized.config.output.git.single_repo? || @group.nil? - remote_repo + if is_git? opt + remote_repo = Oxidized.config.output.git.repo + + if remote_repo.is_a?(::String) + if Oxidized.config.output.git.single_repo? || @group.nil? + remote_repo + else + File.join(File.dirname(remote_repo), @group + '.git') + end + else + remote_repo[@group] + end + elsif is_gitcrypt? opt + remote_repo = Oxidized.config.output.gitcrypt.repo + + if remote_repo.is_a?(::String) + if Oxidized.config.output.gitcrypt.single_repo? || @group.nil? + remote_repo + else + File.join(File.dirname(remote_repo), @group + '.git') + end else - File.join(File.dirname(remote_repo), @group + '.git') + remote_repo[@group] end else - remote_repo[@group] + return end end @@ -212,5 +226,9 @@ module Oxidized (opt[:output] || Oxidized.config.output.default) == 'git' end + def is_gitcrypt? opt + (opt[:output] || Oxidized.config.output.default) == 'gitcrypt' + end + end end |