chef 11.18.12 → 12.0.0.alpha.0

data/spec/unit/knife/cookbook_site_share_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Knife::CookbookSiteShare do
     @cookbook_loader.stub(:[]).and_return(@cookbook)
     Chef::CookbookLoader.stub(:new).and_return(@cookbook_loader)
 
-    @cookbook_uploader = Chef::CookbookUploader.new('herpderp', File.join(CHEF_SPEC_DATA, 'cookbooks'), :rest => "norest")
+    @cookbook_uploader = Chef::CookbookUploader.new('herpderp', :rest => "norest")
     Chef::CookbookUploader.stub(:new).and_return(@cookbook_uploader)
     @cookbook_uploader.stub(:validate_cookbooks).and_return(true)
     Chef::CookbookSiteStreamingUploader.stub(:create_build_dir).and_return(Dir.mktmpdir)
@@ -77,7 +77,7 @@ describe Chef::Knife::CookbookSiteShare do
 
     it 'should make a tarball of the cookbook' do
       @knife.should_receive(:shell_out!) do |args|
-        args.to_s.should match /tar -czf/
+        args.to_s.should match(/tar -czf/)
       end
       @knife.run
     end
@@ -108,16 +108,16 @@ describe Chef::Knife::CookbookSiteShare do
       File.stub(:open).and_return(true)
     end
 
-    it 'should post the cookbook to "https://supermarket.getchef.com"' do
-      response_text = {:uri => 'https://supermarket.getchef.com/cookbooks/cookbook_name'}.to_json
+    it 'should post the cookbook to "http://cookbooks.opscode.com"' do
+      response_text = {:uri => 'http://cookbooks.opscode.com/cookbooks/cookbook_name'}.to_json
       @upload_response.stub(:body).and_return(response_text)
       @upload_response.stub(:code).and_return(201)
-      Chef::CookbookSiteStreamingUploader.should_receive(:post).with(/supermarket\.getchef\.com/, anything(), anything(), anything())
+      Chef::CookbookSiteStreamingUploader.should_receive(:post).with(/cookbooks\.opscode\.com/, anything(), anything(), anything())
       @knife.run
     end
 
     it 'should alert the user when a version already exists' do
-      response_text = Chef::JSONCompat.to_json({:error_messages => ['Version already exists']})
+      response_text = {:error_messages => ['Version already exists']}.to_json
       @upload_response.stub(:body).and_return(response_text)
       @upload_response.stub(:code).and_return(409)
       lambda { @knife.run }.should raise_error(SystemExit)
@@ -125,7 +125,7 @@ describe Chef::Knife::CookbookSiteShare do
     end
 
     it 'should pass any errors on to the user' do
-      response_text = Chef::JSONCompat.to_json({:error_messages => ["You're holding it wrong"]})
+      response_text = {:error_messages => ["You're holding it wrong"]}.to_json
       @upload_response.stub(:body).and_return(response_text)
       @upload_response.stub(:code).and_return(403)
       lambda { @knife.run }.should raise_error(SystemExit)
@@ -133,7 +133,7 @@ describe Chef::Knife::CookbookSiteShare do
     end
 
     it 'should print the body if no errors are exposed on failure' do
