chef 0.9.12 → 0.9.14.beta.1

data/lib/chef/provider/group/pw.rb

@@ -81,4 +81,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/provider/package/easy_install.rb

@@ -34,16 +34,18 @@ class Chef
 
           begin
             # first check to see if we can import it
-            output = shell_out!("python -c \"import #{name}\"").stderr
-            unless output.include? "ImportError"
+            output = shell_out!("#{python_binary_path} -c \"import #{name}\"", :returns=>[0,1]).stderr
+            if output.include? "ImportError"
+              # then check to see if its on the path
+              output = shell_out!("#{python_binary_path} -c \"import sys; print sys.path\"", :returns=>[0,1]).stdout
+              if output.downcase.include? "#{name.downcase}"
+                check = true
+              end
+            else
               check = true
             end
           rescue
-            # then check to see if its on the path
-            output = shell_out!("python -c \"import sys; print sys.path\"").stdout
-            if output.downcase.include? "#{name.downcase}"
-              check = true
-            end
+            # it's probably not installed
           end
 
           check
@@ -54,6 +56,16 @@ class Chef
           path ? path : 'easy_install'
         end
 
+        def python_binary_path
+          path = @new_resource.python_binary
+          path ? path : 'python'
+        end
+
+        def module_name
+          m = @new_resource.module_name
+          m ? m : @new_resource.name
+        end
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
@@ -61,20 +73,30 @@ class Chef
 
           # get the currently installed version if installed
           package_version = nil
-          if install_check(@new_resource.package_name)
+          if install_check(module_name)
             begin
-              output = shell_out!("python -c \"import #{@new_resource.package_name}; print #{@new_resource.package_name}.__version__\"").stdout
+              output = shell_out!("#{python_binary_path} -c \"import #{module_name}; print #{module_name}.__version__\"").stdout
               package_version = output.strip
             rescue
-              output = shell_out!("python -c \"import #{@new_resource.package_name}; print #{@new_resource.package_name}.__path__\"").stdout
-              output[/\S\S(.*)\/(.*)-(.*)-py(.*).egg\S/]
+              output = shell_out!("#{python_binary_path} -c \"import sys; print sys.path\"", :returns=>[0,1]).stdout
+
+              output_array = output.gsub(/[\[\]]/,'').split(/\s*,\s*/)
+              package_path = ""
+
+              output_array.each do |entry|
+                if entry.downcase.include?(@new_resource.package_name)
+                  package_path = entry
+                end
+              end
+
+              package_path[/\S\S(.*)\/(.*)-(.*)-py(.*).egg\S/]
               package_version = $3
             end
           end
 
           if package_version == @new_resource.version
             Chef::Log.debug("#{@new_resource.package_name} at version #{@new_resource.version}")
-          @current_resource.version(@new_resource.version)
+            @current_resource.version(@new_resource.version)
           else
             Chef::Log.debug("#{@new_resource.package_name} at version #{package_version}")
             @current_resource.version(package_version)
@@ -111,4 +133,4 @@ class Chef
       end
     end
   end
-end
+end

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

@@ -24,81 +24,106 @@ class Chef
   class Provider
     class Service
       class Debian < Chef::Provider::Service::Init
-        UPDATE_RC_D_ENABLED_MATCHES = /etc\/rc[\dS].d\/S|not installed/i
-        UPDATE_RC_D_PRIORITIES = /etc\/rc([\dS]).d\/([SK])(\d\d)/i
+        UPDATE_RC_D_ENABLED_MATCHES = /\/rc[\dS].d\/S|not installed/i
+        UPDATE_RC_D_PRIORITIES = /\/rc([\dS]).d\/([SK])(\d\d)/i
 
         def load_current_resource
           super
-          
-          @current_resource.enabled(service_currently_enabled?)
-          @current_resource        
-        end
 
-        def enable_service()
-          run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults")
+          @current_resource.priority(get_priority)
+          @current_resource.enabled(service_currently_enabled?(@current_resource.priority))
+          @current_resource
         end
 
-        def disable_service()
-          run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
-        end
-        
         def assert_update_rcd_available
           unless ::File.exists? "/usr/sbin/update-rc.d"
             raise Chef::Exceptions::Service, "/usr/sbin/update-rc.d does not exist!"
           end
         end
