chef 10.14.0 → 10.14.2

data/lib/chef/provider/service/freebsd.rb

@@ -68,8 +68,7 @@ class Chef
         end
 
         def define_resource_requirements
-          super
-
+          shared_resource_requirements
           requirements.assert(:start, :enable, :reload, :restart) do |a|
             a.assertion { @rcd_script_found } 
             a.failure_message Chef::Exceptions::Service, "#{@new_resource}: unable to locate the rc.d script"

data/lib/chef/provider/service/systemd.rb

@@ -48,7 +48,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
   end
 
   def define_resource_requirements
-    super
+    shared_resource_requirements
     requirements.assert(:all_actions) do |a|
       a.assertion { @status_check_success } 
       # We won't stop in any case, but in whyrun warn and tell what we're doing.

data/lib/chef/provider/user/useradd.rb

@@ -34,8 +34,9 @@ class Chef
         end
         
         def manage_user
-          command = compile_command("usermod") { |u| u << universal_options }
-          command << " -m" if managing_home_dir?
+          command = compile_command("usermod") do |u|
+            u << universal_options
+          end
           run_command(:command => command)
         end
         
@@ -108,7 +109,7 @@ class Chef
           if updating_home?
             if managing_home_dir?
               Chef::Log.debug("#{@new_resource} managing the users home directory")
-              opts << " -d '#{@new_resource.home}'"
+              opts << " -m -d '#{@new_resource.home}'"
             else
               Chef::Log.debug("#{@new_resource} setting home to #{@new_resource.home}")
               opts << " -d '#{@new_resource.home}'"
@@ -120,7 +121,6 @@ class Chef
 
         def useradd_options
           opts = ''
-          opts << " -m" if updating_home? && managing_home_dir?
           opts << " -r" if @new_resource.system
           opts
         end

data/lib/chef/resource/group.rb

@@ -43,7 +43,7 @@ class Chef
         set_or_return(
           :gid,
           arg,
-          :kind_of => [ Integer ]
+          :kind_of => [ String, Integer ]
         )
       end
 

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '10.14.0'
+  VERSION = '10.14.2'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -90,5 +90,44 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
     end
   end
 
+  describe "when explaining an error on windows" do
+    before do
+      Chef::Config.stub!(:cookbook_path).and_return([ "C:/opscode/chef/var/cache/cookbooks" ])
+      recipe_lines = BAD_RECIPE.split("\n").map {|l| l << "\n" }
+      IO.should_receive(:readlines).with("C:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb").and_return(recipe_lines)
+      @trace = [
+        "C:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb:14 in `from_file'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:144:in `rescue in block in load_libraries'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:138:in `block in load_libraries'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:230:in `call'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:230:in `block (2 levels) in foreach_cookbook_load_segment'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:229:in `each'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:229:in `block in foreach_cookbook_load_segment'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:227:in `each'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:227:in `foreach_cookbook_load_segment'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:137:in `load_libraries'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:62:in `load'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/client.rb:198:in `setup_run_context'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/client.rb:418:in `do_run'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/client.rb:176:in `run'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/application/client.rb:283:in `block in run_application'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/application/client.rb:270:in `loop'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/application/client.rb:270:in `run_application'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/application.rb:70:in `run'",
+        "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/bin/chef-client:26:in `<top (required)>'",
+        "C:/opscode/chef/bin/chef-client:19:in `load'",
+        "C:/opscode/chef/bin/chef-client:19:in `<main>'"
+      ]
+      @exception.set_backtrace(@trace)
+      @path = "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb"
+      @inspector = described_class.new(@path, @exception)
+      @inspector.add_explanation(@description)
+    end
+
+    it "prints a pretty message" do
+      @description.display(@outputter)
+    end
+  end
+
 
 end

data/spec/unit/knife/status_spec.rb

