chef-dk 0.14.25 → 0.15.9

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -1,140 +1,140 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'net/http'
-require 'chef/monkey_patches/net_http'
-require 'chef-dk/service_exception_inspectors/http'
-
-describe ChefDK::ServiceExceptionInspectors::HTTP do
-
-  let(:message) { "something went wrong, oops" }
-
-  let(:response_body) { "" }
-
-  let(:request_headers) do
-    {
-      "content-type" => "application/json",
-      "accept" => "application/json"
-    }
-  end
-
-  let(:request_body) { "this is the request" }
-
-  let(:request) do
-    r = instance_double(Net::HTTP::Post,
-                        method: "POST",
-                        uri: nil,
-                        path: "/organizations/chef-oss-dev/cookbooks",
-                        body: request_body)
-    stub = allow(r).to(receive(:each_header))
-    request_headers.each { |k,v| stub.and_yield(k,v) }
-    r
-  end
-
-  let(:response_headers) do
-    {
-      "server" => "ngx_openresty",
-      "date" => "Wed, 29 Oct 2014 22:27:47 GMT"
-    }
-  end
-
-  let(:response) do
-    r = instance_double(Net::HTTPClientError,
-                    code: "400",
-                    message: "Bad Request",
-                    body: response_body)
-    stub = allow(r).to(receive(:each_header))
-    response_headers.each { |k,v| stub.and_yield(k,v) }
-    r
-  end
-
-  let(:exception) do
-    Net::HTTPServerException.new(message, response).tap {|e| e.chef_rest_request = request }
-  end
-
-
-  subject(:inspector) { described_class.new(exception) }
-
-  it "has an exception" do
-    expect(inspector.exception).to eq(exception)
-  end
-
-  context "with a string response body" do
-
-    let(:response_body) { "No sir, I didn't like it" }
-
-    it "gives a customized exception message including the server response" do
-      expect(inspector.message).to eq("HTTP 400 Bad Request: No sir, I didn't like it")
-    end
-
-  end
-
-  context "with an empty response body" do
-
-    let(:response_body) { "" }
-
-    it "gives a customized exception message including the server response" do
-      expect(inspector.message).to eq("HTTP 400 Bad Request: (No explanation provided by server)")
-    end
-
-  end
-
-  context "with a JSON response body in the standard Chef Server format" do
-
-    let(:response_body) { %q[{"error":["Field 'name' invalid"]}] }
-
-    it "gives a customized exception message including the server response" do
-      expect(inspector.message).to eq("HTTP 400 Bad Request: Field 'name' invalid")
-    end
-
-  end
-
-  describe "showing the request and response in extended error info" do
-
-    let(:response_body) { "this is the response" }
-
-    it "shows the request in a format similar to HTTP messages" do
-      expected_request_string = <<-E
---- REQUEST DATA ----
-POST /organizations/chef-oss-dev/cookbooks
-content-type: application/json
-accept: application/json
-
-this is the request
-
-E
-      expect(inspector.extended_error_info).to include(expected_request_string)
-    end
-
-    it "shows the response in a format similar to HTTP messages" do
-      expected_response_string = <<-E
---- RESPONSE DATA ---
-400 Bad Request
-server: ngx_openresty
-date: Wed, 29 Oct 2014 22:27:47 GMT
-
-
-this is the response
-E
-      expect(inspector.extended_error_info).to include(expected_response_string)
-    end
-
-  end
-
-end
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'net/http'
+require 'chef/monkey_patches/net_http'
+require 'chef-dk/service_exception_inspectors/http'
+
+describe ChefDK::ServiceExceptionInspectors::HTTP do
+
+  let(:message) { "something went wrong, oops" }
+
+  let(:response_body) { "" }
+
+  let(:request_headers) do
+    {
+      "content-type" => "application/json",
+      "accept" => "application/json"
+    }
+  end
+
+  let(:request_body) { "this is the request" }
+
+  let(:request) do
+    r = instance_double(Net::HTTP::Post,
+                        method: "POST",
+                        uri: nil,
+                        path: "/organizations/chef-oss-dev/cookbooks",
+                        body: request_body)
+    stub = allow(r).to(receive(:each_header))
+    request_headers.each { |k,v| stub.and_yield(k,v) }
+    r
+  end
+
+  let(:response_headers) do
+    {
+      "server" => "ngx_openresty",
+      "date" => "Wed, 29 Oct 2014 22:27:47 GMT"
+    }
+  end
+
+  let(:response) do
+    r = instance_double(Net::HTTPClientError,
+                    code: "400",
+                    message: "Bad Request",
+                    body: response_body)
+    stub = allow(r).to(receive(:each_header))
+    response_headers.each { |k,v| stub.and_yield(k,v) }
+    r
+  end
+
+  let(:exception) do
+    Net::HTTPServerException.new(message, response).tap {|e| e.chef_rest_request = request }
+  end
+
+
+  subject(:inspector) { described_class.new(exception) }
+
+  it "has an exception" do
+    expect(inspector.exception).to eq(exception)
+  end
+
+  context "with a string response body" do
+
+    let(:response_body) { "No sir, I didn't like it" }
+
+    it "gives a customized exception message including the server response" do
+      expect(inspector.message).to eq("HTTP 400 Bad Request: No sir, I didn't like it")
+    end
+
+  end
+
+  context "with an empty response body" do
+
+    let(:response_body) { "" }
+
+    it "gives a customized exception message including the server response" do
+      expect(inspector.message).to eq("HTTP 400 Bad Request: (No explanation provided by server)")
+    end
+
+  end
+
+  context "with a JSON response body in the standard Chef Server format" do
+
+    let(:response_body) { %q[{"error":["Field 'name' invalid"]}] }
+
+    it "gives a customized exception message including the server response" do
+      expect(inspector.message).to eq("HTTP 400 Bad Request: Field 'name' invalid")
+    end
+
+  end
+
+  describe "showing the request and response in extended error info" do
+
+    let(:response_body) { "this is the response" }
+
+    it "shows the request in a format similar to HTTP messages" do
+      expected_request_string = <<-E
+--- REQUEST DATA ----
+POST /organizations/chef-oss-dev/cookbooks
+content-type: application/json
+accept: application/json
+
+this is the request
+
+E
+      expect(inspector.extended_error_info).to include(expected_request_string)
+    end
+
+    it "shows the response in a format similar to HTTP messages" do
+      expected_response_string = <<-E
+--- RESPONSE DATA ---
+400 Bad Request
+server: ngx_openresty
+date: Wed, 29 Oct 2014 22:27:47 GMT
+
+
+this is the response
+E
+      expect(inspector.extended_error_info).to include(expected_response_string)
+    end
+
+  end
+
+end
+