-      response_text = Chef::JSONCompat.to_json({:system_error => "Your call was dropped", :reason => "There's a map for that"})
+      response_text = {:system_error => "Your call was dropped", :reason => "There's a map for that"}.to_json
       @upload_response.stub(:body).and_return(response_text)
       @upload_response.stub(:code).and_return(500)
       @knife.ui.should_receive(:error).with(/#{Regexp.escape(response_text)}/)#.ordered

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -61,8 +61,9 @@ describe Chef::Knife::CookbookUpload do
       test_cookbook = Chef::CookbookVersion.new('test_cookbook', '/tmp/blah')
       cookbook_loader.stub(:each).and_yield("test_cookbook", test_cookbook)
       cookbook_loader.stub(:cookbook_names).and_return(["test_cookbook"])
-      Chef::CookbookUploader.should_receive(:new).with( kind_of(Array),  kind_of(Array),
-        {:force=>nil, :concurrency => 3}).and_return(double("Chef::CookbookUploader", :upload_cookbooks=> true))
+      Chef::CookbookUploader.should_receive(:new).
+        with( kind_of(Array), { :force => nil, :concurrency => 3}).
+        and_return(double("Chef::CookbookUploader", :upload_cookbooks=> true))
       knife.run
     end
   end

data/spec/unit/knife/core/bootstrap_context_spec.rb

@@ -116,13 +116,13 @@ EXPECTED
   describe "when JSON attributes are given" do
     let(:config) { {:first_boot_attributes => {:baz => :quux}} }
     it "adds the attributes to first_boot" do
-      Chef::JSONCompat.to_json(bootstrap_context.first_boot).should eq(Chef::JSONCompat.to_json({:baz => :quux, :run_list => run_list}))
+      bootstrap_context.first_boot.to_json.should eq({:baz => :quux, :run_list => run_list}.to_json)
     end
   end
 
   describe "when JSON attributes are NOT given" do
     it "sets first_boot equal to run_list" do
-      Chef::JSONCompat.to_json(bootstrap_context.first_boot).should eq(Chef::JSONCompat.to_json({:run_list => run_list}))
+      bootstrap_context.first_boot.to_json.should eq({:run_list => run_list}.to_json)
     end
   end
 
@@ -194,7 +194,7 @@ EXPECTED
   describe "when a bootstrap_version is not specified" do
     it "should send the latest current to the installer" do
       # Intentionally hard coded in order not to replicate the logic.
-      bootstrap_context.latest_current_chef_version_string.should eq("-v 11")
+      bootstrap_context.latest_current_chef_version_string.should eq("-v #{Chef::VERSION.to_i}")
     end
   end
 end

data/spec/unit/knife/core/subcommand_loader_spec.rb

@@ -73,72 +73,7 @@ describe Chef::Knife::SubcommandLoader do
     @loader.site_subcommands.should include(expected_command)
   end
 
-  # https://github.com/opscode/chef-dk/issues/227
-  #
-  # `knife` in ChefDK isn't from a gem install, it's directly run from a clone
-  # of the source, but there can be one or more versions of chef also installed
-  # as a gem. If the gem install contains a command that doesn't exist in the
-  # source tree of the "primary" chef install, it can be loaded and cause an
-  # error. We also want to ensure that we only load builtin commands from the
-  # "primary" chef install.
-  context "when a different version of chef is also installed as a gem" do
-
-    let(:all_found_commands) do
-      [
-        "/opt/chefdk/embedded/apps/chef/lib/chef/knife/bootstrap.rb",
-        "/opt/chefdk/embedded/apps/chef/lib/chef/knife/client_bulk_delete.rb",
-        "/opt/chefdk/embedded/apps/chef/lib/chef/knife/client_create.rb",
-        # We use the fake version 1.0.0 because that version doesn't exist,
-        # which ensures it won't ever equal "chef-#{Chef::VERSION}"
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-1.0.0/lib/chef/knife/bootstrap.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-1.0.0/lib/chef/knife/client_bulk_delete.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-1.0.0/lib/chef/knife/client_create.rb",
-        # This command is "extra" compared to what's in the embedded/apps/chef install:
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-1.0.0/lib/chef/knife/data_bag_secret_options.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-vault-2.2.4/lib/chef/knife/decrypt.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/knife-spork-1.4.1/lib/chef/knife/spork-bump.rb",
-        # These are fake commands that have names designed to test that the
-        # regex is strict enough
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-foo-#{Chef::VERSION}/lib/chef/knife/chef-foo.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/foo-chef-#{Chef::VERSION}/lib/chef/knife/foo-chef.rb",
-        # In a real scenario, we'd use rubygems APIs to only select the most
-        # recent gem, but for this test we want to check that we're doing the
-        # right thing both when the plugin version matches and does not match
-        # the current chef version. Looking at
-        # `SubcommandLoader::MATCHES_THIS_CHEF_GEM` and
-        # `SubcommandLoader::MATCHES_CHEF_GEM` should make it clear why we want
-        # to test these two cases.
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-bar-1.0.0/lib/chef/knife/chef-bar.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb"
-      ]
-    end
-
-    let(:expected_valid_commands) do
-      [
-        "/opt/chefdk/embedded/apps/chef/lib/chef/knife/bootstrap.rb",
-        "/opt/chefdk/embedded/apps/chef/lib/chef/knife/client_bulk_delete.rb",
-        "/opt/chefdk/embedded/apps/chef/lib/chef/knife/client_create.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-vault-2.2.4/lib/chef/knife/decrypt.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/knife-spork-1.4.1/lib/chef/knife/spork-bump.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-foo-#{Chef::VERSION}/lib/chef/knife/chef-foo.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/foo-chef-#{Chef::VERSION}/lib/chef/knife/foo-chef.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-bar-1.0.0/lib/chef/knife/chef-bar.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb"
-      ]
-    end
-
-    before do
-      expect(@loader).to receive(:find_files_latest_gems).with("chef/knife/*.rb").and_return(all_found_commands)
-      expect(@loader).to receive(:find_subcommands_via_dirglob).and_return({})
-    end
-
-    it "ignores commands from the non-matching gem install" do
-      expect(@loader.find_subcommands_via_rubygems.values).to eq(expected_valid_commands)
-    end
-
-  end
-
-  describe "finding 3rd party plugins" do
+  describe "finding 3rd party plugins" do 
     let(:env_home) { "/home/alice" }
     let(:manifest_path) { env_home + "/.chef/plugin_manifest.json" }
 

data/spec/unit/knife/data_bag_from_file_spec.rb

@@ -21,6 +21,7 @@ require 'spec_helper'
 require 'chef/data_bag_item'
 require 'chef/encrypted_data_bag_item'
 require 'tempfile'
+require 'json'
 
 Chef::Knife::DataBagFromFile.load_deps
 
@@ -45,7 +46,7 @@ describe Chef::Knife::DataBagFromFile do
         "greeting" => "hello",
         "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true }}
     }
