chef 11.14.0.alpha.4 → 11.14.0.rc.2

data/spec/functional/application_spec.rb

@@ -47,12 +47,12 @@ describe Chef::Application do
 
     it "saves built proxy to ENV which shell_out can use" do
       so = if windows?
-        shell_out("echo $env:http_proxy")
+        shell_out("echo %http_proxy%")
       else
         shell_out("echo $http_proxy")
       end
 
-      so.stdout.should == "http://proxy.example.org:8080\n"
+      so.stdout.chomp.should == "http://proxy.example.org:8080"
     end
   end
 end

data/spec/functional/resource/mount_spec.rb

@@ -164,7 +164,9 @@ describe Chef::Resource::Mount, :requires_root, :external => include_flag do
   end
 
   # don't run the remount tests on solaris2 (tmpfs does not support remount)
-  describe "when the filesystem should be remounted and the resource supports remounting", :external => ohai[:platform] == "solaris2" do
+  # Need to make sure the platforms we've already excluded are considered:
+  skip_remount = include_flag || (ohai[:platform] == "solaris2")
+  describe "when the filesystem should be remounted and the resource supports remounting", :external => skip_remount do
     it "should remount the filesystem if it is mounted" do
       new_resource.run_action(:mount)
       mount_should_exist(new_resource.mount_point, new_resource.device)

data/spec/functional/shell_spec.rb

@@ -118,5 +118,15 @@ describe Shell do
       output.should include("===fatal===")
       expect(exitstatus).to eq(0)
     end
+
+    it "sets the override_runlist from the command line" do
+      output, exitstatus = run_chef_shell_with("-o 'override::foo,override::bar'") do |out, keyboard|
+        show_recipes_code = %q[puts "#{node.recipes.inspect}"]
+        keyboard.puts(show_recipes_code)
+        read_until(out, show_recipes_code)
+      end
+      output.should include(%q{["override::foo", "override::bar"]})
+      expect(exitstatus).to eq(0)
+    end
   end
 end

data/spec/functional/tiny_server_spec.rb

@@ -54,8 +54,8 @@ describe TinyServer::API do
     response = @api.call("REQUEST_METHOD" => "GET", "REQUEST_URI" => '/no_such_thing')
     response[0].should == 404
     response[1].should == {'Content-Type' => 'application/json'}
-    response[2].should be_a_kind_of(String)
-    response_obj = Chef::JSONCompat.from_json(response[2])
+    response[2].should be_a_kind_of(Array)
+    response_obj = Chef::JSONCompat.from_json(response[2].first)
     response_obj["message"].should == "no data matches the request for /no_such_thing"
     response_obj["available_routes"].should == {"GET"=>[], "PUT"=>[], "POST"=>[], "DELETE"=>[]}
     response_obj["request"].should == {"REQUEST_METHOD"=>"GET", "REQUEST_URI"=>"/no_such_thing"}

data/spec/support/chef_helpers.rb

@@ -20,10 +20,10 @@ Chef::Config[:log_level] = :fatal
 Chef::Config[:persistent_queue] = false
 Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
 
+Chef::Log.init(StringIO.new)
 Chef::Log.level(Chef::Config.log_level)
 Chef::Config.solo(false)
 
-Chef::Log.logger = Logger.new(StringIO.new)
 
 def sha256_checksum(path)
   Digest::SHA256.hexdigest(File.read(path))

data/spec/support/shared/functional/securable_resource.rb

@@ -19,6 +19,7 @@
 #
 
 require 'etc'
+require 'functional/resource/base'
 
 shared_context "setup correct permissions" do
   if windows?
@@ -36,7 +37,11 @@ shared_context "setup correct permissions" do
 
   # Root only context.
   before :each, :unix_only, :requires_root do
-    File.chown(Etc.getpwnam('nobody').uid, 1337, path)
+    if ohai[:platform] == "aix"
+      File.chown(Etc.getpwnam('guest').uid, 1337, path)
+    else
+      File.chown(Etc.getpwnam('nobody').uid, 1337, path)
+    end
   end
 
   before :each, :windows_only do