data/spec/unit/shell_out_spec.rb

@@ -1,34 +1,34 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'chef-dk/shell_out'
-
-describe ChefDK::ShellOut do
-
-  describe "providing the API expected by CookbookOmnifetch" do
-
-    it "provides a `shell_out` class method" do
-      expect(described_class).to respond_to(:shell_out)
-    end
-
-    it "responds to #success?" do
-      expect(described_class.new("echo 'foo'")).to respond_to(:success?)
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef-dk/shell_out'
+
+describe ChefDK::ShellOut do
+
+  describe "providing the API expected by CookbookOmnifetch" do
+
+    it "provides a `shell_out` class method" do
+      expect(described_class).to respond_to(:shell_out)
+    end
+
+    it "responds to #success?" do
+      expect(described_class.new("echo 'foo'")).to respond_to(:success?)
+    end
+
+  end
+end

data/tasks/bin/bundle-platform

@@ -1,10 +1,14 @@
 #!/usr/bin/env ruby
 
 platforms = ARGV.shift
+platforms = platforms.split(" ").map { |p| Gem::Platform.new(p) }
+Gem::Platform.instance_eval { @local = platforms.last }
 old_platforms = Gem.platforms
-Gem.platforms = platforms.split(" ").map { |p| Gem::Platform.new(p) }
+Gem.platforms = platforms
 puts "bundle-platform set Gem.platforms to #{Gem.platforms.map { |p| p.to_s }} (was #{old_platforms.map { |p| p.to_s } })"
 
+desired_version = ARGV.shift.gsub("_", "")
+
 # The rest of this is a normal bundler binstub
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
@@ -12,4 +16,4 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
 
 require "rubygems"
 
-load Gem.bin_path("bundler", "bundle")
+load Gem.bin_path("bundler", "bundle", desired_version)

data/tasks/bundle_util.rb