-    @db_file.write(Chef::JSONCompat.to_json(@plain_data))
+    @db_file.write(@plain_data.to_json)
     @db_file.flush
     @knife.instance_variable_set(:@name_args, ['bag_name', @db_file.path])
   end

data/spec/unit/knife/tag_create_spec.rb

@@ -9,15 +9,15 @@ describe Chef::Knife::TagCreate do
     @node = Chef::Node.new
     @node.stub :save
     Chef::Node.stub(:load).and_return @node
-    @stdout = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    @knife.ui.stub(:stderr).and_return(@stderr)
   end
 
   describe "run" do
     it "can create tags on a node" do
       @knife.run
       @node.tags.should == ["happytag"]
-      @stdout.string.should match /created tags happytag.+node webmonkey.example.com/i
+      @stderr.string.should match /created tags happytag.+node webmonkey.example.com/i
     end
   end
 end

data/spec/unit/knife/tag_delete_spec.rb

@@ -10,8 +10,8 @@ describe Chef::Knife::TagDelete do
     @node.stub :save
     @node.tags << "sadtag" << "happytag"
     Chef::Node.stub(:load).and_return @node
-    @stdout = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    @knife.ui.stub(:stderr).and_return(@stderr)
   end
 
   describe "run" do
@@ -19,7 +19,7 @@ describe Chef::Knife::TagDelete do
       @node.tags.should == ["sadtag", "happytag"]
       @knife.run
       @node.tags.should == ["happytag"]
-      @stdout.string.should match /deleted.+sadtag/i
+      @stderr.string.should match /deleted.+sadtag/i
     end
   end
 end

data/spec/unit/knife/user_create_spec.rb

@@ -46,7 +46,7 @@ describe Chef::Knife::UserCreate do
     Chef::User.should_receive(:new).and_return(@user)
     @user.should_receive(:create)
     @knife.run
-    @stdout.string.should match /created user.+a_user/i
+    @stderr.string.should match /created user.+a_user/i
   end
 
   it "sets the password" do

data/spec/unit/knife_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Knife do
       Chef::Log.stub(level_sym)
     end
     Chef::Knife.stub(:puts)
-    @stdout = StringIO.new
+    @stderr = StringIO.new
   end
 
   describe "selecting a config file" do
@@ -241,7 +241,7 @@ describe Chef::Knife do
     end
 
     it "exits if no subcommand matches the CLI args" do
-      Chef::Knife.ui.stub(:stdout).and_return(@stdout)
+      Chef::Knife.ui.stub(:stderr).and_return(@stderr)
       Chef::Knife.ui.should_receive(:fatal)
       lambda {Chef::Knife.run(%w{fuuu uuuu fuuuu})}.should raise_error(SystemExit) { |e| e.status.should_not == 0 }
     end
