Merge pull request #502 from szechyjs/git-recursive

Clone git repositories with --recursive flag.
chef · Jun 30, 2015 · 438bb35 · 438bb35
2 parents 5ad72a4 + 87c6ab5
commit 438bb35
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/omnibus/fetchers/git_fetcher.rb b/lib/omnibus/fetchers/git_fetcher.rb
@@ -91,6 +91,15 @@ def source_url
       source[:git]
     end
 
+    #
+    # Determine if submodules should be cloned.
+    #
+    # @return [true, false]
+    #
+    def clone_submodules?
+      source[:submodules] || false
+    end
+
     #
     # Determine if a directory is empty
     #
@@ -124,7 +133,7 @@ def cloned?
     # @return [void]
     #
     def git_clone
-      git("clone #{source_url} .")
+      git("clone#{" --recursive" if clone_submodules?} #{source_url} .")
     end
 
     #

diff --git a/lib/omnibus/software.rb b/lib/omnibus/software.rb
@@ -235,7 +235,7 @@ def source(val = NULL)
             "be a kind of `Hash', but was `#{val.class.inspect}'")
         end
 
-        extra_keys = val.keys - [:git, :path, :url, :md5, :cookie, :warning, :unsafe, :options]
+        extra_keys = val.keys - [:git, :path, :url, :md5, :cookie, :warning, :unsafe, :options, :submodules]
         unless extra_keys.empty?
           raise InvalidValue.new(:source,
             "only include valid keys. Invalid keys: #{extra_keys.inspect}")