[DRE-commits] [librarian-puppet] 25/153: add --use-v1-api install flag

[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 129742f8c7882b77b28ee01be7a527c54489a083
Author: Johan Haals <johan.haals at gmail.com>
Date:   Thu Jul 17 10:18:11 2014 +0200

    add --use-v1-api install flag
    
    The v1 API is still default but should be changed to false in future
    versions. Specify --no-use-v1-api to use the new v3 API with a custom
    Puppet Forge
---
 lib/librarian/puppet/cli.rb          | 4 ++--
 lib/librarian/puppet/environment.rb  | 4 ++--
 lib/librarian/puppet/source/forge.rb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/librarian/puppet/cli.rb b/lib/librarian/puppet/cli.rb
index ff19501..3ae2987 100644
--- a/lib/librarian/puppet/cli.rb
+++ b/lib/librarian/puppet/cli.rb
@@ -44,7 +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
+      option "use-v1-api", :type => :boolean, :default => true
       def install
 
         unless File.exist?('Puppetfile')
@@ -65,7 +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['use-v1-api'] = options['use-v1-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 c19927f..4b4edff 100644
--- a/lib/librarian/puppet/environment.rb
+++ b/lib/librarian/puppet/environment.rb
@@ -46,8 +46,8 @@ module Librarian
         config_db['mode'] == 'local'
       end
 
-      def use_v3_api
-        config_db['use-v3-api']
+      def use_v1_api
+        config_db['use-v1-api']
       end
     end
   end
diff --git a/lib/librarian/puppet/source/forge.rb b/lib/librarian/puppet/source/forge.rb
index 7553c99..ca9784b 100644
--- a/lib/librarian/puppet/source/forge.rb
+++ b/lib/librarian/puppet/source/forge.rb
@@ -151,7 +151,7 @@ module Librarian
 
           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$/ || environment.use_v3_api
+            if uri.hostname =~ /\.puppetlabs\.com$/ || !environment.use_v1_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