chef 0.10.10.beta.1 → 0.10.10.rc.1

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

@@ -43,6 +43,14 @@ class Chef
           
           run_context.node
           
+          @job = @new_resource.service_name
+          
+          if @new_resource.parameters
+            @new_resource.parameters.each do |key, value|
+              @job << " #{key}=#{value}"
+            end
+          end
+          
           platform, version = Chef::Platform.find_platform_and_version(run_context.node)
           if platform == "ubuntu" && (8.04..9.04).include?(version.to_f)
             @upstart_job_dir = "/etc/event.d"
@@ -118,7 +126,7 @@ class Chef
             if @new_resource.start_command
               super
             else
-              run_command_with_systems_locale(:command => "/sbin/start #{@new_resource.service_name}")
+              run_command_with_systems_locale(:command => "/sbin/start #{@job}")
             end
           end
         end
@@ -132,7 +140,7 @@ class Chef
             if @new_resource.stop_command
               super
             else
-              run_command_with_systems_locale(:command => "/sbin/stop #{@new_resource.service_name}")
+              run_command_with_systems_locale(:command => "/sbin/stop #{@job}")
             end
           end
         end
@@ -144,7 +152,7 @@ class Chef
           # Older versions of upstart would fail on restart if the service was currently stopped, check for that. LP:430883
           else @new_resource.supports[:restart]
             if @current_resource.running
-              run_command_with_systems_locale(:command => "/sbin/restart #{@new_resource.service_name}")
+              run_command_with_systems_locale(:command => "/sbin/restart #{@job}")
             else
               start_service
             end
@@ -156,7 +164,7 @@ class Chef
             super
           else
             # upstart >= 0.6.3-4 supports reload (HUP)
-            run_command_with_systems_locale(:command => "/sbin/reload #{@new_resource.service_name}")
+            run_command_with_systems_locale(:command => "/sbin/reload #{@job}")
           end
         end
 
@@ -177,7 +185,7 @@ class Chef
         end
 
         def upstart_state
-          command = "/sbin/status #{@new_resource.service_name}"
+          command = "/sbin/status #{@job}"
           status = popen4(command) do |pid, stdin, stdout, stderr|
             stdout.each_line do |line|
               # rsyslog stop/waiting

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

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'pathname'
 require 'chef/provider/user'
 
 class Chef
@@ -124,7 +125,11 @@ class Chef
         end
 
         def updating_home?
-          @current_resource.home != @new_resource.home && @new_resource.home
+          # will return false if paths are equivalent
+          # Pathname#cleanpath does a better job than ::File::expand_path (on both unix and windows)
+          # ::File.expand_path("///tmp") == ::File.expand_path("/tmp") => false
+          # ::File.expand_path("\\tmp") => "C:/tmp"
+          @new_resource.home and Pathname.new(@current_resource.home).cleanpath != Pathname.new(@new_resource.home).cleanpath
         end
 
         def managing_home_dir?

data/lib/chef/resource/mdadm.rb

@@ -31,6 +31,7 @@ class Chef
         @exists = false
         @level = 1
         @metadata = "0.90"
+        @bitmap = "none"
         @raid_device = name
 
         @action = :create
@@ -77,6 +78,14 @@ class Chef
         )
       end
 
