lib/engineyard-recipes/fetch_uri.rb in engineyard-recipes-0.1.3 vs lib/engineyard-recipes/fetch_uri.rb in engineyard-recipes-0.2.0.pre1

@@ -1,20 +1,38 @@
+require "engineyard-recipes/git_cmd"
+
 module Engineyard::Recipes
   module FetchUri
     extend self
+    extend Engineyard::Recipes::GitCmd
     
+    class UnknownPath < StandardError; end
+    
     # Fetch the target at URI (git url or local folder path)
     #
     # Returns a tuple:
     # * path to a local folder structure that contains "cookbooks/<recipe name>"
     # * recipe_name
     def fetch_recipe(uri, source_root, recipe_name = nil)
       if File.exists?(uri)
         normalize_fetched_project(uri, source_root, recipe_name)
+      else
+        raise UnknownPath, uri
       end
     end
     
+    # Vendor/submodule the +uri+ into current git repo at +sm_vendor_path+
+    # If +uri+ is a local folder, then copy folder to +sm_vendor_path+
+    # If +uri+ is a remote git repo, then submodule to +sm_vendor_path+
+    def vendor_recipe_into_recipe(uri, sm_vendor_path)
+      if File.exists?(uri)
+        FileUtils.cp_r(uri, sm_vendor_path)
+      else 
+        git "submodule add #{uri} #{sm_vendor_path}"
+      end
+    end
+    
     # Takes a folder that is either a cookbooks/<recipes> structure, or
     # assumed to be a singular <recipe>/
     # Copies it into +store_path+ and resulting folder
     # guaranteed to be in cookbooks/<recipes> structure
     #
@@ -44,10 +62,9 @@
       FileUtils.rm_rf(store_path)
       FileUtils.mkdir_p(store_path)
       initial_storage = Dir.mktmpdir
       initial_storage_cookbooks = File.join(initial_storage, "cookbooks")
       if File.directory?(File.join(path, "cookbooks"))
-        # FIXME untested
         FileUtils.cp_r("#{path}/", initial_storage)
       else
         FileUtils.mkdir_p(initial_storage_cookbooks)
         FileUtils.cp_r(path, File.join(initial_storage, "cookbooks", recipe_name))
       end