@@ -0,0 +1,43 @@
+#
+# Author:: Sahil Muthoo (<sahil.muthoo@gmail.com>)
+# Copyright:: Copyright (c) 2012 Opscode, 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 'highline'
+
+describe Chef::Knife::Status do
+  before(:each) do
+    node = Chef::Node.new.tap do |n|
+      n["fqdn"] = "foobar"
+      n["ohai_time"] = 1343845969
+    end
+    query = mock("Chef::Search::Query")
+    query.stub!(:search).and_yield(node)
+    Chef::Search::Query.stub!(:new).and_return(query)
+    @knife  = Chef::Knife::Status.new
+    @stdout = StringIO.new
+    @knife.stub!(:highline).and_return(HighLine.new(StringIO.new, @stdout))
+  end
+
+  describe "run" do
+    it "should not colorize output unless it's writing to a tty" do
+      @knife.run
+      @stdout.string.match(/foobar/).should_not be_nil
+      @stdout.string.match(/\e.*ago/).should be_nil
+    end
+  end
+end

data/spec/unit/provider/user/useradd_spec.rb

@@ -115,9 +115,9 @@ describe Chef::Provider::User::Useradd do
                                                    :non_unique => false})
       end
 
-      it "should set -d /homedir -m" do
-        @provider.universal_options.should == " -d '/wowaweea'"
-        @provider.useradd_options.should == " -m"
+      it "should set -m -d /homedir" do
+        @provider.universal_options.should == " -m -d '/wowaweea'"
+        @provider.useradd_options.should == ""
       end
     end
 
@@ -128,9 +128,9 @@ describe Chef::Provider::User::Useradd do
         @new_resource.stub!(:non_unique).and_return(false)
       end
 
-      it "should set -d /homedir -m" do
-        @provider.universal_options.should eql(" -d '/wowaweea'")
-        @provider.useradd_options.should == " -m"
+      it "should set -m -d /homedir" do
+        @provider.universal_options.should eql(" -m -d '/wowaweea'")
+        @provider.useradd_options.should == ""
       end
     end
 
@@ -168,7 +168,7 @@ describe Chef::Provider::User::Useradd do
     end
 
     it "runs useradd with the computed command options" do
-      command = "useradd -c 'Adam Jacob' -g '23' -p 'abracadabra' -s '/usr/bin/zsh' -u '1000' -d '/Users/mud' -m adam"
+      command = "useradd -c 'Adam Jacob' -g '23' -p 'abracadabra' -s '/usr/bin/zsh' -u '1000' -m -d '/Users/mud' adam"
       @provider.should_receive(:run_command).with({ :command => command }).and_return(true)
       @provider.create_user
     end
@@ -181,7 +181,7 @@ describe Chef::Provider::User::Useradd do
         @provider.new_resource.instance_variable_set("@home", nil)
       end
 
-      it "should not include -d in the command options" do
+      it "should not include -m or -d in the command options" do
         command = "useradd -c 'Adam Jacob' -g '23' -p 'abracadabra' -s '/usr/bin/zsh' -u '1000' -r adam"
         @provider.should_receive(:run_command).with({ :command => command }).and_return(true)
         @provider.create_user
@@ -198,17 +198,23 @@ describe Chef::Provider::User::Useradd do
       @provider.new_resource.gid '23'
     end
 
+    # CHEF-3423, -m must come before the username
     it "runs usermod with the computed command options" do
-      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -d '/Users/mud' adam -m" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -m -d '/Users/mud' adam" }).and_return(true)
       @provider.manage_user
     end
 
     it "does not set the -r option to usermod" do
       @new_resource.system(true)
-      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -d '/Users/mud' adam -m" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -m -d '/Users/mud' adam" }).and_return(true)
       @provider.manage_user
     end
 
+    it "CHEF-3429: does not set -m if we aren't changing the home directory" do
+      @provider.should_receive(:updating_home?).and_return(false)
+      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' adam" }).and_return(true)
+      @provider.manage_user
+    end
   end
 
   describe "when removing a user" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 115
   prerelease: 
   segments: 
   - 10
   - 14
-  - 0
-  version: 10.14.0
+  - 2
+  version: 10.14.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-07 00:00:00 Z
+date: 2012-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config
@@ -1151,6 +1151,7 @@ files:
 - spec/unit/knife/role_from_file_spec.rb
 - spec/unit/knife/node_run_list_add_spec.rb
 - spec/unit/knife/cookbook_site_download_spec.rb
+- spec/unit/knife/status_spec.rb
 - spec/unit/knife/configure_client_spec.rb
 - spec/unit/knife/ssh_spec.rb
 - spec/unit/knife/cookbook_metadata_from_file_spec.rb