From 4245acba9bc43ed838351619a0131f1a72b3ffe5 Mon Sep 17 00:00:00 2001 From: Jeffrey Johnson Date: Wed, 15 Apr 2015 17:41:32 +0200 Subject: [PATCH 1/2] Added support for Forge::GitRepository in YAML configuration file --- README.md | 3 +++ lib/puppet_library/puppet_library.rb | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/README.md b/README.md index 6692eb9..8e30a3c 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,9 @@ forges: - Directory: /var/lib/other-modules - Source: /var/code/puppetlabs-apache - Proxy: http://forge.puppetlabs.com + - GitRepository: + - http://github.com/example/puppetlabs-apache-fork.git + - "[0-9.]+" ``` ## Running with Phusion Passenger (EXPERIMENTAL) diff --git a/lib/puppet_library/puppet_library.rb b/lib/puppet_library/puppet_library.rb index 499a73f..7d756dd 100644 --- a/lib/puppet_library/puppet_library.rb +++ b/lib/puppet_library/puppet_library.rb @@ -106,10 +106,17 @@ def build_server(options) Server.configure do options[:forges].each do |(forge_type, config)| + if forge_type == Forge::GitRepository + forge :git_repository do + source config[0] + include_tags Regexp.new config[1] + end + else forge forge_type.new(*config) end end end + end def announce_server_start(options) options = options.clone From 966fed680b8ea53f6210f1a4e5c86fb42b49927d Mon Sep 17 00:00:00 2001 From: Jeffrey Johnson Date: Wed, 15 Apr 2015 17:41:32 +0200 Subject: [PATCH 2/2] Added support for Forge::GitRepository in YAML configuration file --- lib/puppet_library/puppet_library.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/puppet_library/puppet_library.rb b/lib/puppet_library/puppet_library.rb index 7d756dd..b48fb85 100644 --- a/lib/puppet_library/puppet_library.rb +++ b/lib/puppet_library/puppet_library.rb @@ -108,15 +108,15 @@ def build_server(options) options[:forges].each do |(forge_type, config)| if forge_type == Forge::GitRepository forge :git_repository do - source config[0] - include_tags Regexp.new config[1] + source config[0] + include_tags Regexp.new config[1] end else - forge forge_type.new(*config) + forge forge_type.new(*config) + end end end end - end def announce_server_start(options) options = options.clone