deprecate legacy npm support

phlipper · Jun 29, 2013 · ea7ca4b · ea7ca4b
1 parent 09d3797
commit ea7ca4b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,13 @@ The following platforms are supported by this cookbook, meaning that the recipes
 * `nodejs::npm` - Install `npm`.   _NOTE: `node.js-legacy` only_
 
 
+## Attributes
+
+```ruby
+default["nodejs"]["legacy"] = false  # enable legacy npm support
+```
+
+
 ## Usage
 
 This cookbook installs the Node.js components if not present, and pulls updates if they are installed on the system.

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -0,0 +1 @@
+default["nodejs"]["legacy"] = false  # enable legacy npm support
diff --git a/metadata.rb b/metadata.rb
@@ -7,7 +7,7 @@
 version           "1.6.0"
 
 recipe "nodejs", "Sets up the apt repository and installs dependent packages"
-recipe "nodejs::npm", "Install npm"
+recipe "nodejs::npm", "Install npm [DEPRECATED]"
 
 depends "apt", ">= 1.4.4"
 

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -14,16 +14,6 @@
     keyserver "keyserver.ubuntu.com"
     action :add
   end
-
-
-  apt_repository "chris-lea-node.js-legacy" do
-    uri "http://ppa.launchpad.net/chris-lea/node.js-legacy/ubuntu"
-    distribution node["lsb"]["codename"]
-    components ["main"]
-    key "C7917B12"
-    keyserver "keyserver.ubuntu.com"
-    action :add
-  end
 
 when "debian"
 

diff --git a/recipes/npm.rb b/recipes/npm.rb
@@ -3,6 +3,20 @@
 # Recipe:: npm
 #
 
-include_recipe "nodejs"
 
-package "npm"
+if node["nodejs"]["legacy"]
+
+  include_recipe "nodejs"
+
+  apt_repository "chris-lea-node.js-legacy" do
+    uri "http://ppa.launchpad.net/chris-lea/node.js-legacy/ubuntu"
+    distribution node["lsb"]["codename"]
+    components ["main"]
+    key "C7917B12"
+    keyserver "keyserver.ubuntu.com"
+    action :add
+  end
+
+  package "npm"
+
+end