Updated usages of #provided? to #in_path?.

quamen · Apr 4, 2011 · 1571423 · 1571423
1 parent f34d102
commit 1571423
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/deps/git.rb b/deps/git.rb
@@ -5,7 +5,7 @@
     on :osx, 'git.installer'
     otherwise 'git.managed'
   }
-  met? { provided? 'git >= 1.7' }
+  met? { in_path? 'git >= 1.7' }
 end
 
 dep 'git.managed' do

diff --git a/deps/ruby.rb b/deps/ruby.rb
@@ -1,6 +1,6 @@
 dep 'ruby' do
   met? {
-    provided? 'ruby >= 1.8.6'
+    in_path? 'ruby >= 1.8.6'
   }
   requires_when_unmet {
     on :osx, 'ruby.external'

diff --git a/deps/rubygems.rb b/deps/rubygems.rb
@@ -18,7 +18,7 @@
 dep 'rubygems installed' do
   requires 'ruby'
   requires_when_unmet 'curl.managed'
-  met? { provided? %w[gem ruby] }
+  met? { in_path? %w[gem ruby] }
   meet {
     handle_source "http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz" do
       shell "ruby setup.rb", :sudo => !File.writable?(which('ruby'))

diff --git a/deps/templates/external.rb b/deps/templates/external.rb
@@ -4,7 +4,7 @@
 
   template {
     met? {
-      returning provided?(expects) || :fail do |result|
+      returning in_path?(expects) || :fail do |result|
         otherwise.call if result == :fail
       end
     }

diff --git a/deps/templates/installer.rb b/deps/templates/installer.rb
@@ -6,7 +6,7 @@
 
   template {
     prepare { setup_source_uris }
-    met? { provided? }
+    met? { in_path? }
 
     # At the moment, we just try to install every .[m]pkg in the archive.
     # Example:

diff --git a/deps/templates/managed.rb b/deps/templates/managed.rb
@@ -33,7 +33,7 @@ def add_cfg_deps
     if installs.blank?
       log_ok "Not required on #{pkg_manager.manager_key}-based systems."
     else
-      packages_present? and provided?
+      packages_present? and in_path?
     end
   }
   before {