-        
-        def service_currently_enabled?
+
+        def get_priority
           assert_update_rcd_available
+          priority = {}
 
           status = popen4("/usr/sbin/update-rc.d -n -f #{@current_resource.service_name} remove") do |pid, stdin, stdout, stderr|
-            priority = {}
-            enabled = false
 
-            stdout.each_line do |line|
-              if UPDATE_RC_D_PRIORITIES =~ line
-                priority[$1] = [($2 == "S" ? :start : :stop), $3]
-              end
-              if line =~ UPDATE_RC_D_ENABLED_MATCHES
-                enabled = true
+            [stdout, stderr].each do |iop|
+              iop.each_line do |line|
+                if UPDATE_RC_D_PRIORITIES =~ line
+                  # priority[runlevel] = [ S|K, priority ] 
+                  # S = Start, K = Kill
+                  # debian runlevels: 0 Halt, 1 Singleuser, 2 Multiuser, 3-5 == 2, 6 Reboot
+                  priority[$1] = [($2 == "S" ? :start : :stop), $3]
+                end
+                if line =~ UPDATE_RC_D_ENABLED_MATCHES
+                  enabled = true
+                end
               end
             end
-            @current_resource.enabled enabled
-            @current_resource.priority priority
-          end  
+          end
 
           unless status.exitstatus == 0
             raise Chef::Exceptions::Service, "/usr/sbin/update-rc.d -n -f #{@current_resource.service_name} failed - #{status.inspect}"
           end
-          @current_resource.enabled
+          priority
         end
 
-        def enable_service()
-          # If we have a priority which is just a number, we have to
-          # construct the actual priority object
+        def service_currently_enabled?(priority)
+          enabled = false
+
+          priority.each { |runlevel, arguments|
+            Chef::Log.debug("service[#{@current_resource.name}]: runlevel #{runlevel}, action #{arguments[0]}, priority #{arguments[1]}")
+            
+            # if we are in a update-rc.d default startup runlevel && we start in this runlevel
+            if (2..5).include?(runlevel.to_i) && arguments[0] == :start
+              enabled = true
+            end
+          }
 
+          enabled
+        end
+
+        def enable_service()
           if @new_resource.priority.is_a? Integer
+            run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
             run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults #{@new_resource.priority} #{100 - @new_resource.priority}")
           elsif @new_resource.priority.is_a? Hash
-            args = ""
-            @new_resource.priority.each do |level, o|
-              action = o[0]
-              priority = o[1]
-              args += "#{action} #{priority} #{level} . "
-            end
-            run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} #{args}")
+            # we call the same command regardless of we're enabling or disabling  
+            # users passing a Hash are responsible for setting their own start priorities
+            set_priority()
           else # No priority, go with update-rc.d defaults
+            run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
             run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults")
           end
 
         end
 
         def disable_service()
-          run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} disable")
-#          @new_resource.priority({2 => [:stop, 80]})
-#          enable_service
+          if @new_resource.priority.is_a? Integer
+            # Stop processes in reverse order of start using '100 - start_priority'
+            run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
+            run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} stop #{100 - @new_resource.priority} 2 3 4 5 .")
+          elsif @new_resource.priority.is_a? Hash
+            # we call the same command regardless of we're enabling or disabling  
+            # users passing a Hash are responsible for setting their own stop priorities
+            set_priority()
+          else 
+            # no priority, using '100 - 20 (update-rc.d default)' to stop in reverse order of start
+            run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
+            run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} stop 80 2 3 4 5 .")
+          end
+        end
+
+        def set_priority()
+          args = ""
+          @new_resource.priority.each do |level, o|
+            action = o[0]
+            priority = o[1]
+            args += "#{action} #{priority} #{level} . "
+          end
+          run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
+          run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} #{args}")
         end
-        
       end
     end
   end

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