@@ -326,7 +326,7 @@ describe Chef::Knife do
       @knife.stub(:run).and_raise(Net::HTTPServerException.new("401 Unauthorized", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(/ERROR: Failed to authenticate to/)
-      @stdout.string.should match(/Response:  y u no syncronize your clock\?/)
+      @stderr.string.should match(/Response:  y u no syncronize your clock\?/)
     end
 
     it "formats 403s nicely" do
@@ -337,7 +337,7 @@ describe Chef::Knife do
       @knife.stub(:username).and_return("sadpanda")
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: You authenticated successfully to http.+ as sadpanda but you are not authorized for this action])
-      @stdout.string.should match(%r[Response:  y u no administrator])
+      @stderr.string.should match(%r[Response:  y u no administrator])
     end
 
     it "formats 400s nicely" do
@@ -347,7 +347,7 @@ describe Chef::Knife do
       @knife.stub(:run).and_raise(Net::HTTPServerException.new("400 Bad Request", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: The data in your request was invalid])
-      @stdout.string.should match(%r[Response: y u search wrong])
+      @stderr.string.should match(%r[Response: y u search wrong])
     end
 
     it "formats 404s nicely" do
@@ -357,7 +357,7 @@ describe Chef::Knife do
       @knife.stub(:run).and_raise(Net::HTTPServerException.new("404 Not Found", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: The object you are looking for could not be found])
-      @stdout.string.should match(%r[Response: nothing to see here])
+      @stderr.string.should match(%r[Response: nothing to see here])
     end
 
     it "formats 500s nicely" do
@@ -367,7 +367,7 @@ describe Chef::Knife do
       @knife.stub(:run).and_raise(Net::HTTPFatalError.new("500 Internal Server Error", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: internal server error])
-      @stdout.string.should match(%r[Response: sad trombone])
+      @stderr.string.should match(%r[Response: sad trombone])
     end
 
     it "formats 502s nicely" do
@@ -377,7 +377,7 @@ describe Chef::Knife do
       @knife.stub(:run).and_raise(Net::HTTPFatalError.new("502 Bad Gateway", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: bad gateway])
-      @stdout.string.should match(%r[Response: sadder trombone])
+      @stderr.string.should match(%r[Response: sadder trombone])
     end
 
     it "formats 503s nicely" do
@@ -387,7 +387,7 @@ describe Chef::Knife do
       @knife.stub(:run).and_raise(Net::HTTPFatalError.new("503 Service Unavailable", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: Service temporarily unavailable])
-      @stdout.string.should match(%r[Response: saddest trombone])
+      @stderr.string.should match(%r[Response: saddest trombone])
     end
 
     it "formats other HTTP errors nicely" do
@@ -397,15 +397,15 @@ describe Chef::Knife do
       @knife.stub(:run).and_raise(Net::HTTPServerException.new("402 Payment Required", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: Payment Required])
-      @stdout.string.should match(%r[Response: nobugfixtillyoubuy])
+      @stderr.string.should match(%r[Response: nobugfixtillyoubuy])
     end
 
     it "formats NameError and NoMethodError nicely" do
       @knife.stub(:run).and_raise(NameError.new("Undefined constant FUUU"))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: knife encountered an unexpected error])
-      @stdout.string.should match(%r[This may be a bug in the 'knife' knife command or plugin])
-      @stdout.string.should match(%r[Exception: NameError: Undefined constant FUUU])
+      @stderr.string.should match(%r[This may be a bug in the 'knife' knife command or plugin])
+      @stderr.string.should match(%r[Exception: NameError: Undefined constant FUUU])
     end
 
     it "formats missing private key errors nicely" do
@@ -413,7 +413,7 @@ describe Chef::Knife do
       @knife.stub(:api_key).and_return("/home/root/.chef/no-key-here.pem")
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: Your private key could not be loaded from /home/root/.chef/no-key-here.pem])
-      @stdout.string.should match(%r[Check your configuration file and ensure that your private key is readable])
+      @stderr.string.should match(%r[Check your configuration file and ensure that your private key is readable])
     end
 
     it "formats connection refused errors nicely" do
@@ -423,7 +423,7 @@ describe Chef::Knife do
       # *nix = Errno::ECONNREFUSED: Connection refused
       # win32: Errno::ECONNREFUSED: No connection could be made because the target machine actively refused it.
       @stderr.string.should match(%r[ERROR: Network Error: .* - y u no shut up])
-      @stdout.string.should match(%r[Check your knife configuration and network settings])
+      @stderr.string.should match(%r[Check your knife configuration and network settings])
     end
   end
 

data/spec/unit/lwrp_spec.rb

