From e17356f22505f0aed88fd04c9925b8aeb2520e28 Mon Sep 17 00:00:00 2001 From: Danilo Sousa Date: Tue, 16 Feb 2016 14:18:07 -0200 Subject: `Node#repo` should return the node group repository --- lib/oxidized/node.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb index 7a278a9..a1504b9 100644 --- a/lib/oxidized/node.rb +++ b/lib/oxidized/node.rb @@ -24,7 +24,7 @@ module Oxidized @vars = opt[:vars] @stats = Stats.new @retry = 0 - @repo = Oxidized.config.output.git.repo + @repo = resolve_repo # model instance needs to access node instance @model.node = self @@ -170,5 +170,17 @@ module Oxidized Oxidized.mgr.model[model].new end + def resolve_repo + git = Oxidized.config.output.git + cfg_repo = git.repo + + if group && !git.single_repo? + basedir = File.dirname(cfg_repo) + File.join(basedir, "#{group}.git") + else + cfg_repo + end + end + end end -- cgit v1.2.1 From a626c212f9e64434b828dadcb0cb3bd879beb612 Mon Sep 17 00:00:00 2001 From: Danilo Sousa Date: Tue, 16 Feb 2016 18:56:30 -0200 Subject: fix `githubrepo` hook for groups repositories remotes when there was a repository per group we could not use the hook for pushing since we only had **one** remote configured. This PR configures each repository its own remote based in the `groups` config, as follows: ``` --- groups: first: remote_repo: git@gitlab.lab:oxidized/first.git second: remote_repo: git@gitlab.lab:oxidized/second.git ``` --- lib/oxidized/hook/githubrepo.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb index d10b51e..80ae665 100644 --- a/lib/oxidized/hook/githubrepo.rb +++ b/lib/oxidized/hook/githubrepo.rb @@ -4,9 +4,9 @@ class GithubRepo < Oxidized::Hook end def run_hook(ctx) - repo = Rugged::Repository.new(Oxidized.config.output.git.repo) + repo = Rugged::Repository.new(ctx.node.repo) log "Pushing local repository(#{repo.path})..." - remote = repo.remotes['origin'] || repo.remotes.create('origin', cfg.remote_repo) + remote = repo.remotes['origin'] || repo.remotes.create('origin', remote_repo(ctx.node)) log "to remote: #{remote.url}" fetch_and_merge_remote(repo) @@ -54,4 +54,16 @@ class GithubRepo < Oxidized::Hook end end + def remote_repo(node) + if node.group.nil? || single_repo? + cfg.remote_repo + else + Oxidized.config.groups[node.group].remote_repo + end + end + + def single_repo? + Oxidized.config.git.single_repo? + end + end -- cgit v1.2.1 From 695883a75783e19de70e60314fab49661c387a22 Mon Sep 17 00:00:00 2001 From: Danilo Sousa Date: Thu, 18 Feb 2016 17:01:25 -0200 Subject: create tests for `GithubRepo#validate_cfg!` method --- lib/oxidized/hook/githubrepo.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb index 80ae665..0c98460 100644 --- a/lib/oxidized/hook/githubrepo.rb +++ b/lib/oxidized/hook/githubrepo.rb @@ -1,6 +1,6 @@ class GithubRepo < Oxidized::Hook def validate_cfg! - cfg.has_key?('remote_repo') or raise KeyError, 'remote_repo is required' + raise KeyError, 'hook.remote_repo is required' unless cfg.has_key?('remote_repo') end def run_hook(ctx) -- cgit v1.2.1 From 66a0c3261611f737e5f36527da4ba0d13d70e092 Mon Sep 17 00:00:00 2001 From: Danilo Sousa Date: Fri, 19 Feb 2016 12:08:25 -0200 Subject: fix 'GithubRepo#single_repo?' private method --- lib/oxidized/hook/githubrepo.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb index 0c98460..dd9520b 100644 --- a/lib/oxidized/hook/githubrepo.rb +++ b/lib/oxidized/hook/githubrepo.rb @@ -63,7 +63,7 @@ class GithubRepo < Oxidized::Hook end def single_repo? - Oxidized.config.git.single_repo? + Oxidized.config.output.git.single_repo? end end -- cgit v1.2.1 From a486e086fc3b52f26ade94e58a16fa2150fc9cae Mon Sep 17 00:00:00 2001 From: Danilo Sousa Date: Fri, 19 Feb 2016 18:58:47 -0200 Subject: move the groups remote to the hook config thanks to @ElvinEfendi for the idea! :+1: --- lib/oxidized/hook/githubrepo.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb index dd9520b..0c75c68 100644 --- a/lib/oxidized/hook/githubrepo.rb +++ b/lib/oxidized/hook/githubrepo.rb @@ -58,7 +58,7 @@ class GithubRepo < Oxidized::Hook if node.group.nil? || single_repo? cfg.remote_repo else - Oxidized.config.groups[node.group].remote_repo + cfg.remote_repo[node.group] end end -- cgit v1.2.1 From c098f57f5dfc4588673ac62083611736c8a75136 Mon Sep 17 00:00:00 2001 From: Danilo Sousa Date: Fri, 19 Feb 2016 22:17:37 -0200 Subject: refactor `#remote_repo` to not rely on `#single_repo?` config even in the case we have groups, we can assume is only one repository if the `remote_repo` config is a String. --- lib/oxidized/hook/githubrepo.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb index 0c75c68..7fc6677 100644 --- a/lib/oxidized/hook/githubrepo.rb +++ b/lib/oxidized/hook/githubrepo.rb @@ -55,15 +55,10 @@ class GithubRepo < Oxidized::Hook end def remote_repo(node) - if node.group.nil? || single_repo? + if node.group.nil? || cfg.remote_repo.is_a?(String) cfg.remote_repo else cfg.remote_repo[node.group] end end - - def single_repo? - Oxidized.config.output.git.single_repo? - end - end -- cgit v1.2.1 From 69210c7ddf7d77cc9eb7b78f0bc00ad2f1475955 Mon Sep 17 00:00:00 2001 From: Danilo Sousa Date: Mon, 22 Feb 2016 14:16:29 -0300 Subject: follow the hook remotes config also for groups repositories ref.: https://github.com/ytti/oxidized/pull/326/files#r53557892 --- lib/oxidized/node.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb index a1504b9..35bcad9 100644 --- a/lib/oxidized/node.rb +++ b/lib/oxidized/node.rb @@ -171,14 +171,12 @@ module Oxidized end def resolve_repo - git = Oxidized.config.output.git - cfg_repo = git.repo + remote_repo = Oxidized.config.output.git.repo - if group && !git.single_repo? - basedir = File.dirname(cfg_repo) - File.join(basedir, "#{group}.git") + if Oxidized.config.output.git.single_repo? || @group.nil? || remote_repo.is_a?(String) + remote_repo else - cfg_repo + remote_repo[@group] end end -- cgit v1.2.1