@@ -57,7 +57,14 @@ module BundleUtil
 
         # Run the bundle command
         ruby_platforms = platform ? PLATFORMS[platform].join(" ") : "ruby"
-        cmd = Shellwords.join([Gem.ruby, "-S", bundle_platform, ruby_platforms, *args])
+        cmd = Shellwords.join([
+          Gem.ruby,
+          "-S",
+          bundle_platform,
+          ruby_platforms,
+          "_#{desired_bundler_version}_",
+          *args
+        ])
         puts "#{prefix}#{Shellwords.join(["bundle", *args])}#{platform ? " for #{platform} platform" : ""}:"
         with_gemfile(gemfile) do
           puts "#{prefix}BUNDLE_GEMFILE=#{gemfile}"
@@ -65,7 +72,7 @@ module BundleUtil
           if extract_output
             `#{cmd}`
           else
-            unless system(bundle_platform, ruby_platforms, *args)
+            unless system(bundle_platform, ruby_platforms, "_#{desired_bundler_version}_", *args)
               raise "#{bundle_platform} failed: exit code #{$?}"
             end
           end
@@ -91,4 +98,13 @@ module BundleUtil
   def platforms
     PLATFORMS.keys
   end
+
+  def desired_bundler_version
+    @desired_bundler_version ||= begin
+      omnibus_overrides = File.join(project_root, "omnibus_overrides.rb")
+      File.readlines(omnibus_overrides).each do |line|
+        return $1 if line =~ /^override :bundler, version: "(.+)"$/
+      end
+    end
+  end
 end

data/tasks/gemfile_util.rb

@@ -8,27 +8,56 @@ module GemfileUtil
   # Adds `override: true`, which allows your statement to override any other
   # gem statement about the same gem in the Gemfile.
   #
+  # :path does likewise.
+  #
+  # :overrideable holds off on processing the 
+  #
+  def gemfile_parsing_done?
+    overridden_gems == :finished
+  end
+
+  def overridey_thing?(options)
+    options[:path] || options[:override] || options[:overrideable]
+  end
+
   def gem(name, *args)
     options = args[-1].is_a?(Hash) ? args[-1] : {}
 
     # Unless we're finished with everything, ignore gems that are being overridden
-    unless overridden_gems == :finished
+    if gemfile_parsing_done?
+      # Otherwise, add the gem normally
+      super
+    elsif overridey_thing?(options)
       # If it's a path or override gem, it overrides whatever else is there.
       if options[:path] || options[:override]
         options.delete(:override)
         warn_if_replacing(name, overridden_gems[name], args)
         overridden_gems[name] = args
-        return
 
-      # If there's an override gem, and we're *not* an override gem, don't do anything
-      elsif overridden_gems[name]
+      # if this can be overridden by a later `gem` line, don't do anything but save it for later.
+      elsif options[:overrideable]
+        # if you put a `gem` line before ours (which you're supposed to), let it be.
+        unless seen_gems[name]
+          options.delete(:overrideable)
+          overrideable_gems[name] = args
+        end
+      end
+
+      # This is a normal `gem` call. Check if it's overridden by something else.
+    else
+       # If there's an override gem, and we're *not* an override gem, don't do anything
+      if overridden_gems[name]
         warn_if_replacing(name, args, overridden_gems[name])
-        return
+
+      # ok, we found a `gem` definition to override it, so do that.
+      else
+        overrideable_gems.delete(name)
+        super
       end
     end
 
-    # Otherwise, add the gem normally
-    super
+    seen_gems[name] = true
+
   rescue
     puts $!.backtrace
     raise
@@ -38,11 +67,20 @@ module GemfileUtil
     @overridden_gems ||= {}
   end
 
+  def overrideable_gems
+    @overrideable_gems ||= {}
+  end
+
+  def seen_gems
+    @seen_gems ||= {}
+  end
+
   #
-  # Just before we finish the Gemfile, finish up the override gems
+  # Just before we finish the Gemfile, finish up the overridden and overrideable gems
   #
   def to_definition(*args)
     complete_overrides
+    complete_overrideables
     super
   end
 
@@ -56,6 +94,13 @@ module GemfileUtil
     end
   end
 
+  def complete_overrideables
+    # we're mostly done, we just have to process the overrideable gems that didn't get overridden.
+    overrideable_gems.each do |name, args|
+      gem name, *args
+    end
+  end
+
   #
   # Include all gems in the locked gemfile.
   #