@@ -0,0 +1,52 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2011 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 'chef/provider/service'
+require 'chef/provider/service/init'
+require 'chef/mixin/command'
+
+class Chef
+  class Provider
+    class Service
+      class Insserv < Chef::Provider::Service::Init
+
+        def load_current_resource
+          super
+
+          # Look for a /etc/rc.*/SnnSERVICE link to signifiy that the service would be started in a runlevel
+          if Dir.glob("/etc/rc**/S*#{@current_resource.service_name}").empty?
+            @current_resource.enabled false
+          else
+            @current_resource.enabled true 
+          end
+  
+          @current_resource
+        end
+
+        def enable_service()
+          run_command(:command => "/sbin/insserv -r -f #{@new_resource.service_name}")
+          run_command(:command => "/sbin/insserv -d -f #{@new_resource.service_name}")
+        end
+
+        def disable_service()
+          run_command(:command => "/sbin/insserv -r -f #{@new_resource.service_name}")
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 #
 # Author:: Nuo Yan <nuo@opscode.com>
+# Author:: Bryan McLellan <btm@loftninjas.org>
 # Copyright:: Copyright (c) 2010 Opscode, Inc
 # License:: Apache License, Version 2.0
 #
@@ -16,68 +17,86 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service/init'
+# pick up popen4 from chef/mixin/command/windows
+require 'chef/mixin/command'
+require 'chef/provider/service/simple'
 
-class Chef::Provider::Service::Windows < Chef::Provider::Service::Init
+class Chef::Provider::Service::Windows < Chef::Provider::Service::Simple
 
   def initialize(new_resource, run_context)
     super
     @init_command = "sc"
   end
 
+  def io_popen(command)
+    io = IO.popen(command)
+    entries = io.readlines
+    io.close
+    entries
+  end
+
   def load_current_resource
     @current_resource = Chef::Resource::Service.new(@new_resource.name)
     @current_resource.service_name(@new_resource.service_name)
-    status = IO.popen("#{@init_command} query #{@new_resource.service_name}").entries
-    raise Chef::Exceptions::Exec, "Service #{@new_resource.service_name} does not exist.\n#{status.join}\n" if status[0].include?("FAILED 1060")
-
     begin
-      started = status[3].include?("4")
-      @current_resource.running started
+      # Check if service is running
+      status = popen4("#{@init_command} query #{@new_resource.service_name}") do |pid, stdin, stdout, stderr|
+        stdout.each_line do |line|
+          raise Chef::Exceptions::Service, "Service #{@new_resource.service_name} does not exist.\n#{stdout}\n" if line =~ /FAILED 1060/
+          @current_resource.running true if line =~/RUNNING/
+        end
+      end
 
-      start_type = IO.popen("#{@init_command} qc #{@new_resource.service_name}").entries[4]
-      @current_resource.enabled(start_type.include?('2') || start_type.include?('3') ? true : false)
+      # Check if service is enabled
+      status = popen4("#{@init_command} qc #{@new_resource.service_name}") do |pid, stdin, stdout, stderr|
+        stdout.each_line do |line|
+          raise Chef::Exceptions::Service, "Service #{@new_resource.service_name} does not exist.\n#{stdout}\n" if line =~ /FAILED 1060/
+          @current_resource.enabled true if line =~/AUTO_START/
+        end
+      end
 
       Chef::Log.debug "#{@new_resource}: running: #{@current_resource.running}"
-    rescue StandardError
-      raise Chef::Exceptions::Exec
-    rescue Chef::Exceptions::Exec
-      Chef::Log.debug "Failed to determine the current status of the service, assuming it is not running"
-      @current_resource.running false
-      nil
+    rescue Exception => e
+      raise Chef::Exceptions::Service, "Exception determining state of service #{@new_resource.service_name}: #{e.message}"
     end
     @current_resource
   end
 
   def start_service
     begin
-      result = if @new_resource.start_command
-                 Chef::Log.debug "starting service using the given start_command"
-                 IO.popen(@new_resource.start_command).readlines
-               else
-                 IO.popen("#{@init_command} start #{@new_resource.service_name}").readlines
-               end
-      Chef::Log.debug result.join
-      result[3].include?('4') || result.include?('2') ? true : false
-    rescue
-      Chef::Log.debug "Failed to start service #{@new_resource.service_name}"
-      false
+      if @new_resource.start_command
+        popen4(@new_resource.start_command) do |pid, stdin, stdout, stderr|
+          Chef::Log.debug stdout.readlines
+        end
+      else
+        popen4("#{@init_command} start #{@new_resource.service_name}") do |pid, stdin, stdout, stderr|
+          output = stdout.readlines
+          Chef::Log.debug output.join
+          output.join =~ /RUNNING/ || output.join =~ /START_PENDING/ ? true : false
+        end
+      end
+    rescue Exception => e
+      raise Chef::Exceptions::Service, "Failed to start service #{@new_resource.service_name}: #{e.message}"
     end
   end
 
   def stop_service
     begin
