Use systemd to manage munin-node on Ubuntu 15.10

[chef.git] / cookbooks / nodejs / providers / package.rb

diff --git a/cookbooks/nodejs/providers/package.rb b/cookbooks/nodejs/providers/package.rb
index f726df310734abae51fee954610d0feb238cead4..3a33040635c06b8cc0dcd642cd4b8bdd16a4bdae 100644 (file)
--- a/cookbooks/nodejs/providers/package.rb
+++ b/cookbooks/nodejs/providers/package.rb
@@ -23,11 +23,11 @@ require "json"
 include Chef::Mixin::ShellOut
 
 def load_current_resource
 include Chef::Mixin::ShellOut
 
 def load_current_resource

-  @packages = JSON.parse(shell_out("npm list --global --json").stdout)["dependencies"]
+  @packages = JSON.parse(shell_out("npm list --global --json").stdout)["dependencies"] || {}

 
   @current_resource = Chef::Resource::NodejsPackage.new(new_resource.name)
   @current_resource.package_name(new_resource.package_name)
 
   @current_resource = Chef::Resource::NodejsPackage.new(new_resource.name)
   @current_resource.package_name(new_resource.package_name)

-  if package = @packages[@current_resource.package_name]
+  if (package = @packages[@current_resource.package_name])

     @current_resource.version(package["version"])
   end
   @current_resource
     @current_resource.version(package["version"])
   end
   @current_resource


@@ -40,7 +40,7 @@ action :install do
     package_name = new_resource.package_name
   end
 
     package_name = new_resource.package_name
   end
 

-  unless @packages.include?(new_resource.package_name)
+  if !@packages.include?(new_resource.package_name)

     shell_out!("npm install --global #{package_name}")
     new_resource.updated_by_last_action(true)
   else
     shell_out!("npm install --global #{package_name}")
     new_resource.updated_by_last_action(true)
   else