chef-dk 0.13.21 → 0.14.25

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/spec/unit/tasks/helpers_spec.rb

@@ -0,0 +1,75 @@
+#
+# 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_relative "../../../tasks/helpers"
+
+class RakeMock
+
+end
+
+describe "Rake 'dependencies' task" do
+  let(:rake_mock) { Class.new { include RakeDependenciesTaskHelpers }.new }
+  let(:product_name) { "chef" }
+  let(:gemfile_name) { "chef" }
+  let(:gemfile) {'gem "chef", github: "chef/chef", branch: "0.0.0"'}
+  let(:expected_version) { "0.0.1" }
+
+  before do
+    allow(rake_mock).to receive(:puts)
+    allow(rake_mock).to receive(:get_latest_version_for).with(product_name).and_return(expected_version)
+  end
+
+  describe "update_gemfile_from_stable" do
+    context "when gemfile does not contain the expected string" do
+      let(:gemfile) { "These are not the droids you are looking for." }
+
+      it "raises an error" do
+        expect { rake_mock.update_gemfile_from_stable(gemfile, product_name, gemfile_name) }.to raise_error(/Gemfile does not have a line of the form/)
+      end
+    end
+
+    context "when gemfile does contain the expected string" do
+      let(:prefix) { "" }
+      let(:expected_output) {"gem \"chef\", github: \"chef/chef\", branch: \"#{prefix}#{expected_version}\""}
+
+      context "and the version string does not have a prefix" do
+        it "updates the gemfile entry to the newer version" do
+          expect(rake_mock.update_gemfile_from_stable(gemfile, product_name, gemfile_name))
+            .to eq(expected_output)
+        end
+      end
+
+      context "and the version is the same" do
+        let(:expected_version) { "0.0.0" }
+        it "warns the user that the version is not being updated" do
+          expect(rake_mock).to receive(:puts).with(/version in Gemfile already at latest stable/)
+          expect(rake_mock.update_gemfile_from_stable(gemfile, product_name, gemfile_name))
+            .to eq(expected_output)
+        end
+      end
+
+      context "and a prefix is specified" do
+        let(:prefix) { "v" }
+        it "updates the gemfile entry to the newer version" do
+          expect(rake_mock.update_gemfile_from_stable(gemfile, product_name, gemfile_name, prefix))
+            .to eq(expected_output)
+        end
+      end
+    end
+  end
+end

data/tasks/bin/create-override-gemfile

@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "bundler"
+
+Bundler.with_clean_env do
+  require_relative "../gemfile_util"
+
+  options = {}
+  opts = OptionParser.new do |opts|
+    opts.banner = "Usage: create-override-gemfile [OPTIONS]"
+
+    opts.on("--gemfile GEMFILE", "The Gemfile to read (default: Gemfile).") { |path| options[:gemfile_path] = path }
+    opts.on("--lockfile GEMFILE", "The lockfile to read (default: <gemfile>.lock).") { |path| options[:lockfile_path] = path }
+
+    opts.on("--group GROUP", "Groups to include (whitelist).") do |group|
+      options[:groups] ||= []
+      options[:groups] << group.to_sym
+    end
+
+    opts.on("--without GROUP", "Groups to exclude.") do |group|
+      options[:without_groups] ||= []
+      options[:without_groups] << group.to_sym
+    end
+
+    opts.on("--gem GEM", "Gems to include regardless of groups.") do |name|
+      options[:gems] ||= []
+      options[:gems] << name
+    end
+
+    opts.on("--relative-to PATH", "A path to prepend to any relative paths in the Gemfile.") do |path|
+      unless Pathname.new(path).absolute?
+        puts opts
+        raise "--relative-to #{path} was not an absolute path!"
+      end
+      options[:relative_to] = path
+    end
+
+    opts.on("--[no-]copy-groups", "Whether to copy groups over from the original Gemfile or not (default: false).") { |val| options[:copy_groups] = val }
+
+    opts.on("--[no-]override", "Whether to emit override: true on each gem line (default: false).") { |val| options[:override] = val }
+
+    opts.on("-h", "--help", "Print this message.") do
+      puts opts
+      exit(0)
+    end
+  end
+
+  args = opts.parse(ARGV)
+
+  if args.size > 0
+    puts opts
+    raise "Invalid arguments #{args}"
+  end
+
+  def create_override_gemfile(gemfile_path: "Gemfile", lockfile_path: "#{gemfile_path}.lock", groups: nil, without_groups: nil, gems: [], copy_groups: false, relative_to: ".", override: false)
+    relative_to = Pathname.new(relative_to).realpath
+    # Select the gems we want
+    bundle = GemfileUtil::Bundle.parse(gemfile_path, lockfile_path)
+    gems_to_include = bundle.select_gems(groups: groups, without_groups: without_groups)
+    gems.each do |name|
+      raise "Requested gem #{name} is not in #{gemfile_path}.lock!" if !bundle.gems[name]
+      gems_to_include[name] ||= bundle.gems[name]
+      gems_to_include[name][:dependencies].each do |dep|
+        gems_to_include[name] ||= bundle.gems[dep]
+      end
+    end
+
+    # Add the gems to the Gemfile
+    gem_root = Pathname.new(gemfile_path).dirname.realpath
+    gems_to_include.sort_by { |name, options| options[:declared_groups].empty? ? 1 : 0 }.each do |name, options|
+      comment = nil
+      options = options.dup
+      version = options.delete(:version)
+      if copy_groups
+        # Some dependencies have no groups (are not in the Gemfile--just runtime
+        # dependencies). If we actually record that they have no groups, they
+        # will *always* be installed (or perhaps never). We only want them to
+        # install if their other deps do, so we mark them with the groups of the
+        # things that brought them in (the gems that depended on them). To do
+        # this, we just leave :groups intact.
+        if options[:declared_groups].empty?
+          options.delete(:declared_groups)
+          comment = " # Transitive dependency, not actually in original Gemfile"
+        else
+          # For other things, we want to copy the actual declared_groups--the
+          # ones that were in the Gemfile. We want the same --with and --without
+          # options to include and exclude them as worked with the original
+          # Gemfile.
+          options[:groups] = options.delete(:declared_groups)
+        end
+      else
+        options.delete(:groups)
+        options.delete(:declared_groups)
+      end
+      options.delete(:dependencies)
+      options.delete(:development_dependencies)
+      options[:override] = true if override
+      options[:path] = Pathname.new(options[:path]).expand_path(gem_root).relative_path_from(relative_to).to_s if options[:path]
+      line = "gem #{name.inspect}, #{version.inspect}"
+      options.each do |name, value|
+        line << ", #{name}: #{value.inspect}"
+      end
+      line << comment if comment
+      puts line
+    end
+  end
+
+  create_override_gemfile(options)
+end