-      Chef::Log.debug "stopping service using the given stop_command"
-      result = if @new_resource.stop_command
-                 IO.popen(@new_resource.stop_command).readlines
-               else
-                 IO.popen("#{@init_command} stop #{@new_resource.service_name}").readlines
-               end
-      Chef::Log.debug result.join
-      result[3].include?('1')
-    rescue
-      Chef::Log.debug "Failed to stop service #{@new_resource.service_name}"
-      false
+      if @new_resource.stop_command
+        Chef::Log.debug "stopping service using the given stop_command"
+        popen4(@new_resource.stop_command) do |pid, stdin, stdout, stderr|
+          Chef::Log.debug stdout.readlines
+        end
+      else
+        popen4("#{@init_command} stop #{@new_resource.service_name}") do |pid, stdin, stdout, stderr|
+          output = stdout.readlines
+          Chef::Log.debug output.join
+          raise Chef::Exceptions::Service, "Service #{@new_resource.service_name} has dependencies and cannot be stopped.\n" if output.join =~ /FAILED 1051/
+          output.join =~ /1/
+        end
+      end
+    rescue Exception => e
+      raise Chef::Exceptions::Service, "Failed to start service #{@new_resource.service_name}: #{e.message}"
     end
   end
 
@@ -85,38 +104,36 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service::Init
     begin
       if @new_resource.restart_command
         Chef::Log.debug "restarting service using the given restart_command"
-        result = IO.popen(@new_resource.restart_command).readlines
-        Chef::Log.debug result.join
+        popen4(@new_resource.restart_command) do |pid, stdin, stdout, stderr|
+          Chef::Log.debug stdout.readlines
+        end
       else
-        Chef::Log.debug IO.popen("#{@init_command} stop #{@new_resource.service_name}").readlines.join
+        stop_service
         sleep 1
-        result = IO.popen("#{@init_command} start #{@new_resource.service_name}").readlines
-        Chef::Log.debug result.join
+        start_service
       end
-      result[3].include?('4') || result.include?('2')
-    rescue
-      Chef::Log.debug "Failed to restart service #{@new_resource.service_name}"
-      false
+    rescue Exception => e
+      raise Chef::Exceptions::Service, "Failed to start service #{@new_resource.service_name}: #{e.message}"
     end
   end
 
   def enable_service()
     begin
-      Chef::Log.debug result = IO.popen("#{@init_command} config #{@new_resource.service_name} start= #{determine_startup_type}").readlines.join
-      result.include?('SUCCESS')
-    rescue
-      Chef::Log.debug "Failed to enable service #{@new_resource.service_name}"
-      false
+      popen4("#{@init_command} config #{@new_resource.service_name} start= #{determine_startup_type}") do |pid, stdin, stdout, stderr|
+        stdout.readlines.join =~ /SUCCESS/
+      end
+    rescue Exception => e
+      raise Chef::Exceptions::Service, "Failed to start service #{@new_resource.service_name}: #{e.message}"
     end
   end
 
   def disable_service()
     begin
-      Chef::Log.debug result = IO.popen("#{@init_command} config #{@new_resource.service_name} start= disabled").readlines.join
-      result.include?('SUCCESS')
-    rescue
-      Chef::Log.debug "Failed to disable service #{@new_resource.service_name}"
-      false
+      popen4("#{@init_command} config #{@new_resource.service_name} start= disabled") do |pid, stdin, stdout, stderr|
+        stdout.readlines.join =~ /SUCCESS/
+      end
+    rescue Exception => e
+      raise Chef::Exceptions::Service, "Failed to start service #{@new_resource.service_name}: #{e.message}"
     end
   end
 
@@ -126,4 +143,4 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service::Init
     {:automatic => 'auto', :mannual => 'demand'}[@new_resource.startup_type]
   end
 
-end
+end