+      def bitmap(arg=nil)
+        set_or_return(
+          :bitmap,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
       def raid_device(arg=nil)
         set_or_return(
           :raid_device,

data/lib/chef/resource/service.rb

@@ -28,7 +28,8 @@ class Chef
         @service_name = name
         @enabled = nil
         @running = nil
-        @pattern = service_name 
+        @parameters = nil
+        @pattern = service_name
         @start_command = nil
         @stop_command = nil
         @status_command = nil
@@ -136,6 +137,13 @@ class Chef
                       :kind_of => [ Integer, String, Hash ])
       end
 
+      def parameters(arg=nil)
+        set_or_return(
+          :parameters,
+          arg,
+          :kind_of => [ Hash ] )
+      end
+
       def supports(args={})
         if args.is_a? Array
           args.each { |arg| @supports[arg] = true }

data/lib/chef/rest.rb

@@ -199,7 +199,8 @@ class Chef
           end
         end
 
-        if res.kind_of?(Net::HTTPSuccess)
+        case res
+        when Net::HTTPSuccess
           if res['content-type'] =~ /json/
             Chef::JSONCompat.from_json(response_body)
           else
@@ -211,10 +212,10 @@ class Chef
               response_body
             end
           end
-        elsif res.kind_of?(Net::HTTPFound) or res.kind_of?(Net::HTTPMovedPermanently)
-          follow_redirect {run_request(method, create_url(res['location']), headers, false, nil, raw)}
-        elsif res.kind_of?(Net::HTTPNotModified)
+        when Net::HTTPNotModified # Must be tested before Net::HTTPRedirection because it's subclass.
           false
+        when Net::HTTPRedirection
+          follow_redirect {run_request(method, create_url(res['location']), headers, false, nil, raw)}
         else
           if res['content-type'] =~ /json/
             exception = Chef::JSONCompat.from_json(response_body)
@@ -390,11 +391,10 @@ class Chef
     private
 
     def redirected_to(response)
-      if response.kind_of?(Net::HTTPFound) || response.kind_of?(Net::HTTPMovedPermanently)
-        response['location']
-      else
-        nil
-      end
+      return nil  unless response.kind_of?(Net::HTTPRedirection)
+      # Net::HTTPNotModified is undesired subclass of Net::HTTPRedirection so test for this
+      return nil  if response.kind_of?(Net::HTTPNotModified)
+      response['location']
     end
 
     def build_headers(method, url, headers={}, json_body=false, raw=false)

data/lib/chef/version.rb

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

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
+  hash: 15424231
   prerelease: 8
-  version: 0.10.10.beta.1
+  segments: 
+  - 0
+  - 10
+  - 10
+  - rc
+  - 1
+  version: 0.10.10.rc.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-06 00:00:00 Z
+date: 2012-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config
@@ -20,6 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
   type: :runtime
   version_requirements: *id001
@@ -31,6 +43,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id002
@@ -42,6 +59,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id003
@@ -53,6 +75,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id004
@@ -64,6 +91,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7712010
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc
         version: 1.0.0.rc
   type: :runtime
   version_requirements: *id005
@@ -75,6 +108,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id006
@@ -86,9 +124,19 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 0
+        - 4
         version: 1.0.4
     - - <
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 7
+        - 0
         version: 1.7.0
   type: :runtime
   version_requirements: *id007
@@ -100,6 +148,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id008
@@ -111,188 +164,276 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: treetop
+  name: yajl-ruby
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.9
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: treetop
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        hash: 21
+        segments: 
+        - 1
+        - 4
+        - 9
+        version: 1.4.9
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: net-ssh-multi
+  name: net-ssh
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        hash: 3
+        segments: 
+        - 2
+        - 2
+        - 2
+        version: 2.2.2
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: net-ssh-multi
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: moneta
+  name: highline
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 29
+        segments: 
+        - 1
+        - 6
+        - 9
+        version: 1.6.9
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: erubis
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
+  name: moneta
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: uuidtools
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: sdoc
+  name: rdoc
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: ronn
+  name: sdoc
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: ronn
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: rake
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: rspec_junit_formatter
+  name: rack
   prerelease: false
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  name: rspec-core
+  name: rspec_junit_formatter
   prerelease: false
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.8.0
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id023
 - !ruby/object:Gem::Dependency 
-  name: rspec-expectations
+  name: rspec-core
   prerelease: false
   requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
   type: :development
   version_requirements: *id024
 - !ruby/object:Gem::Dependency 
-  name: rspec-mocks
+  name: rspec-expectations
   prerelease: false
   requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
   type: :development
   version_requirements: *id025
+- !ruby/object:Gem::Dependency 
+  name: rspec-mocks
+  prerelease: false
+  requirement: &id026 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
+  type: :development
+  version_requirements: *id026
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: adam@opscode.com
 executables: 
@@ -804,12 +945,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []