r10k 1.3.4 → 1.3.5

data/CHANGELOG.mkd

@@ -1,6 +1,21 @@
 CHANGELOG
 =========
 
+1.3.5
+-----
+
+2014/11/13
+
+### User notes
+
+(GH-212) Force use of json_pure on Ruby 1.8.7
+
+Ruby 1.8.7 does not ship with a JSON library, so r10k has depended on json_pure
+to ensure that there's always a JSON library available. However there is a quirk
+in multi_json in how it probes for JSON implementations and may load the wrong
+gem, which percolates up and breaks the JSON parsing code used when querying for
+forge module versions. To resolve this, json_pure is always used on ruby 1.8.7.
+
 1.3.4
 -----
 
@@ -8,7 +23,6 @@ CHANGELOG
 
 This bugfix release incorporates all fixes added in 1.2.4.
 
-
 1.3.3
 -----
 

data/lib/r10k/module_repository/forge.rb

@@ -18,18 +18,7 @@ class R10K::ModuleRepository::Forge
 
   def initialize(forge = 'forge.puppetlabs.com')
     @forge = forge
-
-    @conn = Faraday.new(
-      :url => "https://#{@forge}",
-      :user_agent => "Ruby/r10k #{R10K::VERSION}"
-    ) do |builder|
-      builder.request :multi_json
-      builder.response :multi_json
-
-      # This needs to be _after_ request/response configuration for testing
-      # purposes. This comment is the result of much consternation.
-      builder.adapter Faraday.default_adapter
-    end
+    @conn  = make_conn
   end
 
   # Query for all published versions of a module
@@ -43,7 +32,6 @@ class R10K::ModuleRepository::Forge
   # @return [Array<String>] All published versions of the given module
   def versions(module_name)
     response = @conn.get("/api/v1/releases.json", {'module' => module_name})
-
     response.body[module_name].map do |version_info|
       version_info['version']
     end
@@ -61,4 +49,23 @@ class R10K::ModuleRepository::Forge
   def latest_version(module_name)
     versions(module_name).last
   end
+
+  private
+
+  def make_conn
+    # Force use of json_pure with multi_json on Ruby 1.8.7
+    multi_json_opts = (RUBY_VERSION == "1.8.7" ? {:adapter => :json_pure} : {})
+
+    Faraday.new(
+      :url => "https://#{@forge}",
+      :user_agent => "Ruby/r10k #{R10K::VERSION}"
+    ) do |builder|
+      builder.request(:multi_json, multi_json_opts)
+      builder.response(:multi_json, multi_json_opts)
+
+      # This needs to be _after_ request/response configuration for testing
+      # purposes. Without this ordering the tests get badly mangled.
+      builder.adapter(Faraday.default_adapter)
+    end
+  end
 end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 end

data/spec/unit/module_repository/forge_spec.rb

@@ -14,7 +14,7 @@ describe R10K::ModuleRepository::Forge do
     expect(forge.forge).to eq 'forge.example.local'
   end
 
-  describe "and the expected version is :latest", :vcr => true, :unless => (RUBY_VERSION == '1.8.7') do
+  describe "and the expected version is :latest", :vcr => true do
     subject(:forge) { described_class.new }
 
     before do

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
+  prerelease: 
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware-multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -338,7 +363,6 @@ files:
 homepage: http://github.com/adrienthebo/r10k
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: ! 'NOTICE
 
   ======
@@ -378,20 +402,22 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Puppet environment and module deployment
 test_files:
 - spec/system/version_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODg0NmZiY2U5NjA3YmU3MjcyYjcwYjAzNGNmMjRjZDA3NTA2MWRjNA==
-  data.tar.gz: !binary |-
-    M2U1MWQxNDI0MGE2NThlYzUzNDg2MzM1OGNmNWZhZWU2MTI4MGY3Mw==
-SHA512:
-  metadata.gz: !binary |-
-    Yzk0MTE4MjhlYWIwOTk1NTFhM2M0Yjg4NzJmZmM4MzQwYWRkMGE0OTdlZGMw
-    YTE0OThhMGYwMjM4YTczNjkzZjAxZDI1YTAwZDBmZjUwMWIxZThjMmJkNWEy
-    NmM1MzkyMDZjMTE5MjMwMjMwOThlYzlhNzc2MGJkZTlmN2E1Zjc=
-  data.tar.gz: !binary |-
-    YWVmYTRhODU0ZmQyYTYzOWU3ODcxYWRkZjhhYmJjNTMyZGFkNjM1NTU1NjA3
-    MTZkNDBmNWRmMTFmYWQxMTNjZDVmYzViZDEyMGUwYWQzYzA3ZWNiYzZmZTNi
-    NThmMjFiNTIzZTJkZWI3ZWQ3ZmE1YTE4MmUwMTg2MGQyYTM0Yjg=