r10k 2.0.2 → 2.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjNhZTM2NGM2Y2I5ZWVjMmM3NjZjMTkzZTY4ZjhkNWRmZjNiODA2Nw==
+    ZGIwYzM5NTYxYjdiMGU3ZjgwNzgxYjYyODIwMDVlMWU2MmQ1ZDYyYw==
   data.tar.gz: !binary |-
-    MzY0NGYyYTM3YzdlMDhjZWU2MDkyM2NiMmZlNmYyNzU1ZWZiMDc3ZQ==
+    ZmQ2NjM2NTFhNzM0NzM5ZjllNDY3MjFiNWFhM2FjYmFiZGM2YzZlZQ==
 SHA512:
   metadata.gz: !binary |-
-    YjUyYjMwOWJhOGY2MWI0OWFmYjUyYmY3OGE5NjI4MTE1YjMzMjUzZjgyOTY5
-    OGY3NTIxYWNhMWUyMWY5ZDEwZmM5MGI1NjFkZDJjZjRmYzU3NmZhZmVlNzM0
-    NTgzMjM0ZTM5NGY0OTJjNWJmOWQ1YjJhMTlkOWZiZjNhYThhM2M=
+    ZjU1Mzc1ODgyMTlmNWRlNzYwMTU1ZGNkM2Y3NjM1ZDgzMTMwODgzNmVmYTc0
+    NTBjMzAwYTg3MzUyYzczNTdkNjJlNDAxZjk2NzFkYzMzMzRlYWQ0N2ZhODFl
+    Mjg3ZWExNTBlMTJlMWQxODJiODQ5ZWQyMDY3MGQ2YmQ5NDA4NTE=
   data.tar.gz: !binary |-
-    ZGE4NmFlMTU3YTE2NDY5NTMyYzNmOWNhMjhlNGYzYmQzNjU5MWQwYzNjMDNi
-    NzhmOGQ2YTMyYWM0ZWM3MTk4ZWJhZWQ5OTJjZDYyZDcxMmJiZTA1NjA0NzY0
-    NjMyMTk4Njk0YzBlM2Q3ODI5YWEyZDMxYzU0NTBkZDgxYjU4Mzk=
+    NjhlNzAxZWJiYzcxMzYwNzIwNDFkODI2MGVkNTg4ZWI1MDAyYjkyMWEzYzJj
+    ZmI1NjJkMjQ2OTdlYjQ2YTIwNTZlMzJmM2ZhMDc0OTlhMDM2MjdmOWZkNmZk
+    ZjcyOTNlN2JhZDYwMjkyNzkyZTE0MzY1MDliNDZmY2NkNDJhYjY=

data/CHANGELOG.mkd

@@ -1,6 +1,23 @@
 CHANGELOG
 =========
 
+2.0.3
+-----
+
+2015/8/13
+
+This is a bugfix release that resolves a critical issue issue in installing PE
+only modules.
+
+### Notes
+
+(RK-156) PE-only modules cannot be installed
+
+The mechanism used to load PE license information in r10k was preventing r10k
+from not being able to locate the pe-license Ruby library in PE 2015.2.0; this
+has been resolved by actually trying to load the relevant files instead of
+probing for a gem and then conditionally loading it.
+
 2.0.2
 -----
 

data/lib/r10k/features.rb

@@ -16,3 +16,5 @@ end
 R10K::Features.add(:shellgit) { R10K::Util::Commands.which('git') }
 
 R10K::Features.add(:rugged, :libraries => 'rugged')
+
+R10K::Features.add(:pe_license, :libraries => 'pe_license')

data/lib/r10k/util/license.rb

@@ -1,19 +1,23 @@
 require 'r10k/errors'
-require 'rubygems'
+require 'r10k/features'
 
 module R10K
   module Util
     module License
+      extend R10K::Logging
+
       def self.load
-        if Gem::Specification::find_all_by_name('pe-license').any?
+        if R10K::Features.available?(:pe_license)
+          logger.debug2 "pe_license feature is available, loading PE license key"
           begin
             return PELicense.load_license_key
           rescue PELicense::InvalidLicenseError => e
             raise R10K::Error.wrap(e, "Invalid PE license detected: #{e.message}")
           end
+        else
+          logger.debug2 "pe_license feature is not available, PE only Puppet modules will not be downloadable."
+          nil
         end
-
-        nil
       end
     end
   end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/lib/shared/puppet_forge/error.rb

@@ -31,4 +31,11 @@ Could not install package
 
   class ModuleReleaseNotFound < PuppetForge::Error
   end
+
+  class ModuleReleaseForbidden < PuppetForge::Error
+    def self.from_response(response)
+      body = JSON.parse(response[:body])
+      new(body["message"])
+    end
+  end
 end

data/lib/shared/puppet_forge/v3/module_release.rb

@@ -1,6 +1,7 @@
 require 'shared/puppet_forge/v3'
 require 'shared/puppet_forge/connection'
 require 'shared/puppet_forge/error'
+require 'json'
 
 module PuppetForge
   module V3
@@ -46,6 +47,12 @@ module PuppetForge
         path.open('wb') { |fh| fh.write(resp.body) }
       rescue Faraday::ResourceNotFound => e
         raise PuppetForge::ModuleReleaseNotFound, "The module release #{slug} does not exist on #{conn.url_prefix}.", e.backtrace
+      rescue Faraday::ClientError => e
+        if e.response[:status] == 403
+          raise PuppetForge::ModuleReleaseForbidden.from_response(e.response)
+        else
+          raise e
+        end
       end
 
       # Verify that a downloaded module matches the checksum in the metadata for this release.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored