civi version bump

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

diff --git a/cookbooks/nodejs/resources/package.rb b/cookbooks/nodejs/resources/package.rb
index 886d486e1c0e61515877fd05670189f24122e0be..5279cc91a09f851c0a052b79b95937e542947513 100644 (file)
--- a/cookbooks/nodejs/resources/package.rb
+++ b/cookbooks/nodejs/resources/package.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: nodejs
+# Cookbook:: nodejs

 # Resource:: package
 #
 # Resource:: package
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,12 +17,13 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-require "chef/mixin/shell_out"

 require "json"
 
 require "json"
 

+unified_mode true
+

 default_action :install
 
 default_action :install
 

-property :package, :kind_of => String, :name_attribute => true
+property :package, :kind_of => String, :name_property => true

 property :version, :kind_of => String
 
 action :install do
 property :version, :kind_of => String
 
 action :install do


@@ -61,8 +62,6 @@ action :remove do
 end
 
 action_class do
 end
 
 action_class do

-  include Chef::Mixin::ShellOut
-

   def current_version
     @current_version ||= JSON.parse(shell_out("npm list --global --json").stdout)
                              .dig("dependencies", new_resource.package, "version")
   def current_version
     @current_version ||= JSON.parse(shell_out("npm list --global --json").stdout)
                              .dig("dependencies", new_resource.package, "version")