From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Nov 2017 20:22:49 +0000 (+0000)
Subject: Modernise nodejs_package LWRP
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/9d0332e71c78a4bec496b93cf19ece6ebf294e55?hp=176d46fe9b5deb4080f433b1ca7f7786492fda9a

Modernise nodejs_package LWRP
---

diff --git a/cookbooks/nodejs/providers/package.rb b/cookbooks/nodejs/providers/package.rb
deleted file mode 100644
index 0ecd08eba..000000000
--- a/cookbooks/nodejs/providers/package.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Cookbook Name:: nodejs
-# Provider:: package
-#
-# 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.
-# 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/mixin/shell_out"
-require "json"
-
-include Chef::Mixin::ShellOut
-
-use_inline_resources
-
-def load_current_resource
-  @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)
-  if (package = @packages[@current_resource.package_name])
-    @current_resource.version(package["version"])
-  end
-  @current_resource
-end
-
-action :install do
-  package_name = if new_resource.version
-                   "#{new_resource.package_name}@#{new_resource.version}"
-                 else
-                   new_resource.package_name
-                 end
-
-  if !@packages.include?(new_resource.package_name)
-    converge_by "install #{package_name}" do
-      shell_out!("npm install --global #{package_name}")
-    end
-  elsif new_resource.version &&
-        new_resource.version != @current_resource.version
-    converge_by "update #{package_name}" do
-      shell_out!("npm install --global #{package_name}")
-    end
-  end
-end
-
-action :upgrade do
-  if @packages.include?(new_resource.package_name)
-    converge_by "update #{new_resource.package_name}" do
-      shell_out!("npm update --global #{new_resource.package_name}")
-    end
-  end
-end
-
-action :remove do
-  if @packages.include?(new_resource.package_name)
-    converge_by "remove #{new_resource.package_name}" do
-      shell_out!("npm remove --global #{new_resource.package_name}")
-    end
-  end
-end
diff --git a/cookbooks/nodejs/resources/package.rb b/cookbooks/nodejs/resources/package.rb
index f62aecc84..db81c9ee6 100644
--- a/cookbooks/nodejs/resources/package.rb
+++ b/cookbooks/nodejs/resources/package.rb
@@ -17,9 +17,54 @@
 # limitations under the License.
 #
 
+require "chef/mixin/shell_out"
+require "json"
+
 default_action :install
 
-actions :install, :upgrade, :remove
+property :package, :kind_of => String, :name_attribute => true
+property :version, :kind_of => String
+
+action :install do
+  qualified_name = if new_resource.version
+                     "#{new_resource.package}@#{new_resource.version}"
+                   else
+                     new_resource.package
+                   end
+
+  if current_version.nil?
+    converge_by "install #{qualified_name}" do
+      shell_out!("npm install --global #{qualified_name}")
+    end
+  elsif new_resource.version &&
+        new_resource.version != current_version
+    converge_by "update #{qualified_name}" do
+      shell_out!("npm install --global #{qualified_name}")
+    end
+  end
+end
+
+action :upgrade do
+  unless current_version.nil?
+    converge_by "update #{new_resource.package}" do
+      shell_out!("npm update --global #{new_resource.package}")
+    end
+  end
+end
+
+action :remove do
+  unless current_version.nil?
+    converge_by "remove #{new_resource.package}" do
+      shell_out!("npm remove --global #{new_resource.package}")
+    end
+  end
+end
+
+action_class do
+  include Chef::Mixin::ShellOut
 
-attribute :package_name, :kind_of => String, :name_attribute => true
-attribute :version, :kind_of => String
+  def current_version
+    @current_version ||= JSON.parse(shell_out("npm list --global --json").stdout)
+                             .dig("dependencies", new_resource.package, "version")
+  end
+end