@@ -149,7 +154,11 @@ shared_examples_for "a securable resource with existing target" do
   include_context "diff disabled"
 
   context "on Unix", :unix_only do
-    let(:expected_user_name) { 'nobody' }
+    if ohai[:platform] == "aix"
+      let(:expected_user_name) { 'guest' }
+    else
+      let(:expected_user_name) { 'nobody' }
+    end
     let(:expected_uid) { Etc.getpwnam(expected_user_name).uid }
     let(:desired_gid) { 1337 }
     let(:expected_gid) { 1337 }

data/spec/support/shared/functional/securable_resource_with_reporting.rb

@@ -1,4 +1,6 @@
 
+require 'functional/resource/base'
+
 ALL_EXPANDED_PERMISSIONS = ["generic read",
                             "generic write",
                             "generic execute",
@@ -72,7 +74,12 @@ shared_examples_for "a securable resource with reporting" do
       context "and owner is specified with a String (username) in new_resource", :requires_root => true do
 
         # TODO/bug: duplicated from the "securable resource" tests
-        let(:expected_user_name) { 'nobody' }
+
+        if ohai[:platform] == "aix"
+          let(:expected_user_name) { 'guest' }
+        else
+          let(:expected_user_name) { 'nobody' }
+        end
 
         before do
           resource.owner(expected_user_name)
@@ -88,7 +95,11 @@ shared_examples_for "a securable resource with reporting" do
       context "and owner is specified with an Integer (uid) in new_resource", :requires_root => true do
 
         # TODO: duplicated from "securable resource"
-        let(:expected_user_name) { 'nobody' }
+        if ohai[:platform] == "aix"
+          let(:expected_user_name) { 'guest' }
+        else
+          let(:expected_user_name) { 'nobody' }
+        end
         let(:expected_uid) { Etc.getpwnam(expected_user_name).uid }
         let(:desired_gid) { 1337 }
         let(:expected_gid) { 1337 }

data/spec/tiny_server.rb

@@ -152,7 +152,7 @@ module TinyServer
                       :available_routes => @routes, :request => env}
         # Uncomment me for glorious debugging
         # pp :not_found => debug_info
-        [404, {'Content-Type' => 'application/json'}, debug_info.to_json]
+        [404, {'Content-Type' => 'application/json'}, [ debug_info.to_json ]]
       end
     end
 

data/spec/unit/config_spec.rb

@@ -341,6 +341,11 @@ describe Chef::Config do
       Chef::Config.stub(:env).and_return({ 'USERPROFILE' => "/users/kitten" })
       Chef::Config[:user_home].should == "/users/kitten"
     end
+
+    it "falls back to the current working directory when HOME and USERPROFILE is not set" do
+      Chef::Config.stub(:env).and_return({})
+      Chef::Config[:user_home].should == Dir.pwd
+    end
   end
 
   describe "Chef::Config[:encrypted_data_bag_secret]" do

data/spec/unit/cookbook/metadata_spec.rb

@@ -178,6 +178,7 @@ describe Chef::Cookbook::Metadata do
   end
 
   describe "describing dependencies" do