@@ -231,28 +231,8 @@ describe "LWRP" do
           expect(child.default_action).to eq(:dont_eat)
         end
       end
-
-      context "when actions are already defined" do
-        let(:child) do
-          Class.new(parent) do
-            actions :eat
-            actions :sleep
-            actions :drink
-          end
-        end
-
-        def raise_if_deprecated!
-          if Chef::VERSION.split('.').first.to_i > 11
-            raise "This test should be removed and the associated code should be removed!"
-          end
-        end
-
-        it "ammends actions when they are already defined" do
-          raise_if_deprecated!
-          expect(child.actions).to eq([:eat, :sleep, :drink])
-        end
-      end
     end
+
   end
 
   describe "Lightweight Chef::Provider" do

data/spec/unit/mixin/shell_out_spec.rb

@@ -104,6 +104,98 @@ describe Chef::Mixin::ShellOut do
 
       should_emit_deprecation_warning_about :command_log_prepend, :log_tag
     end
+  end
+
+  describe "#shell_out_with_systems_locale" do
+    before(:each) do
+      @original_env = ENV.to_hash
+      ENV.clear
+    end
+
+    after(:each) do
+      ENV.clear
+      ENV.update(@original_env)
+    end
+
+    let(:shell_out) { Chef::Mixin::ShellOut }
+    let(:cmd) { "echo '#{rand(1000)}'" }
+
+    describe "when the last argument is a Hash" do
+      describe "and environment is an option" do
+        it "should not change environment['LC_ALL'] when set to nil" do
+          options = { :environment => { 'LC_ALL' => nil } }
+          shell_out.should_receive(:shell_out).with(cmd, options).and_return(true)
+          shell_out.shell_out_with_systems_locale(cmd, options)
+        end
+
+        it "should not change environment['LC_ALL'] when set to non-nil" do
+          options = { :environment => { 'LC_ALL' => 'en_US.UTF-8' } }
+          shell_out.should_receive(:shell_out).with(cmd, options).and_return(true)
+          shell_out.shell_out_with_systems_locale(cmd, options)
+        end
+
+        it "should set environment['LC_ALL'] to nil when 'LC_ALL' not present" do
+          options = { :environment => { 'HOME' => '/Users/morty' } }
+          shell_out.should_receive(:shell_out).with(
+            cmd,
+            { :environment => {
+                'HOME' => '/Users/morty',
+                'LC_ALL' => nil }
+            }
+          ).and_return(true)
+          shell_out.shell_out_with_systems_locale(cmd, options)
+        end
+      end
 
+      describe "and env is an option" do
+        it "should not change env when set to nil" do
+          options = { :env => { 'LC_ALL' => nil } }
+          shell_out.should_receive(:shell_out).with(cmd, options).and_return(true)
+          shell_out.shell_out_with_systems_locale(cmd, options)
+        end
+
+        it "should not change env when set to non-nil" do
+          options = { :env => { 'LC_ALL' => 'en_US.UTF-8'}}
+          shell_out.should_receive(:shell_out).with(cmd, options).and_return(true)
+          shell_out.shell_out_with_systems_locale(cmd, options)
+        end
+
+        it "should set env['LC_ALL'] to nil when 'LC_ALL' not present" do
+          options = { :env => { 'HOME' => '/Users/morty' } }
+          shell_out.should_receive(:shell_out).with(
+            cmd,
+            { :env => {
+                'HOME' => '/Users/morty',
+                'LC_ALL' => nil }
+            }
+          ).and_return(true)
+          shell_out.shell_out_with_systems_locale(cmd, options)
+        end
+      end
+
+      describe "and no env/environment option is present" do
+        it "should add environment option and set environment['LC_ALL'] to nil" do
+          options = { :user => 'morty' }
+          shell_out.should_receive(:shell_out).with(
+            cmd,
+            { :environment => { 'LC_ALL' => nil },
+              :user => 'morty'
+            }
+          ).and_return(true)
+          shell_out.shell_out_with_systems_locale(cmd, options)
+        end
+      end
+    end
+
+    describe "when the last argument is not a Hash" do
+      it "should add environment options and set environment['LC_ALL'] to nil" do
+        shell_out.should_receive(:shell_out).with(
+          cmd,
+          { :environment => { 'LC_ALL' => nil } }
+        ).and_return(true)
+        shell_out.shell_out_with_systems_locale(cmd)
+      end
+    end
   end
+
 end