[DRE-commits] [librarian-puppet] 24/153: fix #237 add flag for using the v3 forge api

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository librarian-puppet.

commit af6dc9685a027c8da74974782aa8b075986a948e
Author: Johan Haals <johan.haals at gmail.com>
Date:   Wed Jul 16 14:35:14 2014 +0200

    fix #237 add flag for using the v3 forge api
    
    librarian-puppet install --use-v3-api adds support for downloading modules from a custom
    Puppet forge using the v3 api
---
 lib/librarian/puppet/cli.rb          | 2 ++
 lib/librarian/puppet/environment.rb  | 3 +++
 lib/librarian/puppet/source/forge.rb | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/librarian/puppet/cli.rb b/lib/librarian/puppet/cli.rb
index fe67ae8..ff19501 100644
--- a/lib/librarian/puppet/cli.rb
+++ b/lib/librarian/puppet/cli.rb
@@ -44,6 +44,7 @@ module Librarian
       option "path", :type => :string
       option "destructive", :type => :boolean, :default => false
       option "local", :type => :boolean, :default => false
+      option "use-v3-api", :type => :boolean, :default => false
       def install
 
         unless File.exist?('Puppetfile')
@@ -64,6 +65,7 @@ module Librarian
           environment.config_db.local["path"] = options["path"]
         end
 
+        environment.config_db.local['use-v3-api'] = options['use-v3-api'] ? '1' : nil
         environment.config_db.local['mode'] = options['local'] ? 'local' : nil
 
         resolve!
diff --git a/lib/librarian/puppet/environment.rb b/lib/librarian/puppet/environment.rb
index 64ec342..c19927f 100644
--- a/lib/librarian/puppet/environment.rb
+++ b/lib/librarian/puppet/environment.rb
@@ -46,6 +46,9 @@ module Librarian
         config_db['mode'] == 'local'
       end
 
+      def use_v3_api
+        config_db['use-v3-api']
+      end
     end
   end
 end
diff --git a/lib/librarian/puppet/source/forge.rb b/lib/librarian/puppet/source/forge.rb
index 59c3926..7553c99 100644
--- a/lib/librarian/puppet/source/forge.rb
+++ b/lib/librarian/puppet/source/forge.rb
@@ -148,9 +148,10 @@ module Librarian
 
         def repo(name)
           @repo ||= {}
+
           unless @repo[name]
             # if we are using the official Forge then use API v3, otherwise stick to v1 for now
-            if uri.hostname =~ /\.puppetlabs\.com$/
+            if uri.hostname =~ /\.puppetlabs\.com$/ || environment.use_v3_api
               @repo[name] = RepoV3.new(self, name)
             else
               @repo[name] = RepoV1.new(self, name)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/librarian-puppet.git