+
     dep_types = {
       :depends     => [ :dependencies, "foo::bar", "> 0.2" ],
       :recommends  => [ :recommendations, "foo::bar", ">= 0.2" ],
@@ -199,6 +200,28 @@ describe Chef::Cookbook::Metadata do
       end
     end
 
+    dep_types = {
+      :depends     => [ :dependencies, "foo::bar", ">0.2", "> 0.2" ],
+      :recommends  => [ :recommendations, "foo::bar", ">=0.2", ">= 0.2" ],
+      :suggests    => [ :suggestions, "foo::bar", ">0.2", "> 0.2" ],
+      :conflicts   => [ :conflicting, "foo::bar", "~>0.2", "~> 0.2" ],
+      :provides    => [ :providing, "foo::bar", "<=0.2", "<= 0.2" ],
+      :replaces    => [ :replacing, "foo::bar", "=0.2.1", "= 0.2.1" ],
+    }
+    dep_types.sort { |a,b| a.to_s <=> b.to_s }.each do |dep, dep_args|
+      check_with = dep_args.shift
+      normalized_version = dep_args.pop
+      describe dep do
+        it "should be set-able and normalized via #{dep}" do
+          @meta.send(dep, *dep_args).should == normalized_version
+        end
+        it "should be get-able and normalized via #{check_with}" do
+          @meta.send(dep, *dep_args)
+          @meta.send(check_with).should == { dep_args[0] => normalized_version }
+        end
+      end
+    end
+
 
     describe "in the obsoleted format" do
       dep_types = {
@@ -546,6 +569,7 @@ describe Chef::Cookbook::Metadata do
       @meta.long_description "I have a long arm!"
       @meta.supports :ubuntu, "> 8.04"
       @meta.depends "bobo", "= 1.0"
+      @meta.depends "bubu", "=1.0"
       @meta.depends "bobotclown", "= 1.1"
       @meta.recommends "snark", "< 3.0"
       @meta.suggests "kindness", "> 2.0"

data/spec/unit/environment_spec.rb

@@ -263,7 +263,9 @@ describe Chef::Environment do
   describe "self.validate_cookbook_version" do
     it "should validate correct version numbers" do
       Chef::Environment.validate_cookbook_version("= 1.2.3").should == true
+      Chef::Environment.validate_cookbook_version("=1.2.3").should == true
       Chef::Environment.validate_cookbook_version(">= 0.0.3").should == true
+      Chef::Environment.validate_cookbook_version(">=0.0.3").should == true
       # A lone version is allowed, interpreted as implicit '='
       Chef::Environment.validate_cookbook_version("1.2.3").should == true
     end
@@ -271,9 +273,13 @@ describe Chef::Environment do
     it "should return false when an invalid version is given" do
       Chef::Environment.validate_cookbook_version(Chef::CookbookVersion.new("meta")).should == false
       Chef::Environment.validate_cookbook_version("= 1.2.3a").should == false
+      Chef::Environment.validate_cookbook_version("=1.2.3a").should == false
       Chef::Environment.validate_cookbook_version("= 1").should == false
+      Chef::Environment.validate_cookbook_version("=1").should == false
       Chef::Environment.validate_cookbook_version("= a").should == false
+      Chef::Environment.validate_cookbook_version("=a").should == false
       Chef::Environment.validate_cookbook_version("= 1.2.3.4").should == false
+      Chef::Environment.validate_cookbook_version("=1.2.3.4").should == false
     end
 
     describe "in solo mode" do

data/spec/unit/http/http_request_spec.rb

@@ -0,0 +1,91 @@
+#
+# Author:: Klaas Jan Wierenga (<k.j.wierenga@gmail.com>)
+# 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'
+
+describe Chef::HTTP::HTTPRequest do
+
+  context "with HTTP url scheme" do
+
+    it "should not include port 80 in Host header" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('http://dummy.com'), '')
+
+      request.headers['Host'].should eql('dummy.com')
+    end
+
+    it "should not include explicit port 80 in Host header" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('http://dummy.com:80'), '')
+
+      request.headers['Host'].should eql('dummy.com')
+    end
+
+    it "should include explicit port 8000 in Host header" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('http://dummy.com:8000'), '')
+
+      request.headers['Host'].should eql('dummy.com:8000')
+    end
+
+    it "should include explicit 443 port in Host header" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('http://dummy.com:443'), '')
+
+      request.headers['Host'].should eql('dummy.com:443')
+    end
+
+    it "should pass on explicit Host header unchanged" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('http://dummy.com:8000'), '', { 'Host' => 'yourhost.com:8888' })
+
+      request.headers['Host'].should eql('yourhost.com:8888')
+    end
+
+  end
+
+  context "with HTTPS url scheme" do
+
+    it "should not include port 443 in Host header" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('https://dummy.com'), '')
+
+      request.headers['Host'].should eql('dummy.com')
+    end
+
+    it "should include explicit port 80 in Host header" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('https://dummy.com:80'), '')
+
+      request.headers['Host'].should eql('dummy.com:80')
+    end
+
+    it "should include explicit port 8000 in Host header" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('https://dummy.com:8000'), '')
+
+      request.headers['Host'].should eql('dummy.com:8000')
+    end
+
+    it "should not include explicit port 443 in Host header" do
+      request = Chef::HTTP::HTTPRequest.new(:GET, URI('https://dummy.com:443'), '')
+
+      request.headers['Host'].should eql('dummy.com')
+    end
+
+  end
+
+  it "should pass on explicit Host header unchanged" do
+    request = Chef::HTTP::HTTPRequest.new(:GET, URI('http://dummy.com:8000'), '', { 'Host' => 'myhost.com:80' })
+
+    request.headers['Host'].should eql('myhost.com:80')
+  end
+
+end

data/spec/unit/http_spec.rb

@@ -21,8 +21,31 @@ require 'spec_helper'
 require 'chef/http'
 require 'chef/http/basic_client'
 
+class Chef::HTTP
+  public :create_url
+end
+
 describe Chef::HTTP do
 
+  describe "create_url" do
+
+    it 'should return a correctly formatted url 1/3 CHEF-5261' do
+      http = Chef::HTTP.new('http://www.getchef.com')
+      http.create_url('api/endpoint').should eql(URI.parse('http://www.getchef.com/api/endpoint'))
+    end
+
+    it 'should return a correctly formatted url 2/3 CHEF-5261' do
+      http = Chef::HTTP.new('http://www.getchef.com/')
+      http.create_url('/organization/org/api/endpoint/').should eql(URI.parse('http://www.getchef.com/organization/org/api/endpoint/'))
+    end
+
+    it 'should return a correctly formatted url 3/3 CHEF-5261' do
+      http = Chef::HTTP.new('http://www.getchef.com/organization/org///')
+      http.create_url('///api/endpoint?url=http://foo.bar').should eql(URI.parse('http://www.getchef.com/organization/org/api/endpoint?url=http://foo.bar'))
+    end
+
+  end # create_url
+
   describe "head" do
 
     it 'should return nil for a "200 Success" response (CHEF-4762)' do

data/spec/unit/knife/bootstrap_spec.rb

@@ -94,8 +94,8 @@ describe Chef::Knife::Bootstrap do
     @knife.instance_variable_set("@template_file", @knife.config[:template_file])
     template_string = @knife.read_template
     @knife.parse_options(["-j", '{"foo":{"bar":"baz"}}'])
-    expected_hash = Yajl::Parser.new.parse('{"foo":{"bar":"baz"},"run_list":[]}')
-    actual_hash = Yajl::Parser.new.parse(@knife.render_template(template_string))
+    expected_hash = FFI_Yajl::Parser.new.parse('{"foo":{"bar":"baz"},"run_list":[]}')
+    actual_hash = FFI_Yajl::Parser.new.parse(@knife.render_template(template_string))
     actual_hash.should == expected_hash
   end
 

data/spec/unit/knife/ssh_spec.rb

@@ -52,7 +52,7 @@ describe Chef::Knife::Ssh do
       def self.should_return_specified_attributes
         it "returns an array of the attributes specified on the command line OR config file, if only one is set" do
           @knife.config[:attribute] = "ipaddress"
-          @knife.config[:override_attribute] = "ipaddress"
+          @knife.config[:attribute_from_cli] = "ipaddress"
           configure_query([@node_foo, @node_bar])
           @knife.should_receive(:session_from_list).with([['10.0.0.1', nil], ['10.0.0.2', nil]])
           @knife.configure_session
@@ -60,7 +60,7 @@ describe Chef::Knife::Ssh do
 
         it "returns an array of the attributes specified on the command line even when a config value is set" do
           @knife.config[:attribute] = "config_file" # this value will be the config file
-          @knife.config[:override_attribute] = "ipaddress" # this is the value of the command line via #configure_attribute
+          @knife.config[:attribute_from_cli] = "ipaddress" # this is the value of the command line via #configure_attribute
           configure_query([@node_foo, @node_bar])
           @knife.should_receive(:session_from_list).with([['10.0.0.1', nil], ['10.0.0.2', nil]])
           @knife.configure_session
@@ -155,25 +155,19 @@ describe Chef::Knife::Ssh do
       @knife.config[:attribute].should == "command_line"
     end
 
-    it "should set override_attribute to the value of attribute from the command line" do
+    it "should set attribute_from_cli to the value of attribute from the command line" do
       @knife.config[:attribute] = "command_line"
       @knife.configure_attribute
       @knife.config[:attribute].should == "command_line"
-      @knife.config[:override_attribute].should == "command_line"
+      @knife.config[:attribute_from_cli].should == "command_line"
     end
 
-    it "should set override_attribute to the value of attribute from the config file" do
-      Chef::Config[:knife][:ssh_attribute] = "config_file"
-      @knife.configure_attribute
-      @knife.config[:attribute].should == "config_file"
-      @knife.config[:override_attribute].should == "config_file"
-    end
-
-    it "should prefer the command line over the config file for the value of override_attribute" do
+    it "should prefer the command line over the config file for the value of attribute_from_cli" do
       Chef::Config[:knife][:ssh_attribute] = "config_file"
       @knife.config[:attribute] = "command_line"
       @knife.configure_attribute
-      @knife.config[:override_attribute].should == "command_line"
+      @knife.config[:attribute].should == "command_line"
+      @knife.config[:attribute_from_cli].should == "command_line"
     end
   end
 

data/spec/unit/knife_spec.rb

@@ -150,7 +150,7 @@ describe Chef::Knife do
     let(:headers) {{"Accept"=>"application/json",
                     "Accept-Encoding"=>"gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
                     'X-Chef-Version' => Chef::VERSION,
-                    "Host"=>"api.opscode.piab:443",
+                    "Host"=>"api.opscode.piab",
                     "X-REMOTE-REQUEST-ID"=>request_id}}
 
     let(:request_id) {"1234"}

data/spec/unit/mixin/convert_to_class_name_spec.rb

@@ -47,4 +47,8 @@ describe Chef::Mixin::ConvertToClassName do
   it "interprets non-alphanumeric characters in snake case as word boundaries" do
     @convert.convert_to_class_name("now_camelized_without-hyphen").should == "NowCamelizedWithoutHyphen"
   end
+
+  it "interprets underscore" do
+    @convert.convert_to_class_name("_remove_leading_underscore").should == "RemoveLeadingUnderscore"
+  end
 end

data/spec/unit/provider/git_spec.rb

@@ -459,7 +459,7 @@ SHAS
   it "syncs the code by updating the source when the repo has already been checked out" do
     ::File.should_receive(:exist?).with("/my/deploy/dir/.git").and_return(true)
     ::File.stub(:directory?).with("/my/deploy").and_return(true)
-    @provider.should_receive(:find_current_revision).exactly(2).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
+    @provider.should_receive(:find_current_revision).exactly(1).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
     @provider.should_not_receive(:fetch_updates)
     @provider.should_receive(:add_remotes)
     @provider.run_action(:sync)
@@ -470,7 +470,7 @@ SHAS
     ::File.should_receive(:exist?).with("/my/deploy/dir/.git").and_return(true)
     ::File.stub(:directory?).with("/my/deploy").and_return(true)
     # invoked twice - first time from load_current_resource
-    @provider.should_receive(:find_current_revision).exactly(2).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
+    @provider.should_receive(:find_current_revision).exactly(1).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
     @provider.stub(:target_revision).and_return('28af684d8460ba4793eda3e7ac238c864a5d029a')
     @provider.should_receive(:fetch_updates)
     @provider.should_receive(:enable_submodules)