librarian-puppet 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f62f0bf74322ffdea65f43ca9fdd8492dfb7613
-  data.tar.gz: 8271b8e56dac0b47cdd14c37125bb005940b773a
+  metadata.gz: b51ee7e9d024d0df081d224ba54a12e4a06dde25
+  data.tar.gz: ef88d4c028b403d861dbb3a7e5ee2d8f53593095
 SHA512:
-  metadata.gz: 9d0005cdf61b630ba4ff967c3b194f12a029a366f32538f34785a66a507567dfa2bd04653e83567ac03ff5913f19e0805166151c1781b2b480d06762d4644069
-  data.tar.gz: ade0f1790f35dbf53c7ad0adf566a5717be051af8f95bb11525d2d988619700502403397c1175e496426fceb1a09ff4f20be73ee91a6d9fa5d643fb7e057ed5d
+  metadata.gz: eeecb236adf9ef6285069e01655e0d559fd63cbebe1a8c8464f610982307a5b1b7a48a94e786f5435cf8eedd719a0837cc1ec25f80a59151883558452abc4794
+  data.tar.gz: c4df7ac66216eb589a12302718a5f9ac7e3aaf1ec21ebb8baff472a1d5eea8fea91208b823d8e192ef893b4cb6b6efd8084a652eb26a3051b97a0377a0d35279

data/lib/librarian/puppet/source/forge.rb

@@ -55,7 +55,7 @@ module Librarian
 
           if uri =~ %r{^http(s)?://forge\.puppetlabs\.com}
             uri = "https://forgeapi.puppetlabs.com"
-            debug { "Replacing Puppet Forge API URL to use v3 #{uri}. You should update your Puppetfile" }
+            warn { "Replacing Puppet Forge API URL to use v3 #{uri}. You should update your Puppetfile" }
           end
 
           @uri = URI::parse(uri)

data/lib/librarian/puppet/source/forge/repo.rb

@@ -86,8 +86,16 @@ module Librarian
 
             target = vendored?(name, version) ? vendored_path(name, version).to_s : name
 
-            # TODO can't pass the default v3 forge url (http://forgeapi.puppetlabs.com) to clients that use the v1 API (https://forge.puppetlabs.com)
+            # can't pass the default v3 forge url (http://forgeapi.puppetlabs.com)
+            # to clients that use the v1 API (https://forge.puppetlabs.com)
+            # nor the other way around
             module_repository = source.to_s
+
+            if Forge.client_api_version() > 1 and module_repository =~ %r{^http(s)?://forge\.puppetlabs\.com}
+              module_repository = "https://forgeapi.puppetlabs.com"
+              warn { "Replacing Puppet Forge API URL to use v3 #{module_repository} as required by your client version #{Librarian::Puppet.puppet_version}" }
+            end
+
             m = module_repository.match(%r{^http(s)?://forgeapi\.puppetlabs\.com})
             if Forge.client_api_version() == 1 and m
               ssl = m[1]

data/lib/librarian/puppet/source/githubtarball/repo.rb

@@ -25,7 +25,7 @@ module Librarian
             all_versions = data.map { |r| r['name'].gsub(/^v/, '') }.sort.reverse
 
             all_versions.delete_if do |version|
-              version !~ /\A\d\.\d(\.\d.*)?\z/
+              version !~ /\A\d+\.\d+(\.\d+.*)?\z/
             end
 
             @versions = all_versions.compact
@@ -71,7 +71,7 @@ module Librarian
             clean_up_old_cached_versions(name)
 
             url = "https://api.github.com/repos/#{name}/tarball/#{version}"
-            url << "?access_token=#{ENV['GITHUB_API_TOKEN']}" if ENV['GITHUB_API_TOKEN']
+            add_api_token_to_url(url)
 
             environment.vendor!
             File.open(vendored_path(name, version).to_s, 'wb') do |f|
@@ -95,6 +95,23 @@ module Librarian
             end
           end
 
+          def token_key_value
+            ENV[TOKEN_KEY]
+          end
+
+          def token_key_nil?
+            token_key_value.nil? || token_key_value.empty?
+          end
+
+          def add_api_token_to_url url
+            if token_key_nil?
+              debug { "#{TOKEN_KEY} environment value is empty or missing" }
+            else
+              url << "?access_token=#{ENV[TOKEN_KEY]}"
+            end
+            url
+          end
+
         private
 
           def api_call(path)
@@ -102,7 +119,7 @@ module Librarian
             url = "https://api.github.com#{path}?page=1&per_page=100"
             while true do
               debug { "  Module #{name} getting tags at: #{url}" }
-              url << "&access_token=#{ENV[TOKEN_KEY]}" if ENV[TOKEN_KEY]
+              add_api_token_to_url(url)
               response = http_get(url, :headers => {
                 "User-Agent" => "librarian-puppet v#{Librarian::Puppet::VERSION}"
               })

data/lib/librarian/puppet/templates/Puppetfile

@@ -1,16 +1,22 @@
 #!/usr/bin/env ruby
 #^syntax detection
 
-forge "http://forge.puppetlabs.com"
+forge "https://forgeapi.puppetlabs.com"
 
 # use dependencies defined in Modulefile
 modulefile
 
+# A module from the Puppet Forge
 # mod 'puppetlabs/stdlib'
 
-# mod 'ntp',
+# A module from git
+# mod 'puppetlabs/ntp',
 #   :git => 'git://github.com/puppetlabs/puppetlabs-ntp.git'
 
-# mod 'apt',
+# A module from a git branch/tag
+# mod 'puppetlabs/apt',
 #   :git => 'https://github.com/puppetlabs/puppetlabs-apt.git',
-#   :ref => 'feature/master/dans_refactor'
+#   :ref => '1.4.x'
+
+# A module from Github pre-packaged tarball
+# mod 'puppetlabs/apache', '0.6.0', :github_tarball => 'puppetlabs/puppetlabs-apache'

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Tim Sharpe
+- Carlos Sanchez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -156,6 +157,7 @@ description: |-
     a single command.
 email:
 - tim@sharpe.id.au
+- carlos@apache.org
 executables:
 - librarian-puppet
 extensions: []